Skip to contentSkip to conversation

soundwire: bus: Move irq mapping cleanup into devres

PATCH Applied Charles Keepax 2 participants 2 messages Dec 5, 2024 – Dec 23, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soundwire: bus: Move irq mapping cleanup into devres

Currently the IRQ mapping is disposed off in sdw_drv_remove(), however if the SoundWire device uses devres this can run before the actual device clean up, potentially clearing the mapping whilst it is still in use. Make this devres safe by also moving the sdw_irq_dispose_mapping into devres.

---
 drivers/soundwire/bus_type.c |  3 ---
 drivers/soundwire/irq.c      | 12 ++++++++----
 drivers/soundwire/irq.h      |  5 -----
 3 files changed, 8 insertions(+), 12 deletions(-)
drivers/soundwire/bus_type.c +0 -3
index 77dc094075e1..e98d5db81b1c 100644
@@ -167,9 +167,6 @@ static int sdw_drv_remove(struct device *dev)
 
 	slave->probed = false;
 
-	if (slave->prop.use_domain_irq)
-		sdw_irq_dispose_mapping(slave);
-
 	mutex_unlock(&slave->sdw_dev_lock);
 
 	if (drv->remove)
drivers/soundwire/irq.c +8 -4
index 0c08cebb1235..c237e6d0766b 100644
@@ -46,14 +46,18 @@ void sdw_irq_delete(struct sdw_bus *bus)
 	irq_domain_remove(bus->domain);
 }
 
+static void sdw_irq_dispose_mapping(void *data)
+{
+	struct sdw_slave *slave = data;
+
+	irq_dispose_mapping(irq_find_mapping(slave->bus->domain, slave->dev_num));
+}
+
 void sdw_irq_create_mapping(struct sdw_slave *slave)
 {
 	slave->irq = irq_create_mapping(slave->bus->domain, slave->dev_num);
 	if (!slave->irq)
 		dev_warn(&slave->dev, "Failed to map IRQ\n");
-}
 
-void sdw_irq_dispose_mapping(struct sdw_slave *slave)
-{
-	irq_dispose_mapping(irq_find_mapping(slave->bus->domain, slave->dev_num));
+	devm_add_action_or_reset(&slave->dev, sdw_irq_dispose_mapping, slave);
 }
drivers/soundwire/irq.h +0 -5
index 58a58046d92b..86e2318409da 100644
@@ -16,7 +16,6 @@ int sdw_irq_create(struct sdw_bus *bus,
 		   struct fwnode_handle *fwnode);
 void sdw_irq_delete(struct sdw_bus *bus);
 void sdw_irq_create_mapping(struct sdw_slave *slave);
-void sdw_irq_dispose_mapping(struct sdw_slave *slave);
 
 #else /* CONFIG_IRQ_DOMAIN */
 
@@ -34,10 +33,6 @@ static inline void sdw_irq_create_mapping(struct sdw_slave *slave)
 {
 }
 
-static inline void sdw_irq_dispose_mapping(struct sdw_slave *slave)
-{
-}
-
 #endif /* CONFIG_IRQ_DOMAIN */
 
 #endif /* __SDW_IRQ_H */
Signature · 1 line
2.39.5
maintainer Applied
#1 lore raw
Quoted 8 lines · Charles Keepax

Currently the IRQ mapping is disposed off in sdw_drv_remove(), however if the SoundWire device uses devres this can run before the actual device clean up, potentially clearing the mapping whilst it is still in use. Make this devres safe by also moving the sdw_irq_dispose_mapping into devres.

[...]

Applied, thanks!

[1/1] soundwire: bus: Move irq mapping cleanup into devres

      commit: a5fef9baa87f8be359a4b3ed11829ebca82e56ad

Best regards,

Signature · 1 line
~Vinod