From patchwork Wed May 9 11:11:59 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: 135250 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5499416lji; Wed, 9 May 2018 04:12:16 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrWWp4gMl94po/BuXoVhm/0+k8r5jq4f/d7irsGh8gaB9wgue/s6GeHFJHvFyqqzs4sfdem X-Received: by 10.98.210.134 with SMTP id c128mr43826675pfg.240.1525864336668; Wed, 09 May 2018 04:12:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525864336; cv=none; d=google.com; s=arc-20160816; b=wxdoGAiTYw51u1EMB/EIaQjxEQhKKATDB02o3WYmSADIiiHg941KkkMImtzKHyhN7Y hTaB3oyTEs6fRTEB88jA3oZV6anqYCcFEsEBn4r/tKyLKB/iYcmCw+p/M7Lti+CK/pLp 3D4E8ClwazaRfVRZGNTxow3UvdSW+d3vmzfGZSWe4tDYXDyd00eMsUMXpRqCDHoJhlTF ZHPFd7+38hHi3G8T3in6Ww+ABKvYPhNuwi6kSD067TPZJDNvc7jqoA5CPr/HiBaHeEm5 LdAGzfnJCzB3hQ+ncQXmVr+ZTssdctZgRjJ6pr3hvmaCdBKuikgec9PqP3MjPKxJdfFk pE8Q== 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=zeuGPFgWALQ1bW+2nI4lV6fxI8Md5t84TmU3mbytVLM=; b=O0dWgdnPTCyZHqSAYpA4Xc86HL2Z3nR8eYiz5wQY+qE1MhVHk7u5DuVuMdLGML3aDr mtWNsRikWZyzNZCcyGyZcllXULbKVwUzyNja59jLYIP6nQVzuGUbGkdhraP/tRb+Bl9s +xn2hv41+LffG6U39+kFqaKYzMfwVU/oEmPQi4MHvjG76vlwsKcSxCM7ulBc1E+NdsRr Y3uiTNLjAsN4vk8q0vjNIqlInYEPn4GigeynHqeQSE3vmPhQ85PT15f3+HsuHrfcGkJj LadidZ6olmSwo7NEJP+XtONZRj5VXq5qoquKUiERd52YQIikU8x55lSAVi3fiE0sK6zk JqsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dq0mP6DE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 x22-v6si900714pge.220.2018.05.09.04.12.16; Wed, 09 May 2018 04:12:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=dq0mP6DE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1756212AbeEILMN (ORCPT + 29 others); Wed, 9 May 2018 07:12:13 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:33792 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750798AbeEILML (ORCPT ); Wed, 9 May 2018 07:12:11 -0400 Received: by mail-pf0-f195.google.com with SMTP id a14so25481651pfi.1 for ; Wed, 09 May 2018 04:12:11 -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=zeuGPFgWALQ1bW+2nI4lV6fxI8Md5t84TmU3mbytVLM=; b=dq0mP6DEShlIKt1JZJrBwlsJWdSsFx3PV8VYeKs3kARjDFGAeC8TldgKvwGZ5UDEBJ /E0XjuJtk0i82Z+U/m1bpJrr4QPehAmM1/nMC1lHvBueZCDicmEbUHfd2FK2hYOIMXuD z4by95Usni50i373K1Gf92LEWI83lc+Y1ffVU= 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=zeuGPFgWALQ1bW+2nI4lV6fxI8Md5t84TmU3mbytVLM=; b=kuvn8QpwM7VqYDEsBCLgCWHwGG7rhdcr7PAJxunmWT2cnoxcOE4CDfcm+UaDm69aOO uAkAML0kB0p5msoaiHP7xecb+jKLnTbhUXdjCEo5ItiYm3pRfh6pTWxSk7Vn5UuCZYvZ 31vOBWx64jKAdUNibaEPFaBgaC34q3L5bPim3DNWcQIRkikyVILzP1TAKpvdrl2E23Cj NV7h9Su+dqn+Nt4H5kn5SBDScZiq1BdwbUFGEo1iQ4eXG1GTOfUlkenyJ6kAuIR9+EE7 x4BCV5JnK5q2nU5PpcXBlyH7zKiMVAYJcvfySal/dwlWXL9mR23muPnxvENUee++vFrN OwaA== X-Gm-Message-State: ALQs6tBKBIFuTLFi5dwRYFaAveHwCTQ+2opg7NvpOBWsz/xIrpSsvEaX sH71VYTf1sRhYm7s8evj13Wj3g== X-Received: by 2002:a63:3758:: with SMTP id g24-v6mr30473367pgn.283.1525864331091; Wed, 09 May 2018 04:12:11 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id s189-v6sm43459762pgc.39.2018.05.09.04.12.08 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 May 2018 04:12:10 -0700 (PDT) From: Baolin Wang To: dan.j.williams@intel.com, vinod.koul@intel.com Cc: eric.long@spreadtrum.com, broonie@kernel.org, lars@metafoo.de, baolin.wang@linaro.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] dmaengine: sprd: Optimize the sprd_dma_prep_dma_memcpy() Date: Wed, 9 May 2018 19:11:59 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Long This is one preparation patch, we can use default DMA configuration to implement the device_prep_dma_memcpy() interface instead of issuing sprd_dma_config(). We will implement one new sprd_dma_config() function with introducing device_prep_slave_sg() interface in following patch. So we can remove the obsolete sprd_dma_config() firstly. Signed-off-by: Eric Long Signed-off-by: Baolin Wang --- Changes since v1: - No updates. --- drivers/dma/sprd-dma.c | 154 ++++++++++-------------------------------------- 1 file changed, 32 insertions(+), 122 deletions(-) -- 1.7.9.5 diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index e715d07..e07e253 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -552,147 +552,57 @@ static void sprd_dma_issue_pending(struct dma_chan *chan) spin_unlock_irqrestore(&schan->vc.lock, flags); } -static int sprd_dma_config(struct dma_chan *chan, struct sprd_dma_desc *sdesc, - dma_addr_t dest, dma_addr_t src, size_t len) +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) { - struct sprd_dma_dev *sdev = to_sprd_dma_dev(chan); - struct sprd_dma_chn_hw *hw = &sdesc->chn_hw; - u32 datawidth, src_step, des_step, fragment_len; - u32 block_len, req_mode, irq_mode, transcation_len; - u32 fix_mode = 0, fix_en = 0; + struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); + struct sprd_dma_desc *sdesc; + struct sprd_dma_chn_hw *hw; + enum sprd_dma_datawidth datawidth; + u32 step; - if (IS_ALIGNED(len, 4)) { - datawidth = SPRD_DMA_DATAWIDTH_4_BYTES; - src_step = SPRD_DMA_WORD_STEP; - des_step = SPRD_DMA_WORD_STEP; - } else if (IS_ALIGNED(len, 2)) { - datawidth = SPRD_DMA_DATAWIDTH_2_BYTES; - src_step = SPRD_DMA_SHORT_STEP; - des_step = SPRD_DMA_SHORT_STEP; - } else { - datawidth = SPRD_DMA_DATAWIDTH_1_BYTE; - src_step = SPRD_DMA_BYTE_STEP; - des_step = SPRD_DMA_BYTE_STEP; - } + sdesc = kzalloc(sizeof(*sdesc), GFP_NOWAIT); + if (!sdesc) + return NULL; - fragment_len = SPRD_DMA_MEMCPY_MIN_SIZE; - if (len <= SPRD_DMA_BLK_LEN_MASK) { - block_len = len; - transcation_len = 0; - req_mode = SPRD_DMA_BLK_REQ; - irq_mode = SPRD_DMA_BLK_INT; - } else { - block_len = SPRD_DMA_MEMCPY_MIN_SIZE; - transcation_len = len; - req_mode = SPRD_DMA_TRANS_REQ; - irq_mode = SPRD_DMA_TRANS_INT; - } + hw = &sdesc->chn_hw; hw->cfg = SPRD_DMA_DONOT_WAIT_BDONE << SPRD_DMA_WAIT_BDONE_OFFSET; + hw->intc = SPRD_DMA_TRANS_INT | SPRD_DMA_CFG_ERR_INT_EN; + hw->src_addr = (u32)(src & SPRD_DMA_LOW_ADDR_MASK); + hw->des_addr = (u32)(dest & SPRD_DMA_LOW_ADDR_MASK); hw->wrap_ptr = (u32)((src >> SPRD_DMA_HIGH_ADDR_OFFSET) & SPRD_DMA_HIGH_ADDR_MASK); hw->wrap_to = (u32)((dest >> SPRD_DMA_HIGH_ADDR_OFFSET) & SPRD_DMA_HIGH_ADDR_MASK); - hw->src_addr = (u32)(src & SPRD_DMA_LOW_ADDR_MASK); - hw->des_addr = (u32)(dest & SPRD_DMA_LOW_ADDR_MASK); - - if ((src_step != 0 && des_step != 0) || (src_step | des_step) == 0) { - fix_en = 0; + if (IS_ALIGNED(len, 8)) { + datawidth = SPRD_DMA_DATAWIDTH_8_BYTES; + step = SPRD_DMA_DWORD_STEP; + } else if (IS_ALIGNED(len, 4)) { + datawidth = SPRD_DMA_DATAWIDTH_4_BYTES; + step = SPRD_DMA_WORD_STEP; + } else if (IS_ALIGNED(len, 2)) { + datawidth = SPRD_DMA_DATAWIDTH_2_BYTES; + step = SPRD_DMA_SHORT_STEP; } else { - fix_en = 1; - if (src_step) - fix_mode = 1; - else - fix_mode = 0; + datawidth = SPRD_DMA_DATAWIDTH_1_BYTE; + step = SPRD_DMA_BYTE_STEP; } hw->frg_len = datawidth << SPRD_DMA_SRC_DATAWIDTH_OFFSET | datawidth << SPRD_DMA_DES_DATAWIDTH_OFFSET | - req_mode << SPRD_DMA_REQ_MODE_OFFSET | - fix_mode << SPRD_DMA_FIX_SEL_OFFSET | - fix_en << SPRD_DMA_FIX_EN_OFFSET | - (fragment_len & SPRD_DMA_FRG_LEN_MASK); - hw->blk_len = block_len & SPRD_DMA_BLK_LEN_MASK; - - hw->intc = SPRD_DMA_CFG_ERR_INT_EN; - - switch (irq_mode) { - case SPRD_DMA_NO_INT: - break; - - case SPRD_DMA_FRAG_INT: - hw->intc |= SPRD_DMA_FRAG_INT_EN; - break; - - case SPRD_DMA_BLK_INT: - hw->intc |= SPRD_DMA_BLK_INT_EN; - break; + SPRD_DMA_TRANS_REQ << SPRD_DMA_REQ_MODE_OFFSET | + (len & SPRD_DMA_FRG_LEN_MASK); + hw->blk_len = len & SPRD_DMA_BLK_LEN_MASK; + hw->trsc_len = len & SPRD_DMA_TRSC_LEN_MASK; - case SPRD_DMA_BLK_FRAG_INT: - hw->intc |= SPRD_DMA_BLK_INT_EN | SPRD_DMA_FRAG_INT_EN; - break; - - case SPRD_DMA_TRANS_INT: - hw->intc |= SPRD_DMA_TRANS_INT_EN; - break; - - case SPRD_DMA_TRANS_FRAG_INT: - hw->intc |= SPRD_DMA_TRANS_INT_EN | SPRD_DMA_FRAG_INT_EN; - break; - - case SPRD_DMA_TRANS_BLK_INT: - hw->intc |= SPRD_DMA_TRANS_INT_EN | SPRD_DMA_BLK_INT_EN; - break; - - case SPRD_DMA_LIST_INT: - hw->intc |= SPRD_DMA_LIST_INT_EN; - break; - - case SPRD_DMA_CFGERR_INT: - hw->intc |= SPRD_DMA_CFG_ERR_INT_EN; - break; - - default: - dev_err(sdev->dma_dev.dev, "invalid irq mode\n"); - return -EINVAL; - } - - if (transcation_len == 0) - hw->trsc_len = block_len & SPRD_DMA_TRSC_LEN_MASK; - else - hw->trsc_len = transcation_len & SPRD_DMA_TRSC_LEN_MASK; - - hw->trsf_step = (des_step & SPRD_DMA_TRSF_STEP_MASK) << + hw->trsf_step = (step & SPRD_DMA_TRSF_STEP_MASK) << SPRD_DMA_DEST_TRSF_STEP_OFFSET | - (src_step & SPRD_DMA_TRSF_STEP_MASK) << + (step & SPRD_DMA_TRSF_STEP_MASK) << SPRD_DMA_SRC_TRSF_STEP_OFFSET; - hw->frg_step = 0; - hw->src_blk_step = 0; - hw->des_blk_step = 0; - hw->src_blk_step = 0; - return 0; -} - -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) -{ - struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); - struct sprd_dma_desc *sdesc; - int ret; - - sdesc = kzalloc(sizeof(*sdesc), GFP_NOWAIT); - if (!sdesc) - return NULL; - - ret = sprd_dma_config(chan, sdesc, dest, src, len); - if (ret) { - kfree(sdesc); - return NULL; - } - return vchan_tx_prep(&schan->vc, &sdesc->vd, flags); }