From: <stefanc@marvell.com>
To: <netdev@vger.kernel.org>
Cc: <thomas.petazzoni@bootlin.com>, <davem@davemloft.net>,
<nadavh@marvell.com>, <ymarkman@marvell.com>,
<linux-kernel@vger.kernel.org>, <stefanc@marvell.com>,
<kuba@kernel.org>, <linux@armlinux.org.uk>, <mw@semihalf.com>,
<andrew@lunn.ch>, <rmk+kernel@armlinux.org.uk>,
<atenart@kernel.org>, <devicetree@vger.kernel.org>,
<robh+dt@kernel.org>, <sebastian.hesselbarth@gmail.com>,
<gregory.clement@bootlin.com>,
<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH v12 net-next 15/15] net: mvpp2: add TX FC firmware check
Date: Wed, 10 Feb 2021 11:48:20 +0200 [thread overview]
Message-ID: <1612950500-9682-16-git-send-email-stefanc@marvell.com> (raw)
In-Reply-To: <1612950500-9682-1-git-send-email-stefanc@marvell.com>
From: Stefan Chulski <stefanc@marvell.com>
Patch check that TX FC firmware is running in CM3.
If not, global TX FC would be disabled.
Signed-off-by: Stefan Chulski <stefanc@marvell.com>
Acked-by: Marcin Wojtas <mw@semihalf.com>
---
drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 1 +
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 39 ++++++++++++++++----
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
index b61a1ba..da87152 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -828,6 +828,7 @@
#define MSS_THRESHOLD_STOP 768
#define MSS_THRESHOLD_START 1024
+#define MSS_FC_MAX_TIMEOUT 5000
/* RX buffer constants */
#define MVPP2_SKB_SHINFO_SIZE \
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 4d0a398..ac2f442 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -931,6 +931,34 @@ static void mvpp2_bm_pool_update_fc(struct mvpp2_port *port,
spin_unlock_irqrestore(&port->priv->mss_spinlock, flags);
}
+static int mvpp2_enable_global_fc(struct mvpp2 *priv)
+{
+ int val, timeout = 0;
+
+ /* Enable global flow control. In this stage global
+ * flow control enabled, but still disabled per port.
+ */
+ val = mvpp2_cm3_read(priv, MSS_FC_COM_REG);
+ val |= FLOW_CONTROL_ENABLE_BIT;
+ mvpp2_cm3_write(priv, MSS_FC_COM_REG, val);
+
+ /* Check if Firmware running and disable FC if not*/
+ val |= FLOW_CONTROL_UPDATE_COMMAND_BIT;
+ mvpp2_cm3_write(priv, MSS_FC_COM_REG, val);
+
+ while (timeout < MSS_FC_MAX_TIMEOUT) {
+ val = mvpp2_cm3_read(priv, MSS_FC_COM_REG);
+
+ if (!(val & FLOW_CONTROL_UPDATE_COMMAND_BIT))
+ return 0;
+ usleep_range(10, 20);
+ timeout++;
+ }
+
+ priv->global_tx_fc = false;
+ return -EOPNOTSUPP;
+}
+
/* Release buffer to BM */
static inline void mvpp2_bm_pool_put(struct mvpp2_port *port, int pool,
dma_addr_t buf_dma_addr,
@@ -7263,7 +7291,7 @@ static int mvpp2_probe(struct platform_device *pdev)
struct resource *res;
void __iomem *base;
int i, shared;
- int err, val;
+ int err;
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
@@ -7487,13 +7515,10 @@ static int mvpp2_probe(struct platform_device *pdev)
goto err_port_probe;
}
- /* Enable global flow control. In this stage global
- * flow control enabled, but still disabled per port.
- */
if (priv->global_tx_fc && priv->hw_version != MVPP21) {
- val = mvpp2_cm3_read(priv, MSS_FC_COM_REG);
- val |= FLOW_CONTROL_ENABLE_BIT;
- mvpp2_cm3_write(priv, MSS_FC_COM_REG, val);
+ err = mvpp2_enable_global_fc(priv);
+ if (err)
+ dev_warn(&pdev->dev, "Minimum of CM3 firmware 18.09 and chip revision B0 required for flow control\n");
}
mvpp2_dbgfs_init(priv, pdev->name);
--
1.9.1
prev parent reply other threads:[~2021-02-10 9:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-10 9:48 [PATCH v12 net-next 00/15] net: mvpp2: Add TX Flow Control support stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 01/15] doc: marvell: add CM3 address space and PPv2.3 description stefanc
2021-02-10 17:24 ` Rob Herring
2021-02-10 9:48 ` [PATCH v12 net-next 02/15] dts: marvell: add CM3 SRAM memory to cp11x ethernet device tree stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 03/15] net: mvpp2: add CM3 SRAM memory map stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 04/15] net: mvpp2: always compare hw-version vs MVPP21 stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 05/15] net: mvpp2: add PPv23 version definition stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 06/15] net: mvpp2: increase BM pool and RXQ size stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 07/15] net: mvpp2: add FCA periodic timer configurations stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 08/15] net: mvpp2: add FCA RXQ non occupied descriptor threshold stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 09/15] net: mvpp2: enable global flow control stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 10/15] net: mvpp2: add RXQ flow control configurations stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 11/15] net: mvpp2: add ethtool flow control configuration support stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 12/15] net: mvpp2: add BM protection underrun feature support stefanc
2021-02-10 23:29 ` David Miller
2021-02-11 8:22 ` [EXT] " Stefan Chulski
2021-02-11 14:19 ` Andrew Lunn
2021-02-11 19:13 ` Marcin Wojtas
2021-02-12 13:52 ` Andrew Lunn
2021-02-14 9:20 ` Stefan Chulski
2021-02-15 0:38 ` Andrew Lunn
2021-02-10 9:48 ` [PATCH v12 net-next 13/15] net: mvpp2: add PPv23 RX FIFO flow control stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 14/15] net: mvpp2: set 802.3x GoP Flow Control mode stefanc
2021-02-10 9:48 ` stefanc [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1612950500-9682-16-git-send-email-stefanc@marvell.com \
--to=stefanc@marvell.com \
--cc=andrew@lunn.ch \
--cc=atenart@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=gregory.clement@bootlin.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mw@semihalf.com \
--cc=nadavh@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=ymarkman@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).