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: 10412217 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F38A602C2 for ; Fri, 18 May 2018 21:16:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79B1D28AB7 for ; Fri, 18 May 2018 21:16:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E0DC28AF1; Fri, 18 May 2018 21:16:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0E1928AB7 for ; Fri, 18 May 2018 21:16:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751985AbeERVQW (ORCPT ); Fri, 18 May 2018 17:16:22 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:44029 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752210AbeERVPX (ORCPT ); Fri, 18 May 2018 17:15:23 -0400 Received: by mail-lf0-f68.google.com with SMTP id n18-v6so15864439lfh.10 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=kx/2K3uscGJ8kkhAYmd05XkF1fbf/qk7jqACW83LB/24b72KgRtpYj5p2T34YaabkX 2D/faCgBeV1tbtWk7vbaZJdpI/3R4Bu9ECNnlrmYtKQ3vmdm0I4EC4AgE1k9TOKGR1rs 1+hxo/pukE1ZFaECvCcJFJB6lkIn2tJaieb+BGky/F54aCKes47NOkQbCM9MtzVPXPYN oFhnODzQLLvDlY9Yd01Kd18wcfSGBI6wVd7BDoJyS02OP6sU6qTCZePwNyQVtN8qt73r QQg6g87LMkcGqEuUCM3xcs8CTbidTJLDLxwUQR4EUDBMnBVq4NXeirXpL0qbtp6yW2Dp UfQQ== X-Gm-Message-State: ALKqPwfxvPmTBl/OZh6+UOB2Bh5sbgFxo4yC+ApfiCdxuuyqPJsOv7C6 TYO/J69m9qH+maXVqvkqC+YvbA== X-Google-Smtp-Source: AB8JxZqxvYZRX/YrgORhMORoWm62w59rwA1C1IdcnxUUtYqyRhnYWiqyf/z/QsW7Bfr16eA5WsPZGg== 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: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(+) 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;