RE: [PATCH 3/7] soundwire: intel: Split PDIs and DAIs initialization

[Liao, Bard]

> -----Original Message-----
> From: Cezary Rojewski <cezary.rojewski@xxxxxxxxx>
> Sent: Tuesday, November 3, 2026 2:11 AM
> To: linux-sound@xxxxxxxxxxxxxxx
> Cc: broonie@xxxxxxxxxx; tiwai@xxxxxxxx; perex@xxxxxxxx; amade@xxxxxxxxxx;
> linux-kernel@xxxxxxxxxxxxxxx; yung-chuan.liao@xxxxxxxxxxxxxxx; pierre-
> louis.bossart@xxxxxxxxx; vkoul@xxxxxxxxxx; Rojewski, Cezary
> <cezary.rojewski@xxxxxxxxx>
> Subject: [PATCH 3/7] soundwire: intel: Split PDIs and DAIs initialization
> 
> Not every client of the soundwire-driver needs the secondary
> soc-component and full range of DAIs immediately when initializing the
> device. As function intel_register_dai() does all of that on top of
> initializing PDIs, split it into two logical blocks to accommodate for
> both approaches. In consequence, register_dai() callback becomes
> optional.
> 
> To keep things in status quo for existing users, update
> intel_link_startup() to call sdw_intel_init_pdis().
> 
> Cc: Vinod Koul <vkoul@xxxxxxxxxx>
> Signed-off-by: Cezary Rojewski <cezary.rojewski@xxxxxxxxx>
> ---
>  drivers/soundwire/intel.c           | 24 +++++++++++++++---------
>  drivers/soundwire/intel.h           |  3 ++-
>  drivers/soundwire/intel_auxdevice.c |  4 ++++
>  3 files changed, 21 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
> index d53fa3d299bc..708503373183 100644
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@ -1027,23 +1027,29 @@ static int intel_create_dai(struct sdw_cdns *cdns,
>  	return 0;
>  }
> 
> +int sdw_intel_init_pdis(struct sdw_intel *sdw)
> +{
> +	struct sdw_cdns_stream_config config;
> +	int ret;
> +
> +	/* Read the PDI config and initialize cadence PDI */
> +	intel_pdi_init(sdw, &config);
> +	ret = sdw_cdns_pdi_init(&sdw->cdns, config);
> +	if (ret)
> +		return ret;
> +
> +	intel_pdi_stream_ch_update(sdw, &sdw->cdns.pcm);
> +	return 0;
> +}
> +
>  static int intel_register_dai(struct sdw_intel *sdw)
>  {
>  	struct sdw_cdns_dai_runtime **dai_runtime_array;
> -	struct sdw_cdns_stream_config config;
>  	struct sdw_cdns *cdns = &sdw->cdns;
>  	struct sdw_cdns_streams *stream;
>  	struct snd_soc_dai_driver *dais;
>  	int num_dai, ret, off = 0;
> 
> -	/* Read the PDI config and initialize cadence PDI */
> -	intel_pdi_init(sdw, &config);
> -	ret = sdw_cdns_pdi_init(cdns, config);
> -	if (ret)
> -		return ret;
> -
> -	intel_pdi_stream_ch_update(sdw, &sdw->cdns.pcm);
> -
>  	/* DAIs are created based on total number of PDIs supported */
>  	num_dai = cdns->pcm.num_pdi;
> 
> diff --git a/drivers/soundwire/intel.h b/drivers/soundwire/intel.h
> index 7a2e7e73ad63..12416cef8224 100644
> --- a/drivers/soundwire/intel.h
> +++ b/drivers/soundwire/intel.h
> @@ -158,7 +158,7 @@ static inline int sdw_intel_register_dai(struct sdw_intel
> *sdw)
>  {
>  	if (SDW_INTEL_CHECK_OPS(sdw, register_dai))
>  		return SDW_INTEL_OPS(sdw, register_dai)(sdw);
> -	return -ENOTSUPP;
> +	return 0;
>  }
> 
>  static inline void sdw_intel_check_clock_stop(struct sdw_intel *sdw)
> @@ -262,6 +262,7 @@ int intel_start_bus_after_reset(struct sdw_intel *sdw);
>  void intel_check_clock_stop(struct sdw_intel *sdw);
>  int intel_start_bus_after_clock_stop(struct sdw_intel *sdw);
>  int intel_stop_bus(struct sdw_intel *sdw, bool clock_stop, bool wake_enable);
> +int sdw_intel_init_pdis(struct sdw_intel *sdw);
> 
>  /* common bank switch routines */
>  int intel_pre_bank_switch(struct sdw_intel *sdw);
> diff --git a/drivers/soundwire/intel_auxdevice.c
> b/drivers/soundwire/intel_auxdevice.c
> index 5983fbc5725a..114dadedfa14 100644
> --- a/drivers/soundwire/intel_auxdevice.c
> +++ b/drivers/soundwire/intel_auxdevice.c
> @@ -423,6 +423,10 @@ int intel_link_startup(struct auxiliary_device *auxdev)
>  	if (ret)
>  		goto err_init;
> 
> +	ret = sdw_intel_init_pdis(sdw);

intel_link_startup will be called by all Intel platforms, but the PDI
initialization are different for the ACE2+ platforms. Please call
sdw_intel_init_pdi in one of the sdw_intel_hw_ops ops.

> +	if (ret)
> +		goto err_init;

This is after sdw_intel_link_power_up(), please goto err_power_up

> +
>  	/* Register DAIs */
>  	ret = sdw_intel_register_dai(sdw);
>  	if (ret) {
> --
> 2.34.1
>