| Message ID | 20240904145228.289891-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | soundwire: stream: Revert "soundwire: stream: fix programming slave ports for non-continous port maps" | expand |
On 9/4/2024 10:52 PM, Krzysztof Kozlowski wrote: > This reverts commit ab8d66d132bc8f1992d3eb6cab8d32dda6733c84 because it > breaks codecs using non-continuous masks in source and sink ports. The > commit missed the point that port numbers are not used as indices for > iterating over prop.sink_ports or prop.source_ports. > > Soundwire core and existing codecs expect that the array passed as > prop.sink_ports and prop.source_ports is continuous. The port mask still > might be non-continuous, but that's unrelated. > > Reported-by: Bard Liao <yung-chuan.liao@linux.intel.com> > Closes: https://lore.kernel.org/all/b6c75eee-761d-44c8-8413-2a5b34ee2f98@linux.intel.com/ > Fixes: ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Acked-by: Bard Liao <yung-chuan.liao@linux.intel.com> > --- > > I will need to fix my codec drivers, but that's independent. > --- > drivers/soundwire/stream.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c > index f275143d7b18..7aa4900dcf31 100644 > --- 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; > - unsigned long mask; > + u8 num_ports; > int i; > > if (direction == SDW_DATA_DIR_TX) { > - mask = slave->prop.source_ports; > + num_ports = hweight32(slave->prop.source_ports); > dpn_prop = slave->prop.src_dpn_prop; > } else { > - mask = slave->prop.sink_ports; > + num_ports = hweight32(slave->prop.sink_ports); > dpn_prop = slave->prop.sink_dpn_prop; > } > > - for_each_set_bit(i, &mask, 32) { > + for (i = 0; i < num_ports; i++) { > if (dpn_prop[i].num == port_num) > return &dpn_prop[i]; > }
On Wed, Sep 04, 2024 at 04:52:28PM +0200, Krzysztof Kozlowski wrote: > This reverts commit ab8d66d132bc8f1992d3eb6cab8d32dda6733c84 because it > breaks codecs using non-continuous masks in source and sink ports. The > commit missed the point that port numbers are not used as indices for > iterating over prop.sink_ports or prop.source_ports. > > Soundwire core and existing codecs expect that the array passed as > prop.sink_ports and prop.source_ports is continuous. The port mask still > might be non-continuous, but that's unrelated. > > Reported-by: Bard Liao <yung-chuan.liao@linux.intel.com> > Closes: https://lore.kernel.org/all/b6c75eee-761d-44c8-8413-2a5b34ee2f98@linux.intel.com/ > Fixes: ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- Would be good to merge this as soon as we can, this is causing soundwire regressions from rc6 onwards. Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com> Thanks, Charles
On 9/9/24 16:36, Charles Keepax wrote: > On Wed, Sep 04, 2024 at 04:52:28PM +0200, Krzysztof Kozlowski wrote: >> This reverts commit ab8d66d132bc8f1992d3eb6cab8d32dda6733c84 because it >> breaks codecs using non-continuous masks in source and sink ports. The >> commit missed the point that port numbers are not used as indices for >> iterating over prop.sink_ports or prop.source_ports. >> >> Soundwire core and existing codecs expect that the array passed as >> prop.sink_ports and prop.source_ports is continuous. The port mask still >> might be non-continuous, but that's unrelated. >> >> Reported-by: Bard Liao <yung-chuan.liao@linux.intel.com> >> Closes: https://lore.kernel.org/all/b6c75eee-761d-44c8-8413-2a5b34ee2f98@linux.intel.com/ >> Fixes: ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >> >> --- > > Would be good to merge this as soon as we can, this is causing > soundwire regressions from rc6 onwards. the revert also needs to happen in -stable. 6.10.8 is broken as well. https://github.com/thesofproject/linux/issues/5168
On 09/09/2024 17:45, Pierre-Louis Bossart wrote: > > > On 9/9/24 16:36, Charles Keepax wrote: >> On Wed, Sep 04, 2024 at 04:52:28PM +0200, Krzysztof Kozlowski wrote: >>> This reverts commit ab8d66d132bc8f1992d3eb6cab8d32dda6733c84 because it >>> breaks codecs using non-continuous masks in source and sink ports. The >>> commit missed the point that port numbers are not used as indices for >>> iterating over prop.sink_ports or prop.source_ports. >>> >>> Soundwire core and existing codecs expect that the array passed as >>> prop.sink_ports and prop.source_ports is continuous. The port mask still >>> might be non-continuous, but that's unrelated. >>> >>> Reported-by: Bard Liao <yung-chuan.liao@linux.intel.com> >>> Closes: https://lore.kernel.org/all/b6c75eee-761d-44c8-8413-2a5b34ee2f98@linux.intel.com/ >>> Fixes: ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") >>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>> >>> --- >> >> Would be good to merge this as soon as we can, this is causing >> soundwire regressions from rc6 onwards. > > the revert also needs to happen in -stable. 6.10.8 is broken as well. It will happen. You do not need to Cc-stable (and it will not help, will not be picked), because this is marked as fix for existing commit. Best regards, Krzysztof
On Mon, Sep 09, 2024 at 06:08:14PM +0200, Krzysztof Kozlowski wrote: > On 09/09/2024 17:45, Pierre-Louis Bossart wrote: > > > > > > On 9/9/24 16:36, Charles Keepax wrote: > >> On Wed, Sep 04, 2024 at 04:52:28PM +0200, Krzysztof Kozlowski wrote: > >>> This reverts commit ab8d66d132bc8f1992d3eb6cab8d32dda6733c84 because it > >>> breaks codecs using non-continuous masks in source and sink ports. The > >>> commit missed the point that port numbers are not used as indices for > >>> iterating over prop.sink_ports or prop.source_ports. > >>> > >>> Soundwire core and existing codecs expect that the array passed as > >>> prop.sink_ports and prop.source_ports is continuous. The port mask still > >>> might be non-continuous, but that's unrelated. > >>> > >>> Reported-by: Bard Liao <yung-chuan.liao@linux.intel.com> > >>> Closes: https://lore.kernel.org/all/b6c75eee-761d-44c8-8413-2a5b34ee2f98@linux.intel.com/ > >>> Fixes: ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") > >>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >>> > >>> --- > >> > >> Would be good to merge this as soon as we can, this is causing > >> soundwire regressions from rc6 onwards. > > > > the revert also needs to happen in -stable. 6.10.8 is broken as well. > > It will happen. You do not need to Cc-stable (and it will not help, will > not be picked), because this is marked as fix for existing commit. No, "Fixes:" tags only do not guarantee anything going to stable, you have to explicitly tag it Cc: stable to do so, as per the documentation. Yes, we often pick up "Fixes:" only tags, when we have the time, but again, never guaranteed at all. thanks, greg k-h
On 09/09/2024 18:23, Greg KH wrote: >>>>> Soundwire core and existing codecs expect that the array passed as >>>>> prop.sink_ports and prop.source_ports is continuous. The port mask still >>>>> might be non-continuous, but that's unrelated. >>>>> >>>>> Reported-by: Bard Liao <yung-chuan.liao@linux.intel.com> >>>>> Closes: https://lore.kernel.org/all/b6c75eee-761d-44c8-8413-2a5b34ee2f98@linux.intel.com/ >>>>> Fixes: ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") >>>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>>>> >>>>> --- >>>> >>>> Would be good to merge this as soon as we can, this is causing >>>> soundwire regressions from rc6 onwards. >>> >>> the revert also needs to happen in -stable. 6.10.8 is broken as well. >> >> It will happen. You do not need to Cc-stable (and it will not help, will >> not be picked), because this is marked as fix for existing commit. > > No, "Fixes:" tags only do not guarantee anything going to stable, you > have to explicitly tag it Cc: stable to do so, as per the documentation. Then anyway cc-stable not in body won't work. > > Yes, we often pick up "Fixes:" only tags, when we have the time, but > again, never guaranteed at all. Hm, I assumed you are still taking fixes for the fixes automatically. That's the case here. I will resend with cc-stable in such case. Best regards, Krzysztof
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index f275143d7b18..7aa4900dcf31 100644 --- 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; - unsigned long mask; + u8 num_ports; int i; if (direction == SDW_DATA_DIR_TX) { - mask = slave->prop.source_ports; + num_ports = hweight32(slave->prop.source_ports); dpn_prop = slave->prop.src_dpn_prop; } else { - mask = slave->prop.sink_ports; + num_ports = hweight32(slave->prop.sink_ports); dpn_prop = slave->prop.sink_dpn_prop; } - for_each_set_bit(i, &mask, 32) { + for (i = 0; i < num_ports; i++) { if (dpn_prop[i].num == port_num) return &dpn_prop[i]; }
This reverts commit ab8d66d132bc8f1992d3eb6cab8d32dda6733c84 because it breaks codecs using non-continuous masks in source and sink ports. The commit missed the point that port numbers are not used as indices for iterating over prop.sink_ports or prop.source_ports. Soundwire core and existing codecs expect that the array passed as prop.sink_ports and prop.source_ports is continuous. The port mask still might be non-continuous, but that's unrelated. Reported-by: Bard Liao <yung-chuan.liao@linux.intel.com> Closes: https://lore.kernel.org/all/b6c75eee-761d-44c8-8413-2a5b34ee2f98@linux.intel.com/ Fixes: ab8d66d132bc ("soundwire: stream: fix programming slave ports for non-continous port maps") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- I will need to fix my codec drivers, but that's independent. --- drivers/soundwire/stream.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)