Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Joy Zou <joy.zou@nxp.com>
To:     krzysztof.kozlowski@linaro.org, vkoul@kernel.org
Cc:     shengjiu.wang@nxp.com, shawnguo@kernel.org, s.hauer@pengutronix.de,
        kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
        dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH V4 2/4] dmaengine: imx-sdma: support hdmi audio
Date:   Thu,  1 Sep 2022 10:00:59 +0800
Message-Id: <20220901020059.50099-1-joy.zou@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cKM3fKASlVr8i/fmtU+T6c1XsDmLhP2alC7tn8L+1AEbNq3SodT51qKy0+gf?=
 =?us-ascii?Q?R990QH3xl7s9D/9VQ2xw6CfU9BhSNE1Iz+txEYCsTnNi0KrRjbuIh0UZ2r7v?=
 =?us-ascii?Q?0S/CIr6OvqQauaVtZBhR4wI2Wc6UlG+iPnFPAvd/9bHEZDcXTc1TEMMQls42?=
 =?us-ascii?Q?5L05ISoD+JuZU5onCGdpIsgOc0sNZQCRKxwotohMxmdprzRf/31eDQTyUxX9?=
 =?us-ascii?Q?/WM9sps+9Nm0XPG2KtUlJljDcxKnGjU8L5Bc/Jm9JMCC4NMcX7oCkiaU0eAA?=
 =?us-ascii?Q?m0qxMXLuWlHuWTebV7EhkAs4fqQjT3RYWemIY1REZokEVyUBQCn7Z3ic0vEh?=
 =?us-ascii?Q?GaOpWmcDj/szjeyQFGAzp6p4SqNG4BtwY4tycmFcbSnZ17aRgI4jK6xHaEwT?=
 =?us-ascii?Q?xxFqUN1hy7rmhiaZ9uN5SzyQhVezxlBPQ4vyEiBmAuFMV8fFE0TnF6BpV4hV?=
 =?us-ascii?Q?QECPXkJSPXuhlRWUW0FfiBwdoA86NQAGJjLujQte4t5GUThRrc7Hor3xsQvf?=
 =?us-ascii?Q?cotlAizHPSHX4iNA1zAOu5EIomRDcVwJ/fRvrQiTNNQhkrIIzuLnNqniZUPM?=
 =?us-ascii?Q?ojzQ1w75sjQ716Ko3uIcoMWRF5Mu3XIsXvisOn/9FKGoIBucPKy88CdeQ6Cx?=
 =?us-ascii?Q?8n03CTzmQyEYK23d01bI5zb+Fdb/Il2c3bWi46JuG6utNCJOt5+7JsRPxheC?=
 =?us-ascii?Q?OphXgQlNDKuEmwyxMkkWrWGOoaCJfuEDKeh2W/rrS9MjosSE0W/QF5zQwh64?=
 =?us-ascii?Q?GhbL/UWq1v5s/TDt89iTHaH86VF9JD+RL0fB2rE3pjL/qevQPL+/ee2TuDJ+?=
 =?us-ascii?Q?TYlWvNCX/bFrF45mqkErCKZX7H3RJ9Ka4G/kcu8/vNgj/T1QX8Pr9EJBEMGC?=
 =?us-ascii?Q?WhkxCYYvO7iPCSw577UetJJdxgIQUZRzuBShZwNfe2GF2bLxgxwR55UHlCqD?=
 =?us-ascii?Q?W5Yx6N3L1V9kTykzYLWXVxAMj984rQe4vEjvELnxyxotte+76MSEk3cP4RAX?=
 =?us-ascii?Q?mugsJGq49ZM33R/WfWdj39s4XImtYrEK621xDiAV4ryOUfkQg7OPfKMnFUa4?=
 =?us-ascii?Q?grEGdZ5YroTQ7jc6VbiWKjEHrQW7R1uZP9/ieBCuJYT7edG1KU9sql6YejA8?=
 =?us-ascii?Q?Q7XqUOu2U4nAq8a9hNOMIF1516+tIln3GAo7QsUMFlymOE8rA8Wvsj41o6uQ?=
 =?us-ascii?Q?YAkbPf8jpy02wFvuTAM0sgxDYIklLag1qA/FKGP03vLO3yqFV5fjiqe6zM93?=
 =?us-ascii?Q?4S76Jj18U+zX9pLclpoijp0voh3gpUSK9JHZgbdIvybjjFlVMJBYWqTN/xM1?=
 =?us-ascii?Q?MnuQ1LwtD+kQGDABjReMjClSO0nCCc6L/oM+Ky+QlsStTJJ93LI/pq8/4+B4?=
 =?us-ascii?Q?YBkEVOLvrRUk3eqMb3D5uL/WhfQAhyGJKt023e0vMDTIbj116UXFqk2GygLm?=
 =?us-ascii?Q?k+Yy0hd2zYRU70Nq8g27+an9xlLIny73XP7+auG+Mi5luS85jpg6QceBMYnO?=
 =?us-ascii?Q?V4kzKezb2eTFJLIU/At+i6eAJPHAzTJmTF16pvY8d/XEXUI2PacMQcdJAYlH?=
 =?us-ascii?Q?+DwMaEoP5yKDYlWkeougeIO+iDJuTXIHauZ7aCSO?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5abd72d5-4998-4dd7-66fe-08da8bbd9f30
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5925.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 01:59:36.4519
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: NybkBnC4Jp23MmHNvzGjyaJ+hL/pFsM1MJD5yDxeAHFlxvSjHip44N6hMW84/DGI
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8724
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add hdmi audio support in sdma.

Signed-off-by: Joy Zou <joy.zou@nxp.com>
---
 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