soundwire: stream: fix programming slave ports for non-continous port maps

Two bitmasks in 'struct sdw_slave_prop' - 'source_ports' and
'sink_ports' - define which ports to program in
sdw_program_slave_port_params().  The masks are used to get the
appropriate data port properties ('struct sdw_get_slave_dpn_prop') from
an array.

Bitmasks can be non-continuous or can start from index different than 0,
thus when looking for matching port property for given port, we must
iterate over mask bits, not from 0 up to number of ports.

This fixes allocation and programming slave ports, when a source or sink
masks start from further index.

Fixes: f8101c74aa54 ("soundwire: Add Master and Slave port programming")
Cc: stable@vger.kernel.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240729140157.326450-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index 7aa4900dcf31723f1b54a54e0d641bb735828eb2..f275143d7b18e457095fd3e50b57f4cc515d55f8 100644 (file)
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -1291,18 +1291,18 @@ struct sdw_dpn_prop *sdw_get_slave_dpn_prop(struct sdw_slave *slave,
                                            unsigned int port_num)
 {
        struct sdw_dpn_prop *dpn_prop;
-       u8 num_ports;
+       unsigned long mask;
        int i;
 
        if (direction == SDW_DATA_DIR_TX) {
-               num_ports = hweight32(slave->prop.source_ports);
+               mask = slave->prop.source_ports;
                dpn_prop = slave->prop.src_dpn_prop;
        } else {
-               num_ports = hweight32(slave->prop.sink_ports);
+               mask = slave->prop.sink_ports;
                dpn_prop = slave->prop.sink_dpn_prop;
        }
 
-       for (i = 0; i < num_ports; i++) {
+       for_each_set_bit(i, &mask, 32) {
                if (dpn_prop[i].num == port_num)
                        return &dpn_prop[i];
        }