Commit 8f29bb83 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: generic_allocation: fix confusion between group and packing 



The existing code makes no sense, we multiply a channel number by
zero (SDW_BLK_GRP_CNT_1), and the result is used to configure the
block packing mode. Sampling grouping and channel packing are two
separate concepts in SoundWire.

In addition, the bandwidth allocation allocates a vertical slice for
each stream, which makes the use of the PER_CHANNEL packing mode
irrelevant.

Let's use the proper definition for block packing mode (PER_PORT).

This change has no functional impact though since the net result is
the same configuration of the DPN_BlockCtrl3 register, when
implemented.

Reported-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20210323050701.23760-3-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 886ce97a

drivers/soundwire/generic_bandwidth_allocation.c

+3 −4
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static void sdw_compute_slave_ports(struct sdw_master_runtime *m_rt, 
					      sample_int, port_bo, port_bo >> 8,

					      t_data->hstart,

					      t_data->hstop,

					      (SDW_BLK_GRP_CNT_1 * ch), 0x0);

					      SDW_BLK_PKG_PER_PORT, 0x0);



			sdw_fill_port_params(&p_rt->port_params,

					     p_rt->num, bps,
@@ -95,7 +95,7 @@ static void sdw_compute_master_ports(struct sdw_master_runtime *m_rt, 
	struct sdw_bus *bus = m_rt->bus;

	struct sdw_bus_params *b_params = &bus->params;

	int sample_int, hstart = 0;

	unsigned int rate, bps, ch, no_ch;

	unsigned int rate, bps, ch;



	rate = m_rt->stream->params.rate;

	bps = m_rt->stream->params.bps;
@@ -110,12 +110,11 @@ static void sdw_compute_master_ports(struct sdw_master_runtime *m_rt, 
	t_data.hstart = hstart;



	list_for_each_entry(p_rt, &m_rt->port_list, port_node) {

		no_ch = sdw_ch_mask_to_ch(p_rt->ch_mask);



		sdw_fill_xport_params(&p_rt->transport_params, p_rt->num,

				      false, SDW_BLK_GRP_CNT_1, sample_int,

				      port_bo, port_bo >> 8, hstart, hstop,

				      (SDW_BLK_GRP_CNT_1 * no_ch), 0x0);

				      SDW_BLK_PKG_PER_PORT, 0x0);



		sdw_fill_port_params(&p_rt->port_params,

				     p_rt->num, bps,