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 90EDCC433E0 for ; Tue, 2 Jun 2020 17:35:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 693712067B for ; Tue, 2 Jun 2020 17:35:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AzYcFasI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726019AbgFBRfd (ORCPT ); Tue, 2 Jun 2020 13:35:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725969AbgFBRfc (ORCPT ); Tue, 2 Jun 2020 13:35:32 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B740FC05BD1E; Tue, 2 Jun 2020 10:35:32 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id a45so1283808pje.1; Tue, 02 Jun 2020 10:35:32 -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=RQz6mXYVQk0BFmm0NO1g36FUQOi7dk9D0LeRLoLDtYo=; b=AzYcFasIXKtOZM1b3NTqulWLRLcNSQNaUgzjQQlZK5GmKi0hH1+Q4la6jARw0v2L/v +hKF3CJbv5WzcdQvCMItIbmcvB2K4LLxLidyFRGk4xjXT2vNZGTjWWnm/6j4tP8H171W 93ocEDoDWXpm3dO71rJgj9Af6CYv1CPi0qcRLe/4fgIIElt+57tYCTJAP9J8K7jKenRo av1NGlUJr4slq3eDum1JrsYWREjE7xS94efsf5Tfen+FHBF7BiGTFKjYXrFnPCcVpvMn K8F3rPvbzYHqtPZGo2PwvcK3SuPKkQrEBNvr6tDb937PNjJ2RUL1Hj+GeYtK33j/jk6D 5WOQ== 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=RQz6mXYVQk0BFmm0NO1g36FUQOi7dk9D0LeRLoLDtYo=; b=nJLRVa3mV01mIFFNwDQl2MMxD3FOqrx6D2A49tkOu3zm/ShgplWB7u5B727qrxkuv2 LUBaDmSmfBwAnxKyApl1GTEtNnzAvkqa9PQUVLOmZ+f4xBMRboq+ebLMeUrHxRe1p//R +10EeaQSBEAdrYhDWbLlIQBtLVDKy/VxlYxjzoR+cpBCrcAMKHgW/ZkSWrqRCT35d2TT Qi/ZooDFfwoiclPtVCmIzgtqwNrovPj026n5e4SGr2Mga3elPmdlr0D/m3AEZ0ynejGM F4XQuIgFoNfCqMz/uTOljrRYDlF0/48KAUOqXpTvMFBvTgm25fFhPgKe9oxlaBpwVq1h Fb8Q== X-Gm-Message-State: AOAM5313ejp6Y2fL36h42zeQD0SHsodRzozkuGvkMh1K/xWfyJ6W7gzg E/XySKx3c2Nm5K6r4E2Lgj4= X-Google-Smtp-Source: ABdhPJyxZUgVOr7AzryG3GnqNmUk8BcIDVV/ODBzTnbReFF+boZAxo8pBTq57AHIG4AvTlH7dwUWVg== X-Received: by 2002:a17:90b:3691:: with SMTP id mj17mr277416pjb.152.1591119332203; Tue, 02 Jun 2020 10:35:32 -0700 (PDT) Received: from localhost.localdomain ([223.235.152.125]) by smtp.gmail.com with ESMTPSA id i22sm2864382pfo.92.2020.06.02.10.34.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 10:35:31 -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-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-actions@lists.infradead.org Subject: [PATCH v3 02/10] dmaengine: Actions: Add support for S700 DMA engine Date: Tue, 2 Jun 2020 23:03:04 +0530 Message-Id: <1591119192-18538-3-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591119192-18538-1-git-send-email-amittomer25@gmail.com> References: <1591119192-18538-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 v2: * No changes. Changes since v1: * Moved llc_hw_flen() to patch 1/9. * provided comments about dma descriptor difference. between S700 and S900. Changes since RFC: * Added accessor function to get the frame lenght. * Removed the SoC specific check in IRQ routine. --- drivers/dma/owl-dma.c | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/drivers/dma/owl-dma.c b/drivers/dma/owl-dma.c index dd85c205454e..17d2fc2d568b 100644 --- a/drivers/dma/owl-dma.c +++ b/drivers/dma/owl-dma.c @@ -137,6 +137,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 @@ -203,6 +208,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; @@ -217,6 +223,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, @@ -306,6 +313,11 @@ static inline u32 llc_hw_ctrlb(u32 int_ctl) { u32 ctl; + /* + * Irrespective of the SoC, ctrlb value starts filling from + * bit 18. + */ + ctl = BIT_FIELD(int_ctl, 7, 0, 18); return ctl; @@ -362,6 +374,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); @@ -417,8 +430,18 @@ 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 | FCNT_VAL << 20; - lli->hw[OWL_DMADESC_CTRLB] = ctrlb; + + /* + * S700 put flen and fcnt at offset 0x0c and 0x1c respectively, + * whereas S900 put flen and fcnt at offset 0x0c. + */ + if (od->devid == S700_DMA) { + lli->hw[OWL_DMADESC_FLEN] = len; + lli->hw[OWL_DMADESC_CTRLB] = FCNT_VAL | ctrlb; + } else { + lli->hw[OWL_DMADESC_FLEN] = len | FCNT_VAL << 20; + lli->hw[OWL_DMADESC_CTRLB] = ctrlb; + } return 0; } @@ -580,7 +603,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"); @@ -1038,11 +1061,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) @@ -1067,6 +1099,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; @@ -1199,12 +1233,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