soundwire: bus: introduce controller_id

[ Upstream commit 6543ac13c623f906200dfd3f1c407d8d333b6995 ]

The existing SoundWire support misses a clear Controller/Manager
hiearchical definition to deal with all variants across SOC vendors.

a) Intel platforms have one controller with 4 or more Managers.
b) AMD platforms have two controllers with one Manager each, but due
to BIOS issues use two different link_id values within the scope of a
single controller.
c) QCOM platforms have one or more controller with one Manager each.

This patch adds a 'controller_id' which can be set by higher
levels. If assigned to -1, the controller_id will be set to the
system-unique IDA-assigned bus->id.

The main change is that the bus->id is no longer used for any device
name, which makes the definition completely predictable and not
dependent on any enumeration order. The bus->id is only used to insert
the Managers in the stream rt context.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/stable/20231017160933.12624-2-pierre-louis.bossart%40linux.intel.com
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20231017160933.12624-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Stable-dep-of: 8a8a9ac8a497 ("soundwire: fix initializing sysfs for same devices on different buses")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 3a99f6d..a3b1f4e 100644 (file)
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -927,6 +927,14 @@ static int amd_sdw_manager_probe(struct platform_device *pdev)
        amd_manager->bus.clk_stop_timeout = 200;
        amd_manager->bus.link_id = amd_manager->instance;
 
+       /*
+        * Due to BIOS compatibility, the two links are exposed within
+        * the scope of a single controller. If this changes, the
+        * controller_id will have to be updated with drv_data
+        * information.
+        */
+       amd_manager->bus.controller_id = 0;
+
        switch (amd_manager->instance) {
        case ACP_SDW0:
                amd_manager->num_dout_ports = AMD_SDW0_MAX_TX_PORTS;

diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index 0e7bc3c..e7553c3 100644 (file)
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -22,6 +22,10 @@ static int sdw_get_id(struct sdw_bus *bus)
                return rc;
 
        bus->id = rc;
+
+       if (bus->controller_id == -1)
+               bus->controller_id = rc;
+
        return 0;
 }
 

diff --git a/drivers/soundwire/debugfs.c b/drivers/soundwire/debugfs.c
index d1553cb..67abd7e 100644 (file)
--- a/drivers/soundwire/debugfs.c
+++ b/drivers/soundwire/debugfs.c
@@ -20,7 +20,7 @@ void sdw_bus_debugfs_init(struct sdw_bus *bus)
                return;
 
        /* create the debugfs master-N */
-       snprintf(name, sizeof(name), "master-%d-%d", bus->id, bus->link_id);
+       snprintf(name, sizeof(name), "master-%d-%d", bus->controller_id, bus->link_id);
        bus->debugfs = debugfs_create_dir(name, sdw_debugfs_root);
 }
 

diff --git a/drivers/soundwire/intel_auxdevice.c b/drivers/soundwire/intel_auxdevice.c
index 7f15e35..9369853 100644 (file)
--- a/drivers/soundwire/intel_auxdevice.c
+++ b/drivers/soundwire/intel_auxdevice.c
@@ -234,6 +234,9 @@ static int intel_link_probe(struct auxiliary_device *auxdev,
        cdns->instance = sdw->instance;
        cdns->msg_count = 0;
 
+       /* single controller for all SoundWire links */
+       bus->controller_id = 0;
+
        bus->link_id = auxdev->id;
        bus->clk_stop_timeout = 1;
 

diff --git a/drivers/soundwire/master.c b/drivers/soundwire/master.c
index 9b05c9e..51abedb 100644 (file)
--- a/drivers/soundwire/master.c
+++ b/drivers/soundwire/master.c
@@ -145,7 +145,7 @@ int sdw_master_device_add(struct sdw_bus *bus, struct device *parent,
        md->dev.fwnode = fwnode;
        md->dev.dma_mask = parent->dma_mask;
 
-       dev_set_name(&md->dev, "sdw-master-%d", bus->id);
+       dev_set_name(&md->dev, "sdw-master-%d-%d", bus->controller_id, bus->link_id);
 
        ret = device_register(&md->dev);
        if (ret) {

diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index 55be9f4..e3ae4e4 100644 (file)
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -1612,6 +1612,9 @@ static int qcom_swrm_probe(struct platform_device *pdev)
                }
        }
 
+       /* FIXME: is there a DT-defined value to use ? */
+       ctrl->bus.controller_id = -1;
+
        ret = sdw_bus_master_add(&ctrl->bus, dev, dev->fwnode);
        if (ret) {
                dev_err(dev, "Failed to register Soundwire controller (%d)\n",

diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index 4f3d14b..c383579 100644 (file)
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -886,7 +886,8 @@ struct sdw_master_ops {
  * struct sdw_bus - SoundWire bus
  * @dev: Shortcut to &bus->md->dev to avoid changing the entire code.
  * @md: Master device
- * @link_id: Link id number, can be 0 to N, unique for each Master
+ * @controller_id: system-unique controller ID. If set to -1, the bus @id will be used.
+ * @link_id: Link id number, can be 0 to N, unique for each Controller
  * @id: bus system-wide unique id
  * @slaves: list of Slaves on this bus
  * @assigned: Bitmap for Slave device numbers.
@@ -918,6 +919,7 @@ struct sdw_master_ops {
 struct sdw_bus {
        struct device *dev;
        struct sdw_master_device *md;
+       int controller_id;
        unsigned int link_id;
        int id;
        struct list_head slaves;