soundwire: add bpt_hstop in struct sdw_bus

To allow BPT and audio stream work simultaneously, we need to record the
hstop of the BPT stream. And use column bpt_hstop + 1 to the last column
for audio streams.
No function changed since bus->bpt_hstop is set to bus->params.col - 1
for now. Will update bus->audio_stream_hstart in the follow up commit.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Author: bardliao

drivers/soundwire/generic_bandwidth_allocation.c

@@ -97,9 +97,9 @@ static void sdw_compute_dp0_slave_ports(struct sdw_master_runtime *m_rt)
 		list_for_each_entry(p_rt, &s_rt->port_list, port_node) {
 			sdw_fill_xport_params(&p_rt->transport_params, p_rt->num, false,
 					      SDW_BLK_GRP_CNT_1, bus->params.col, 0, 0, 1,
-					      bus->params.col - 1, SDW_BLK_PKG_PER_PORT, 0x0);
+					      bus->bpt_hstop, SDW_BLK_PKG_PER_PORT, 0x0);
 
-			sdw_fill_port_params(&p_rt->port_params, p_rt->num, bus->params.col - 1,
+			sdw_fill_port_params(&p_rt->port_params, p_rt->num, bus->bpt_hstop,
 					     SDW_PORT_FLOW_MODE_ISOCH, SDW_PORT_DATA_MODE_NORMAL);
 		}
 	}
@@ -113,9 +113,9 @@ static void sdw_compute_dp0_master_ports(struct sdw_master_runtime *m_rt)
 	list_for_each_entry(p_rt, &m_rt->port_list, port_node) {
 		sdw_fill_xport_params(&p_rt->transport_params, p_rt->num, false,
 				      SDW_BLK_GRP_CNT_1, bus->params.col, 0, 0, 1,
-				      bus->params.col - 1, SDW_BLK_PKG_PER_PORT, 0x0);
+				      bus->bpt_hstop, SDW_BLK_PKG_PER_PORT, 0x0);
 
-		sdw_fill_port_params(&p_rt->port_params, p_rt->num, bus->params.col - 1,
+		sdw_fill_port_params(&p_rt->port_params, p_rt->num, bus->bpt_hstop,
 				     SDW_PORT_FLOW_MODE_ISOCH, SDW_PORT_DATA_MODE_NORMAL);
 	}
 }
@@ -695,6 +695,7 @@ int sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream)
 	if (ret < 0)
 		return ret;
 
+	bus->bpt_hstop = bus->params.col - 1;
 	if (stream->type == SDW_STREAM_BPT) {
 		sdw_compute_dp0_port_params(bus);
 		return 0;

drivers/soundwire/intel_ace2x.c

@@ -153,7 +153,7 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
 	command = (msg->flags & SDW_MSG_FLAG_WRITE) ? 0 : 1;
 
 	ret = sdw_cdns_bpt_find_bandwidth(command, cdns->bus.params.row,
-					  cdns->bus.params.col,
+					  cdns->bus.bpt_hstop + 1,
 					  prop->default_frame_rate,
 					  &tx_dma_bandwidth, &rx_dma_bandwidth);
 	if (ret < 0)
@@ -166,7 +166,7 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
 	/* Add up pdi buffer size and frame numbers of each BPT sections */
 	for (i = 0; i < msg->sections; i++) {
 		ret = sdw_cdns_bpt_find_buffer_sizes(command, cdns->bus.params.row,
-						     cdns->bus.params.col,
+						     cdns->bus.bpt_hstop + 1,
 						     msg->sec[i].len, SDW_BPT_MSG_MAX_BYTES,
 						     &data_per_frame, &pdi0_buffer_size_,
 						     &pdi1_buffer_size_, &num_frames_);
@@ -190,7 +190,7 @@ static int intel_ace2x_bpt_open_stream(struct sdw_intel *sdw, struct sdw_slave *
 	if (command) { /* read */
 		/* Get buffer size of a full frame */
 		ret = sdw_cdns_bpt_find_buffer_sizes(command, cdns->bus.params.row,
-						     cdns->bus.params.col,
+						     cdns->bus.bpt_hstop + 1,
 						     data_per_frame, SDW_BPT_MSG_MAX_BYTES,
 						     &data_per_frame, &pdi0_buf_size_pre_frame,
 						     &pdi1_buf_size_pre_frame, &fake_num_frames);

include/linux/soundwire/sdw.h

@@ -985,6 +985,7 @@ struct sdw_stream_runtime {
  * @stream_refcount: number of streams currently using this bus
  * @btp_stream_refcount: number of BTP streams currently using this bus (should
  * be zero or one, multiple streams per link is not supported).
+ * @bpt_hstop: The hstop of the BPT stream.
  * @bpt_stream: pointer stored to handle BTP streams.
  * @ops: Master callback ops
  * @port_ops: Master port callback ops
@@ -1025,6 +1026,7 @@ struct sdw_bus {
 	struct sdw_bus_params params;
 	int stream_refcount;
 	int bpt_stream_refcount;
+	int bpt_hstop;
 	struct sdw_stream_runtime *bpt_stream;
 	const struct sdw_master_ops *ops;
 	const struct sdw_master_port_ops *port_ops;