Krzysztof Kozlowski cfaa04a3ab soundwire: fix initializing sysfs for same devices on different buses ...

[ Upstream commit 8a8a9ac8a4972ee69d3dd3d1ae43963ae39cee18 ]

If same devices with same device IDs are present on different soundwire
buses, the probe fails due to conflicting device names and sysfs
entries:

  sysfs: cannot create duplicate filename '/bus/soundwire/devices/sdw:0:0217:0204:00:0'

The link ID is 0 for both devices, so they should be differentiated by
the controller ID. Add the controller ID so, the device names and sysfs entries look
like:

  sdw:1:0:0217:0204:00:0 -> ../../../devices/platform/soc@0/6ab0000.soundwire-controller/sdw-master-1-0/sdw:1:0:0217:0204:00:0
  sdw:3:0:0217:0204:00:0 -> ../../../devices/platform/soc@0/6b10000.soundwire-controller/sdw-master-3-0/sdw:3:0:0217:0204:00:0

[PLB changes: use bus->controller_id instead of bus->id]

Fixes: 7c3cd189b8 ("soundwire: Add Master registration")
Cc: stable@vger.kernel.org
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Co-developed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tested-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Mark Brown <broonie@kernel.org>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20231017160933.12624-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

2024-01-31 16:18:47 -08:00

..

amd_manager.c

soundwire: bus: introduce controller_id

2024-01-31 16:18:47 -08:00

amd_manager.h

soundwire: amd: handle SoundWire wake enable interrupt

2023-04-12 15:30:36 +05:30

bus_type.c

soundwire: bus: Make IRQ handling conditionally built

2023-09-21 11:31:33 +02:00

bus.c

soundwire: bus: introduce controller_id

2024-01-31 16:18:47 -08:00

bus.h

soundwire: export sdw_compute_slave_ports() function

2023-04-12 15:30:35 +05:30

cadence_master.c

soundwire: cadence: revisit parity injection

2023-05-29 10:49:47 +05:30

cadence_master.h

soundwire: intel/cadence: update hardware reset sequence

2023-05-29 10:49:47 +05:30

debugfs.c

soundwire: bus: introduce controller_id

2024-01-31 16:18:47 -08:00

dmi-quirks.c

soundwire: dmi-quirks: update HP Omen match

2023-11-28 17:19:45 +00:00

generic_bandwidth_allocation.c

soundwire: bandwidth allocation: Remove pointless variable

2023-06-08 17:09:11 +05:30

intel_ace2x_debugfs.c

soundwire: intel_ace2x: add debugfs support

2023-05-27 16:06:45 +05:30

intel_ace2x.c

soundwire: intel_ace2x: fix AC timing setting for ACE2.x

2024-01-20 11:51:42 +01:00

intel_auxdevice.c

soundwire: bus: introduce controller_id

2024-01-31 16:18:47 -08:00

intel_auxdevice.h

soundwire: intel: split auxdevice to different file

2022-11-23 20:11:49 +05:30

intel_bus_common.c

soundwire: intel/cadence: update hardware reset sequence

2023-05-29 10:49:47 +05:30

intel_init.c

soundwire: intel_init: use eml_lock parameter

2023-05-27 16:06:45 +05:30

intel.c

soundwire: intel: read AC timing control register before updating it

2023-05-27 16:08:48 +05:30

intel.h

soundwire: intel_ace2x: add debugfs support

2023-05-27 16:06:45 +05:30

irq.c

soundwire: bus: Make IRQ handling conditionally built

2023-09-21 11:31:33 +02:00

irq.h

soundwire: bus: Make IRQ handling conditionally built

2023-09-21 11:31:33 +02:00

Kconfig

soundwire: intel_ace2x: fix SND_SOC_SOF_HDA_MLINK dependency

2023-06-21 16:19:44 +05:30

Makefile

soundwire: bus: Make IRQ handling conditionally built

2023-09-21 11:31:33 +02:00

master.c

soundwire: bus: introduce controller_id

2024-01-31 16:18:47 -08:00

mipi_disco.c

soundwire: fix port_ready[] dynamic allocation in mipi_disco

2020-09-03 16:02:29 +05:30

qcom.c

soundwire: bus: introduce controller_id

2024-01-31 16:18:47 -08:00

slave.c

soundwire: fix initializing sysfs for same devices on different buses

2024-01-31 16:18:47 -08:00

stream.c

soundwire: stream: fix NULL pointer dereference for multi_link

2023-12-20 17:02:01 +01:00

sysfs_local.h

soundwire: sysfs: add slave status and device number before probe

2020-09-28 11:17:43 +05:30

sysfs_slave_dpn.c

soundwire: Fix DEBUG_LOCKS_WARN_ON for uninitialized attribute

2020-11-24 14:08:51 +05:30

sysfs_slave.c

soundwire: sysfs: Constify static struct attribute_group

2021-01-19 20:21:20 +05:30