From patchwork Tue Jun 2 17:33:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 11584167 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F14E739 for ; Tue, 2 Jun 2020 17:35:38 +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 6C62F2067B for ; Tue, 2 Jun 2020 17:35:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Hgh4eLIB"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AzYcFasI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C62F2067B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=qtWHZC9Z/100Wo5W4MEq8zis4XLLs9NPNsOt7v4Nr84=; b=Hgh4eLIBmnOYlQN7v+DuZClOut oygtJWF5MQQ8P6KLYNv1m9HscfsJtN5Z7kEabq/HHYTJIeX1/nx7YkOVGVDFIpSoOcM3FCzgGZeer iCtTsSc2nH7KPKHpwSaoTfxYA4MYdCt0u44yIqI3aMv5G/Cyta8lOnl+05wl4VCNqK+PUfgS0heoe NtbHaHO6SxDj0If6Q1FweiWnHjLEgPYM2C/7feiEkvAPkxXketCCJ+ki0NA+cTu/dmJVxQ3r0Nl9D qq7DbxcgszTspjyCbxYc2ksSKXTQ/JpvvNZK8wiNPYWHKjypRPwDVnbp5v/ifOuZtdWcxy+oWfrSy 6MSiq1mQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jgAp5-0001UK-UT; Tue, 02 Jun 2020 17:35:35 +0000 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jgAp3-0001Tt-1M; Tue, 02 Jun 2020 17:35:34 +0000 Received: by mail-pj1-x1041.google.com with SMTP id d6so1818967pjs.3; 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=n6bEO9VpEjHsBwis5jE+vmPGvR3Fk3/pUShoFz97f199l7LlbQIa4ryGVTUIZNv2fl uzMVr3Qe7QVhmqZnjLn035kWAOLYyWmN6+kP1LM0FG/m/YaWmaITgzZjGuWt6VSSie7B lW8wb0u9LPzVuxSJqwSN0DA0EPyGWN+1KElyzYufTEuNmle4bhSZyv2+m9GShYw0P4hb m2NQIfYJCB64cxGiyLLGh4cwB6oQo23+DLDn9ps7c72BFpDIH9TYdyLxGiaXumtL1jOO L19pjXl6GNJZITIBEdlEs2Gk/D0zuNgl62ac7VoAaOdumpw1K5F1tNTY0Kz2Y1TWh7ca QWVA== X-Gm-Message-State: AOAM533vkEiAl16rmatbclsNSaI/3koIR6aqEPSUSaybDGMQfbvm0P5h NfoY2dOB+nZ5+SdRNyZPHqM= 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200602_103533_082125_07D9A1FB X-CRM114-Status: GOOD ( 18.51 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1041 listed in] [list.dnswl.org] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [amittomer25[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [amittomer25[at]gmail.com] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-actions@lists.infradead.org, linux-kernel@vger.kernel.org, cristian.ciocaltea@gmail.com, dmaengine@vger.kernel.org, dan.j.williams@intel.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 Reported-by: kernel test robot --- 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,