From patchwork Tue Aug 28 11:09:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 145305 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1051241ljw; Tue, 28 Aug 2018 04:10:26 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbj9CUqLrDQsYHtfxyb1azDrREXHIZyTFZclupWMJu47XwVCnNLn6iXglHb1IxG3PuBXK8t X-Received: by 2002:a63:df4e:: with SMTP id h14-v6mr1068839pgj.300.1535454626275; Tue, 28 Aug 2018 04:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535454626; cv=none; d=google.com; s=arc-20160816; b=Ttxutj/SaFekQ1dWOxP5ltwioqO4dsFfp+eaGKmr0ZgQx8Bs/7iCmsq/F60Z7fe7Re jTn3kgi3dasLuLUyl6z1sZnRBA/s+b8BLBFRZolZXWZvyAX9jyKloGrK7zQNa4cO05fL xVfUv4j7EVCKy7oJfFRAv9pvDdvSFovEezgfAGEsPNInaU7XNRegLHHkcCKqIpSckElt Ia6MQrPY6bAvXsAE6tKFvjlv8g1hDVuLBJAIjIe8QYCWvDSl6GMiIjg8UfOKmWkJMPfP Gs8Yny9AsrbqsI92ePkXoEvvx7YwsUOAxUqylspDjpBEpldR8POdo6gjgUm3qrFlvXeq /YUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=eA8xKng8tFx/Zc/TMlBzoXsxp5TzvlNjlwCKxyZ+J+A=; b=mutIzGiQB5aTrPz6OLzghqMbkm934BASkOBsHFWLS61n5nFivjdVfbW4m2GU77ScAc 1/0hNb67ZXfDFVLH0IylcVgB8ShPo23DHUPyQcXnSfHly/4FANO9cMIwn75hZPVmglhS 3LbW++eXqlumNURv10V3nXqAYPhtRVhHXnnrlmvvYs5/elAObCUSKuGaLYSrJXFRYKf8 Gbz33TOssJY+wd3Fxbt8ufOw5F6S8I9QMlRz7EvDiNBWFSPpmzrPBegvZwazRD+IU6O4 Enqi6oxntq0JfESjT8+l9qROKZugcgFjU+2Bsb46A1L1zscTnxKV98K870vWgX18N1zd 6+4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kRmqu82n; spf=pass (google.com: best guess record for domain of dmaengine-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=dmaengine-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j135-v6si807458pfd.207.2018.08.28.04.10.26; Tue, 28 Aug 2018 04:10:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dmaengine-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kRmqu82n; spf=pass (google.com: best guess record for domain of dmaengine-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=dmaengine-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727481AbeH1PBd (ORCPT + 3 others); Tue, 28 Aug 2018 11:01:33 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:42807 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727433AbeH1PBd (ORCPT ); Tue, 28 Aug 2018 11:01:33 -0400 Received: by mail-pl1-f194.google.com with SMTP id g23-v6so574652plq.9 for ; Tue, 28 Aug 2018 04:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=eA8xKng8tFx/Zc/TMlBzoXsxp5TzvlNjlwCKxyZ+J+A=; b=kRmqu82nZ/p37/bzD2NC3TnzekXHftEWEzutwsW4FARAtSMlJW2oFathgo8dAtOw9G fwnd18KWFL7QhBoGrhOgMkiirKes9K1Ujqpa8e/8tCdoVVmTc+FLmtUcKUtY/4r6Gepa tEB0Fj7z7wPa/xBYpWi/5q2fQC44Almb5Zpkw= 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; bh=eA8xKng8tFx/Zc/TMlBzoXsxp5TzvlNjlwCKxyZ+J+A=; b=k9xxFJhUmYWdAHKCZyHjuyGfAg1xVKn+nIhThkXjFW2KMr1azt12os6S1O9QkaoqGk oUteK3kWrtLBQ1ACyPW8WySaT4nNLkG3Jo9cQyH4/Re/7yXEHTmv2A/QqCN7svvJgn3p eKHrWnOqfmZ4zpCV07nB79kf5/0hH48EkcEnvau4exha4uDNSATLEtOxHC+Np3VtUYJZ iBPa+ut4h7Be9J/mQuQWNkoe9W/jDXT2WvHcapeTYz6u5p/4ve4Uiu/P+lJK43BrxUyR Nu5gPGHRF9FN+M+OGwdQnavNGdN1ocvnqy3+pz4AacaKSMMtoqzaM8qDSWPTzOjy6bL5 nfLA== X-Gm-Message-State: APzg51BmWnp4ynfi+u/qTkYyepOov8IPL54VJBjNZSzbGRRUgtBaXXMn QOwLFjPWW33utb0Pwgpe41vkZw== X-Received: by 2002:a17:902:5acc:: with SMTP id g12-v6mr1099014plm.90.1535454624645; Tue, 28 Aug 2018 04:10:24 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id e14-v6sm1408857pgv.48.2018.08.28.04.10.21 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Aug 2018 04:10:24 -0700 (PDT) From: Baolin Wang To: dan.j.williams@intel.com, vkoul@kernel.org Cc: eric.long@spreadtrum.com, broonie@kernel.org, baolin.wang@linaro.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v2] dmaengine: sprd: Support DMA link-list mode Date: Tue, 28 Aug 2018 19:09:07 +0800 Message-Id: <6ce34813e7b3eb25390c6854ee1bc6b618075f20.1535454372.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org From: Eric Long The Spreadtrum DMA can support the link-list transaction mode, which means DMA controller can do transaction one by one automatically once we linked these transaction by link-list register. Signed-off-by: Eric Long Signed-off-by: Baolin Wang --- Changes since v1: - Remove sprd_dma_fill_chn_desc() function. - Remove the redundant validation of 'sglen' in sprd_dma_fill_linklist_desc(). - Add some comments make code more clear. - Fix the typos. --- drivers/dma/sprd-dma.c | 81 ++++++++++++++++++++++++++++++++++++++---- include/linux/dma/sprd-dma.h | 69 +++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 7 deletions(-) -- 1.7.9.5 diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index 55df0d4..38d4e4f 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -68,6 +68,7 @@ /* SPRD_DMA_CHN_CFG register definition */ #define SPRD_DMA_CHN_EN BIT(0) +#define SPRD_DMA_LINKLIST_EN BIT(4) #define SPRD_DMA_WAIT_BDONE_OFFSET 24 #define SPRD_DMA_DONOT_WAIT_BDONE 1 @@ -103,7 +104,7 @@ #define SPRD_DMA_REQ_MODE_MASK GENMASK(1, 0) #define SPRD_DMA_FIX_SEL_OFFSET 21 #define SPRD_DMA_FIX_EN_OFFSET 20 -#define SPRD_DMA_LLIST_END_OFFSET 19 +#define SPRD_DMA_LLIST_END BIT(19) #define SPRD_DMA_FRG_LEN_MASK GENMASK(16, 0) /* SPRD_DMA_CHN_BLK_LEN register definition */ @@ -164,6 +165,7 @@ struct sprd_dma_desc { struct sprd_dma_chn { struct virt_dma_chan vc; void __iomem *chn_base; + struct sprd_dma_linklist linklist; struct dma_slave_config slave_cfg; u32 chn_num; u32 dev_id; @@ -582,7 +584,8 @@ static int sprd_dma_get_step(enum dma_slave_buswidth buswidth) } static int sprd_dma_fill_desc(struct dma_chan *chan, - struct sprd_dma_desc *sdesc, + struct sprd_dma_chn_hw *hw, + unsigned int sglen, int sg_index, dma_addr_t src, dma_addr_t dst, u32 len, enum dma_transfer_direction dir, unsigned long flags, @@ -590,7 +593,6 @@ static int sprd_dma_fill_desc(struct dma_chan *chan, { struct sprd_dma_dev *sdev = to_sprd_dma_dev(chan); struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); - struct sprd_dma_chn_hw *hw = &sdesc->chn_hw; u32 req_mode = (flags >> SPRD_DMA_REQ_SHIFT) & SPRD_DMA_REQ_MODE_MASK; u32 int_mode = flags & SPRD_DMA_INT_MASK; int src_datawidth, dst_datawidth, src_step, dst_step; @@ -670,12 +672,52 @@ static int sprd_dma_fill_desc(struct dma_chan *chan, temp |= (src_step & SPRD_DMA_TRSF_STEP_MASK) << SPRD_DMA_SRC_TRSF_STEP_OFFSET; hw->trsf_step = temp; + /* link-list configuration */ + if (schan->linklist.phy_addr) { + if (sg_index == sglen - 1) + hw->frg_len |= SPRD_DMA_LLIST_END; + + hw->cfg |= SPRD_DMA_LINKLIST_EN; + + /* link-list index */ + temp = (sg_index + 1) % sglen; + /* Next link-list configuration's physical address offset */ + temp = temp * sizeof(*hw) + SPRD_DMA_CHN_SRC_ADDR; + /* + * Set the link-list pointer point to next link-list + * configuration's physical address. + */ + hw->llist_ptr = schan->linklist.phy_addr + temp; + } else { + hw->llist_ptr = 0; + } + hw->frg_step = 0; hw->src_blk_step = 0; hw->des_blk_step = 0; return 0; } +static int sprd_dma_fill_linklist_desc(struct dma_chan *chan, + unsigned int sglen, int sg_index, + dma_addr_t src, dma_addr_t dst, u32 len, + enum dma_transfer_direction dir, + unsigned long flags, + struct dma_slave_config *slave_cfg) +{ + struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); + struct sprd_dma_chn_hw *hw; + + if (!schan->linklist.virt_addr) + return -EINVAL; + + hw = (struct sprd_dma_chn_hw *)(schan->linklist.virt_addr + + sg_index * sizeof(*hw)); + + return sprd_dma_fill_desc(chan, hw, sglen, sg_index, src, dst, len, + dir, flags, slave_cfg); +} + static struct dma_async_tx_descriptor * sprd_dma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, size_t len, unsigned long flags) @@ -744,10 +786,20 @@ static int sprd_dma_fill_desc(struct dma_chan *chan, u32 len = 0; int ret, i; - /* TODO: now we only support one sg for each DMA configuration. */ - if (!is_slave_direction(dir) || sglen > 1) + if (!is_slave_direction(dir)) return NULL; + if (context) { + struct sprd_dma_linklist *ll_cfg = + (struct sprd_dma_linklist *)context; + + schan->linklist.phy_addr = ll_cfg->phy_addr; + schan->linklist.virt_addr = ll_cfg->virt_addr; + } else { + schan->linklist.phy_addr = 0; + schan->linklist.virt_addr = 0; + } + sdesc = kzalloc(sizeof(*sdesc), GFP_NOWAIT); if (!sdesc) return NULL; @@ -762,10 +814,25 @@ static int sprd_dma_fill_desc(struct dma_chan *chan, src = slave_cfg->src_addr; dst = sg_dma_address(sg); } + + /* + * The link-list mode needs at least 2 link-list + * configurations. If there is only one sg, it doesn't + * need to fill the link-list configuration. + */ + if (sglen < 2) + break; + + ret = sprd_dma_fill_linklist_desc(chan, sglen, i, src, dst, len, + dir, flags, slave_cfg); + if (ret) { + kfree(sdesc); + return NULL; + } } - ret = sprd_dma_fill_desc(chan, sdesc, src, dst, len, dir, flags, - slave_cfg); + ret = sprd_dma_fill_desc(chan, &sdesc->chn_hw, 0, 0, src, dst, len, + dir, flags, slave_cfg); if (ret) { kfree(sdesc); return NULL; diff --git a/include/linux/dma/sprd-dma.h b/include/linux/dma/sprd-dma.h index b0115e3..b42b80e5 100644 --- a/include/linux/dma/sprd-dma.h +++ b/include/linux/dma/sprd-dma.h @@ -58,4 +58,73 @@ enum sprd_dma_int_type { SPRD_DMA_CFGERR_INT, }; +/* + * struct sprd_dma_linklist - DMA link-list address structure + * @virt_addr: link-list virtual address to configure link-list node + * @phy_addr: link-list physical address to link DMA transfer + * + * The Spreadtrum DMA controller supports the link-list mode, that means slaves + * can supply several groups configurations (each configuration represents one + * DMA transfer) saved in memory, and DMA controller will link these groups + * configurations by writing the physical address of each configuration into the + * link-list register. + * + * Just as shown below, the link-list pointer register will be pointed to the + * physical address of 'configuration 1', and the 'configuration 1' link-list + * pointer will be pointed to 'configuration 2', and so on. + * Once trigger the DMA transfer, the DMA controller will load 'configuration + * 1' to its registers automatically, after 'configuration 1' transaction is + * done, DMA controller will load 'configuration 2' automatically, until all + * DMA transactions are done. + * + * Note: The last link-list pointer should point to the physical address + * of 'configuration 1', which can avoid DMA controller loads incorrect + * configuration when the last configuration transaction is done. + * + * DMA controller linklist memory + * ====================== ----------------------- + *| | | configuration 1 |<--- + *| DMA controller | ------->| | | + *| | | | | | + *| | | | | | + *| | | | | | + *| linklist pointer reg |---- ----| linklist pointer | | + * ====================== | ----------------------- | + * | | + * | ----------------------- | + * | | configuration 2 | | + * --->| | | + * | | | + * | | | + * | | | + * ----| linklist pointer | | + * | ----------------------- | + * | | + * | ----------------------- | + * | | configuration 3 | | + * --->| | | + * | | | + * | . | | + * . | + * . | + * . | + * | . | + * | ----------------------- | + * | | configuration n | | + * --->| | | + * | | | + * | | | + * | | | + * | linklist pointer |---- + * ----------------------- + * + * To support the link-list mode, DMA slaves should allocate one segment memory + * from always-on IRAM or dma coherent memory to store these groups of DMA + * configuration, and pass the virtual and physical address to DMA controller. + */ +struct sprd_dma_linklist { + unsigned long virt_addr; + phys_addr_t phy_addr; +}; + #endif