soundwire: cadence_master: improve PDI allocation (1b53385e) · Commits · 戴 / test

drivers/soundwire/cadence_master.c

+14 −13

Original line number	Diff line number	Diff line
		@@ -814,7 +814,6 @@ static int cdns_allocate_pdi(struct sdw_cdns *cdns,

		for (i = 0; i < num; i++) {
		pdi[i].num = i + pdi_offset;
		pdi[i].assigned = false;
		}

		*stream = pdi;
		@@ -1166,21 +1165,20 @@ EXPORT_SYMBOL(cdns_set_sdw_stream);
		* @num: Number of PDIs
		* @pdi: PDI instances
		*
		* Find and return a free PDI for a given PDI array
		* Find a PDI for a given PDI array. The PDI num and dai_id are
		* expected to match, return NULL otherwise.
		*/
		static struct sdw_cdns_pdi cdns_find_pdi(struct sdw_cdns cdns,
		unsigned int offset,
		unsigned int num,
		struct sdw_cdns_pdi *pdi)
		struct sdw_cdns_pdi *pdi,
		int dai_id)
		{
		int i;

		for (i = offset; i < num; i++) {
		if (pdi[i].assigned)
		continue;
		pdi[i].assigned = true;
		for (i = offset; i < offset + num; i++)
		if (pdi[i].num == dai_id)
		return &pdi[i];
		}

		return NULL;
		}
		@@ -1220,18 +1218,21 @@ EXPORT_SYMBOL(sdw_cdns_config_stream);
		*/
		struct sdw_cdns_pdi sdw_cdns_alloc_pdi(struct sdw_cdns cdns,
		struct sdw_cdns_streams *stream,
		u32 ch, u32 dir)
		u32 ch, u32 dir, int dai_id)
		{
		struct sdw_cdns_pdi *pdi = NULL;

		if (dir == SDW_DATA_DIR_RX)
		pdi = cdns_find_pdi(cdns, 0, stream->num_in, stream->in);
		pdi = cdns_find_pdi(cdns, 0, stream->num_in, stream->in,
		dai_id);
		else
		pdi = cdns_find_pdi(cdns, 0, stream->num_out, stream->out);
		pdi = cdns_find_pdi(cdns, 0, stream->num_out, stream->out,
		dai_id);

		/* check if we found a PDI, else find in bi-directional */
		if (!pdi)
		pdi = cdns_find_pdi(cdns, 2, stream->num_bd, stream->bd);
		pdi = cdns_find_pdi(cdns, 2, stream->num_bd, stream->bd,
		dai_id);

		if (pdi) {
		pdi->l_ch_num = 0;

drivers/soundwire/cadence_master.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@
		/**
		* struct sdw_cdns_pdi: PDI (Physical Data Interface) instance
		*
		* @assigned: pdi assigned
		* @num: pdi number
		* @intel_alh_id: link identifier
		* @l_ch_num: low channel for PDI
		@@ -18,7 +17,6 @@
		* @type: stream type, PDM or PCM
		*/
		struct sdw_cdns_pdi {
		bool assigned;
		int num;
		int intel_alh_id;
		int l_ch_num;
		@@ -154,7 +152,7 @@ int sdw_cdns_get_stream(struct sdw_cdns *cdns,
		u32 ch, u32 dir);
		struct sdw_cdns_pdi sdw_cdns_alloc_pdi(struct sdw_cdns cdns,
		struct sdw_cdns_streams *stream,
		u32 ch, u32 dir);
		u32 ch, u32 dir, int dai_id);
		void sdw_cdns_config_stream(struct sdw_cdns *cdns,
		u32 ch, u32 dir, struct sdw_cdns_pdi *pdi);

drivers/soundwire/intel.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -631,11 +631,10 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
		if (dma->stream_type == SDW_STREAM_PDM)
		pcm = false;

		/* FIXME: We would need to get PDI info from topology */
		if (pcm)
		pdi = sdw_cdns_alloc_pdi(cdns, &cdns->pcm, ch, dir);
		pdi = sdw_cdns_alloc_pdi(cdns, &cdns->pcm, ch, dir, dai->id);
		else
		pdi = sdw_cdns_alloc_pdi(cdns, &cdns->pdm, ch, dir);
		pdi = sdw_cdns_alloc_pdi(cdns, &cdns->pdm, ch, dir, dai->id);

		if (!pdi) {
		ret = -EINVAL;

Admin message