[v2,13/14] SoundWire: pass stream to compute_params()

Message ID	20241203131813.58454-14-yung-chuan.liao@linux.intel.com (mailing list archive)
State	New
Headers	show Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E35D11F706B; Tue, 3 Dec 2024 13:18:47 +0000 (UTC) From: Bard Liao <yung-chuan.liao@linux.intel.com> To: linux-sound@vger.kernel.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, pierre-louis.bossart@linux.dev, bard.liao@intel.com Subject: [PATCH v2 13/14] SoundWire: pass stream to compute_params() Date: Tue, 3 Dec 2024 21:18:12 +0800 Message-ID: <20241203131813.58454-14-yung-chuan.liao@linux.intel.com> In-Reply-To: <20241203131813.58454-1-yung-chuan.liao@linux.intel.com> References: <20241203131813.58454-1-yung-chuan.liao@linux.intel.com> Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Series	soundwire: add multi-lane support \| expand [v2,00/14] soundwire: add multi-lane support [v2,01/14] soundwire: add lane field in sdw_port_runtime [v2,02/14] soundwire: mipi_disco: read lane mapping properties from ACPI [v2,03/14] soundwire: add lane_used_bandwidth in struct sdw_bus [v2,04/14] soundwire: stream: set DEPREPARED state earlier [v2,05/14] soundwire: generic_bandwidth_allocation: skip DEPREPARED streams [v2,06/14] Soundwire: add sdw_slave_get_scale_index helper [v2,07/14] Soundwire: stream: program BUSCLOCK_SCALE [v2,08/14] Soundwire: generic_bandwidth_allocation: set frame shape on fly [v2,09/14] soundwire: generic_bandwidth_allocation: correct clk_freq check in sdw_select_row_col [v2,10/14] soundwire: generic_bandwidth_allocation: check required freq accurately [v2,11/14] soundwire: generic_bandwidth_allocation: select data lane [v2,12/14] soundwire: generic_bandwidth_allocation: add lane in sdw_group_params [v2,13/14] SoundWire: pass stream to compute_params() [v2,14/14] soundwire: generic_bandwidth_allocation: count the bandwidth of active streams only

diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c index f47d4cd656ae..0ee792176f22 100644 --- a/drivers/soundwire/amd_manager.c +++ b/drivers/soundwire/amd_manager.c @@ -384,7 +384,7 @@ static u32 amd_sdw_read_ping_status(struct sdw_bus *bus) return slave_stat; } -static int amd_sdw_compute_params(struct sdw_bus *bus) +static int amd_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream) { struct sdw_transport_data t_data = {0}; struct sdw_master_runtime *m_rt; diff --git a/drivers/soundwire/generic_bandwidth_allocation.c b/drivers/soundwire/generic_bandwidth_allocation.c index faf04d82ba0a..062e7488b226 100644 --- a/drivers/soundwire/generic_bandwidth_allocation.c +++ b/drivers/soundwire/generic_bandwidth_allocation.c @@ -170,6 +170,7 @@ static void _sdw_compute_port_params(struct sdw_bus *bus, } static int sdw_compute_group_params(struct sdw_bus *bus, + struct sdw_stream_runtime *stream, struct sdw_group_params *params, struct sdw_group *group) { @@ -319,8 +320,9 @@ static int sdw_get_group_count(struct sdw_bus *bus, * sdw_compute_port_params: Compute transport and port parameters * * @bus: SDW Bus instance + * @stream: Soundwire stream */ -static int sdw_compute_port_params(struct sdw_bus *bus) +static int sdw_compute_port_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream) { struct sdw_group_params *params = NULL; struct sdw_group group; @@ -340,7 +342,7 @@ static int sdw_compute_port_params(struct sdw_bus *bus) } /* Compute transport parameters for grouped streams */ - ret = sdw_compute_group_params(bus, params, &group); + ret = sdw_compute_group_params(bus, stream, params, &group); if (ret < 0) goto free_params; @@ -592,8 +594,9 @@ static int sdw_compute_bus_params(struct sdw_bus *bus) * sdw_compute_params: Compute bus, transport and port parameters * * @bus: SDW Bus instance + * @stream: Soundwire stream */ -int sdw_compute_params(struct sdw_bus *bus) +int sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream) { int ret; @@ -603,7 +606,7 @@ int sdw_compute_params(struct sdw_bus *bus) return ret; /* Compute transport and port params */ - ret = sdw_compute_port_params(bus); + ret = sdw_compute_port_params(bus, stream); if (ret < 0) { dev_err(bus->dev, "Compute transport params failed: %d\n", ret); return ret; diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 2b403b14066c..fd98f05bf56d 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1072,7 +1072,7 @@ static const struct sdw_master_ops qcom_swrm_ops = { .pre_bank_switch = qcom_swrm_pre_bank_switch, }; -static int qcom_swrm_compute_params(struct sdw_bus *bus) +static int qcom_swrm_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream) { struct qcom_swrm_ctrl *ctrl = to_qcom_sdw(bus); struct sdw_master_runtime *m_rt; diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index b0868f71b63e..48b637f3c189 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -1415,7 +1415,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, /* Compute params */ if (bus->compute_params) { - ret = bus->compute_params(bus); + ret = bus->compute_params(bus, stream); if (ret < 0) { dev_err(bus->dev, "Compute params failed: %d\n", ret); @@ -1717,7 +1717,7 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream) /* Compute params */ if (bus->compute_params) { - ret = bus->compute_params(bus); + ret = bus->compute_params(bus, stream); if (ret < 0) { dev_err(bus->dev, "Compute params failed: %d\n", ret); diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index fc0a203c3ae0..2d6c30317792 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -855,6 +855,95 @@ struct sdw_master_ops { int dev_num); }; +int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent, + struct fwnode_handle *fwnode); +void sdw_bus_master_delete(struct sdw_bus *bus); + +void sdw_show_ping_status(struct sdw_bus *bus, bool sync_delay); + +/** + * sdw_port_config: Master or Slave Port configuration + * + * @num: Port number + * @ch_mask: channels mask for port + */ +struct sdw_port_config { + unsigned int num; + unsigned int ch_mask; +}; + +/** + * sdw_stream_config: Master or Slave stream configuration + * + * @frame_rate: Audio frame rate of the stream, in Hz + * @ch_count: Channel count of the stream + * @bps: Number of bits per audio sample + * @direction: Data direction + * @type: Stream type PCM or PDM + */ +struct sdw_stream_config { + unsigned int frame_rate; + unsigned int ch_count; + unsigned int bps; + enum sdw_data_direction direction; + enum sdw_stream_type type; +}; + +/** + * sdw_stream_state: Stream states + * + * @SDW_STREAM_ALLOCATED: New stream allocated. + * @SDW_STREAM_CONFIGURED: Stream configured + * @SDW_STREAM_PREPARED: Stream prepared + * @SDW_STREAM_ENABLED: Stream enabled + * @SDW_STREAM_DISABLED: Stream disabled + * @SDW_STREAM_DEPREPARED: Stream de-prepared + * @SDW_STREAM_RELEASED: Stream released + */ +enum sdw_stream_state { + SDW_STREAM_ALLOCATED = 0, + SDW_STREAM_CONFIGURED = 1, + SDW_STREAM_PREPARED = 2, + SDW_STREAM_ENABLED = 3, + SDW_STREAM_DISABLED = 4, + SDW_STREAM_DEPREPARED = 5, + SDW_STREAM_RELEASED = 6, +}; + +/** + * sdw_stream_params: Stream parameters + * + * @rate: Sampling frequency, in Hz + * @ch_count: Number of channels + * @bps: bits per channel sample + */ +struct sdw_stream_params { + unsigned int rate; + unsigned int ch_count; + unsigned int bps; +}; + +/** + * sdw_stream_runtime: Runtime stream parameters + * + * @name: SoundWire stream name + * @params: Stream parameters + * @state: Current state of the stream + * @type: Stream type PCM or PDM + * @m_rt_count: Count of Master runtime(s) in this stream + * @master_list: List of Master runtime(s) in this stream. + * master_list can contain only one m_rt per Master instance + * for a stream + */ +struct sdw_stream_runtime { + const char *name; + struct sdw_stream_params params; + enum sdw_stream_state state; + enum sdw_stream_type type; + int m_rt_count; + struct list_head master_list; +}; + /** * struct sdw_bus - SoundWire bus * @dev: Shortcut to &bus->md->dev to avoid changing the entire code. @@ -915,7 +1004,7 @@ struct sdw_bus { int controller_id; unsigned int link_id; int id; - int (*compute_params)(struct sdw_bus *bus); + int (*compute_params)(struct sdw_bus *bus, struct sdw_stream_runtime *stream); DECLARE_BITMAP(assigned, SDW_MAX_DEVICES); unsigned int clk_stop_timeout; u32 bank_switch_timeout; @@ -928,99 +1017,10 @@ struct sdw_bus { unsigned int lane_used_bandwidth[SDW_MAX_LANES]; }; -int sdw_bus_master_add(struct sdw_bus *bus, struct device *parent, - struct fwnode_handle *fwnode); -void sdw_bus_master_delete(struct sdw_bus *bus); - -void sdw_show_ping_status(struct sdw_bus *bus, bool sync_delay); - -/** - * sdw_port_config: Master or Slave Port configuration - * - * @num: Port number - * @ch_mask: channels mask for port - */ -struct sdw_port_config { - unsigned int num; - unsigned int ch_mask; -}; - -/** - * sdw_stream_config: Master or Slave stream configuration - * - * @frame_rate: Audio frame rate of the stream, in Hz - * @ch_count: Channel count of the stream - * @bps: Number of bits per audio sample - * @direction: Data direction - * @type: Stream type PCM or PDM - */ -struct sdw_stream_config { - unsigned int frame_rate; - unsigned int ch_count; - unsigned int bps; - enum sdw_data_direction direction; - enum sdw_stream_type type; -}; - -/** - * sdw_stream_state: Stream states - * - * @SDW_STREAM_ALLOCATED: New stream allocated. - * @SDW_STREAM_CONFIGURED: Stream configured - * @SDW_STREAM_PREPARED: Stream prepared - * @SDW_STREAM_ENABLED: Stream enabled - * @SDW_STREAM_DISABLED: Stream disabled - * @SDW_STREAM_DEPREPARED: Stream de-prepared - * @SDW_STREAM_RELEASED: Stream released - */ -enum sdw_stream_state { - SDW_STREAM_ALLOCATED = 0, - SDW_STREAM_CONFIGURED = 1, - SDW_STREAM_PREPARED = 2, - SDW_STREAM_ENABLED = 3, - SDW_STREAM_DISABLED = 4, - SDW_STREAM_DEPREPARED = 5, - SDW_STREAM_RELEASED = 6, -}; - -/** - * sdw_stream_params: Stream parameters - * - * @rate: Sampling frequency, in Hz - * @ch_count: Number of channels - * @bps: bits per channel sample - */ -struct sdw_stream_params { - unsigned int rate; - unsigned int ch_count; - unsigned int bps; -}; - -/** - * sdw_stream_runtime: Runtime stream parameters - * - * @name: SoundWire stream name - * @params: Stream parameters - * @state: Current state of the stream - * @type: Stream type PCM or PDM - * @m_rt_count: Count of Master runtime(s) in this stream - * @master_list: List of Master runtime(s) in this stream. - * master_list can contain only one m_rt per Master instance - * for a stream - */ -struct sdw_stream_runtime { - const char *name; - struct sdw_stream_params params; - enum sdw_stream_state state; - enum sdw_stream_type type; - int m_rt_count; - struct list_head master_list; -}; - struct sdw_stream_runtime *sdw_alloc_stream(const char *stream_name); void sdw_release_stream(struct sdw_stream_runtime *stream); -int sdw_compute_params(struct sdw_bus *bus); +int sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream); int sdw_stream_add_master(struct sdw_bus *bus, struct sdw_stream_config *stream_config,

[v2,13/14] SoundWire: pass stream to compute_params()

Commit Message

Patch