Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3476177pxb; Sun, 7 Feb 2021 10:44:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJx1PbRPp+Zd7ijN8YZk4oA6LKij7UU22U8ANLhZAy87QGWw9sA58rGS/qxsAuxkAUE5OgPb X-Received: by 2002:a50:9f4e:: with SMTP id b72mr14090919edf.4.1612723463569; Sun, 07 Feb 2021 10:44:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612723463; cv=none; d=google.com; s=arc-20160816; b=BHLotgm2lWpw+2xL0Jyf6pwjVSCG1B0aT7PNrkdDrFbItMJs4B+bTUBAAMuBgy7pDu wh5cr5NKaSDRg5secx2FDZyMC5HOj7I0KT54QzKn3hPytZHXk+rlyYLs1EONetBM+2NE Pw119JJYSpdQ+NWJzz0kOaCo5V7itkVEsRzAaX27Hnk7SeHtAi1tcLPzhHzRJQp8xJG6 sojRHavb4Ry9D3HsbZxycXaiR74X/3IxdxzF45TwGOmlT7r32nyfFCh5PXYSgE2mZK4S 7YOilrultaOmXyk7Yflv6Px5BL+WM+qGAWPXe4+AWhO2x1TGYgGLISP1qVO6Xk0m/zSq AwBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Te/P93E6xYEL0XCHhhJJsDjnhAHpLCRMF2jCq3hbBE0=; b=th4D6zDh9H5P5+RaCnZ8gmGo/6D2bmSYV4aduEvu0o7/Jku21A6nYzKNgps/1VJqWC RVC6W4nics5rXi9FYCR6n2oBf3AZbkPPEXsW3si9u+pbo9oudGhlSot6hPGPyWed+0BP 4nxB3wJdLymvKj7RFda2AGINVd7mo+Oev8MGgOYcm/RPQjDs6GR5JhS3KHvcJcuaRruL QgV+aCXMPkSfL70qdOf0YmCAYro2RMbgTIbVO/zvkbe3DeUGeW3GKraFELnt1JqKE5B0 lCm00ClAa27hVF5SvHkZ0F6P7q2+ec0hzcPKmPLD2bPhvqFh02iYao6tkcw1RR/+IYPV 4ZqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=YzO7qf6U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id kl4si9698840ejc.341.2021.02.07.10.44.00; Sun, 07 Feb 2021 10:44:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=YzO7qf6U; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229835AbhBGSmB (ORCPT + 99 others); Sun, 7 Feb 2021 13:42:01 -0500 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:26826 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229623AbhBGSl4 (ORCPT ); Sun, 7 Feb 2021 13:41:56 -0500 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 117IexkZ014563; Sun, 7 Feb 2021 10:41:05 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=Te/P93E6xYEL0XCHhhJJsDjnhAHpLCRMF2jCq3hbBE0=; b=YzO7qf6UBv0ouYpjVYaTYRIKLPqPT4UYRkg5OaO4vIT12E6FFBiBYE7DodkTw1XeZQHk d3RFp/THhU2BwUF7MAIBuQHu+05emABxODg80i2krJLnOdy1GvcK471kJTR0m5gmFPKR fFUqlGICb9xMj9Ns59JYfEt5HoWY6Sn746TgnwxH1ORPKAtijXRLqoELNaOCGKMK6l94 Vb+d9FdfrgShmCgthmdPNDaB60i8RHrzPI+eE5e/n0O576YpVz293TjQcj3i29I/l5NZ hGZY05E7LidKRSRe5gGxvoKicMS/QpAp1g974zvJoF9hgmsDHlA3EpRDb3c/jH1Xjjsu 2Q== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com with ESMTP id 36hugq2euh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sun, 07 Feb 2021 10:41:05 -0800 Received: from SC-EXCH04.marvell.com (10.93.176.84) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 7 Feb 2021 10:41:03 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 7 Feb 2021 10:41:03 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sun, 7 Feb 2021 10:41:03 -0800 Received: from stefan-pc.marvell.com (stefan-pc.marvell.com [10.5.25.21]) by maili.marvell.com (Postfix) with ESMTP id 962C83F7041; Sun, 7 Feb 2021 10:40:59 -0800 (PST) From: To: CC: , , , , , , , , , , , , , , , , Subject: [PATCH v9 net-next 07/15] net: mvpp2: add FCA periodic timer configurations Date: Sun, 7 Feb 2021 20:38:49 +0200 Message-ID: <1612723137-18045-8-git-send-email-stefanc@marvell.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1612723137-18045-1-git-send-email-stefanc@marvell.com> References: <1612723137-18045-1-git-send-email-stefanc@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.737 definitions=2021-02-07_10:2021-02-05,2021-02-07 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Chulski Flow Control periodic timer would be used if port in XOFF to transmit periodic XOFF frames. Signed-off-by: Stefan Chulski --- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 13 ++++++ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 45 ++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h index e7bbf0a..9239d80 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h @@ -596,6 +596,15 @@ #define MVPP22_MPCS_CLK_RESET_DIV_RATIO(n) ((n) << 4) #define MVPP22_MPCS_CLK_RESET_DIV_SET BIT(11) +/* FCA registers. PPv2.2 and PPv2.3 */ +#define MVPP22_FCA_BASE(port) (0x7600 + (port) * 0x1000) +#define MVPP22_FCA_REG_SIZE 16 +#define MVPP22_FCA_REG_MASK 0xFFFF +#define MVPP22_FCA_CONTROL_REG 0x0 +#define MVPP22_FCA_ENABLE_PERIODIC BIT(11) +#define MVPP22_PERIODIC_COUNTER_LSB_REG (0x110) +#define MVPP22_PERIODIC_COUNTER_MSB_REG (0x114) + /* XPCS registers. PPv2.2 and PPv2.3 */ #define MVPP22_XPCS_BASE(port) (0x7400 + (port) * 0x1000) #define MVPP22_XPCS_CFG0 0x0 @@ -751,6 +760,10 @@ #define MVPP2_TX_FIFO_THRESHOLD(kb) \ ((kb) * 1024 - MVPP2_TX_FIFO_THRESHOLD_MIN) +/* MSS Flow control */ +#define FC_QUANTA 0xFFFF +#define FC_CLK_DIVIDER 100 + /* RX buffer constants */ #define MVPP2_SKB_SHINFO_SIZE \ SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 5730900..761f745 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -1280,6 +1280,49 @@ static void mvpp22_gop_init_10gkr(struct mvpp2_port *port) writel(val, mpcs + MVPP22_MPCS_CLK_RESET); } +static void mvpp22_gop_fca_enable_periodic(struct mvpp2_port *port, bool en) +{ + struct mvpp2 *priv = port->priv; + void __iomem *fca = priv->iface_base + MVPP22_FCA_BASE(port->gop_id); + u32 val; + + val = readl(fca + MVPP22_FCA_CONTROL_REG); + val &= ~MVPP22_FCA_ENABLE_PERIODIC; + if (en) + val |= MVPP22_FCA_ENABLE_PERIODIC; + writel(val, fca + MVPP22_FCA_CONTROL_REG); +} + +static void mvpp22_gop_fca_set_timer(struct mvpp2_port *port, u32 timer) +{ + struct mvpp2 *priv = port->priv; + void __iomem *fca = priv->iface_base + MVPP22_FCA_BASE(port->gop_id); + u32 lsb, msb; + + lsb = timer & MVPP22_FCA_REG_MASK; + msb = timer >> MVPP22_FCA_REG_SIZE; + + writel(lsb, fca + MVPP22_PERIODIC_COUNTER_LSB_REG); + writel(msb, fca + MVPP22_PERIODIC_COUNTER_MSB_REG); +} + +/* Set Flow Control timer x100 faster than pause quanta to ensure that link + * partner won't send traffic if port is in XOFF mode. + */ +static void mvpp22_gop_fca_set_periodic_timer(struct mvpp2_port *port) +{ + u32 timer; + + timer = (port->priv->tclk / (USEC_PER_SEC * FC_CLK_DIVIDER)) + * FC_QUANTA; + + mvpp22_gop_fca_enable_periodic(port, false); + + mvpp22_gop_fca_set_timer(port, timer); + + mvpp22_gop_fca_enable_periodic(port, true); +} + static int mvpp22_gop_init(struct mvpp2_port *port) { struct mvpp2 *priv = port->priv; @@ -1324,6 +1367,8 @@ static int mvpp22_gop_init(struct mvpp2_port *port) val |= GENCONF_SOFT_RESET1_GOP; regmap_write(priv->sysctrl_base, GENCONF_SOFT_RESET1, val); + mvpp22_gop_fca_set_periodic_timer(port); + unsupported_conf: return 0; -- 1.9.1