From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65E71C433EF for ; Mon, 25 Oct 2021 04:46:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EEA160FBF for ; Mon, 25 Oct 2021 04:46:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2EEA160FBF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hMIDbXMPidSRodbXkxsKR4np50ZIO22UPmK5aw/nHh8=; b=R+4adNDdpicccr xCbbh7sn8L/RloOeRBq0K8x7KfPTDoEe8CgxmPjYEoSKBgQJIsOY9clqssWMHXr3rYruJCIp+mVVf fJpeL7g+EImGo+eNeNAMr8xSEJpRnhWhL8rc9N0HMQlEAO/ssNHWQg065nuP0APUQF5JoV8EEW89/ 0wfZASHZI+UyqogV9/iIYAWrDJYsPcb2k1LYMGDa3M4hW43MjHcFixCoLMt+FjamssLEwHaVQ8xKH 0YuahOI3Y6tbFCQdvxNsj5q4ng5ASBlA0Zspu5zaTqz4Yv9wB0/4h6y4KbmWwLXjs25r7wZCMPWL4 NRkRT0Vj0ZpyPhpDzQgw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1merqr-00FG9t-UJ; Mon, 25 Oct 2021 04:44:50 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1merqn-00FG8W-Hp for linux-arm-kernel@lists.infradead.org; Mon, 25 Oct 2021 04:44:47 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id AA9C960FBF; Mon, 25 Oct 2021 04:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635137080; bh=sOhHF+HAnRoEIqH19QgSH9mZon6LU9SS6cFQOHW/XKA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fXkfEU/RowxRIqyNz781xmT/AtHIyBELbIK0hw32+2rGJcYmWkVmoyjnEA/hnIo10 vwo2VYnwXIEb7O59Ws4YkADa0NpE8ATi+cJ/NxQIsFseO8LzobCID6pVXOKKbGINu4 SeVW04XVRw/XA3HuAFFJQWAIxUrhddp8ptamlUjBLkuDhQaOiuKNHkNp8kmhQDMZgQ Oqtn53v7ppjrN4+moHDju3sRVRHdfGf6i38dZSsB+Z0PeR/RGyjBmcHtpSPW2WHak9 skn5BmGIF87XBHuRfRXgdCQ3k9iY1VSHd4EDh2C7IKWxIHMPttiqPlSjaNXXs2js34 w7QCyswT10YTA== Date: Mon, 25 Oct 2021 10:14:35 +0530 From: Vinod Koul To: Joy Zou Cc: yibin.gong@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: Re: [PATCH 2/2] dmaengine: imx-sdma: support hdmi audio Message-ID: References: <20211021051611.3155385-1-joy.zou@nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211021051611.3155385-1-joy.zou@nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211024_214445_663567_28429729 X-CRM114-Status: GOOD ( 22.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 21-10-21, 13:16, Joy Zou wrote: > Add hdmi audio support in sdma. Pls send a series together and chained. They appear here as disjoint patches > > Signed-off-by: Joy Zou > --- > drivers/dma/imx-sdma.c | 38 +++++++++++++++++++++------ > include/linux/platform_data/dma-imx.h | 1 + > 2 files changed, 31 insertions(+), 8 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index cacc725ca545..3a0e408f7741 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -907,7 +907,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); > @@ -1023,6 +1026,10 @@ static void sdma_get_pc(struct sdma_channel *sdmac, > case IMX_DMATYPE_IPU_MEMORY: > emi_2_per = sdma->script_addrs->ext_mem_2_ipu_addr; > break; > + case IMX_DMATYPE_HDMI: > + emi_2_per = sdma->script_addrs->hdmi_dma_addr; > + sdmac->is_ram_script = true; > + break; > default: > break; > } > @@ -1070,11 +1077,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; > @@ -1420,7 +1432,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 */ > @@ -1585,13 +1597,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); > @@ -1608,6 +1623,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; > @@ -1668,6 +1686,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 * You missed adding cyclic capability, pls add that > diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h > index 281adbb26e6b..29ac21d40f28 100644 > --- a/include/linux/platform_data/dma-imx.h > +++ b/include/linux/platform_data/dma-imx.h > @@ -39,6 +39,7 @@ enum sdma_peripheral_type { > IMX_DMATYPE_SSI_DUAL, /* SSI Dual FIFO */ > IMX_DMATYPE_ASRC_SP, /* Shared ASRC */ > IMX_DMATYPE_SAI, /* SAI */ > + IMX_DMATYPE_HDMI, /* HDMI Audio */ Why is this in latform_data, these should be moved to include/dt-bindings -- ~Vinod _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel