soundwire: intel/cadence: simplify PDI handling
cover soundwire: intel/cadence: simplify PDI handling
These patches were originally submitted as '[RFC PATCH 00/11]
soundwire: intel: simplify DAI/PDI handling'. There were no comments received.
This series only provides the PDI changes, which makes it simpler to review. The DAI changes will be provided with the complete series for ASoC/SOF integration, which is a larger change.
Bard Liao (3):
soundwire: intel: fix intel_register_dai PDI offsets and numbers
soundwire: intel: remove playback/capture stream_name
soundwire: cadence_master: improve PDI allocation
Pierre-Louis Bossart (3):
soundwire: remove DAI_ID_RANGE definitions
soundwire: cadence/intel: simplify PDI/port mapping
soundwire: intel: don't filter out PDI0/1
drivers/soundwire/cadence_master.c | 158 +++++++---------------------- drivers/soundwire/cadence_master.h | 34 ++----- drivers/soundwire/intel.c | 155 ++++++---------------------- include/linux/soundwire/sdw.h | 3 - 4 files changed, 73 insertions(+), 277 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/6 soundwire: intel: fix intel_register_dai PDI offsets and numbers
From: Bard Liao <[email protected]>
There are two issues, likely copy/paste:
1. Use cdns->pcm.num_in instead of stream_num_in for consistency with the rest of the code. This was not detected earlier since platforms did not have input-only PDIs.
2. use the correct offset for bi-dir PDM, based on IN and OUT PDIs. Again this was not detected since PDM was not supported earlier.
--- drivers/soundwire/intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soundwire/intel.c +2 -2
@@ -901,7 +901,7 @@ static int intel_register_dai(struct sdw_intel *sdw)/* Create PCM DAIs */ stream = &cdns->pcm; - ret =intel_create_dai (cdns, dais,INTEL_PDI_IN , stream->num_in, + ret =intel_create_dai (cdns, dais,INTEL_PDI_IN , cdns->pcm.num_in, off, stream->num_ch_in, true);if (ret)return ret;
@@ -932,7 +932,7 @@ static int intel_register_dai(struct sdw_intel *sdw)if (ret)return ret; - off += cdns->pdm.num_bd; + off += cdns->pdm.num_out; ret =intel_create_dai (cdns, dais,INTEL_PDI_BD , cdns->pdm.num_bd, off, stream->num_ch_bd, false);if (ret)
Signature · 1 line
2.20.1
PATCH 2/6 soundwire: remove DAI_ID_RANGE definitions
In reply to Pierre-Louis BossartThere is no reason to reserve a range of DAI IDs for SoundWire. This is not scalable and it's better to let the ASoC core allocate the dai->id when registering a component.
--- drivers/soundwire/intel.c | 2 -- include/linux/soundwire/sdw.h | 3 --- 2 files changed, 5 deletions(-)
drivers/soundwire/intel.c +0 -2
@@ -873,8 +873,6 @@ static int intel_create_dai(struct sdw_cdns *cdns, dais[i].capture.formats =SNDRV_PCM_FMTBIT_S16_LE ; } - dais[i].id =SDW_DAI_ID_RANGE_START + i; -if (pcm) dais[i].ops = &intel_pcm_dai_ops;else
include/linux/soundwire/sdw.h +0 -3
@@ -40,9 +40,6 @@ struct sdw_slave;#define SDW_VALID_PORT_RANGE (n) ((n) <= 14 && (n) >= 1) -#define SDW_DAI_ID_RANGE_START 100 -#define SDW_DAI_ID_RANGE_END 200 -enum {SDW_PORT_DIRN_SINK =0 ,SDW_PORT_DIRN_SOURCE ,
Signature · 1 line
2.20.1
PATCH 3/6 soundwire: intel: remove playback/capture stream_name
In reply to Pierre-Louis BossartFrom: Bard Liao <[email protected]>
We will create dai widget in SOF.
--- drivers/soundwire/intel.c | 17 ----------------- 1 file changed, 17 deletions(-)
drivers/soundwire/intel.c +0 -17
@@ -843,14 +843,6 @@ static int intel_create_dai(struct sdw_cdns *cdns,return -ENOMEM ;if (type ==INTEL_PDI_BD || type ==INTEL_PDI_OUT ) { - dais[i].playback.stream_name = -kasprintf (GFP_KERNEL ,"SDW%d Tx%d" , - cdns->instance, i); -if (!dais[i].playback.stream_name) { -kfree (dais[i].name); -return -ENOMEM ; - } - dais[i].playback.channels_min =1 ; dais[i].playback.channels_max = max_ch; dais[i].playback.rates =SNDRV_PCM_RATE_48000 ;
@@ -858,15 +850,6 @@ static int intel_create_dai(struct sdw_cdns *cdns, }if (type ==INTEL_PDI_BD || type ==INTEL_PDI_IN ) { - dais[i].capture.stream_name = -kasprintf (GFP_KERNEL ,"SDW%d Rx%d" , - cdns->instance, i); -if (!dais[i].capture.stream_name) { -kfree (dais[i].name); -kfree (dais[i].playback.stream_name); -return -ENOMEM ; - } - dais[i].capture.channels_min =1 ; dais[i].capture.channels_max = max_ch; dais[i].capture.rates =SNDRV_PCM_RATE_48000 ;
Signature · 1 line
2.20.1
PATCH 4/6 soundwire: cadence/intel: simplify PDI/port mapping
In reply to Pierre-Louis BossartThe existing Linux code uses a 1:1 mapping between ports and PDIs, but still has an independent allocation of ports and PDIs.
Let's simplify the code and remove the port layer by only using PDIs.
This patch does not change any functionality, just removes unnecessary code.
This will also allow for further simplifications where the PDIs are not dynamically allocated but instead described in a topology file.
--- drivers/soundwire/cadence_master.c | 110 ++++-------------------- drivers/soundwire/cadence_master.h | 32 ++----- drivers/soundwire/intel.c | 133 ++++++----------------------- 3 files changed, 51 insertions(+), 224 deletions(-)
drivers/soundwire/cadence_master.c +16 -94
@@ -895,7 +895,8 @@ int sdw_cdns_pdi_init(struct sdw_cdns *cdns, struct sdw_cdns_stream_config config) {struct sdw_cdns_streams *stream; -int offset, i, ret; +int offset; +int ret; cdns->pcm.num_bd = config.pcm_bd; cdns->pcm.num_in = config.pcm_in;
@@ -962,18 +963,6 @@ int sdw_cdns_pdi_init(struct sdw_cdns *cdns, stream->num_pdi = stream->num_bd + stream->num_in + stream->num_out; cdns->num_ports += stream->num_pdi; - cdns->ports =devm_kcalloc (cdns->dev, cdns->num_ports, -sizeof (*cdns->ports),GFP_KERNEL ); -if (!cdns->ports) { - ret = -ENOMEM ; -return ret; - } - -for (i =0 ; i < cdns->num_ports; i++) { - cdns->ports[i].assigned = false; - cdns->ports[i].num = i +1 ;/* Port 0 reserved for bulk */ - } -return 0 ; }EXPORT_SYMBOL (sdw_cdns_pdi_init);
@@ -1266,13 +1255,11 @@ static struct sdw_cdns_pdi *cdns_find_pdi(struct sdw_cdns *cdns,* sdw_cdns_config_stream: Configure a stream * * @cdns: Cadence instance -* @port: Cadence data port * @ch: Channel count * @dir: Data direction * @pdi: PDI to be used */ void sdw_cdns_config_stream (struct sdw_cdns *cdns, -struct sdw_cdns_port *port,u32 ch,u32 dir,struct sdw_cdns_pdi *pdi) {u32 offset, val =0 ;
@@ -1280,89 +1267,26 @@ void sdw_cdns_config_stream(struct sdw_cdns *cdns,if (dir ==SDW_DATA_DIR_RX ) val =CDNS_PORTCTRL_DIRN ; - offset =CDNS_PORTCTRL + port->num *CDNS_PORT_OFFSET ; + offset =CDNS_PORTCTRL + pdi->num *CDNS_PORT_OFFSET ;cdns_updatel (cdns, offset,CDNS_PORTCTRL_DIRN , val); - val = port->num; + val = pdi->num; val |= ((1 << ch) -1 ) <<SDW_REG_SHIFT (CDNS_PDI_CONFIG_CHANNEL );cdns_writel (cdns,CDNS_PDI_CONFIG (pdi->num), val); }EXPORT_SYMBOL (sdw_cdns_config_stream);/** -* cdns_get_num_pdi() - Get number of PDIs required -* -* @cdns: Cadence instance -* @pdi: PDI to be used -* @num: Number of PDIs -* @ch_count: Channel count -*/ -static int cdns_get_num_pdi (struct sdw_cdns *cdns, -struct sdw_cdns_pdi *pdi, -unsigned int num,u32 ch_count) -{ -int i, pdis =0 ; - -for (i =0 ; i < num; i++) { -if (pdi[i].assigned) -continue ; - -if (pdi[i].ch_count < ch_count) - ch_count -= pdi[i].ch_count; -else - ch_count =0 ; - - pdis++; - -if (!ch_count) -break ; - } - -if (ch_count) -return 0 ; - -return pdis; -} - -/** -* sdw_cdns_get_stream() - Get stream information -* -* @cdns: Cadence instance -* @stream: Stream to be allocated -* @ch: Channel count -* @dir: Data direction -*/ -int sdw_cdns_get_stream (struct sdw_cdns *cdns, -struct sdw_cdns_streams *stream, -u32 ch,u32 dir) -{ -int pdis =0 ; - -if (dir ==SDW_DATA_DIR_RX ) - pdis =cdns_get_num_pdi (cdns, stream->in, stream->num_in, ch); -else - pdis =cdns_get_num_pdi (cdns, stream->out, stream->num_out, ch); - -/* check if we found PDI, else find in bi-directional */ -if (!pdis) - pdis =cdns_get_num_pdi (cdns, stream->bd, stream->num_bd, ch); - -return pdis; -} -EXPORT_SYMBOL (sdw_cdns_get_stream); - -/** -* sdw_cdns_alloc_stream() - Allocate a stream +* sdw_cdns_alloc_pdi() - Allocate a PDI * * @cdns: Cadence instance * @stream: Stream to be allocated -* @port: Cadence data port * @ch: Channel count * @dir: Data direction */ -int sdw_cdns_alloc_stream (struct sdw_cdns *cdns, -struct sdw_cdns_streams *stream, -struct sdw_cdns_port *port,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) {struct sdw_cdns_pdi *pdi =NULL ;
@@ -1375,18 +1299,16 @@ int sdw_cdns_alloc_stream(struct sdw_cdns *cdns,if (!pdi) pdi =cdns_find_pdi (cdns, stream->num_bd, stream->bd); -if (!pdi) -return -EIO ; - - port->pdi = pdi; - pdi->l_ch_num =0 ; - pdi->h_ch_num = ch -1 ; - pdi->dir = dir; - pdi->ch_count = ch; +if (pdi) { + pdi->l_ch_num =0 ; + pdi->h_ch_num = ch -1 ; + pdi->dir = dir; + pdi->ch_count = ch; + } -return 0 ; +return pdi; } -EXPORT_SYMBOL (sdw_cdns_alloc_stream); +EXPORT_SYMBOL (sdw_cdns_alloc_pdi);MODULE_LICENSE ("Dual BSD/GPL" );MODULE_DESCRIPTION ("Cadence Soundwire Library" );
drivers/soundwire/cadence_master.h +7 -25
@@ -28,23 +28,6 @@ struct sdw_cdns_pdi {enum sdw_stream_type type; }; -/** -* struct sdw_cdns_port: Cadence port structure -* -* @num: port number -* @assigned: port assigned -* @ch: channel count -* @direction: data port direction -* @pdi: pdi for this port -*/ -struct sdw_cdns_port { -unsigned int num; -bool assigned; -unsigned int ch; -enum sdw_data_direction direction; -struct sdw_cdns_pdi *pdi; -}; -/** * struct sdw_cdns_streams: Cadence stream data structure *
@@ -95,8 +78,8 @@ struct sdw_cdns_stream_config {* struct sdw_cdns_dma_data: Cadence DMA data * * @name: SoundWire stream name -* @nr_ports: Number of ports -* @port: Ports +* @stream: stream runtime +* @pdi: PDI used for this dai * @bus: Bus handle * @stream_type: Stream type * @link_id: Master link id
@@ -104,8 +87,7 @@ struct sdw_cdns_stream_config {struct sdw_cdns_dma_data {char *name;struct sdw_stream_runtime *stream; -int nr_ports; -struct sdw_cdns_port **port; +struct sdw_cdns_pdi *pdi;struct sdw_bus *bus;enum sdw_stream_type stream_type;int link_id;
@@ -171,10 +153,10 @@ void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root);int sdw_cdns_get_stream (struct sdw_cdns *cdns,struct sdw_cdns_streams *stream,u32 ch,u32 dir); -int sdw_cdns_alloc_stream (struct sdw_cdns *cdns, -struct sdw_cdns_streams *stream, -struct sdw_cdns_port *port,u32 ch,u32 dir); -void sdw_cdns_config_stream (struct sdw_cdns *cdns,struct sdw_cdns_port *port, +struct sdw_cdns_pdi *sdw_cdns_alloc_pdi (struct sdw_cdns *cdns, +struct sdw_cdns_streams *stream, +u32 ch,u32 dir); +void sdw_cdns_config_stream (struct sdw_cdns *cdns,u32 ch,u32 dir,struct sdw_cdns_pdi *pdi); int sdw_cdns_pcm_set_stream(struct snd_soc_dai *dai,
drivers/soundwire/intel.c +28 -105
181 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 5/6 soundwire: intel: don't filter out PDI0/1
In reply to Pierre-Louis BossartPDI0/1 are reserved for Bulk and filtered out in the existing code. That leads to endless confusions on whether the index is the raw or corrected one. In addition we will need support for Bulk at some point so it's just simpler to expose those PDIs and not use it for now than try to be smart unless we have to remove the smarts.
This patch requires a topology change to use PDIs starting at offset 2 explicitly.
Note that there is a known discrepancy between hardware documentation and what ALH stream works in practice, future fixes are likely.
--- drivers/soundwire/cadence_master.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-)
drivers/soundwire/cadence_master.c +11 -18
@@ -183,9 +183,6 @@ MODULE_PARM_DESC(cdns_mcp_int_mask, "Cadence MCP IntMask");#define CDNS_DEFAULT_SSP_INTERVAL 0x18#define CDNS_TX_TIMEOUT 2000 -#define CDNS_PCM_PDI_OFFSET 0x2 -#define CDNS_PDM_PDI_OFFSET 0x6 -#define CDNS_SCP_RX_FIFOLEVEL 0x2/*
@@ -295,11 +292,7 @@ static int cdns_reg_show(struct seq_file *s, void *data) ret +=scnprintf (buf + ret,RD_BUF - ret,"\nDPn B0 Registers\n" ); -/* -* in sdw_cdns_pdi_init() we filter out the Bulk PDIs, -* so the indices need to be corrected again -*/ - num_ports = cdns->num_ports +CDNS_PCM_PDI_OFFSET ; + num_ports = cdns->num_ports;for (i =0 ; i < num_ports; i++) { ret += scnprintf(buf + ret, RD_BUF - ret,
@@ -908,11 +901,8 @@ int sdw_cdns_pdi_init(struct sdw_cdns *cdns,/* Allocate PDIs for PCMs */ stream = &cdns->pcm; -/* First two PDIs are reserved for bulk transfers */ -if (stream->num_bd <CDNS_PCM_PDI_OFFSET ) -return -EINVAL ; - stream->num_bd -=CDNS_PCM_PDI_OFFSET ; - offset =CDNS_PCM_PDI_OFFSET ; +/* we allocate PDI0 and PDI1 which are used for Bulk */ + offset =0 ; ret =cdns_allocate_pdi (cdns, &stream->bd, stream->num_bd, offset);
@@ -930,6 +920,9 @@ int sdw_cdns_pdi_init(struct sdw_cdns *cdns, ret =cdns_allocate_pdi (cdns, &stream->out, stream->num_out, offset); + + offset += stream->num_out; +if (ret)return ret;
@@ -939,7 +932,6 @@ int sdw_cdns_pdi_init(struct sdw_cdns *cdns,/* Allocate PDIs for PDMs */ stream = &cdns->pdm; - offset =CDNS_PDM_PDI_OFFSET ; ret =cdns_allocate_pdi (cdns, &stream->bd, stream->num_bd, offset);if (ret)
@@ -1236,12 +1228,13 @@ EXPORT_SYMBOL(cdns_set_sdw_stream);* Find and return a free PDI for a given PDI array */ static struct sdw_cdns_pdi *cdns_find_pdi (struct sdw_cdns *cdns, +unsigned int offset,unsigned int num,struct sdw_cdns_pdi *pdi) {int i; -for (i =0 ; i < num; i++) { +for (i = offset; i < num; i++) {if (pdi[i].assigned)continue ; pdi[i].assigned = true;
@@ -1291,13 +1284,13 @@ struct sdw_cdns_pdi *sdw_cdns_alloc_pdi(struct sdw_cdns *cdns,struct sdw_cdns_pdi *pdi =NULL ;if (dir ==SDW_DATA_DIR_RX ) - pdi =cdns_find_pdi (cdns, stream->num_in, stream->in); + pdi =cdns_find_pdi (cdns,0 , stream->num_in, stream->in);else - pdi =cdns_find_pdi (cdns, stream->num_out, stream->out); + pdi =cdns_find_pdi (cdns,0 , stream->num_out, stream->out);/* check if we found a PDI, else find in bi-directional */ if (!pdi) - pdi =cdns_find_pdi (cdns, stream->num_bd, stream->bd); + pdi =cdns_find_pdi (cdns,2 , stream->num_bd, stream->bd);if (pdi) { pdi->l_ch_num =0 ;
Signature · 1 line
2.20.1
PATCH 6/6 soundwire: cadence_master: improve PDI allocation
In reply to Pierre-Louis BossartFrom: Bard Liao <[email protected]>
PDI number should match dai->id, there is no need to track if a PDI is allocated or not.
--- drivers/soundwire/cadence_master.c | 27 ++++++++++++++------------- drivers/soundwire/cadence_master.h | 4 +--- drivers/soundwire/intel.c | 5 ++--- 3 files changed, 17 insertions(+), 19 deletions(-)
drivers/soundwire/cadence_master.c +14 -13
@@ -871,7 +871,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;
@@ -1225,21 +1224,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; -return &pdi[i]; - } +for (i = offset; i < offset + num; i++) +if (pdi[i].num == dai_id) +return &pdi[i];return NULL ; }
@@ -1279,18 +1277,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
@@ -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;
@@ -155,7 +153,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
@@ -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 ;
Signature · 1 line
2.20.1
Quoted 7 lines · Pierre-Louis Bossart
These patches were originally submitted as '[RFC PATCH 00/11]
soundwire: intel: simplify DAI/PDI handling'. There were no comments received.This series only provides the PDI changes, which makes it simpler to review. The DAI changes will be provided with the complete series for ASoC/SOF integration, which is a larger change.
Vinod, if you are back at your desk, those patches are almost a month old. thanks!
Quoted 17 lines
Bard Liao (3):
soundwire: intel: fixintel_register_daiPDI offsets and numbers
soundwire: intel: remove playback/capturestream_name
soundwire:cadence_master: improve PDI allocationPierre-Louis Bossart (3):
soundwire: removeDAI_ID_RANGEdefinitions
soundwire: cadence/intel: simplify PDI/port mapping
soundwire: intel: don't filter out PDI0/1drivers/soundwire/cadence_master.c | 158 +++++++---------------------- drivers/soundwire/cadence_master.h | 34 ++----- drivers/soundwire/intel.c | 155 ++++++---------------------- include/linux/soundwire/sdw.h | 3 - 4 files changed, 73 insertions(+), 277 deletions(-)
Quoted 7 lines · Pierre-Louis Bossart
These patches were originally submitted as '[RFC PATCH 00/11]
soundwire: intel: simplify DAI/PDI handling'. There were no comments received.This series only provides the PDI changes, which makes it simpler to review. The DAI changes will be provided with the complete series for ASoC/SOF integration, which is a larger change.
Applied all, thanks
Signature · 5 lines
~Vinod _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel