From patchwork Fri May 18 21:15:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 136369 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1727466lji; Fri, 18 May 2018 14:16:04 -0700 (PDT) X-Google-Smtp-Source: AB8JxZopDtcSkbTFClXnyeOvBJC04b6jcyx0IsOqMw1bA0g8auws4HVPKxpkmrHWMiVV3CmsfKjS X-Received: by 2002:a17:902:d707:: with SMTP id w7-v6mr6560498ply.142.1526678163911; Fri, 18 May 2018 14:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526678163; cv=none; d=google.com; s=arc-20160816; b=fTr8mK+qcW02rnnOMZvwPMhF9LWR5HbMNqesVhGZRCF37wcjvf3YwBnyQolTg7anF7 zTFdt2bFQZfsqjMvm5Liv9HSobfSzo6kk6jeDtomzAqUC28vdW6n6xpPuANB49DNL5r4 IGtdWCJU+5mFI/ruoeeSi5CoLB7m8dzNXLgXZverqisubewkAo9IRjmLkmtXztxC/SlB erU/f/+6hG+IgkNDl/FxqwhyehTv6RCDDLlJzIgqvUMXXLPXTkw25bGyyKwH3IaApBsw C2HUN7c8dOf7+pYEKu9F4uucjErXOcLQ6OIHV7poQ7b3UbaVxHDD7gkmuY76qopcAT0a bdCQ== 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=ipc/qNQrKTE3lp0xIgbG2YftOJpAgeq9/oT0QY88PVM=; b=Zw6w8xmOf2slkb0YFofgUKse0hFWvYa80+4YQtQGxGHH7f3jH55UqFmR0BAO+q/zh/ SkXsbGPZ3rExXIQXalOzXKDbZYchb2HJHIcBxAEvVEo50UR4j/ukygSGrUbw2sanlZfO UDgxkZ45bZ27LxkDKvA5ifvOE+BmwmUfgNJFyrO8tNbLcfTCquxWvjicPg3xARGgW2YE UJxceRfYN09f54obxl/oXqnaDiBOA5uVhqbA/5pbKdVUvonlo68mpNZ6S23yWGwBEtP2 fu9IeKOO7NKzIW3qWPTPv5D3QCuOLEjQS9YTIba+xbrKYaGM63P++b2FVErZtMBJQ0FA 1wqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cYLg6nVg; 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 y67-v6si8392080pfi.195.2018.05.18.14.16.03; Fri, 18 May 2018 14:16:03 -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=cYLg6nVg; 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 S1752522AbeERVQC (ORCPT + 9 others); Fri, 18 May 2018 17:16:02 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:42658 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752218AbeERVPY (ORCPT ); Fri, 18 May 2018 17:15:24 -0400 Received: by mail-lf0-f66.google.com with SMTP id b18-v6so15881915lfa.9 for ; Fri, 18 May 2018 14:15:23 -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=ipc/qNQrKTE3lp0xIgbG2YftOJpAgeq9/oT0QY88PVM=; b=cYLg6nVgAizCZaRcHDYMwkNLbvsEl/X3OuHR7MGL8URg4qSyVubNI3Y0DkGjdn+Fzw E3Ul2yLZQhINnJ/dIdmQiCrxlhbaFBFtUdck2yNIVLu1AGed2j0Px3K5L580JZ2GiRiJ v/oKeeE+LtPsjf38SVUjT9EPCnlOfSp/y+1lc= 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=ipc/qNQrKTE3lp0xIgbG2YftOJpAgeq9/oT0QY88PVM=; b=aAGMpmgxi5z3c5Odj7v06LDbnfI3tRynAyRmPWMeqKF7tHW2OdMefGjUMm/435ENNw hXUYtid7IJm1ciTjnfICwMsIo/V6VLm/GFmBmoxQUMFQ3v2Q7fSl95QNambrSs3DNcjD /U2Z0w0qRtmU5S3T5VL63mXfgaJ83NUegGsJGlF6dcMFR815Na9W1fQ26ETto0xhl+z6 PaClUTLjxJ1hYI63n7vMYAGZwIyfxph53xQyXI/SZQz4Obw0YvdkOvnKmRaV8j5vAtOj oqVpp1LQouKPhEWJAvCTpQm64jk46CcUHjWs4Kqf5ksJWKSlx9KFVxH5Lu/KcU4Itm9F IXeg== X-Gm-Message-State: ALKqPwe0FEJDthdDP8MILLAvhIZAxcmJLkV4ROG1rOLMvEBZ/fiUE7cZ RI041lL5SHo+n4YNZfIYoXszqQ== X-Received: by 2002:a19:e10c:: with SMTP id y12-v6mr19149717lfg.9.1526678122503; Fri, 18 May 2018 14:15:22 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 May 2018 14:15:21 -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 5/6] net: ethernet: ti: cpsw: restore shaper configuration while down/up Date: Sat, 19 May 2018 00:15:09 +0300 Message-Id: <20180518211510.13341-6-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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Need to restore shapers configuration after interface was down/up. This is needed as appropriate configuration is still replicated in kernel settings. This only shapers context restore, so vlan configuration should be restored by user if needed, especially for devices with one port where vlan frames are sent via ALE. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 47 ++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) -- 2.17.0 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index c7710b0e1c17..c3e88be36c1b 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1807,6 +1807,51 @@ static int cpsw_set_cbs(struct net_device *ndev, return ret; } +static void cpsw_cbs_resume(struct cpsw_slave *slave, struct cpsw_priv *priv) +{ + int fifo, bw; + + for (fifo = CPSW_FIFO_SHAPERS_NUM; fifo > 0; fifo--) { + bw = priv->fifo_bw[fifo]; + if (!bw) + continue; + + cpsw_set_fifo_rlimit(priv, fifo, bw); + } +} + +static void cpsw_mqprio_resume(struct cpsw_slave *slave, struct cpsw_priv *priv) +{ + struct cpsw_common *cpsw = priv->cpsw; + u32 tx_prio_map = 0; + int i, tc, fifo; + u32 tx_prio_rg; + + if (!priv->mqprio_hw) + return; + + for (i = 0; i < 8; i++) { + tc = netdev_get_prio_tc_map(priv->ndev, i); + fifo = CPSW_FIFO_SHAPERS_NUM - tc; + tx_prio_map |= fifo << (4 * i); + } + + tx_prio_rg = cpsw->version == CPSW_VERSION_1 ? + CPSW1_TX_PRI_MAP : CPSW2_TX_PRI_MAP; + + slave_write(slave, tx_prio_map, tx_prio_rg); +} + +/* restore resources after port reset */ +static void cpsw_restore(struct cpsw_priv *priv) +{ + /* restore MQPRIO offload */ + for_each_slave(priv, cpsw_mqprio_resume, priv); + + /* restore CBS offload */ + for_each_slave(priv, cpsw_cbs_resume, priv); +} + static int cpsw_ndo_open(struct net_device *ndev) { struct cpsw_priv *priv = netdev_priv(ndev); @@ -1886,6 +1931,8 @@ static int cpsw_ndo_open(struct net_device *ndev) } + cpsw_restore(priv); + /* Enable Interrupt pacing if configured */ if (cpsw->coal_intvl != 0) { struct ethtool_coalesce coal;