The patchset supports sdma hdmi audio.
For the details, please check the patch commit log.
Joy Zou (4):
dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema
dmaengine: imx-sdma: support hdmi audio
ARM: dts: imx: update sdma node name format
arm64: dts: imx8mq: update sdma node name format
.../devicetree/bindings/dma/fsl,imx-sdma.yaml | 147 ++++++++++++++++++
.../devicetree/bindings/dma/fsl-imx-sdma.txt | 118 --------------
arch/arm/boot/dts/imx25.dtsi | 2 +-
arch/arm/boot/dts/imx31.dtsi | 2 +-
arch/arm/boot/dts/imx35.dtsi | 2 +-
arch/arm/boot/dts/imx50.dtsi | 2 +-
arch/arm/boot/dts/imx51.dtsi | 2 +-
arch/arm/boot/dts/imx53.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
arch/arm/boot/dts/imx6sl.dtsi | 2 +-
arch/arm/boot/dts/imx6sx.dtsi | 2 +-
arch/arm/boot/dts/imx6ul.dtsi | 2 +-
arch/arm/boot/dts/imx7s.dtsi | 2 +-
arch/arm64/boot/dts/freescale/imx8mq.dtsi | 4 +-
drivers/dma/imx-sdma.c | 38 ++++-
include/linux/dma/imx-dma.h | 1 +
16 files changed, 191 insertions(+), 139 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
delete mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
--
2.37.1
Add hdmi audio support in sdma.
Signed-off-by: Joy Zou <[email protected]>
---
drivers/dma/imx-sdma.c | 38 +++++++++++++++++++++++++++++--------
include/linux/dma/imx-dma.h | 1 +
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index fbea5f62dd98..ab877ceeac3f 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -954,7 +954,10 @@ static irqreturn_t sdma_int_handler(int irq, void *dev_id)
desc = sdmac->desc;
if (desc) {
if (sdmac->flags & IMX_DMA_SG_LOOP) {
- sdma_update_channel_loop(sdmac);
+ if (sdmac->peripheral_type != IMX_DMATYPE_HDMI)
+ sdma_update_channel_loop(sdmac);
+ else
+ vchan_cyclic_callback(&desc->vd);
} else {
mxc_sdma_handle_channel_normal(sdmac);
vchan_cookie_complete(&desc->vd);
@@ -1074,6 +1077,10 @@ static int sdma_get_pc(struct sdma_channel *sdmac,
per_2_emi = sdma->script_addrs->sai_2_mcu_addr;
emi_2_per = sdma->script_addrs->mcu_2_sai_addr;
break;
+ case IMX_DMATYPE_HDMI:
+ emi_2_per = sdma->script_addrs->hdmi_dma_addr;
+ sdmac->is_ram_script = true;
+ break;
default:
dev_err(sdma->dev, "Unsupported transfer type %d\n",
peripheral_type);
@@ -1125,11 +1132,16 @@ static int sdma_load_context(struct sdma_channel *sdmac)
/* Send by context the event mask,base address for peripheral
* and watermark level
*/
- context->gReg[0] = sdmac->event_mask[1];
- context->gReg[1] = sdmac->event_mask[0];
- context->gReg[2] = sdmac->per_addr;
- context->gReg[6] = sdmac->shp_addr;
- context->gReg[7] = sdmac->watermark_level;
+ if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
+ context->gReg[4] = sdmac->per_addr;
+ context->gReg[6] = sdmac->shp_addr;
+ } else {
+ context->gReg[0] = sdmac->event_mask[1];
+ context->gReg[1] = sdmac->event_mask[0];
+ context->gReg[2] = sdmac->per_addr;
+ context->gReg[6] = sdmac->shp_addr;
+ context->gReg[7] = sdmac->watermark_level;
+ }
bd0->mode.command = C0_SETDM;
bd0->mode.status = BD_DONE | BD_WRAP | BD_EXTD;
@@ -1513,7 +1525,7 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,
desc->sdmac = sdmac;
desc->num_bd = bds;
- if (sdma_alloc_bd(desc))
+ if (bds && sdma_alloc_bd(desc))
goto err_desc_out;
/* No slave_config called in MEMCPY case, so do here */
@@ -1678,13 +1690,16 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
{
struct sdma_channel *sdmac = to_sdma_chan(chan);
struct sdma_engine *sdma = sdmac->sdma;
- int num_periods = buf_len / period_len;
+ int num_periods = 0;
int channel = sdmac->channel;
int i = 0, buf = 0;
struct sdma_desc *desc;
dev_dbg(sdma->dev, "%s channel: %d\n", __func__, channel);
+ if (sdmac->peripheral_type != IMX_DMATYPE_HDMI)
+ num_periods = buf_len / period_len;
+
sdma_config_write(chan, &sdmac->slave_config, direction);
desc = sdma_transfer_init(sdmac, direction, num_periods);
@@ -1701,6 +1716,9 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
goto err_bd_out;
}
+ if (sdmac->peripheral_type == IMX_DMATYPE_HDMI)
+ return vchan_tx_prep(&sdmac->vc, &desc->vd, flags);
+
while (buf < buf_len) {
struct sdma_buffer_descriptor *bd = &desc->bd[i];
int param;
@@ -1761,6 +1779,10 @@ static int sdma_config_write(struct dma_chan *chan,
sdmac->watermark_level |= (dmaengine_cfg->dst_maxburst << 16) &
SDMA_WATERMARK_LEVEL_HWML;
sdmac->word_size = dmaengine_cfg->dst_addr_width;
+ } else if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
+ sdmac->per_address = dmaengine_cfg->dst_addr;
+ sdmac->per_address2 = dmaengine_cfg->src_addr;
+ sdmac->watermark_level = 0;
} else {
sdmac->per_address = dmaengine_cfg->dst_addr;
sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
diff --git a/include/linux/dma/imx-dma.h b/include/linux/dma/imx-dma.h
index f487a4fa103a..cfec5f946e23 100644
--- a/include/linux/dma/imx-dma.h
+++ b/include/linux/dma/imx-dma.h
@@ -40,6 +40,7 @@ enum sdma_peripheral_type {
IMX_DMATYPE_ASRC_SP, /* Shared ASRC */
IMX_DMATYPE_SAI, /* SAI */
IMX_DMATYPE_MULTI_SAI, /* MULTI FIFOs For Audio */
+ IMX_DMATYPE_HDMI, /* HDMI Audio */
};
enum imx_dma_prio {
--
2.37.1
On 06-09-22, 17:42, Joy Zou wrote:
> Add hdmi audio support in sdma.
Pls add description in changelog about what it takes to enabled hdmi
(cyclic support etc)
>
> Signed-off-by: Joy Zou <[email protected]>
> ---
> drivers/dma/imx-sdma.c | 38 +++++++++++++++++++++++++++++--------
> include/linux/dma/imx-dma.h | 1 +
> 2 files changed, 31 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index fbea5f62dd98..ab877ceeac3f 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -954,7 +954,10 @@ static irqreturn_t sdma_int_handler(int irq, void *dev_id)
> desc = sdmac->desc;
> if (desc) {
> if (sdmac->flags & IMX_DMA_SG_LOOP) {
> - sdma_update_channel_loop(sdmac);
> + if (sdmac->peripheral_type != IMX_DMATYPE_HDMI)
> + sdma_update_channel_loop(sdmac);
> + else
> + vchan_cyclic_callback(&desc->vd);
> } else {
> mxc_sdma_handle_channel_normal(sdmac);
> vchan_cookie_complete(&desc->vd);
> @@ -1074,6 +1077,10 @@ static int sdma_get_pc(struct sdma_channel *sdmac,
> per_2_emi = sdma->script_addrs->sai_2_mcu_addr;
> emi_2_per = sdma->script_addrs->mcu_2_sai_addr;
> break;
> + case IMX_DMATYPE_HDMI:
> + emi_2_per = sdma->script_addrs->hdmi_dma_addr;
> + sdmac->is_ram_script = true;
> + break;
> default:
> dev_err(sdma->dev, "Unsupported transfer type %d\n",
> peripheral_type);
> @@ -1125,11 +1132,16 @@ static int sdma_load_context(struct sdma_channel *sdmac)
> /* Send by context the event mask,base address for peripheral
> * and watermark level
> */
> - context->gReg[0] = sdmac->event_mask[1];
> - context->gReg[1] = sdmac->event_mask[0];
> - context->gReg[2] = sdmac->per_addr;
> - context->gReg[6] = sdmac->shp_addr;
> - context->gReg[7] = sdmac->watermark_level;
> + if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
> + context->gReg[4] = sdmac->per_addr;
> + context->gReg[6] = sdmac->shp_addr;
> + } else {
> + context->gReg[0] = sdmac->event_mask[1];
> + context->gReg[1] = sdmac->event_mask[0];
> + context->gReg[2] = sdmac->per_addr;
> + context->gReg[6] = sdmac->shp_addr;
> + context->gReg[7] = sdmac->watermark_level;
> + }
>
> bd0->mode.command = C0_SETDM;
> bd0->mode.status = BD_DONE | BD_WRAP | BD_EXTD;
> @@ -1513,7 +1525,7 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,
> desc->sdmac = sdmac;
> desc->num_bd = bds;
>
> - if (sdma_alloc_bd(desc))
> + if (bds && sdma_alloc_bd(desc))
> goto err_desc_out;
>
> /* No slave_config called in MEMCPY case, so do here */
> @@ -1678,13 +1690,16 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
> {
> struct sdma_channel *sdmac = to_sdma_chan(chan);
> struct sdma_engine *sdma = sdmac->sdma;
> - int num_periods = buf_len / period_len;
> + int num_periods = 0;
> int channel = sdmac->channel;
> int i = 0, buf = 0;
> struct sdma_desc *desc;
>
> dev_dbg(sdma->dev, "%s channel: %d\n", __func__, channel);
>
> + if (sdmac->peripheral_type != IMX_DMATYPE_HDMI)
> + num_periods = buf_len / period_len;
> +
> sdma_config_write(chan, &sdmac->slave_config, direction);
>
> desc = sdma_transfer_init(sdmac, direction, num_periods);
> @@ -1701,6 +1716,9 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
> goto err_bd_out;
> }
>
> + if (sdmac->peripheral_type == IMX_DMATYPE_HDMI)
> + return vchan_tx_prep(&sdmac->vc, &desc->vd, flags);
> +
> while (buf < buf_len) {
> struct sdma_buffer_descriptor *bd = &desc->bd[i];
> int param;
> @@ -1761,6 +1779,10 @@ static int sdma_config_write(struct dma_chan *chan,
> sdmac->watermark_level |= (dmaengine_cfg->dst_maxburst << 16) &
> SDMA_WATERMARK_LEVEL_HWML;
> sdmac->word_size = dmaengine_cfg->dst_addr_width;
> + } else if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
> + sdmac->per_address = dmaengine_cfg->dst_addr;
> + sdmac->per_address2 = dmaengine_cfg->src_addr;
> + sdmac->watermark_level = 0;
> } else {
> sdmac->per_address = dmaengine_cfg->dst_addr;
> sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
> diff --git a/include/linux/dma/imx-dma.h b/include/linux/dma/imx-dma.h
> index f487a4fa103a..cfec5f946e23 100644
> --- a/include/linux/dma/imx-dma.h
> +++ b/include/linux/dma/imx-dma.h
> @@ -40,6 +40,7 @@ enum sdma_peripheral_type {
> IMX_DMATYPE_ASRC_SP, /* Shared ASRC */
> IMX_DMATYPE_SAI, /* SAI */
> IMX_DMATYPE_MULTI_SAI, /* MULTI FIFOs For Audio */
> + IMX_DMATYPE_HDMI, /* HDMI Audio */
> };
>
> enum imx_dma_prio {
> --
> 2.37.1
--
~Vinod
> -----Original Message-----
> From: Vinod Koul <[email protected]>
> Sent: 2022??10??19?? 22:25
> To: Joy Zou <[email protected]>
> Cc: [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; S.J. Wang <[email protected]>;
> [email protected]; [email protected]; [email protected];
> Peng Fan <[email protected]>; [email protected]; [email protected];
> Hongxing Zhu <[email protected]>; dl-linux-imx <[email protected]>;
> [email protected]; [email protected];
> [email protected]; [email protected]
> Subject: [EXT] Re: [PATCH v6 2/4] dmaengine: imx-sdma: support hdmi audio
>
> Caution: EXT Email
>
> On 06-09-22, 17:42, Joy Zou wrote:
> > Add hdmi audio support in sdma.
>
> Pls add description in changelog about what it takes to enabled hdmi (cyclic
> support etc)
Thank you very much for your comments.
I have changed commit message in patch v7.
BR
Joy Zou
>
> >
> > Signed-off-by: Joy Zou <[email protected]>
> > ---
> > drivers/dma/imx-sdma.c | 38
> +++++++++++++++++++++++++++++--------
> > include/linux/dma/imx-dma.h | 1 +
> > 2 files changed, 31 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index
> > fbea5f62dd98..ab877ceeac3f 100644
> > --- a/drivers/dma/imx-sdma.c
> > +++ b/drivers/dma/imx-sdma.c
> > @@ -954,7 +954,10 @@ static irqreturn_t sdma_int_handler(int irq, void
> *dev_id)
> > desc = sdmac->desc;
> > if (desc) {
> > if (sdmac->flags & IMX_DMA_SG_LOOP) {
> > - sdma_update_channel_loop(sdmac);
> > + if (sdmac->peripheral_type !=
> IMX_DMATYPE_HDMI)
> > +
> sdma_update_channel_loop(sdmac);
> > + else
> > +
> > + vchan_cyclic_callback(&desc->vd);
> > } else {
> >
> mxc_sdma_handle_channel_normal(sdmac);
> > vchan_cookie_complete(&desc->vd);
> @@
> > -1074,6 +1077,10 @@ static int sdma_get_pc(struct sdma_channel *sdmac,
> > per_2_emi = sdma->script_addrs->sai_2_mcu_addr;
> > emi_2_per = sdma->script_addrs->mcu_2_sai_addr;
> > break;
> > + case IMX_DMATYPE_HDMI:
> > + emi_2_per = sdma->script_addrs->hdmi_dma_addr;
> > + sdmac->is_ram_script = true;
> > + break;
> > default:
> > dev_err(sdma->dev, "Unsupported transfer type %d\n",
> > peripheral_type); @@ -1125,11 +1132,16 @@
> static
> > int sdma_load_context(struct sdma_channel *sdmac)
> > /* Send by context the event mask,base address for peripheral
> > * and watermark level
> > */
> > - context->gReg[0] = sdmac->event_mask[1];
> > - context->gReg[1] = sdmac->event_mask[0];
> > - context->gReg[2] = sdmac->per_addr;
> > - context->gReg[6] = sdmac->shp_addr;
> > - context->gReg[7] = sdmac->watermark_level;
> > + if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
> > + context->gReg[4] = sdmac->per_addr;
> > + context->gReg[6] = sdmac->shp_addr;
> > + } else {
> > + context->gReg[0] = sdmac->event_mask[1];
> > + context->gReg[1] = sdmac->event_mask[0];
> > + context->gReg[2] = sdmac->per_addr;
> > + context->gReg[6] = sdmac->shp_addr;
> > + context->gReg[7] = sdmac->watermark_level;
> > + }
> >
> > bd0->mode.command = C0_SETDM;
> > bd0->mode.status = BD_DONE | BD_WRAP | BD_EXTD; @@ -1513,7
> > +1525,7 @@ static struct sdma_desc *sdma_transfer_init(struct
> sdma_channel *sdmac,
> > desc->sdmac = sdmac;
> > desc->num_bd = bds;
> >
> > - if (sdma_alloc_bd(desc))
> > + if (bds && sdma_alloc_bd(desc))
> > goto err_desc_out;
> >
> > /* No slave_config called in MEMCPY case, so do here */ @@
> > -1678,13 +1690,16 @@ static struct dma_async_tx_descriptor
> > *sdma_prep_dma_cyclic( {
> > struct sdma_channel *sdmac = to_sdma_chan(chan);
> > struct sdma_engine *sdma = sdmac->sdma;
> > - int num_periods = buf_len / period_len;
> > + int num_periods = 0;
> > int channel = sdmac->channel;
> > int i = 0, buf = 0;
> > struct sdma_desc *desc;
> >
> > dev_dbg(sdma->dev, "%s channel: %d\n", __func__, channel);
> >
> > + if (sdmac->peripheral_type != IMX_DMATYPE_HDMI)
> > + num_periods = buf_len / period_len;
> > +
> > sdma_config_write(chan, &sdmac->slave_config, direction);
> >
> > desc = sdma_transfer_init(sdmac, direction, num_periods); @@
> > -1701,6 +1716,9 @@ static struct dma_async_tx_descriptor
> *sdma_prep_dma_cyclic(
> > goto err_bd_out;
> > }
> >
> > + if (sdmac->peripheral_type == IMX_DMATYPE_HDMI)
> > + return vchan_tx_prep(&sdmac->vc, &desc->vd, flags);
> > +
> > while (buf < buf_len) {
> > struct sdma_buffer_descriptor *bd = &desc->bd[i];
> > int param;
> > @@ -1761,6 +1779,10 @@ static int sdma_config_write(struct dma_chan
> *chan,
> > sdmac->watermark_level |= (dmaengine_cfg->dst_maxburst
> << 16) &
> > SDMA_WATERMARK_LEVEL_HWML;
> > sdmac->word_size = dmaengine_cfg->dst_addr_width;
> > + } else if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
> > + sdmac->per_address = dmaengine_cfg->dst_addr;
> > + sdmac->per_address2 = dmaengine_cfg->src_addr;
> > + sdmac->watermark_level = 0;
> > } else {
> > sdmac->per_address = dmaengine_cfg->dst_addr;
> > sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
> > diff --git a/include/linux/dma/imx-dma.h b/include/linux/dma/imx-dma.h
> > index f487a4fa103a..cfec5f946e23 100644
> > --- a/include/linux/dma/imx-dma.h
> > +++ b/include/linux/dma/imx-dma.h
> > @@ -40,6 +40,7 @@ enum sdma_peripheral_type {
> > IMX_DMATYPE_ASRC_SP, /* Shared ASRC */
> > IMX_DMATYPE_SAI, /* SAI */
> > IMX_DMATYPE_MULTI_SAI, /* MULTI FIFOs For Audio */
> > + IMX_DMATYPE_HDMI, /* HDMI Audio */
> > };
> >
> > enum imx_dma_prio {
> > --
> > 2.37.1
>
> --
> ~Vinod