soundwire: bus: Fix race on the creation of the IRQ domain

[ Upstream commit fd15594ba7d559d9da741504c322b9f57c4981e5 ]

The SoundWire IRQ domain needs to be created before any slaves are added
to the bus, such that the domain is always available when needed. Move
the call to sdw_irq_create() before the calls to sdw_acpi_find_slaves()
and sdw_of_find_slaves().

Fixes: 12a95123bfe1 ("soundwire: bus: Allow SoundWire peripherals to register IRQ handlers")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20250409122239.1396489-1-ckeepax@opensource.cirrus.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index 9b295fc9acd53460af56219ad02712bef3be31e4..df73e2c0409046e1b9517af9a697643ed637b879 100644 (file)
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -121,6 +121,10 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
        set_bit(SDW_GROUP13_DEV_NUM, bus->assigned);
        set_bit(SDW_MASTER_DEV_NUM, bus->assigned);
 
+       ret = sdw_irq_create(bus, fwnode);
+       if (ret)
+               return ret;
+
        /*
         * SDW is an enumerable bus, but devices can be powered off. So,
         * they won't be able to report as present.
@@ -137,6 +141,7 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
 
        if (ret < 0) {
                dev_err(bus->dev, "Finding slaves failed:%d\n", ret);
+               sdw_irq_delete(bus);
                return ret;
        }
 
@@ -155,10 +160,6 @@ int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent,
        bus->params.curr_bank = SDW_BANK0;
        bus->params.next_bank = SDW_BANK1;
 
-       ret = sdw_irq_create(bus, fwnode);
-       if (ret)
-               return ret;
-
        return 0;
 }
 EXPORT_SYMBOL(sdw_bus_master_add);