From patchwork Fri May 18 21:15:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 136367 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1726596lji; Fri, 18 May 2018 14:15:25 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoS26S6ieF/0O8oaJ56IRSTg5nIEXZlc0C3N/ezFb/lnRe+ZrjddxhQDVQNoZvwjl4uXC1i X-Received: by 2002:a65:49c3:: with SMTP id t3-v6mr8576935pgs.65.1526678125585; Fri, 18 May 2018 14:15:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526678125; cv=none; d=google.com; s=arc-20160816; b=vcZdd9dLiOaRXT5uR5OEm9MKUvjVvefUTedslTw9sdwriwv3V8wZrb1ci1Jv+urtbN sGScgLkKWzw1XhJBn6xizBWStL6t0Z4b7ra9cqShKsPsDjPpw+AW6UaIHH3/ftyAHYz6 jodvBV3JYT/PHuyak23rkkP4pCZE1JMAm9CtGiaQYEBeiJgQCM80KEYZ2oDbhoDI264f yHUNOBX0t0gruYjOkZRYVq3c+ZzYfueMymH7cJy4MTODwFW9UPvs1/2uokzoxQ4c5g1g 5qpwFNRSE5drzkMdmZbFQioA25+iNCX3H2LDvv4PSfWnMwesgf6u+timpgTBHd7jEUgb 52lw== 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=Fvy1uWAIHjgQjtXdfGYGORKGpD9kiUO/cLZPbaCeCA8=; b=mRp0I81epytc+jUnm3oBzeznYjsxmSQKG/TxzYm+0flMm87iXjHEhPXrhO9IM6foYV QNUhEQizIqfjlorABEgNW2fCpqQIgG2Z8+yYQZFa9mBT4FyXg8K2Y/f9QJAYgCzz0GAs DBZmwNnG1wNliigI2uVW/En6PXN7kIKvKvIjkE6yo+d7PEZ3ZQ+ebzCr0kVJ6OvWOcBU 3R50p649vWqdLaRB56SgZe9iymbPXbHVNuzuCqKKEGHsxg33W1/jx+h5bW+MOFZNfD3F EVyoWVlVXyG8TsDUEPsJSRsW5cC6udXEnYV/9veMaQ0fCnOiLuYOB8QCft9pu0RRSgwR i58w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WoT3uFz2; 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=fail (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 c13-v6si6779854pgt.649.2018.05.18.14.15.25; Fri, 18 May 2018 14:15:25 -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=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=WoT3uFz2; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752206AbeERVPX (ORCPT + 5 others); Fri, 18 May 2018 17:15:23 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:44023 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752129AbeERVPU (ORCPT ); Fri, 18 May 2018 17:15:20 -0400 Received: by mail-lf0-f66.google.com with SMTP id n18-v6so15864252lfh.10 for ; Fri, 18 May 2018 14:15:19 -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=evqVlSgwE0Mq3D3CWJiiP/nrSl0JupLCAxkyhHdkCDo=; b=WoT3uFz2l1Ig2Hb8nuOBRLmj+prhEM/N7QtBaCTrE5h7DdyLImWJ8EN8BXQgLgBb6z IT9DeRR169jNdTgTTXJXK5rPyxtBId3D3aFbxk4pojtlBMphio0VEX6mcsHNIFZkeNvc Lja90ER3Tx+Eez7UWmVAIjFJcO6I+qfm9+bBw= 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=evqVlSgwE0Mq3D3CWJiiP/nrSl0JupLCAxkyhHdkCDo=; b=pRyfCRKGeZBtIJz/+Xfo7MSjI2F5e2jgV+31bvCK1fcvMun8TyIMVB/LuJCjalEdHQ vS5EnbLfeOtZ0phroxiFgOs1gsBIWYE/OEfty0vgl8JYxSAFd4FuXo5aZ25cWc2OHJlx O8sHED/ES7zsSQTYCIPIz522GCe7YoQlF48IhyswnOERuBiaAaocUBcuVMuxlr8w83Zt G7e7ZrNGAIu7Dg45V+hjddvV0HyhhfSp2OaKgMx742V7sa3Egh41qwXp+9kAewiu4dGT dXGqsOr+p63NZ7OWwC8LemCi2rXNmbvUMEuS4ZcRRJ+/0qDCo1mVheCv/eQvqwGUtbQE B+FA== X-Gm-Message-State: ALKqPwfqvmUbktMEFDJmF6RVVC69WMEZeCeGd3fZG0EGgmqxz2y9YRzx tJ35WP2rTUtdjd2c6tJ/gGBsmQ== X-Received: by 2002:a2e:2a45:: with SMTP id q66-v6mr6617173ljq.40.1526678118623; Fri, 18 May 2018 14:15:18 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id g20-v6sm2045991lfk.39.2018.05.18.14.15.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 May 2018 14:15:18 -0700 (PDT) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com, davem@davemloft.net 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, Ivan Khoronzhuk Subject: [RFC PATCH 2/6] net: ethernet: ti: cpdma: fit rated channels in backward order Date: Sat, 19 May 2018 00:15:06 +0300 Message-Id: <20180518211510.13341-3-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518211510.13341-1-ivan.khoronzhuk@linaro.org> References: <20180518211510.13341-1-ivan.khoronzhuk@linaro.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org According to TRM tx rated channels should be in 7..0 order, so correct it. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/davinci_cpdma.c | 31 ++++++++++++------------- 1 file changed, 15 insertions(+), 16 deletions(-) -- 2.17.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c index 31ae04117f0a..37fbdc668cc7 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c @@ -406,37 +406,36 @@ static int cpdma_chan_fit_rate(struct cpdma_chan *ch, u32 rate, struct cpdma_chan *chan; u32 old_rate = ch->rate; u32 new_rmask = 0; - int rlim = 1; + int rlim = 0; int i; - *prio_mode = 0; for (i = tx_chan_num(0); i < tx_chan_num(CPDMA_MAX_CHANNELS); i++) { chan = ctlr->channels[i]; - if (!chan) { - rlim = 0; + if (!chan) continue; - } if (chan == ch) chan->rate = rate; if (chan->rate) { - if (rlim) { - new_rmask |= chan->mask; - } else { - ch->rate = old_rate; - dev_err(ctlr->dev, "Prev channel of %dch is not rate limited\n", - chan->chan_num); - return -EINVAL; - } - } else { - *prio_mode = 1; - rlim = 0; + rlim = 1; + new_rmask |= chan->mask; + continue; } + + if (rlim) + goto err; } *rmask = new_rmask; + *prio_mode = rlim; return 0; + +err: + ch->rate = old_rate; + dev_err(ctlr->dev, "Upper cpdma ch%d is not rate limited\n", + chan->chan_num); + return -EINVAL; } static u32 cpdma_chan_set_factors(struct cpdma_ctlr *ctlr,