Skip to contentSkip to conversation

Fix TX Timeout and implement Safety Features

PATCH Superseded Jose Abreu 4 participants 9 messages Feb 1, 2018

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jose Abreu

author
#0 lore raw

cover Fix TX Timeout and implement Safety Features

Fix the TX Timeout handler to correctly reconfigure the whole system and start implementing features for DWMAC5 cores, specifically the Safety Features.

Cc David S. Miller <[email protected]>
Cc Joao Pinto <[email protected]>
Cc Giuseppe Cavallaro <[email protected]>
Cc Alexandre Torgue <[email protected]>

Jose Abreu (2):
net: stmmac: Rework and fix TX Timeout code
net: stmmac: Add support for DWMAC5 and implement Safety Features

 drivers/net/ethernet/stmicro/stmmac/Makefile      |    2 +-
 drivers/net/ethernet/stmicro/stmmac/common.h      |    8 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4.h      |    4 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c |   38 +++-
 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c  |    6 +
 drivers/net/ethernet/stmicro/stmmac/dwmac5.c      |  242 +++++++++++++++++++++
 drivers/net/ethernet/stmicro/stmmac/dwmac5.h      |   49 ++++
 drivers/net/ethernet/stmicro/stmmac/stmmac.h      |   11 +
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |  101 ++++++++-
 9 files changed, 454 insertions(+), 7 deletions(-)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac5.c
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac5.h
author
#1 lore raw

PATCH 1/2 net: stmmac: Rework and fix TX Timeout code

Currently TX Timeout handler does not behaves as expected and leads to an unrecoverable state. Rework current implementation of TX Timeout handling to actually perform a complete reset of the driver state and IP.

We use deferred work to init a task which will be responsible for resetting the system.

Cc David S. Miller <[email protected]>
Cc Joao Pinto <[email protected]>
Cc Giuseppe Cavallaro <[email protected]>
Cc Alexandre Torgue <[email protected]>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac.h      |   11 ++++
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   66 +++++++++++++++++++--
 2 files changed, 72 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac.h +11 -0
index a916e13..c8b70a7 100644
@@ -145,6 +145,17 @@ struct stmmac_priv {
 	struct dentry *dbgfs_rings_status;
 	struct dentry *dbgfs_dma_cap;
 #endif
+
+	unsigned long state;
+	struct workqueue_struct *wq;
+	struct work_struct service_task;
+};
+
+enum stmmac_state {
+	STMMAC_DOWN,
+	STMMAC_RESET_REQUESTED,
+	STMMAC_RESETING,
+	STMMAC_SERVICE_SCHED,
 };
 
 int stmmac_mdio_unregister(struct net_device *ndev);
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +61 -5

109 lines not on this page · raw message

Signature · 1 line
1.7.1
author
#2 lore raw

PATCH 2/2 net: stmmac: Add support for DWMAC5 and implement Safety Features

In reply to Jose Abreu

This adds initial suport for DWMAC5 and implements the Automotive Safety Package which is available from core version 5.10.

The Automotive Safety Pacakge (also called Safety Features) offers us with error protection in the core by implementing ECC Protection in memories, on-chip data path parity protection, FSM parity and timeout protection and Application/CSR interface timeout protection.

In case of an uncorrectable error we call stmmac_global_err() and reconfigure the whole core.

Cc David S. Miller <[email protected]>
Cc Joao Pinto <[email protected]>
Cc Giuseppe Cavallaro <[email protected]>
Cc Alexandre Torgue <[email protected]>
---
 drivers/net/ethernet/stmicro/stmmac/Makefile      |    2 +-
 drivers/net/ethernet/stmicro/stmmac/common.h      |    8 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4.h      |    4 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c |   38 +++-
 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c  |    6 +
 drivers/net/ethernet/stmicro/stmmac/dwmac5.c      |  242 +++++++++++++++++++++
 drivers/net/ethernet/stmicro/stmmac/dwmac5.h      |   49 ++++
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   35 +++
 8 files changed, 382 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac5.c
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac5.h
drivers/net/ethernet/stmicro/stmmac/Makefile +1 -1
index ff3f83b..972e4ef 100644
@@ -4,7 +4,7 @@ stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o	\
 	      chain_mode.o dwmac_lib.o dwmac1000_core.o dwmac1000_dma.o	\
 	      dwmac100_core.o dwmac100_dma.o enh_desc.o norm_desc.o	\
 	      mmc_core.o stmmac_hwtstamp.o stmmac_ptp.o dwmac4_descs.o	\
-	      dwmac4_dma.o dwmac4_lib.o dwmac4_core.o $(stmmac-y)
+	      dwmac4_dma.o dwmac4_lib.o dwmac4_core.o dwmac5.o $(stmmac-y)
 
 # Ordering matters. Generic driver must be last.
 obj-$(CONFIG_STMMAC_PLATFORM)	+= stmmac-platform.o
drivers/net/ethernet/stmicro/stmmac/common.h +8 -0
index 2ffe76c..7bbd7eb 100644
@@ -38,6 +38,8 @@
 #define	DWMAC_CORE_3_40	0x34
 #define	DWMAC_CORE_3_50	0x35
 #define	DWMAC_CORE_4_00	0x40
+#define DWMAC_CORE_5_00 0x50
+#define DWMAC_CORE_5_10 0x51
 #define STMMAC_CHAN0	0	/* Always supported and default for all chips */
 
 /* These need to be power of two, and >= 4 */
@@ -336,6 +338,8 @@ struct dma_features {
 	/* TX and RX FIFO sizes */
 	unsigned int tx_fifo_size;
 	unsigned int rx_fifo_size;
+	/* Automotive Safety Package */
+	unsigned int asp;
 };
 
 /* GMAC TX FIFO is 8K, Rx FIFO is 16K */
@@ -532,6 +536,10 @@ struct stmmac_ops {
 			     bool loopback);
 	void (*pcs_rane)(void __iomem *ioaddr, bool restart);
 	void (*pcs_get_adv_lp)(void __iomem *ioaddr, struct rgmii_adv *adv);
+	/* Safety Features */
+	int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp);
+	bool (*safety_feat_irq_status)(struct net_device *ndev,
+			void __iomem *ioaddr, unsigned int asp);
 };
 
 /* PTP and HW Timer helpers */
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +4 -0
index 789dad8..afe9834 100644
@@ -39,6 +39,7 @@
 #define GMAC_HW_FEATURE0		0x0000011c
 #define GMAC_HW_FEATURE1		0x00000120
 #define GMAC_HW_FEATURE2		0x00000124
+#define GMAC_HW_FEATURE3		0x00000128
 #define GMAC_MDIO_ADDR			0x00000200
 #define GMAC_MDIO_DATA			0x00000204
 #define GMAC_ADDR_HIGH(reg)		(0x300 + reg * 8)
@@ -192,6 +193,9 @@ enum power_event {
 #define GMAC_HW_FEAT_TXQCNT		GENMASK(9, 6)
 #define GMAC_HW_FEAT_RXQCNT		GENMASK(3, 0)
 
+/* MAC HW features3 bitmap */
+#define GMAC_HW_FEAT_ASP		GENMASK(29, 28)
+
 /* MAC HW ADDR regs */
 #define GMAC_HI_DCS			GENMASK(18, 16)
 #define GMAC_HI_DCS_SHIFT		16
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +37 -1
index ed222b2..5a24a6f 100644
@@ -20,6 +20,7 @@
 #include <net/dsa.h>
 #include "stmmac_pcs.h"
 #include "dwmac4.h"
+#include "dwmac5.h"
 
 static void dwmac4_core_init(struct mac_device_info *hw,
 			     struct net_device *dev)
@@ -767,6 +768,39 @@ static void dwmac4_debug(void __iomem *ioaddr, struct stmmac_extra_stats *x,
 	.set_filter = dwmac4_set_filter,
 };
 
+static const struct stmmac_ops dwmac510_ops = {
+	.core_init = dwmac4_core_init,
+	.set_mac = stmmac_dwmac4_set_mac,
+	.rx_ipc = dwmac4_rx_ipc_enable,
+	.rx_queue_enable = dwmac4_rx_queue_enable,
+	.rx_queue_prio = dwmac4_rx_queue_priority,
+	.tx_queue_prio = dwmac4_tx_queue_priority,
+	.rx_queue_routing = dwmac4_tx_queue_routing,
+	.prog_mtl_rx_algorithms = dwmac4_prog_mtl_rx_algorithms,
+	.prog_mtl_tx_algorithms = dwmac4_prog_mtl_tx_algorithms,
+	.set_mtl_tx_queue_weight = dwmac4_set_mtl_tx_queue_weight,
+	.map_mtl_to_dma = dwmac4_map_mtl_dma,
+	.config_cbs = dwmac4_config_cbs,
+	.dump_regs = dwmac4_dump_regs,
+	.host_irq_status = dwmac4_irq_status,
+	.host_mtl_irq_status = dwmac4_irq_mtl_status,
+	.flow_ctrl = dwmac4_flow_ctrl,
+	.pmt = dwmac4_pmt,
+	.set_umac_addr = dwmac4_set_umac_addr,
+	.get_umac_addr = dwmac4_get_umac_addr,
+	.set_eee_mode = dwmac4_set_eee_mode,
+	.reset_eee_mode = dwmac4_reset_eee_mode,
+	.set_eee_timer = dwmac4_set_eee_timer,
+	.set_eee_pls = dwmac4_set_eee_pls,
+	.pcs_ctrl_ane = dwmac4_ctrl_ane,
+	.pcs_rane = dwmac4_rane,
+	.pcs_get_adv_lp = dwmac4_get_adv_lp,
+	.debug = dwmac4_debug,
+	.set_filter = dwmac4_set_filter,
+	.safety_feat_config = dwmac5_safety_feat_config,
+	.safety_feat_irq_status = dwmac5_safety_feat_irq_status,
+};
+
 struct mac_device_info *dwmac4_setup(void __iomem *ioaddr, int mcbins,
 				     int perfect_uc_entries, int *synopsys_id)
 {
@@ -807,7 +841,9 @@ struct mac_device_info *dwmac4_setup(void __iomem *ioaddr, int mcbins,
 	else
 		mac->dma = &dwmac4_dma_ops;
 
-	if (*synopsys_id >= DWMAC_CORE_4_00)
+	if (*synopsys_id >= DWMAC_CORE_5_10)
+		mac->mac = &dwmac510_ops;
+	else if (*synopsys_id >= DWMAC_CORE_4_00)
 		mac->mac = &dwmac410_ops;
 	else
 		mac->mac = &dwmac4_ops;
drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +6 -0
index c110f68..d37d457 100644
@@ -373,6 +373,12 @@ static void dwmac4_get_hw_feature(void __iomem *ioaddr,
 
 	/* IEEE 1588-2002 */
 	dma_cap->time_stamp = 0;
+
+	/* MAC HW feature3 */
+	hw_cap = readl(ioaddr + GMAC_HW_FEATURE3);
+
+	/* 5.10 Features */
+	dma_cap->asp = (hw_cap & GMAC_HW_FEAT_ASP) >> 28;
 }
 
 /* Enable/disable TSO feature and set MSS */
drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +242 -0

242 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/dwmac5.h new file +49 -0

49 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +35 -0
index c84c24f..97ab4ca 100644
@@ -205,6 +205,7 @@ static void stmmac_service_event_schedule(struct stmmac_priv *priv)
 
 static void stmmac_global_err(struct stmmac_priv *priv)
 {
+	netif_carrier_off(priv->dev);
 	set_bit(STMMAC_RESET_REQUESTED, &priv->state);
 	stmmac_service_event_schedule(priv);
 }
@@ -2006,6 +2007,22 @@ static void stmmac_set_dma_operation_mode(struct stmmac_priv *priv, u32 txmode,
 	}
 }
 
+static bool stmmac_safety_feat_interrupt(struct stmmac_priv *priv)
+{
+	bool ret = false;
+
+	/* Safety features are only available in cores >= 5.10 */
+	if (priv->synopsys_id < DWMAC_CORE_5_10)
+		return ret;
+	if (priv->hw->mac->safety_feat_irq_status)
+		ret = priv->hw->mac->safety_feat_irq_status(priv->dev,
+				priv->ioaddr, priv->dma_cap.asp);
+
+	if (ret)
+		stmmac_global_err(priv);
+	return ret;
+}
+
 /**
  * stmmac_dma_interrupt - DMA ISR
  * @priv: driver private structure
@@ -2495,6 +2512,17 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv)
 		stmmac_mac_config_rx_queues_routing(priv);
 }
 
+static void stmmac_safety_feat_configuration(struct stmmac_priv *priv)
+{
+	if (priv->hw->mac->safety_feat_config && priv->dma_cap.asp) {
+		netdev_info(priv->dev, "Enabling Safety Features\n");
+		priv->hw->mac->safety_feat_config(priv->ioaddr,
+				priv->dma_cap.asp);
+	} else {
+		netdev_info(priv->dev, "No Safety Features support found\n");
+	}
+}
+
 /**
  * stmmac_hw_setup - setup mac in a usable state.
  *  @dev : pointer to the device structure.
@@ -2546,6 +2574,10 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
 	if (priv->synopsys_id >= DWMAC_CORE_4_00)
 		stmmac_mtl_configuration(priv);
 
+	/* Initialize Safety Features */
+	if (priv->synopsys_id >= DWMAC_CORE_5_10)
+		stmmac_safety_feat_configuration(priv);
+
 	ret = priv->hw->mac->rx_ipc(priv->hw);
 	if (!ret) {
 		netdev_warn(priv->dev, "RX IPC Checksum Offload disabled\n");
@@ -3713,6 +3745,9 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
 	/* Check if adapter is up */
 	if (test_bit(STMMAC_DOWN, &priv->state))
 		return IRQ_HANDLED;
+	/* Check if a fatal error happened */
+	if (stmmac_safety_feat_interrupt(priv))
+		return IRQ_HANDLED;
 
 	/* To handle GMAC own interrupts */
 	if ((priv->plat->has_gmac) || (priv->plat->has_gmac4)) {
Signature · 1 line
1.7.1
#3 lore raw

RE: [PATCH net-next 2/2] net: stmmac: Add support for DWMAC5 and implement Safety Features

Looking great!

-----Original Message-----
From: Jose Abreu [mailto:[email protected]]
Sent: Thursday, February 1, 2018 2:42 PM
To: [email protected]
Cc: Jose Abreu <[email protected]>; David S. Miller <[email protected]>; Joao Pinto <[email protected]>; Giuseppe Cavallaro <[email protected]>; Alexandre Torgue <[email protected]>
Subject: [PATCH net-next 2/2] net: stmmac: Add support for DWMAC5 and implement Safety Features

This adds initial suport for DWMAC5 and implements the Automotive Safety Package which is available from core version 5.10.

The Automotive Safety Pacakge (also called Safety Features) offers us with error protection in the core by implementing ECC Protection in memories, on-chip data path parity protection, FSM parity and timeout protection and Application/CSR interface timeout protection.

In case of an uncorrectable error we call stmmac_global_err() and reconfigure the whole core.

Cc David S. Miller <[email protected]>
Cc Joao Pinto <[email protected]>
Cc Giuseppe Cavallaro <[email protected]>
Cc Alexandre Torgue <[email protected]>
---
 drivers/net/ethernet/stmicro/stmmac/Makefile      |    2 +-
 drivers/net/ethernet/stmicro/stmmac/common.h      |    8 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4.h      |    4 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c |   38 +++-
 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c  |    6 +
 drivers/net/ethernet/stmicro/stmmac/dwmac5.c      |  242 +++++++++++++++++++++
 drivers/net/ethernet/stmicro/stmmac/dwmac5.h      |   49 ++++
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |   35 +++
 8 files changed, 382 insertions(+), 2 deletions(-)  create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac5.c
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac5.h
drivers/net/ethernet/stmicro/stmmac/Makefile +1 -1
index ff3f83b..972e4ef 100644
@@ -4,7 +4,7 @@ stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o	\
 	      chain_mode.o dwmac_lib.o dwmac1000_core.o dwmac1000_dma.o	\
 	      dwmac100_core.o dwmac100_dma.o enh_desc.o norm_desc.o	\
 	      mmc_core.o stmmac_hwtstamp.o stmmac_ptp.o dwmac4_descs.o	\
-	      dwmac4_dma.o dwmac4_lib.o dwmac4_core.o $(stmmac-y)
+	      dwmac4_dma.o dwmac4_lib.o dwmac4_core.o dwmac5.o $(stmmac-y)
 
 # Ordering matters. Generic driver must be last.
 obj-$(CONFIG_STMMAC_PLATFORM)	+= stmmac-platform.o
drivers/net/ethernet/stmicro/stmmac/common.h +2 -0
index 2ffe76c..7bbd7eb 100644
@@ -38,6 +38,8 @@
 #define	DWMAC_CORE_3_40	0x34
 #define	DWMAC_CORE_3_50	0x35
 #define	DWMAC_CORE_4_00	0x40
+#define DWMAC_CORE_5_00 0x50
+#define DWMAC_CORE_5_10 0x51
 #define STMMAC_CHAN0	0	/* Always supported and default for all chips */
 
 /* These need to be power of two, and >= 4 */ @@ -336,6 +338,8 @@ struct dma_features {

/* TX and RX FIFO sizes */
unsigned int tx_fifo_size;
unsigned int rx_fifo_size;
+ /* Automotive Safety Package */
+ unsigned int asp;
};

/* GMAC TX FIFO is 8K, Rx FIFO is 16K */ @@ -532,6 +536,10 @@ struct stmmac_ops {
bool loopback);
void (*pcs_rane)(void __iomem *ioaddr, bool restart);
void (*pcs_get_adv_lp)(void __iomem *ioaddr, struct rgmii_adv *adv);
+ /* Safety Features */
+ int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp);
+ bool (*safety_feat_irq_status)(struct net_device *ndev,
+ void __iomem *ioaddr, unsigned int asp);
};

/* PTP and HW Timer helpers */

drivers/net/ethernet/stmicro/stmmac/dwmac4.h +4 -0
index 789dad8..afe9834 100644
@@ -39,6 +39,7 @@
 #define GMAC_HW_FEATURE0		0x0000011c
 #define GMAC_HW_FEATURE1		0x00000120
 #define GMAC_HW_FEATURE2		0x00000124
+#define GMAC_HW_FEATURE3		0x00000128
 #define GMAC_MDIO_ADDR			0x00000200
 #define GMAC_MDIO_DATA			0x00000204
 #define GMAC_ADDR_HIGH(reg)		(0x300 + reg * 8)
@@ -192,6 +193,9 @@ enum power_event {
 #define GMAC_HW_FEAT_TXQCNT		GENMASK(9, 6)
 #define GMAC_HW_FEAT_RXQCNT		GENMASK(3, 0)
 
+/* MAC HW features3 bitmap */
+#define GMAC_HW_FEAT_ASP		GENMASK(29, 28)
+
 /* MAC HW ADDR regs */
 #define GMAC_HI_DCS			GENMASK(18, 16)
 #define GMAC_HI_DCS_SHIFT		16
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +33 -0
index ed222b2..5a24a6f 100644
@@ -20,6 +20,7 @@
 #include <net/dsa.h>
 #include "stmmac_pcs.h"
 #include "dwmac4.h"
+#include "dwmac5.h"
 
 static void dwmac4_core_init(struct mac_device_info *hw,
 			     struct net_device *dev)
@@ -767,6 +768,39 @@ static void dwmac4_debug(void __iomem *ioaddr, struct stmmac_extra_stats *x,
 	.set_filter = dwmac4_set_filter,
 };
 
+static const struct stmmac_ops dwmac510_ops = {
+	.core_init = dwmac4_core_init,
+	.set_mac = stmmac_dwmac4_set_mac,
+	.rx_ipc = dwmac4_rx_ipc_enable,
+	.rx_queue_enable = dwmac4_rx_queue_enable,
+	.rx_queue_prio = dwmac4_rx_queue_priority,
+	.tx_queue_prio = dwmac4_tx_queue_priority,
+	.rx_queue_routing = dwmac4_tx_queue_routing,
+	.prog_mtl_rx_algorithms = dwmac4_prog_mtl_rx_algorithms,
+	.prog_mtl_tx_algorithms = dwmac4_prog_mtl_tx_algorithms,
+	.set_mtl_tx_queue_weight = dwmac4_set_mtl_tx_queue_weight,
+	.map_mtl_to_dma = dwmac4_map_mtl_dma,
+	.config_cbs = dwmac4_config_cbs,
+	.dump_regs = dwmac4_dump_regs,
+	.host_irq_status = dwmac4_irq_status,
+	.host_mtl_irq_status = dwmac4_irq_mtl_status,
+	.flow_ctrl = dwmac4_flow_ctrl,
+	.pmt = dwmac4_pmt,
+	.set_umac_addr = dwmac4_set_umac_addr,
+	.get_umac_addr = dwmac4_get_umac_addr,
+	.set_eee_mode = dwmac4_set_eee_mode,
+	.reset_eee_mode = dwmac4_reset_eee_mode,
+	.set_eee_timer = dwmac4_set_eee_timer,
+	.set_eee_pls = dwmac4_set_eee_pls,
+	.pcs_ctrl_ane = dwmac4_ctrl_ane,
+	.pcs_rane = dwmac4_rane,
+	.pcs_get_adv_lp = dwmac4_get_adv_lp,
+	.debug = dwmac4_debug,
+	.set_filter = dwmac4_set_filter,
+	.safety_feat_config = dwmac5_safety_feat_config,
+	.safety_feat_irq_status = dwmac5_safety_feat_irq_status, };
+
 struct mac_device_info *dwmac4_setup(void __iomem *ioaddr, int mcbins,
 				     int perfect_uc_entries, int *synopsys_id)  { @@ -807,7 +841,9 @@ struct mac_device_info *dwmac4_setup(void __iomem *ioaddr, int mcbins,
 	else

mac->dma = &dwmac4_dma_ops;

- if (*synopsys_id >= DWMAC_CORE_4_00)
+ if (*synopsys_id >= DWMAC_CORE_5_10)
+ mac->mac = &dwmac510_ops;
+ else if (*synopsys_id >= DWMAC_CORE_4_00)
mac->mac = &dwmac410_ops;
else
mac->mac = &dwmac4_ops;

drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +6 -0
index c110f68..d37d457 100644
@@ -373,6 +373,12 @@ static void dwmac4_get_hw_feature(void __iomem *ioaddr,
 
 	/* IEEE 1588-2002 */
 	dma_cap->time_stamp = 0;
+
+	/* MAC HW feature3 */
+	hw_cap = readl(ioaddr + GMAC_HW_FEATURE3);
+
+	/* 5.10 Features */
+	dma_cap->asp = (hw_cap & GMAC_HW_FEAT_ASP) >> 28;
 }
 
 /* Enable/disable TSO feature and set MSS */ diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c

new file mode 100644
index 0000000..f751cd8

drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +236 -0

236 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/dwmac5.h new file +49 -0

49 lines not on this page · raw message

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +31 -0
index c84c24f..97ab4ca 100644
@@ -205,6 +205,7 @@ static void stmmac_service_event_schedule(struct stmmac_priv *priv)
 
 static void stmmac_global_err(struct stmmac_priv *priv)  {
+	netif_carrier_off(priv->dev);
 	set_bit(STMMAC_RESET_REQUESTED, &priv->state);
 	stmmac_service_event_schedule(priv);
 }
@@ -2006,6 +2007,22 @@ static void stmmac_set_dma_operation_mode(struct stmmac_priv *priv, u32 txmode,
 	}
 }
 
+static bool stmmac_safety_feat_interrupt(struct stmmac_priv *priv) {
+	bool ret = false;
+
+	/* Safety features are only available in cores >= 5.10 */
+	if (priv->synopsys_id < DWMAC_CORE_5_10)
+		return ret;
+	if (priv->hw->mac->safety_feat_irq_status)
+		ret = priv->hw->mac->safety_feat_irq_status(priv->dev,
+				priv->ioaddr, priv->dma_cap.asp);
+
+	if (ret)
+		stmmac_global_err(priv);
+	return ret;
+}
+
 /**
  * stmmac_dma_interrupt - DMA ISR
  * @priv: driver private structure
@@ -2495,6 +2512,17 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv)
 		stmmac_mac_config_rx_queues_routing(priv);
 }
 
+static void stmmac_safety_feat_configuration(struct stmmac_priv *priv) 
+{
+	if (priv->hw->mac->safety_feat_config && priv->dma_cap.asp) {
+		netdev_info(priv->dev, "Enabling Safety Features\n");
+		priv->hw->mac->safety_feat_config(priv->ioaddr,
+				priv->dma_cap.asp);
+	} else {
+		netdev_info(priv->dev, "No Safety Features support found\n");
+	}
+}
+
 /**
  * stmmac_hw_setup - setup mac in a usable state.
  *  @dev : pointer to the device structure.
@@ -2546,6 +2574,10 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
 	if (priv->synopsys_id >= DWMAC_CORE_4_00)
 		stmmac_mtl_configuration(priv);
 
+	/* Initialize Safety Features */
+	if (priv->synopsys_id >= DWMAC_CORE_5_10)
+		stmmac_safety_feat_configuration(priv);
+
 	ret = priv->hw->mac->rx_ipc(priv->hw);
 	if (!ret) {
 		netdev_warn(priv->dev, "RX IPC Checksum Offload disabled\n"); @@ -3713,6 +3745,9 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)

/* Check if adapter is up */
if (test_bit(STMMAC_DOWN, &priv->state))
return IRQ_HANDLED;
+ /* Check if a fatal error happened */
+ if (stmmac_safety_feat_interrupt(priv))
+ return IRQ_HANDLED;

/* To handle GMAC own interrupts */
if ((priv->plat->has_gmac) || (priv->plat->has_gmac4)) {

#4 lore raw

Re: [PATCH net-next 2/2] net: stmmac: Add support for DWMAC5 and implement Safety Features

drivers/net/ethernet/stmicro/stmmac/dwmac5.c line 21

Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +11 -0
+static void dwmac5_log_error(struct net_device *ndev, u32 value, bool corr,
+		const char *module_name, const char **errors_str) {
+	unsigned long loc, mask;
+
+	mask = value;
+	for_each_set_bit(loc, &mask, 32) {
+		netdev_err(ndev, "Found %s error in %s: '%s'\n", corr ?
+				"correctable" : "uncorrectable", module_name,
+				errors_str[loc]);
+	}
+}

How about also adding ethtool -S stats. You have a text string, so all you need to add is a counter. And i expect statistics are looked at more than dmesg output.

drivers/net/ethernet/stmicro/stmmac/dwmac5.c line 67

Quoted 11 lines
drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +11 -0
+
+static bool dwmac5_handle_mac_err(struct net_device *ndev,
+		void __iomem *ioaddr, bool correctable) {
+	u32 value;
+
+	value = readl(ioaddr + MAC_DPP_FSM_INT_STATUS);
+	writel(value, ioaddr + MAC_DPP_FSM_INT_STATUS);
+
+	dwmac5_log_error(ndev, value, correctable, "MAC", dwmac5_mac_errors);
+	return !correctable;
+}

Returning !correctable in all these functions seems pointless. None of the handlers change its value. So just make these void functions.

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static void stmmac_service_event_schedule(struct stmmac_priv *priv) · line 210

Quoted 5 lines

static void stmmac_global_err(struct stmmac_priv *priv) {

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -0
+	netif_carrier_off(priv->dev);
 	set_bit(STMMAC_RESET_REQUESTED, &priv->state);
 	stmmac_service_event_schedule(priv);
 }

This should be in a separate patch, with an explanation why it is needed.

Andrew

maintainer
#5 lore raw

Re: [PATCH net-next 2/2] net: stmmac: Add support for DWMAC5 and implement Safety Features

From: Andrew Lunn <[email protected]>
Date: Thu, 1 Feb 2018 16:02:09 +0100

Quoted 7 lines
Quoted 7 lines
drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +7 -0
+static void dwmac5_log_error(struct net_device *ndev, u32 value, bool corr,
+		const char *module_name, const char **errors_str) {
+	unsigned long loc, mask;
+
+	mask = value;
+	for_each_set_bit(loc, &mask, 32) {
+		netdev_err(ndev, "Found %s error in %s: '%s'\n", corr ?
Quoted 8 lines

drivers/net/ethernet/stmicro/stmmac/dwmac5.c line 21

Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +4 -0
+				"correctable" : "uncorrectable", module_name,
+				errors_str[loc]);
+	}
+}

How about also adding ethtool -S stats. You have a text string, so all you need to add is a counter. And i expect statistics are looked at more than dmesg output.

I agree. Perhaps for extremely catastrophic errors (those which require a complete chip reset, for example), statistics are really the way to go.

Also, all of these functions are not style properly. The openning curly braces of a function belong on a separate line of their own, not at the end of the arguments.

The braces for structure assignment blocks have a similar problem, the final closing brace and semicolon should be on a line by itself.

author
#8 lore raw

Re: [PATCH net-next 2/2] net: stmmac: Add support for DWMAC5 and implement Safety Features

In reply to Andrew Lunn

Hi Andrew,

Quoted 6 lines · Andrew Lunn
Quoted 6 lines
drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +6 -0
+static void dwmac5_log_error(struct net_device *ndev, u32 value, bool corr,
+		const char *module_name, const char **errors_str) {
+	unsigned long loc, mask;
+
+	mask = value;
+	for_each_set_bit(loc, &mask, 32) {
Quoted 8 lines

drivers/net/ethernet/stmicro/stmmac/dwmac5.c line 21

Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +5 -0
+		netdev_err(ndev, "Found %s error in %s: '%s'\n", corr ?
+				"correctable" : "uncorrectable", module_name,
+				errors_str[loc]);
+	}
+}

How about also adding ethtool -S stats. You have a text string, so all you need to add is a counter. And i expect statistics are looked at more than dmesg output.

Yes, I will add.

Quoted 14 lines

drivers/net/ethernet/stmicro/stmmac/dwmac5.c line 67

Quoted 12 lines
drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +11 -0
+
+static bool dwmac5_handle_mac_err(struct net_device *ndev,
+		void __iomem *ioaddr, bool correctable) {
+	u32 value;
+
+	value = readl(ioaddr + MAC_DPP_FSM_INT_STATUS);
+	writel(value, ioaddr + MAC_DPP_FSM_INT_STATUS);
+
+	dwmac5_log_error(ndev, value, correctable, "MAC", dwmac5_mac_errors);
+	return !correctable;
+}

Returning !correctable in all these functions seems pointless. None of the handlers change its value. So just make these void functions.

Ok.

Quoted 8 lines

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static void stmmac_service_event_schedule(struct stmmac_priv *priv) · line 210

Quoted 6 lines

static void stmmac_global_err(struct stmmac_priv *priv) {

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -0
+	netif_carrier_off(priv->dev);
 	set_bit(STMMAC_RESET_REQUESTED, &priv->state);
 	stmmac_service_event_schedule(priv);
 }

This should be in a separate patch, with an explanation why it is needed.

Yes it should belong in the first patch of this series.

Best Regards,
Jose Miguel Abreu

Quoted 2 lines

Andrew

author
#6 lore raw

Re: [PATCH net-next 2/2] net: stmmac: Add support for DWMAC5 and implement Safety Features

In reply to David Miller

Hi David,

Quoted 17 lines · David Miller

From: Andrew Lunn <[email protected]>
Date: Thu, 1 Feb 2018 16:02:09 +0100

Quoted 6 lines
Quoted 6 lines
drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +6 -0
+static void dwmac5_log_error(struct net_device *ndev, u32 value, bool corr,
+		const char *module_name, const char **errors_str) {
+	unsigned long loc, mask;
+
+	mask = value;
+	for_each_set_bit(loc, &mask, 32) {
Quoted 8 lines

drivers/net/ethernet/stmicro/stmmac/dwmac5.c line 21

Quoted 5 lines
drivers/net/ethernet/stmicro/stmmac/dwmac5.c new file +5 -0
+		netdev_err(ndev, "Found %s error in %s: '%s'\n", corr ?
+				"correctable" : "uncorrectable", module_name,
+				errors_str[loc]);
+	}
+}

How about also adding ethtool -S stats. You have a text string, so all you need to add is a counter. And i expect statistics are looked at more than dmesg output.

Quoted 7 lines

I agree. Perhaps for extremely catastrophic errors (those which require a complete chip reset, for example), statistics are really the way to go.

Also, all of these functions are not style properly. The openning curly braces of a function belong on a separate line of their own, not at the end of the arguments.

Hmm, I have that locally and in the raw .patch file ... Maybe there is something wrong with my git send-email?

Quoted 3 lines

The braces for structure assignment blocks have a similar problem, the final closing brace and semicolon should be on a line by itself.

And I also have that ...

Best Regards,
Jose Miguel Abreu

maintainer
#7 lore raw

Re: [PATCH net-next 2/2] net: stmmac: Add support for DWMAC5 and implement Safety Features

From: Jose Abreu <[email protected]>
Date: Thu, 1 Feb 2018 15:26:44 +0000

Quoted 2 lines

Hmm, I have that locally and in the raw .patch file ... Maybe there is something wrong with my git send-email?

That's for you to figure out I suppose :-)