From patchwork Sat Jul 21 11:59:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 142492 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4011996ljj; Sat, 21 Jul 2018 04:59:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdPfHjmWvBjrK3FgYe3tz+n5CvAICaBHkZEbGMb9/P/HKabV0a1TX23eqvog9/8tUrNnc6R X-Received: by 2002:a63:5758:: with SMTP id h24-v6mr5393724pgm.432.1532174381127; Sat, 21 Jul 2018 04:59:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532174381; cv=none; d=google.com; s=arc-20160816; b=AFEXxWn6oflzquMGmEIe4fRcffO/O6FBbrHUFxVNErnbOUJvBJ4p90B4g02QBD8V3e 0WUmvr1ywTHEGyGqqO9aEiNF/OlEty2rE7BlMKzqYsqhbsTgxGmOAotvM6/O00VtcilV MF7twJTAuRernULjIKfx0aOFCszlRwfbX/bcqZc7KeKK4m82n45WZ/XJQpjSoZmJgdtC wlrqhWKfpPSqbDI7mqj3Nv8OAz92oQT9IEGPK4QfhBnCTsP9AHsHbamejJJuWW1ehxv/ ywuArDZ/ZbXBN5ALWy2LFwyWxMAh2KyxRTgIe6jKFnPjjNZK8Hk7nZsDXVXQpAnW5/dK W35Q== 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:arc-authentication-results; bh=cafp2N5/pCFZNE4LiyMSXZb3eQNaxHPcEoMdkA3oO3Y=; b=tpLrKfEqGUxSokGwa03K46Pxf3sMWL7Bzv+/IXMvV+P90C9mymZ55/20ki8Xc8MseM 4O7nhym6AwNo8sysNZekBcdl4Mt+2SY2unBaBNgYbixWxYMR5+qxqjjw50o7NyjsnQ8l 0JD8SqTlK8fBbLQXFGAscKQn26wF2aLDc5XTr1Hb40+9M3x4xsyhK3cVIywbojSmpME2 lBr0WODLgA7NvWttiNcdMgwDSosvuC6VIr72sKuZimMPY9KwEZTIJdfkmKPKd7jAzgL8 13DyIfPGYu/hGjysnLYFx9qDwhNkxA2ToGMC0qHbyhR/RK4+v82NNYq4lfgNje76ru7G VrDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SUm+EKoG; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-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 7-v6si2980743pll.369.2018.07.21.04.59.40; Sat, 21 Jul 2018 04:59:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-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=SUm+EKoG; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-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 S1728016AbeGUMwG (ORCPT + 10 others); Sat, 21 Jul 2018 08:52:06 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:33114 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727781AbeGUMwE (ORCPT ); Sat, 21 Jul 2018 08:52:04 -0400 Received: by mail-lf1-f67.google.com with SMTP id u14-v6so3476892lfu.0 for ; Sat, 21 Jul 2018 04:59:34 -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=cafp2N5/pCFZNE4LiyMSXZb3eQNaxHPcEoMdkA3oO3Y=; b=SUm+EKoG+uABvx2ouH3GAwsJB7jH9LxMkOyvxgqxi3AEXJxbPW0sM96HAOwCV7aAc8 /hB2S+BLCCBiyclUuNIkqrercbJGoosmuDRIQ14mdO2EymaUR/LM9o2QsGFHmYlv9IC7 NnwMZfweTeZ88FiIK0R/CbIxLTc9aidqd3k3M= 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=cafp2N5/pCFZNE4LiyMSXZb3eQNaxHPcEoMdkA3oO3Y=; b=MAbGemjqCC8wnB0H9JtNy2sSswsI07rafDw9IFounSPA72rWRTnd/JXdAhS3l8NsdX GNiUDlOdyC/rrvehWdm72TezJKpZy7Xrn8nTWG6tEQi+8zjee9x3voVFT7KUVe9Yo8Pa ynTRdiWVKkEBEOqZDxqhFAXe8iMD8HS8ZsvSrBiEB5tvKWYzbwAoBs497BOm0FuwyMFT Je2Mia6NNbHlV7N5QyJ6+qtXi4/QW8byCDnuSjHD+sVQXrw47jMsUySnFuVWFITsaR// DMPSAg1cJvZOAkcnB3UMnTwc2sIUTWCXx2SpRX598Kp2gIlo70ayLK3VuFY8f1CBRgaS FXEg== X-Gm-Message-State: AOUpUlHG7cJ9oMX4YejPhG9T9AvYu9LMer5xqF++/PD3iOFK0V+hYQVY KuVGwb7vAXYDBDMXAQ69bZdCCA== X-Received: by 2002:a19:e955:: with SMTP id g82-v6mr3585281lfh.44.1532174374222; Sat, 21 Jul 2018 04:59:34 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id 73-v6sm664260lfs.44.2018.07.21.04.59.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jul 2018 04:59:33 -0700 (PDT) From: Ivan Khoronzhuk To: davem@davemloft.net, grygorii.strashko@ti.com Cc: corbet@lwn.net, akpm@linux-foundation.org, netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, vinicius.gomes@intel.com, henrik@austad.us, jesus.sanchez-palencia@intel.com, ilias.apalodimas@linaro.org, p-varis@ti.com, spatton@ti.com, francois.ozog@linaro.org, yogeshs@ti.com, nsekhar@ti.com, andrew@lunn.ch, Ivan Khoronzhuk Subject: [PATCH v4 net-next 1/6] net: ethernet: ti: cpsw: use cpdma channels in backward order for txq Date: Sat, 21 Jul 2018 14:59:18 +0300 Message-Id: <20180721115923.1389-2-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180721115923.1389-1-ivan.khoronzhuk@linaro.org> References: <20180721115923.1389-1-ivan.khoronzhuk@linaro.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The cpdma channel highest priority is from hi to lo number. The driver has limited number of descriptors that are shared between number of cpdma channels. Number of queues can be tuned with ethtool, that allows to not spend descriptors on not needed cpdma channels. In AVB usually only 2 tx queues can be enough with rate limitation. The rate limitation can be used only for hi priority queues. Thus, to use only 2 queues the 8 has to be created. It's wasteful. So, in order to allow using only needed number of rate limited tx queues, save resources, and be able to set rate limitation for them, let assign tx cpdma channels in backward order to queues. Reviewed-by: Grygorii Strashko Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 00761fe59848..4425b537b9dd 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -968,8 +968,8 @@ static int cpsw_tx_mq_poll(struct napi_struct *napi_tx, int budget) /* process every unprocessed channel */ ch_map = cpdma_ctrl_txchs_state(cpsw->dma); - for (ch = 0, num_tx = 0; ch_map; ch_map >>= 1, ch++) { - if (!(ch_map & 0x01)) + for (ch = 0, num_tx = 0; ch_map & 0xff; ch_map <<= 1, ch++) { + if (!(ch_map & 0x80)) continue; txv = &cpsw->txv[ch]; @@ -2432,7 +2432,7 @@ static int cpsw_update_channels_res(struct cpsw_priv *priv, int ch_num, int rx) void (*handler)(void *, int, int); struct netdev_queue *queue; struct cpsw_vector *vec; - int ret, *ch; + int ret, *ch, vch; if (rx) { ch = &cpsw->rx_ch_num; @@ -2445,7 +2445,8 @@ static int cpsw_update_channels_res(struct cpsw_priv *priv, int ch_num, int rx) } while (*ch < ch_num) { - vec[*ch].ch = cpdma_chan_create(cpsw->dma, *ch, handler, rx); + vch = rx ? *ch : 7 - *ch; + vec[*ch].ch = cpdma_chan_create(cpsw->dma, vch, handler, rx); queue = netdev_get_tx_queue(priv->ndev, *ch); queue->tx_maxrate = 0; @@ -2982,7 +2983,7 @@ static int cpsw_probe(struct platform_device *pdev) u32 slave_offset, sliver_offset, slave_size; const struct soc_device_attribute *soc; struct cpsw_common *cpsw; - int ret = 0, i; + int ret = 0, i, ch; int irq; cpsw = devm_kzalloc(&pdev->dev, sizeof(struct cpsw_common), GFP_KERNEL); @@ -3157,7 +3158,8 @@ static int cpsw_probe(struct platform_device *pdev) if (soc) cpsw->quirk_irq = 1; - cpsw->txv[0].ch = cpdma_chan_create(cpsw->dma, 0, cpsw_tx_handler, 0); + ch = cpsw->quirk_irq ? 0 : 7; + cpsw->txv[0].ch = cpdma_chan_create(cpsw->dma, ch, cpsw_tx_handler, 0); if (IS_ERR(cpsw->txv[0].ch)) { dev_err(priv->dev, "error initializing tx dma channel\n"); ret = PTR_ERR(cpsw->txv[0].ch);