| Message ID | 20221027060311.2549711-4-chancel.liu@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 870b89d118a29bd845ea706a74e313f9b83f5a45 |
| Headers | show |
| Series | Add support for SAI on i.MX93 platform | expand |
On Thu, Oct 27, 2022 at 2:04 PM Chancel Liu <chancel.liu@nxp.com> wrote: > There is a limit to eDMA AXI on i.MX93. Only TCD that has NBYTES in a > multiple of 8bytes can enable scatter-gather. NBYTES is calculated by > bus width times maxburst. On i.MX93 platform the value of maxburst is > specified to 8. It makes sure that NBYTES is a multiple of 8bytes. > > Signed-off-by: Chancel Liu <chancel.liu@nxp.com> > Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> best regards wang shengjiu > --- > sound/soc/fsl/fsl_sai.c | 11 +++++++---- > sound/soc/fsl/fsl_sai.h | 1 + > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > index 68e1cc4c369a..a0ea27f06997 100644 > --- a/sound/soc/fsl/fsl_sai.c > +++ b/sound/soc/fsl/fsl_sai.c > @@ -872,10 +872,10 @@ static int fsl_sai_dai_probe(struct snd_soc_dai > *cpu_dai) > > regmap_update_bits(sai->regmap, FSL_SAI_TCR1(ofs), > FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth), > - sai->soc_data->fifo_depth - > FSL_SAI_MAXBURST_TX); > + sai->soc_data->fifo_depth - > sai->dma_params_tx.maxburst); > regmap_update_bits(sai->regmap, FSL_SAI_RCR1(ofs), > FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth), > - FSL_SAI_MAXBURST_RX - 1); > + sai->dma_params_rx.maxburst - 1); > > snd_soc_dai_init_dma_data(cpu_dai, &sai->dma_params_tx, > &sai->dma_params_rx); > @@ -1416,8 +1416,10 @@ static int fsl_sai_probe(struct platform_device > *pdev) > > sai->dma_params_rx.addr = sai->res->start + FSL_SAI_RDR0; > sai->dma_params_tx.addr = sai->res->start + FSL_SAI_TDR0; > - sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX; > - sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX; > + sai->dma_params_rx.maxburst = > + sai->soc_data->max_burst[RX] ? > sai->soc_data->max_burst[RX] : FSL_SAI_MAXBURST_RX; > + sai->dma_params_tx.maxburst = > + sai->soc_data->max_burst[TX] ? > sai->soc_data->max_burst[TX] : FSL_SAI_MAXBURST_TX; > > sai->pinctrl = devm_pinctrl_get(&pdev->dev); > > @@ -1588,6 +1590,7 @@ static const struct fsl_sai_soc_data > fsl_sai_imx93_data = { > .pins = 4, > .flags = 0, > .max_register = FSL_SAI_MCTL, > + .max_burst = {8, 8}, > }; > > static const struct of_device_id fsl_sai_ids[] = { > diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h > index 697f6690068c..197748a888d5 100644 > --- a/sound/soc/fsl/fsl_sai.h > +++ b/sound/soc/fsl/fsl_sai.h > @@ -235,6 +235,7 @@ struct fsl_sai_soc_data { > unsigned int reg_offset; > unsigned int flags; > unsigned int max_register; > + unsigned int max_burst[2]; > }; > > /** > -- > 2.25.1 > >
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 68e1cc4c369a..a0ea27f06997 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -872,10 +872,10 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai) regmap_update_bits(sai->regmap, FSL_SAI_TCR1(ofs), FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth), - sai->soc_data->fifo_depth - FSL_SAI_MAXBURST_TX); + sai->soc_data->fifo_depth - sai->dma_params_tx.maxburst); regmap_update_bits(sai->regmap, FSL_SAI_RCR1(ofs), FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth), - FSL_SAI_MAXBURST_RX - 1); + sai->dma_params_rx.maxburst - 1); snd_soc_dai_init_dma_data(cpu_dai, &sai->dma_params_tx, &sai->dma_params_rx); @@ -1416,8 +1416,10 @@ static int fsl_sai_probe(struct platform_device *pdev) sai->dma_params_rx.addr = sai->res->start + FSL_SAI_RDR0; sai->dma_params_tx.addr = sai->res->start + FSL_SAI_TDR0; - sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX; - sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX; + sai->dma_params_rx.maxburst = + sai->soc_data->max_burst[RX] ? sai->soc_data->max_burst[RX] : FSL_SAI_MAXBURST_RX; + sai->dma_params_tx.maxburst = + sai->soc_data->max_burst[TX] ? sai->soc_data->max_burst[TX] : FSL_SAI_MAXBURST_TX; sai->pinctrl = devm_pinctrl_get(&pdev->dev); @@ -1588,6 +1590,7 @@ static const struct fsl_sai_soc_data fsl_sai_imx93_data = { .pins = 4, .flags = 0, .max_register = FSL_SAI_MCTL, + .max_burst = {8, 8}, }; static const struct of_device_id fsl_sai_ids[] = { diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 697f6690068c..197748a888d5 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -235,6 +235,7 @@ struct fsl_sai_soc_data { unsigned int reg_offset; unsigned int flags; unsigned int max_register; + unsigned int max_burst[2]; }; /**
There is a limit to eDMA AXI on i.MX93. Only TCD that has NBYTES in a multiple of 8bytes can enable scatter-gather. NBYTES is calculated by bus width times maxburst. On i.MX93 platform the value of maxburst is specified to 8. It makes sure that NBYTES is a multiple of 8bytes. Signed-off-by: Chancel Liu <chancel.liu@nxp.com> --- sound/soc/fsl/fsl_sai.c | 11 +++++++---- sound/soc/fsl/fsl_sai.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-)