soundwire: generic_bandwidth_allocation: update bpt_hstop

Update bus->bpt_hstop to record the hstop of the BPT stream.
And return -EAGAIN when there is no bandwidth for the BPT stream.

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

Author: bardliao

drivers/soundwire/generic_bandwidth_allocation.c

@@ -190,8 +190,8 @@ static void sdw_compute_master_ports(struct sdw_master_runtime *m_rt,
 	sdw_compute_slave_ports(m_rt, &t_data);
 }
 
-static void _sdw_compute_port_params(struct sdw_bus *bus,
-				     struct sdw_group_params *params, int count)
+static void _sdw_compute_port_params(struct sdw_bus *bus, struct sdw_group_params *params,
+				     int count, bool update_bpt_hstop)
 {
 	struct sdw_master_runtime *m_rt;
 	int port_bo, i, l;
@@ -223,6 +223,16 @@ static void _sdw_compute_port_params(struct sdw_bus *bus,
 			}
 
 			hstop = hstop - params[i].hwidth;
+			if (l == 0 && update_bpt_hstop && bus->bpt_hstop > hstop) {
+				/* Assume BPT stream uses lane 0 */
+				/*
+				 * hstart = hstop - params->hwidth + 1.
+				 * At this point after hstop = hstop - params[i].hwidth above,
+				 * the hstart is equal to hstop + 1, and bus->bpt_hstop should
+				 * be hstart - 1. so we can set bpt_hstop to hstop directly.
+				 */
+				bus->bpt_hstop = hstop;
+			}
 		}
 	}
 }
@@ -419,7 +429,7 @@ static int sdw_compute_port_params(struct sdw_bus *bus, struct sdw_stream_runtim
 	if (ret < 0)
 		goto free_params;
 
-	_sdw_compute_port_params(bus, params, group.count);
+	_sdw_compute_port_params(bus, params, group.count, stream->type == SDW_STREAM_BPT);
 
 free_params:
 	kfree(params);
@@ -682,6 +692,10 @@ static int sdw_compute_bus_params(struct sdw_bus *bus)
 	return 0;
 }
 
+#define SDW_DEFAULT_COL			4
+#define SDW_COL_RESERVED_FOR_AUDIO	2
+
+
 /**
  * sdw_compute_params: Compute bus, transport and port parameters
  *
@@ -697,10 +711,20 @@ 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;
+	if (stream->type == SDW_STREAM_BPT && stream->state == SDW_STREAM_CONFIGURED) {
+		/*
+		 * Set the initial bpt_hstop when the BPT stream is preparing and it will be
+		 * updated in sdw_compute_port_params() below.
+		 */
+		bus->bpt_hstop = bus->params.col - 1;
+		/*
+		 * Reserve 2 columns for future audio stream if the bus->params.col is greater
+		 * than SDW_DEFAULT_COL (4) + reserved columns (2). And don't reserve columns
+		 * for future use otherwise. This ensures that the BPT stream will not meet the
+		 * bandwidth issue when there is no audio stream is open.
+		 */
+		if (bus->params.col >= (SDW_DEFAULT_COL + SDW_COL_RESERVED_FOR_AUDIO))
+			bus->bpt_hstop -= SDW_COL_RESERVED_FOR_AUDIO;
 	}
 
 	/* Compute transport and port params */
@@ -710,6 +734,16 @@ int sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream)
 		return ret;
 	}
 
+	if (stream->type == SDW_STREAM_BPT && stream->state == SDW_STREAM_CONFIGURED) {
+		/* No usable data columns left */
+		if (bus->bpt_hstop < 1) {
+			dev_err(bus->dev, "%s: No bandwidth for BPT stream\n",
+				__func__);
+			return -EAGAIN;
+		}
+		sdw_compute_dp0_port_params(bus);
+	}
+
 	return 0;
 }
 EXPORT_SYMBOL(sdw_compute_params);

drivers/soundwire/stream.c

@@ -1480,13 +1480,15 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream,
 	struct sdw_bus *bus;
 	struct sdw_master_prop *prop;
 	struct sdw_bus_params params;
+	int prev_bpt_hstop;
 	int ret;
 
 	/* Prepare  Master(s) and Slave(s) port(s) associated with stream */
 	list_for_each_entry(m_rt, &stream->master_list, stream_node) {
 		bus = m_rt->bus;
 		prop = &bus->prop;
 		memcpy(&params, &bus->params, sizeof(params));
+		prev_bpt_hstop = bus->bpt_hstop;
 
 		/* TODO: Support Asynchronous mode */
 		if ((prop->max_clk_freq % stream->params.rate) != 0) {
@@ -1546,6 +1548,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream,
 
 restore_params:
 	memcpy(&bus->params, &params, sizeof(params));
+	bus->bpt_hstop = prev_bpt_hstop;
 	return ret;
 }