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 X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D57DC433E0 for ; Thu, 14 May 2020 16:11:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E23AB2065D for ; Thu, 14 May 2020 16:11:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XB674fNp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726763AbgENQLv (ORCPT ); Thu, 14 May 2020 12:11:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726073AbgENQLv (ORCPT ); Thu, 14 May 2020 12:11:51 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82504C061A0C for ; Thu, 14 May 2020 09:11:50 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id x10so1339478plr.4 for ; Thu, 14 May 2020 09:11:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9fV5j8sOG/Soznuq8VAGR0RqzJqSwDfkCf7U4jRW15Y=; b=XB674fNpCkVfFAvljox/XXiF9FYuhispHDqy/LvVa52BMMWsPlD45UsFBzAmOdZGrn 2yUhRF45w2aaOT4toKMzgIlJ2dtDwppawPXCN8vycusNotzPApLVeEfEzMVPWsxy0woQ nCr6KNuIcP8UB8keZwX+20DVVNHpA3+iYVxKdzKALg4EFmiwF3UkZ7A0YtYhNF2+aG/k Dvr8z8kLOOJIoacxDRe6wQ0vtyj8MW+7xEh5Kv/bSUJXXLYOiyOPoxmSKUKPlAJMliaL yPSKA5z1/z99nRWIGHqtzdbAj+B/amxRAGaGL9qVsapMeaExU/TlPObrAX+rHQybqy+m H2gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9fV5j8sOG/Soznuq8VAGR0RqzJqSwDfkCf7U4jRW15Y=; b=PghwgibiYjpPX70uJ7LFwYAWUb46R2ugHIlg2ZBXeo/das3hR5aUasa48D8JaA0w8m MHCFDlOCzh+dbEkJr7lPfXgEPtxTHAyfcMgFg92zay9i8Iphn1LwCsm0JGa77Fq3pi6O 7jenQYMyxyIrb97d9hS7fa+4IObWbBPNhUBB7GlVPogeQv0OaMKvfOI+t+Lh/VyxWtJh 2ANUTfUxxzdq+CnF+ymVmBL77Pc0wzwIhYCNeBZEmLgk7gFXfYpJsV6H+ScgKU1Vc2+Y yZOIY6cYG5BMq1waO5bTkW6hLNWuws4v5zd98lcXVag04FYfD2wK4piRgKZqzh9fJWLG DlJQ== X-Gm-Message-State: AOAM532P/PDRc1FxKCAX6CEmSO5t362gX+wlrspEXAx0ife96BNzRL88 Z2Lpt3pbFIn/JRxaw61SB1M= X-Google-Smtp-Source: ABdhPJyM3l1jZefp/L/7D+K4oY6HdUnNSnRtNv3vvopsPp2rumOF7OQ8zPFUx7Q8RL78swJROPK1qQ== X-Received: by 2002:a17:902:8c89:: with SMTP id t9mr4673253plo.131.1589472709957; Thu, 14 May 2020 09:11:49 -0700 (PDT) Received: from localhost.localdomain ([106.215.24.137]) by smtp.gmail.com with ESMTPSA id t5sm2331755pgp.80.2020.05.14.09.11.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2020 09:11:49 -0700 (PDT) From: Amit Singh Tomar To: andre.przywara@arm.com, vkoul@kernel.org, afaerber@suse.de, manivannan.sadhasivam@linaro.org Cc: dan.j.williams@intel.com, cristian.ciocaltea@gmail.com, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-actions@lists.infradead.org Subject: [PATCH v1 2/9] dmaengine: Actions: Add support for S700 DMA engine Date: Thu, 14 May 2020 21:40:50 +0530 Message-Id: <1589472657-3930-3-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1589472657-3930-1-git-send-email-amittomer25@gmail.com> References: <1589472657-3930-1-git-send-email-amittomer25@gmail.com> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org DMA controller present on S700 SoC is compatible with the one on S900 (as most of registers are same), but it has different DMA descriptor structure where registers "fcnt" and "ctrlb" uses different encoding. For instance, on S900 "fcnt" starts at offset 0x0c and uses upper 12 bits whereas on S700, it starts at offset 0x1c and uses lower 12 bits. This commit adds support for DMA controller present on S700. Signed-off-by: Amit Singh Tomar --- Changes since RFC: * Added accessor function to get the frame lenght. * Removed the SoC specific check in IRQ routine. --- drivers/dma/owl-dma.c | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/drivers/dma/owl-dma.c b/drivers/dma/owl-dma.c index b0d80a2fa383..afa6c6f43d26 100644 --- a/drivers/dma/owl-dma.c +++ b/drivers/dma/owl-dma.c @@ -134,6 +134,11 @@ enum owl_dmadesc_offsets { OWL_DMADESC_SIZE }; +enum owl_dma_id { + S900_DMA, + S700_DMA, +}; + /** * struct owl_dma_lli - Link list for dma transfer * @hw: hardware link list @@ -200,6 +205,7 @@ struct owl_dma_vchan { * @pchans: array of data for the physical channels * @nr_vchans: the number of physical channels * @vchans: array of data for the physical channels + * @devid: device id based on OWL SoC */ struct owl_dma { struct dma_device dma; @@ -214,6 +220,7 @@ struct owl_dma { unsigned int nr_vchans; struct owl_dma_vchan *vchans; + enum owl_dma_id devid; }; static void pchan_update(struct owl_dma_pchan *pchan, u32 reg, @@ -308,6 +315,11 @@ static inline u32 llc_hw_ctrlb(u32 int_ctl) return ctl; } +static inline u32 llc_hw_flen(struct owl_dma_lli *lli) +{ + return lli->hw[OWL_DMADESC_FLEN] & GENMASK(19, 0); +} + static void owl_dma_free_lli(struct owl_dma *od, struct owl_dma_lli *lli) { @@ -354,6 +366,7 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, struct dma_slave_config *sconfig, bool is_cyclic) { + struct owl_dma *od = to_owl_dma(vchan->vc.chan.device); u32 mode, ctrlb; mode = OWL_DMA_MODE_PW(0); @@ -409,8 +422,14 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, lli->hw[OWL_DMADESC_DADDR] = dst; lli->hw[OWL_DMADESC_SRC_STRIDE] = 0; lli->hw[OWL_DMADESC_DST_STRIDE] = 0; - lli->hw[OWL_DMADESC_FLEN] = len | 1 << 20; - lli->hw[OWL_DMADESC_CTRLB] = ctrlb; + + if (od->devid == S700_DMA) { + lli->hw[OWL_DMADESC_FLEN] = len; + lli->hw[OWL_DMADESC_CTRLB] = 1 | ctrlb; + } else { + lli->hw[OWL_DMADESC_FLEN] = len | 1 << 20; + lli->hw[OWL_DMADESC_CTRLB] = ctrlb; + } return 0; } @@ -572,7 +591,7 @@ static irqreturn_t owl_dma_interrupt(int irq, void *dev_id) global_irq_pending = dma_readl(od, OWL_DMA_IRQ_PD0); - if (chan_irq_pending && !(global_irq_pending & BIT(i))) { + if (chan_irq_pending && !(global_irq_pending & BIT(i))) { dev_dbg(od->dma.dev, "global and channel IRQ pending match err\n"); @@ -741,9 +760,9 @@ static u32 owl_dma_getbytes_chan(struct owl_dma_vchan *vchan) list_for_each_entry(lli, &txd->lli_list, node) { /* Start from the next active node */ if (lli->phys == next_lli_phy) { - list_for_each_entry(lli, &txd->lli_list, node) - bytes += lli->hw[OWL_DMADESC_FLEN] & - GENMASK(19, 0); + list_for_each_entry(lli, &txd->lli_list, + node) + bytes += llc_hw_flen(lli); break; } } @@ -774,7 +793,7 @@ static enum dma_status owl_dma_tx_status(struct dma_chan *chan, if (vd) { txd = to_owl_txd(&vd->tx); list_for_each_entry(lli, &txd->lli_list, node) - bytes += lli->hw[OWL_DMADESC_FLEN] & GENMASK(19, 0); + bytes += llc_hw_flen(lli); } else { bytes = owl_dma_getbytes_chan(vchan); } @@ -1031,11 +1050,20 @@ static struct dma_chan *owl_dma_of_xlate(struct of_phandle_args *dma_spec, return chan; } +static const struct of_device_id owl_dma_match[] = { + { .compatible = "actions,s900-dma", .data = (void *)S900_DMA,}, + { .compatible = "actions,s700-dma", .data = (void *)S700_DMA,}, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, owl_dma_match); + static int owl_dma_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; struct owl_dma *od; int ret, i, nr_channels, nr_requests; + const struct of_device_id *of_id = + of_match_device(owl_dma_match, &pdev->dev); od = devm_kzalloc(&pdev->dev, sizeof(*od), GFP_KERNEL); if (!od) @@ -1060,6 +1088,8 @@ static int owl_dma_probe(struct platform_device *pdev) dev_info(&pdev->dev, "dma-channels %d, dma-requests %d\n", nr_channels, nr_requests); + od->devid = (enum owl_dma_id)of_id->data; + od->nr_pchans = nr_channels; od->nr_vchans = nr_requests; @@ -1192,12 +1222,6 @@ static int owl_dma_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id owl_dma_match[] = { - { .compatible = "actions,s900-dma", }, - { /* sentinel */ } -}; -MODULE_DEVICE_TABLE(of, owl_dma_match); - static struct platform_driver owl_dma_driver = { .probe = owl_dma_probe, .remove = owl_dma_remove, -- 2.7.4