Skip to contentSkip to conversation

i3c: master: Free the old_dyn_addr when reattach.

PATCH Applied Billy Tsai 2 participants 3 messages Sep 26, 2022 – Oct 12, 2022 I3C

lore
Share & tools
lore

Billy Tsai

author
#0 lore raw

PATCH 1/2 i3c: master: Free the old_dyn_addr when reattach.

This patch is used to free the old_dyn_addr when the caller want to reattach the device to the different dynamic address. If the old_dyn_addr is 0 the function will treat it as no old_dyn_addr is reserved on the bus. Without the patch, when the driver reattach the i3c device after setnewda the old_dyn_addr will be permanently occupied.

---
 drivers/i3c/master.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/i3c/master.c +3 -0
index 7850287dfe7a..6349ce0ce835 100644
@@ -1379,6 +1379,9 @@ static int i3c_master_reattach_i3c_dev(struct i3c_dev_desc *dev,
 		i3c_bus_set_addr_slot_status(&master->bus,
 					     dev->info.dyn_addr,
 					     I3C_ADDR_SLOT_I3C_DEV);
+		if (old_dyn_addr)
+			i3c_bus_set_addr_slot_status(&master->bus, old_dyn_addr,
+						     I3C_ADDR_SLOT_FREE);
 	}
 
 	if (master->ops->reattach_i3c_dev) {
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 i3c: master: Remove the wrong place of reattach.

The reattach should be used when an I3C device has its address changed. But the modified place in this patch doesn't have the address changed of the newdev. This wrong reattach will reserve the same address slot twice and return unexpected -EBUSY when the bus find the duplicate device with diffent dynamic address.

---
 drivers/i3c/master.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/i3c/master.c +0 -4
index 6349ce0ce835..351c81a929a6 100644
@@ -1911,10 +1911,6 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,
 		i3c_master_free_i3c_dev(olddev);
 	}
 
-	ret = i3c_master_reattach_i3c_dev(newdev, old_dyn_addr);
-	if (ret)
-		goto err_detach_dev;
-
 	/*
 	 * Depending on our previous state, the expected dynamic address might
 	 * differ:
Signature · 1 line
2.25.1
maintainer Applied
#2 lore raw
In reply to Billy Tsai
Quoted 8 lines · Billy Tsai

This patch is used to free the old_dyn_addr when the caller want to reattach the device to the different dynamic address. If the old_dyn_addr is 0 the function will treat it as no old_dyn_addr is reserved on the bus. Without the patch, when the driver reattach the i3c device after setnewda the old_dyn_addr will be permanently occupied.

[...]

Applied, thanks!

[1/2] i3c: master: Free the old_dyn_addr when reattach.

      commit: d4fa7d772adc02451076b3ad1f990d8b822909fc
[2/2] i3c: master: Remove the wrong place of reattach.
      commit: 90f4a09a15239f4a819b2e90a7a0b92a75060655

Best regards,

Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com