From patchwork Thu May 23 18:20:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 165046 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2549360ili; Thu, 23 May 2019 11:22:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqyydVJzAzbFd0YTUANOd6yTzi3EVte6eUrslObmP9zoWwdh8HNgNOa4x10QhXzAkpM9aXeJ X-Received: by 2002:a63:5404:: with SMTP id i4mr69461880pgb.347.1558635729698; Thu, 23 May 2019 11:22:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558635729; cv=none; d=google.com; s=arc-20160816; b=QuZI2fUUbgplcr5zrGjIZz5i0r9cI3l723d2n/Ouc1Ga4xa3UkIuYzdf99jKcI7pa0 Mp194pJnvfpK8yWkDvLQ2jBBxkSj6zB7gL+cDKqgpJz7pnEVhRiW7WP1Td8+RN2JLHrA fWNL3HpuBO8sQKq8HecBEl7+rvzYZQy4ULX1hZ4zRlE76VCKryCgd3f6QFm1QNPIXh/w NHJixvDs4ZUcG/fYlgXx0VGR99vtbSPSNNPgHXogKj9ZN50GixM/etQbJwp5xknbxMzL kLUedFiM+F9UJ0thKS/4bAff5OrXefYppDFdvscYx+mPyafnqDHt81j+B0M+zRNkpaF9 h/5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=ExBErmLKvAHAcEzB9N5VayIpTNJEe2yiC9dz/BkkizE=; b=LykKPrOtfMuynw4friVSso8+UGjHqYq8BeBM31YEgofMxGFtHd2ncjbgDAAeirS1+e Q770VINTyizbJ45kIzN893egjevFhB0DAXjTxzt2UWmJx9F2pOZRS6zm4MafQiBVcXyP 3+69KOCIHtqImk+3WKstEMznno2KhOVfPbb0pIbHJaYGdkszUi73zmSJb1xUgjnAfAy+ ltjI5OkYSY3WfrzqF7W54XuS8RgnDqemQLyqpD6L0gt2nM8l/OzBhBBRhFoXn1woYOyO a3c9QophsMDum23AP2Pmjc0LoIsZxJSEkdCAvK5EfC5xJ39p/gt0YPDTsNvVzBPFJJlI A09g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Jt7Fpt/P"; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-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 d2si324783plr.138.2019.05.23.11.22.09; Thu, 23 May 2019 11:22:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-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="Jt7Fpt/P"; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-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 S1731514AbfEWSWI (ORCPT + 5 others); Thu, 23 May 2019 14:22:08 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:39592 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731473AbfEWSWH (ORCPT ); Thu, 23 May 2019 14:22:07 -0400 Received: by mail-lf1-f67.google.com with SMTP id f1so5101339lfl.6 for ; Thu, 23 May 2019 11:22:05 -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:in-reply-to:references; bh=ExBErmLKvAHAcEzB9N5VayIpTNJEe2yiC9dz/BkkizE=; b=Jt7Fpt/PNF3rJVbtyZwTEO5En1kS6xwPMi8rxm+kvjTx0YaNdEP90fpTn5S8UqN2GI cHhg8f+t3VUw7xaVF2rKqUOuJN67s1dhzPuonwuom5jTwbKnbLeGDUeE/K3ONRS8MDZS Hi6qhk3MwbxCyUwhOiw2TnjlfbgM4yq/A2SjIMlBBw62Zqh8qp360MkN9XlAeAj0ggrx hW71K8v27oymqy5rtlzb36//GOX8GNMGTZaebKQz+wyYjBniLNAjLH4uITknVDQk2NLv fwHHXizcIebDh4VnLStsKgwFHHCQrtL8yUnbKLbKuBoOXDKMtZLrz2iP7EFQwwETks+a HuvQ== 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=ExBErmLKvAHAcEzB9N5VayIpTNJEe2yiC9dz/BkkizE=; b=N2SpLrIaoEOzKFkxQNyD2Mxa1RBqJHGKLWp1czVkaN5ow7vpqCF7dSnEEl4QeYoPe0 MNHsDJbgV6D0qpBMsbv4H1CmCiLXLl/RQLZJfnQs8+gVkgFLNR9eyRZ7SyIUHNo0nChM rYpWF/VUDW3WoM//xVyl0ZIX4ghgOzQ73+ETkgHAAXn3Zr8twKN1BL56/y2M00E/O7vL StP7ZUrwZcconwDBu2irah+jRcn5TsxadAazyCFEWVlVi90q8sC1f/PHRtW+DpAKnzm1 wBTSsjVOeCFgPXBMLtzPiB+kxHyRpjMz2Fmut/CKcVpRicIwo/KYj9oy+7iFR9FmqSVx DbyA== X-Gm-Message-State: APjAAAXHveV6UjB++c+8HbMD8zailMLgETDAyhZlWX03znenM51jE+M/ FMtdyeZ3sfXm8D1e9XZvnOfIfA== X-Received: by 2002:ac2:51d1:: with SMTP id u17mr7278737lfm.151.1558635724585; Thu, 23 May 2019 11:22:04 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id n26sm59904lfi.90.2019.05.23.11.22.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 11:22:04 -0700 (PDT) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com, hawk@kernel.org, davem@davemloft.net Cc: ast@kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, xdp-newbies@vger.kernel.org, ilias.apalodimas@linaro.org, netdev@vger.kernel.org, daniel@iogearbox.net, jakub.kicinski@netronome.com, john.fastabend@gmail.com, Ivan Khoronzhuk Subject: [PATCH net-next 1/3] net: ethernet: ti: davinci_cpdma: add dma mapped submit Date: Thu, 23 May 2019 21:20:33 +0300 Message-Id: <20190523182035.9283-2-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190523182035.9283-1-ivan.khoronzhuk@linaro.org> References: <20190523182035.9283-1-ivan.khoronzhuk@linaro.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org In case if dma mapped packet needs to be sent, like with XDP page pool, the "mapped" submit can be used. This patch adds dma mapped submit based on regular one. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/davinci_cpdma.c | 88 ++++++++++++++++++++----- drivers/net/ethernet/ti/davinci_cpdma.h | 2 + 2 files changed, 75 insertions(+), 15 deletions(-) -- 2.17.1 diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c index 35bf14d8e7af..7f89b2299f05 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c @@ -125,6 +125,15 @@ struct cpdma_chan { u32 rate; }; +struct submit_info { + struct cpdma_chan *chan; + int directed; + void *token; + void *data; + int flags; + int len; +}; + struct cpdma_control_info { u32 reg; u32 shift, mask; @@ -176,6 +185,8 @@ static struct cpdma_control_info controls[] = { (directed << CPDMA_TO_PORT_SHIFT)); \ } while (0) +#define CPDMA_DMA_EXT_MAP BIT(16) + static void cpdma_desc_pool_destroy(struct cpdma_ctlr *ctlr) { struct cpdma_desc_pool *pool = ctlr->pool; @@ -1002,10 +1013,12 @@ static void __cpdma_chan_submit(struct cpdma_chan *chan, } } -int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, - int len, int directed) +static int cpdma_chan_submit_si(struct submit_info *si) { + struct cpdma_chan *chan = si->chan; struct cpdma_ctlr *ctlr = chan->ctlr; + int len = si->len; + int swlen = len; struct cpdma_desc __iomem *desc; dma_addr_t buffer; unsigned long flags; @@ -1037,16 +1050,22 @@ int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, chan->stats.runt_transmit_buff++; } - buffer = dma_map_single(ctlr->dev, data, len, chan->dir); - ret = dma_mapping_error(ctlr->dev, buffer); - if (ret) { - cpdma_desc_free(ctlr->pool, desc, 1); - ret = -EINVAL; - goto unlock_ret; - } - mode = CPDMA_DESC_OWNER | CPDMA_DESC_SOP | CPDMA_DESC_EOP; - cpdma_desc_to_port(chan, mode, directed); + cpdma_desc_to_port(chan, mode, si->directed); + + if (si->flags & CPDMA_DMA_EXT_MAP) { + buffer = (dma_addr_t)si->data; + dma_sync_single_for_device(ctlr->dev, buffer, len, chan->dir); + swlen |= CPDMA_DMA_EXT_MAP; + } else { + buffer = dma_map_single(ctlr->dev, si->data, len, chan->dir); + ret = dma_mapping_error(ctlr->dev, buffer); + if (ret) { + cpdma_desc_free(ctlr->pool, desc, 1); + ret = -EINVAL; + goto unlock_ret; + } + } /* Relaxed IO accessors can be used here as there is read barrier * at the end of write sequence. @@ -1055,9 +1074,9 @@ int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, writel_relaxed(buffer, &desc->hw_buffer); writel_relaxed(len, &desc->hw_len); writel_relaxed(mode | len, &desc->hw_mode); - writel_relaxed((uintptr_t)token, &desc->sw_token); + writel_relaxed((uintptr_t)si->token, &desc->sw_token); writel_relaxed(buffer, &desc->sw_buffer); - writel_relaxed(len, &desc->sw_len); + writel_relaxed(swlen, &desc->sw_len); desc_read(desc, sw_len); __cpdma_chan_submit(chan, desc); @@ -1072,6 +1091,38 @@ int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, return ret; } +int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, int len, + int directed) +{ + struct submit_info si; + + si.chan = chan; + si.token = token; + si.data = data; + si.len = len; + si.directed = directed; + si.flags = 0; + + return cpdma_chan_submit_si(&si); +} +EXPORT_SYMBOL_GPL(cpdma_chan_submit); + +int cpdma_chan_submit_mapped(struct cpdma_chan *chan, void *token, + dma_addr_t data, int len, int directed) +{ + struct submit_info si; + + si.chan = chan; + si.token = token; + si.data = (void *)data; + si.len = len; + si.directed = directed; + si.flags = CPDMA_DMA_EXT_MAP; + + return cpdma_chan_submit_si(&si); +} +EXPORT_SYMBOL_GPL(cpdma_chan_submit_mapped); + bool cpdma_check_free_tx_desc(struct cpdma_chan *chan) { struct cpdma_ctlr *ctlr = chan->ctlr; @@ -1097,10 +1148,17 @@ static void __cpdma_chan_free(struct cpdma_chan *chan, uintptr_t token; token = desc_read(desc, sw_token); - buff_dma = desc_read(desc, sw_buffer); origlen = desc_read(desc, sw_len); - dma_unmap_single(ctlr->dev, buff_dma, origlen, chan->dir); + buff_dma = desc_read(desc, sw_buffer); + if (origlen & CPDMA_DMA_EXT_MAP) { + origlen &= ~CPDMA_DMA_EXT_MAP; + dma_sync_single_for_cpu(ctlr->dev, buff_dma, origlen, + chan->dir); + } else { + dma_unmap_single(ctlr->dev, buff_dma, origlen, chan->dir); + } + cpdma_desc_free(pool, desc, 1); (*chan->handler)((void *)token, outlen, status); } diff --git a/drivers/net/ethernet/ti/davinci_cpdma.h b/drivers/net/ethernet/ti/davinci_cpdma.h index 10376062dafa..8f6f27185c63 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.h +++ b/drivers/net/ethernet/ti/davinci_cpdma.h @@ -77,6 +77,8 @@ int cpdma_chan_stop(struct cpdma_chan *chan); int cpdma_chan_get_stats(struct cpdma_chan *chan, struct cpdma_chan_stats *stats); +int cpdma_chan_submit_mapped(struct cpdma_chan *chan, void *token, + dma_addr_t data, int len, int directed); int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data, int len, int directed); int cpdma_chan_process(struct cpdma_chan *chan, int quota);