net: stmmac: Selftests
Subsystems (5)
RFC v2 2/14 net: stmmac: dwmac100: Add MAC loopback support
In reply to Jose AbreuIn preparation for the addition of stmmac selftests we implement the MAC loopback callback in dwmac100 core.
--- drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c +13 -0
@@ -160,6 +160,18 @@ static void dwmac100_pmt(struct mac_device_info *hw, unsigned long mode)return ; } +static void dwmac100_set_mac_loopback (void __iomem *ioaddr,bool enable) +{ +u32 value =readl (ioaddr +MAC_CONTROL ); + +if (enable) + value |=MAC_CONTROL_OM ; +else + value &= ~MAC_CONTROL_OM ; + +writel (value, ioaddr +MAC_CONTROL ); +} +const struct stmmac_ops dwmac100_ops = { .core_init = dwmac100_core_init, .set_mac = stmmac_set_mac,
@@ -171,6 +183,7 @@ const struct stmmac_ops dwmac100_ops = { .pmt = dwmac100_pmt, .set_umac_addr = dwmac100_set_umac_addr, .get_umac_addr = dwmac100_get_umac_addr, + .set_mac_loopback = dwmac100_set_mac_loopback, };int dwmac100_setup (struct stmmac_priv *priv)
Signature · 1 line
2.7.4
RFC v2 13/14 net: stmmac: dwmac1000: Clear unused address entries
In reply to Jose AbreuIn case we don't use a given address entry we need to clear it because it could contain previous values that are no longer valid.
Found out while running stmmac selftests.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +6 -0
@@ -217,6 +217,12 @@ static void dwmac1000_set_filter(struct mac_device_info *hw, GMAC_ADDR_LOW(reg)); reg++; } + +while (reg <= perfect_addr_number) { +writel (0 , ioaddr +GMAC_ADDR_HIGH (reg)); +writel (0 , ioaddr +GMAC_ADDR_LOW (reg)); + reg++; + } }#ifdef FRAME_FILTER_DEBUG
Signature · 1 line
2.7.4
RFC v2 5/14 net: stmmac: dwxgmac2: Add MAC loopback support
In reply to Jose AbreuIn preparation for the addition of stmmac selftests we implement the MAC loopback callback in dwxgmac2 core.
--- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 13 +++++++++++++ 2 files changed, 14 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +1 -0
@@ -29,6 +29,7 @@#define XGMAC_CONFIG_GPSL GENMASK(29, 16)#define XGMAC_CONFIG_GPSL_SHIFT 16#define XGMAC_CONFIG_S2KP BIT(11) +#define XGMAC_CONFIG_LM BIT(10)#define XGMAC_CONFIG_IPC BIT(9)#define XGMAC_CONFIG_JE BIT(8)#define XGMAC_CONFIG_WD BIT(7)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +13 -0
@@ -321,6 +321,18 @@ static void dwxgmac2_set_filter(struct mac_device_info *hw,writel (value, ioaddr +XGMAC_PACKET_FILTER ); } +static void dwxgmac2_set_mac_loopback (void __iomem *ioaddr,bool enable) +{ +u32 value =readl (ioaddr +XGMAC_RX_CONFIG ); + +if (enable) + value |=XGMAC_CONFIG_LM ; +else + value &= ~XGMAC_CONFIG_LM ; + +writel (value, ioaddr +XGMAC_RX_CONFIG ); +} +const struct stmmac_ops dwxgmac210_ops = { .core_init = dwxgmac2_core_init, .set_mac = dwxgmac2_set_mac,
@@ -350,6 +362,7 @@ const struct stmmac_ops dwxgmac210_ops = { .pcs_get_adv_lp = NULL, .debug = NULL, .set_filter = dwxgmac2_set_filter, + .set_mac_loopback = dwxgmac2_set_mac_loopback, };int dwxgmac2_setup (struct stmmac_priv *priv)
Signature · 1 line
2.7.4
RFC v2 1/14 net: stmmac: Add MAC loopback callback to HWIF
In reply to Jose AbreuIn preparation for the addition of selftests support for stmmac we add a new callback to HWIF that can be used to set the controller in loopback mode.
--- drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/stmicro/stmmac/hwif.h +4 -0
@@ -324,6 +324,8 @@ struct stmmac_ops {int (*flex_pps_config)(void __iomem *ioaddr,int index,struct stmmac_pps_cfg *cfg,bool enable,u32 sub_second_inc,u32 systime_flags); +/* Loopback for selftests */ +void (*set_mac_loopback)(void __iomem *ioaddr,bool enable); }; #define stmmac_core_init(__priv, __args...) \
@@ -392,6 +394,8 @@ struct stmmac_ops { stmmac_do_callback(__priv, mac, rxp_config, __args) #define stmmac_flex_pps_config(__priv, __args...) \ stmmac_do_callback(__priv, mac, flex_pps_config, __args) +#define stmmac_set_mac_loopback(__priv, __args...) \ + stmmac_do_void_callback(__priv, mac, set_mac_loopback, __args)/* PTP and HW Timer helpers */ struct stmmac_hwtimestamp {
Signature · 1 line
2.7.4
RFC v2 3/14 net: stmmac: dwmac1000: Add MAC loopback support
In reply to Jose AbreuIn preparation for the addition of stmmac selftests we implement the MAC loopback callback in dwmac1000 core.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +13 -0
@@ -499,6 +499,18 @@ static void dwmac1000_debug(void __iomem *ioaddr, struct stmmac_extra_stats *x, x->mac_gmii_rx_proto_engine++; } +static void dwmac1000_set_mac_loopback (void __iomem *ioaddr,bool enable) +{ +u32 value =readl (ioaddr +GMAC_CONTROL ); + +if (enable) + value |=GMAC_CONTROL_LM ; +else + value &= ~GMAC_CONTROL_LM ; + +writel (value, ioaddr +GMAC_CONTROL ); +} +const struct stmmac_ops dwmac1000_ops = { .core_init = dwmac1000_core_init, .set_mac = stmmac_set_mac,
@@ -518,6 +530,7 @@ const struct stmmac_ops dwmac1000_ops = { .pcs_ctrl_ane = dwmac1000_ctrl_ane, .pcs_rane = dwmac1000_rane, .pcs_get_adv_lp = dwmac1000_get_adv_lp, + .set_mac_loopback = dwmac1000_set_mac_loopback, };int dwmac1000_setup (struct stmmac_priv *priv)
Signature · 1 line
2.7.4
RFC v2 14/14 net: stmmac: dwmac4/5: Fix Hash Filter
In reply to Jose AbreuIn order for hash filter to work we need to set the HPF bit.
Fout out while running stmmac selftests
--- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +1 -0
@@ -65,6 +65,7 @@#define GMAC_PACKET_FILTER_HMC BIT(2)#define GMAC_PACKET_FILTER_PM BIT(4)#define GMAC_PACKET_FILTER_PCF BIT(7) +#define GMAC_PACKET_FILTER_HPF BIT(10)#define GMAC_MAX_PERFECT_ADDRESSES 128
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +2 -0
@@ -438,6 +438,8 @@ static void dwmac4_set_filter(struct mac_device_info *hw,writel (mc_filter[1 ], ioaddr +GMAC_HASH_TAB_32_63 ); } + value |=GMAC_PACKET_FILTER_HPF ; +/* Handle multiple unicast addresses */ if (netdev_uc_count (dev) >GMAC_MAX_PERFECT_ADDRESSES ) {/* Switch to promiscuous mode if more than 128 addrs
Signature · 1 line
2.7.4
RFC v2 6/14 net: ethernet: stmmac: dwmac-sun8i: Enable control of loopback
In reply to Jose AbreuFrom: Corentin Labbe <[email protected]>
This patch enable use of set_mac_loopback in dwmac-sun8i
--- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +13 -0
@@ -986,6 +986,18 @@ static void sun8i_dwmac_exit(struct platform_device *pdev, void *priv)regulator_disable (gmac->regulator); } +static void sun8i_dwmac_set_mac_loopback (void __iomem *ioaddr,bool enable) +{ +u32 value =readl (ioaddr +EMAC_BASIC_CTL0 ); + +if (enable) + value |=EMAC_LOOPBACK ; +else + value &= ~EMAC_LOOPBACK ; + +writel (value, ioaddr +EMAC_BASIC_CTL0 ); +} +static const struct stmmac_ops sun8i_dwmac_ops = { .core_init = sun8i_dwmac_core_init, .set_mac = sun8i_dwmac_set_mac,
@@ -995,6 +1007,7 @@ static const struct stmmac_ops sun8i_dwmac_ops = { .flow_ctrl = sun8i_dwmac_flow_ctrl, .set_umac_addr = sun8i_dwmac_set_umac_addr, .get_umac_addr = sun8i_dwmac_get_umac_addr, + .set_mac_loopback = sun8i_dwmac_set_mac_loopback, };static struct mac_device_info *sun8i_dwmac_setup (void *ppriv)
Signature · 1 line
2.7.4
RFC v2 4/14 net: stmmac: dwmac4/5: Add MAC loopback support
In reply to Jose AbreuIn preparation for the addition of stmmac selftests we implement the MAC loopback callback in dwmac4/5 cores.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +1 -0
@@ -160,6 +160,7 @@ enum power_event {#define GMAC_CONFIG_PS BIT(15)#define GMAC_CONFIG_FES BIT(14)#define GMAC_CONFIG_DM BIT(13) +#define GMAC_CONFIG_LM BIT(12)#define GMAC_CONFIG_DCRS BIT(9)#define GMAC_CONFIG_TE BIT(1)#define GMAC_CONFIG_RE BIT(0)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +15 -0
@@ -701,6 +701,18 @@ static void dwmac4_debug(void __iomem *ioaddr, struct stmmac_extra_stats *x, x->mac_gmii_rx_proto_engine++; } +static void dwmac4_set_mac_loopback (void __iomem *ioaddr,bool enable) +{ +u32 value =readl (ioaddr +GMAC_CONFIG ); + +if (enable) + value |=GMAC_CONFIG_LM ; +else + value &= ~GMAC_CONFIG_LM ; + +writel (value, ioaddr +GMAC_CONFIG ); +} +const struct stmmac_ops dwmac4_ops = { .core_init = dwmac4_core_init, .set_mac = stmmac_set_mac,
@@ -730,6 +742,7 @@ const struct stmmac_ops dwmac4_ops = { .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, + .set_mac_loopback = dwmac4_set_mac_loopback, };const struct stmmac_ops dwmac410_ops = {
@@ -761,6 +774,7 @@ const struct stmmac_ops dwmac410_ops = { .pcs_get_adv_lp = dwmac4_get_adv_lp, .debug = dwmac4_debug, .set_filter = dwmac4_set_filter, + .set_mac_loopback = dwmac4_set_mac_loopback, };const struct stmmac_ops dwmac510_ops = {
@@ -797,6 +811,7 @@ const struct stmmac_ops dwmac510_ops = { .safety_feat_dump = dwmac5_safety_feat_dump, .rxp_config = dwmac5_rxp_config, .flex_pps_config = dwmac5_flex_pps_config, + .set_mac_loopback = dwmac4_set_mac_loopback, };int dwmac4_setup (struct stmmac_priv *priv)
Signature · 1 line
2.7.4
RFC v2 11/14 net: stmmac: Introduce selftests support
In reply to Jose AbreuWe add support for selftests on stmmac driver with 9 basic sanity checks for now:
- MAC Loopback
- PHY Loopback
- MMC Counters
- EEE
- Hash Filter Multicast
- Perfect Filter Unicast
- Multicast Filter All
- Unicast Filter All
- Flow Control
This allows for fast tracking of regressions in the driver and helps in spotting mis-configuration of HW.
Changes from v1:
- Change test_loopback to test_mac_loopback (Andrew)
- Change timeout to retries (Andrew)
- Add MC/UC filter tests (Andrew)
- Only test in offline mode (Andrew)
- Do not call phy_loopback twice (Alexandre)
--- drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 22 + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 6 + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 846 +++++++++++++++++++++ 5 files changed, 885 insertions(+) create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
drivers/net/ethernet/stmicro/stmmac/Kconfig +9 -0
@@ -12,6 +12,15 @@ config STMMAC_ETH if STMMAC_ETH +config STMMAC_SELFTESTS + bool "Support for STMMAC Selftests" + depends on STMMAC_ETH + default n + ---help--- + This adds support for STMMAC Selftests using ethtool. Enable this + feature if you are facing problems with your HW and submit the test + results to the netdev Mailing List. + config STMMAC_PLATFORM tristate "STMMAC Platform bus support" depends on STMMAC_ETH
drivers/net/ethernet/stmicro/stmmac/Makefile +2 -0
@@ -8,6 +8,8 @@ stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o \ stmmac_tc.o dwxgmac2_core.o dwxgmac2_dma.o dwxgmac2_descs.o \ $(stmmac-y) +stmmac-$(CONFIG_STMMAC_SELFTESTS) += stmmac_selftests.o + # Ordering matters. Generic driver must be last. obj-$(CONFIG_STMMAC_PLATFORM) += stmmac-platform.o obj-$(CONFIG_DWMAC_ANARION) += dwmac-anarion.o
drivers/net/ethernet/stmicro/stmmac/stmmac.h +22 -0
@@ -229,4 +229,26 @@ int stmmac_dvr_probe(struct device *device,void stmmac_disable_eee_mode (struct stmmac_priv *priv);bool stmmac_eee_init (struct stmmac_priv *priv); +#if IS_ENABLED (CONFIG_STMMAC_SELFTESTS ) +void stmmac_selftest_run (struct net_device *dev, +struct ethtool_test *etest,u64 *buf); +void stmmac_selftest_get_strings (struct stmmac_priv *priv,u8 *data); +int stmmac_selftest_get_count (struct stmmac_priv *priv); +#else +static inline void stmmac_selftest_run (struct net_device *dev, +struct ethtool_test *etest,u64 *buf) +{ +/* Not enabled */ +} +static inline void stmmac_selftest_get_strings (struct stmmac_priv *priv, +u8 *data) +{ +/* Not enabled */ +} +static inline int stmmac_selftest_get_count (struct stmmac_priv *priv) +{ +return -EOPNOTSUPP ; +} +#endif /* CONFIG_STMMAC_SELFTESTS */ +#endif /* __STMMAC_H__ */
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +6 -0
@@ -589,6 +589,8 @@ static int stmmac_get_sset_count(struct net_device *netdev, int sset) }return len; +case ETH_SS_TEST : +return stmmac_selftest_get_count (priv);default :return -EOPNOTSUPP ; }
@@ -625,6 +627,9 @@ static void stmmac_get_strings(struct net_device *dev, u32 stringset, u8 *data) p +=ETH_GSTRING_LEN ; }break ; +case ETH_SS_TEST : +stmmac_selftest_get_strings (priv, p); +break ;default :WARN_ON (1 );break ;
@@ -890,6 +895,7 @@ static const struct ethtool_ops stmmac_ethtool_ops = { .nway_reset = phy_ethtool_nway_reset, .get_pauseparam = stmmac_get_pauseparam, .set_pauseparam = stmmac_set_pauseparam, + .self_test = stmmac_selftest_run, .get_ethtool_stats = stmmac_get_ethtool_stats, .get_strings = stmmac_get_strings, .get_wol = stmmac_get_wol,
drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c new file +846 -0
846 lines not on this page · raw message
Signature · 1 line
2.7.4
RFC v2 8/14 net: stmmac: dwmac1000: Also pass control frames while in promisc mode
In reply to Jose AbreuIn order for the selftests to run the Flow Control selftest we need to also pass pause frames to the stack.
Pass this type of frames while in promiscuous mode.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +1 -0
@@ -146,6 +146,7 @@ enum inter_frame_gap {#define GMAC_FRAME_FILTER_DAIF 0x00000008/* DA Inverse Filtering */ #define GMAC_FRAME_FILTER_PM 0x00000010/* Pass all multicast */ #define GMAC_FRAME_FILTER_DBF 0x00000020/* Disable Broadcast frames */ +#define GMAC_FRAME_FILTER_PCF 0x00000080/* Pass Control frames */ #define GMAC_FRAME_FILTER_SAIF 0x00000100/* Inverse Filtering */ #define GMAC_FRAME_FILTER_SAF 0x00000200/* Source Address Filter */ #define GMAC_FRAME_FILTER_HPF 0x00000400/* Hash or perfect Filter */
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +1 -1
@@ -172,7 +172,7 @@ static void dwmac1000_set_filter(struct mac_device_info *hw,memset (mc_filter,0 ,sizeof (mc_filter));if (dev->flags &IFF_PROMISC ) { - value =GMAC_FRAME_FILTER_PR ; + value =GMAC_FRAME_FILTER_PR |GMAC_FRAME_FILTER_PCF ; }else if (dev->flags &IFF_ALLMULTI ) { value =GMAC_FRAME_FILTER_PM ;/* pass all multi */ }else if (!netdev_mc_empty (dev)) {
Signature · 1 line
2.7.4
v2 cover net: stmmac: Selftests
[ Submitting with net-next closed for proper review and testing. ]
This introduces selftests support in stmmac driver. We add 9 basic sanity checks and MAC loopback support for all cores within the driver. This way more tests can easily be added in the future and can be run in virtually any MAC/GMAC/QoS/XGMAC platform.
Having this we can find regressions and missing features in the driver while at the same time we can check if the IP is correctly working.
We have been using this for some time now and I do have more tests to submit in the feature. My experience is that although writing the tests adds more development time, the gain results are obvious.
I let this feature optional within the driver under a Kconfig option.
Corentin Labbe (1):
net: ethernet: stmmac: dwmac-sun8i: Enable control of loopback
Jose Abreu (13):
net: stmmac: Add MAC loopback callback to HWIF
net: stmmac: dwmac100: Add MAC loopback support
net: stmmac: dwmac1000: Add MAC loopback support
net: stmmac: dwmac4/5: Add MAC loopback support
net: stmmac: dwxgmac2: Add MAC loopback support
net: stmmac: Switch MMC functions to HWIF callbacks
net: stmmac: dwmac1000: Also pass control frames while in promisc mode
net: stmmac: dwmac4/5: Also pass control frames while in promisc mode
net: stmmac: dwxgmac2: Also pass control frames while in promisc mode
net: stmmac: Introduce selftests support
net: stmmac: dwmac1000: Fix Hash Filter
net: stmmac: dwmac1000: Clear unused address entries
net: stmmac: dwmac4/5: Fix Hash Filter
drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 + drivers/net/ethernet/stmicro/stmmac/common.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 13 + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 1 + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 22 +- .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 13 + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 19 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 15 +- drivers/net/ethernet/stmicro/stmmac/hwif.c | 9 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 21 + drivers/net/ethernet/stmicro/stmmac/mmc.h | 4 - drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 13 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 22 + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 846 +++++++++++++++++++++ 19 files changed, 1014 insertions(+), 13 deletions(-) create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
Signature · 1 line
2.7.4
RFC v2 7/14 net: stmmac: Switch MMC functions to HWIF callbacks
XGMAC has a different MMC module. Lets use HWIF callbacks for MMC module so that correct callbacks are automatically selected.
--- drivers/net/ethernet/stmicro/stmmac/common.h | 1 + drivers/net/ethernet/stmicro/stmmac/hwif.c | 9 +++++++++ drivers/net/ethernet/stmicro/stmmac/hwif.h | 17 +++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/mmc.h | 4 ---- drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 13 ++++++++++--- drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 7 files changed, 40 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +1 -0
@@ -424,6 +424,7 @@ struct mac_device_info {const struct stmmac_mode_ops *mode;const struct stmmac_hwtimestamp *ptp;const struct stmmac_tc_ops *tc; +const struct stmmac_mmc_ops *mmc;struct mii_regs mii;/* MII register Addresses */ struct mac_link link;void __iomem *pcsr;/* vpointer to device CSRs */
drivers/net/ethernet/stmicro/stmmac/hwif.c +9 -0
@@ -81,6 +81,7 @@ static const struct stmmac_hwif_entry {const void *hwtimestamp;const void *mode;const void *tc; +const void *mmc;int (*setup)(struct stmmac_priv *priv);int (*quirks)(struct stmmac_priv *priv); } stmmac_hw[] = {
@@ -100,6 +101,7 @@ static const struct stmmac_hwif_entry { .hwtimestamp = &stmmac_ptp, .mode = NULL, .tc = NULL, + .mmc = &dwmac_mmc_ops, .setup = dwmac100_setup, .quirks = stmmac_dwmac1_quirks, }, {
@@ -117,6 +119,7 @@ static const struct stmmac_hwif_entry { .hwtimestamp = &stmmac_ptp, .mode = NULL, .tc = NULL, + .mmc = &dwmac_mmc_ops, .setup = dwmac1000_setup, .quirks = stmmac_dwmac1_quirks, }, {
@@ -134,6 +137,7 @@ static const struct stmmac_hwif_entry { .hwtimestamp = &stmmac_ptp, .mode = NULL, .tc = &dwmac510_tc_ops, + .mmc = &dwmac_mmc_ops, .setup = dwmac4_setup, .quirks = stmmac_dwmac4_quirks, }, {
@@ -151,6 +155,7 @@ static const struct stmmac_hwif_entry { .hwtimestamp = &stmmac_ptp, .mode = &dwmac4_ring_mode_ops, .tc = &dwmac510_tc_ops, + .mmc = &dwmac_mmc_ops, .setup = dwmac4_setup, .quirks = NULL, }, {
@@ -168,6 +173,7 @@ static const struct stmmac_hwif_entry { .hwtimestamp = &stmmac_ptp, .mode = &dwmac4_ring_mode_ops, .tc = &dwmac510_tc_ops, + .mmc = &dwmac_mmc_ops, .setup = dwmac4_setup, .quirks = NULL, }, {
@@ -185,6 +191,7 @@ static const struct stmmac_hwif_entry { .hwtimestamp = &stmmac_ptp, .mode = &dwmac4_ring_mode_ops, .tc = &dwmac510_tc_ops, + .mmc = &dwmac_mmc_ops, .setup = dwmac4_setup, .quirks = NULL, }, {
@@ -202,6 +209,7 @@ static const struct stmmac_hwif_entry { .hwtimestamp = &stmmac_ptp, .mode = NULL, .tc = &dwmac510_tc_ops, + .mmc = NULL, .setup = dwxgmac2_setup, .quirks = NULL, },
@@ -267,6 +275,7 @@ int stmmac_hwif_init(struct stmmac_priv *priv) mac->ptp = mac->ptp ? : entry->hwtimestamp; mac->mode = mac->mode ? : entry->mode; mac->tc = mac->tc ? : entry->tc; + mac->mmc = mac->mmc ? : entry->mmc; priv->hw = mac; priv->ptpaddr = priv->ioaddr + entry->regs.ptp_off;
drivers/net/ethernet/stmicro/stmmac/hwif.h +17 -0
@@ -6,6 +6,7 @@#define __STMMAC_HWIF_H__#include <linux/netdevice.h> +#include <linux/stmmac.h> #define stmmac_do_void_callback(__priv, __module, __cname, __arg0, __args...) \ ({ \
@@ -468,6 +469,21 @@ struct stmmac_tc_ops { #define stmmac_tc_setup_cbs(__priv, __args...) \ stmmac_do_callback(__priv, tc, setup_cbs, __args) +struct stmmac_counters ; + +struct stmmac_mmc_ops { +void (*ctrl)(void __iomem *ioaddr,unsigned int mode); +void (*intr_all_mask)(void __iomem *ioaddr); +void (*read)(void __iomem *ioaddr,struct stmmac_counters *mmc); +}; + +#define stmmac_mmc_ctrl(__priv, __args...) \ + stmmac_do_void_callback(__priv, mmc, ctrl, __args) +#define stmmac_mmc_intr_all_mask(__priv, __args...) \ + stmmac_do_void_callback(__priv, mmc, intr_all_mask, __args) +#define stmmac_mmc_read(__priv, __args...) \ + stmmac_do_void_callback(__priv, mmc, read, __args) +struct stmmac_regs_off {u32 ptp_off;u32 mmc_off;
@@ -486,6 +502,7 @@ extern const struct stmmac_tc_ops dwmac510_tc_ops;extern const struct stmmac_ops dwxgmac210_ops;extern const struct stmmac_dma_ops dwxgmac210_dma_ops;extern const struct stmmac_desc_ops dwxgmac210_desc_ops; +extern const struct stmmac_mmc_ops dwmac_mmc_ops;#define GMAC_VERSION 0x00000020/* GMAC CORE Version */ #define GMAC4_VERSION 0x00000110/* GMAC4+ CORE Version */
drivers/net/ethernet/stmicro/stmmac/mmc.h +0 -4
@@ -128,8 +128,4 @@ struct stmmac_counters { unsigned int mmc_rx_icmp_err_octets; }; -void dwmac_mmc_ctrl (void __iomem *ioaddr,unsigned int mode); -void dwmac_mmc_intr_all_mask (void __iomem *ioaddr); -void dwmac_mmc_read (void __iomem *ioaddr,struct stmmac_counters *mmc); -#endif /* __MMC_H__ */
drivers/net/ethernet/stmicro/stmmac/mmc_core.c +10 -3
@@ -20,6 +20,7 @@#include <linux/kernel.h> #include <linux/io.h> +#include "hwif.h" #include "mmc.h" /* MAC Management Counters register offset */
@@ -128,7 +129,7 @@#define MMC_RX_ICMP_GD_OCTETS 0x180#define MMC_RX_ICMP_ERR_OCTETS 0x184 -void dwmac_mmc_ctrl (void __iomem *mmcaddr,unsigned int mode) +static void dwmac_mmc_ctrl (void __iomem *mmcaddr,unsigned int mode) {u32 value =readl (mmcaddr +MMC_CNTRL );
@@ -141,7 +142,7 @@ void dwmac_mmc_ctrl(void __iomem *mmcaddr, unsigned int mode) }/* To mask all all interrupts.*/ -void dwmac_mmc_intr_all_mask (void __iomem *mmcaddr) +static void dwmac_mmc_intr_all_mask (void __iomem *mmcaddr) {writel (MMC_DEFAULT_MASK , mmcaddr +MMC_RX_INTR_MASK );writel (MMC_DEFAULT_MASK , mmcaddr +MMC_TX_INTR_MASK );
@@ -153,7 +154,7 @@ void dwmac_mmc_intr_all_mask(void __iomem *mmcaddr)* counter after a read. So all the field of the mmc struct * have to be incremented. */ -void dwmac_mmc_read (void __iomem *mmcaddr,struct stmmac_counters *mmc) +static void dwmac_mmc_read (void __iomem *mmcaddr,struct stmmac_counters *mmc) { mmc->mmc_tx_octetcount_gb +=readl (mmcaddr +MMC_TX_OCTETCOUNT_GB ); mmc->mmc_tx_framecount_gb +=readl (mmcaddr +MMC_TX_FRAMECOUNT_GB );
@@ -266,3 +267,9 @@ void dwmac_mmc_read(void __iomem *mmcaddr, struct stmmac_counters *mmc) mmc->mmc_rx_icmp_gd_octets +=readl (mmcaddr +MMC_RX_ICMP_GD_OCTETS ); mmc->mmc_rx_icmp_err_octets +=readl (mmcaddr +MMC_RX_ICMP_ERR_OCTETS ); } + +const struct stmmac_mmc_ops dwmac_mmc_ops = { + .ctrl = dwmac_mmc_ctrl, + .intr_all_mask = dwmac_mmc_intr_all_mask, + .read = dwmac_mmc_read, +};
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +1 -1
@@ -537,7 +537,7 @@ static void stmmac_get_ethtool_stats(struct net_device *dev,if (ret) {/* If supported, for new GMAC chips expose the MMC counters */ if (priv->dma_cap.rmon) { -dwmac_mmc_read (priv->mmcaddr, &priv->mmc); +stmmac_mmc_read (priv, priv->mmcaddr, &priv->mmc);for (i =0 ; i <STMMAC_MMC_STATS_LEN ; i++) {char *p;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -2
@@ -2128,10 +2128,10 @@ static void stmmac_mmc_setup(struct stmmac_priv *priv)unsigned int mode =MMC_CNTRL_RESET_ON_READ |MMC_CNTRL_COUNTER_RESET |MMC_CNTRL_PRESET |MMC_CNTRL_FULL_HALF_PRESET ; -dwmac_mmc_intr_all_mask (priv->mmcaddr); +stmmac_mmc_intr_all_mask (priv, priv->mmcaddr);if (priv->dma_cap.rmon) { -dwmac_mmc_ctrl (priv->mmcaddr, mode); +stmmac_mmc_ctrl (priv, priv->mmcaddr, mode);memset (&priv->mmc,0 ,sizeof (struct stmmac_counters )); }else netdev_info (priv->dev,"No MAC Management Counters available\n" );
Signature · 1 line
2.7.4
RFC v2 12/14 net: stmmac: dwmac1000: Fix Hash Filter
In reply to Jose AbreuIn order for hash filter to work we need to set the HPF bit.
Found out while running stmmac selftests.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +1 -0
@@ -198,6 +198,7 @@ static void dwmac1000_set_filter(struct mac_device_info *hw, } } + value |=GMAC_FRAME_FILTER_HPF ;dwmac1000_set_mchash (ioaddr, mc_filter, mcbitslog2);/* Handle multiple unicast addresses (perfect filtering) */
Signature · 1 line
2.7.4
RFC v2 9/14 net: stmmac: dwmac4/5: Also pass control frames while in promisc mode
In reply to Jose AbreuIn order for the selftests to run the Flow Control selftest we need to also pass pause frames to the stack.
Pass this type of frames while in promiscuous mode.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +1 -0
@@ -64,6 +64,7 @@#define GMAC_PACKET_FILTER_PR BIT(0)#define GMAC_PACKET_FILTER_HMC BIT(2)#define GMAC_PACKET_FILTER_PM BIT(4) +#define GMAC_PACKET_FILTER_PCF BIT(7)#define GMAC_MAX_PERFECT_ADDRESSES 128
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +1 -1
@@ -404,7 +404,7 @@ static void dwmac4_set_filter(struct mac_device_info *hw,unsigned int value =0 ;if (dev->flags &IFF_PROMISC ) { - value =GMAC_PACKET_FILTER_PR ; + value =GMAC_PACKET_FILTER_PR |GMAC_PACKET_FILTER_PCF ; }else if ((dev->flags &IFF_ALLMULTI ) || (netdev_mc_count (dev) >HASH_TABLE_SIZE )) {/* Pass all multi */
Signature · 1 line
2.7.4
RFC v2 10/14 net: stmmac: dwxgmac2: Also pass control frames while in promisc mode
In reply to Jose AbreuIn order for the selftests to run the Flow Control selftest we need to also pass pause frames to the stack.
Pass this type of frames while in promiscuous mode.
--- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +1 -0
@@ -40,6 +40,7 @@#define XGMAC_CORE_INIT_RX 0#define XGMAC_PACKET_FILTER 0x00000008#define XGMAC_FILTER_RA BIT(31) +#define XGMAC_FILTER_PCF BIT(7)#define XGMAC_FILTER_PM BIT(4)#define XGMAC_FILTER_HMC BIT(2)#define XGMAC_FILTER_PR BIT(0)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +1 -1
@@ -310,7 +310,7 @@ static void dwxgmac2_set_filter(struct mac_device_info *hw,u32 value =XGMAC_FILTER_RA ;if (dev->flags &IFF_PROMISC ) { - value |=XGMAC_FILTER_PR ; + value |=XGMAC_FILTER_PR |XGMAC_FILTER_PCF ; }else if ((dev->flags &IFF_ALLMULTI ) || (netdev_mc_count (dev) >HASH_TABLE_SIZE )) { value |=XGMAC_FILTER_PM ;
Signature · 1 line
2.7.4
David Miller
maintainerFrom: Jose Abreu <[email protected]>
Date: Tue, 14 May 2019 17:45:22 +0200
Quoted 7 lines
[ Submitting with net-next closed for proper review and testing. ]
This introduces selftests support in stmmac driver. We add 9 basic sanity checks and MAC loopback support for all cores within the driver. This way more tests can easily be added in the future and can be run in virtually any MAC/GMAC/QoS/XGMAC platform.
Quoted 8 lines
Having this we can find regressions and missing features in the driver while at the same time we can check if the IP is correctly working.
We have been using this for some time now and I do have more tests to submit in the feature. My experience is that although writing the tests adds more development time, the gain results are obvious.
I let this feature optional within the driver under a
Kconfigoption.
Generally, this series looks fine to me.
Quoted 54 lines · Jose Abreu
[ Submitting with net-next closed for proper review and testing. ]
This introduces selftests support in stmmac driver. We add 9 basic sanity checks and MAC loopback support for all cores within the driver. This way more tests can easily be added in the future and can be run in virtually any MAC/GMAC/QoS/XGMAC platform.
Having this we can find regressions and missing features in the driver while at the same time we can check if the IP is correctly working.
We have been using this for some time now and I do have more tests to submit in the feature. My experience is that although writing the tests adds more development time, the gain results are obvious.
I let this feature optional within the driver under a
Kconfigoption.Cc Joao Pinto <[email protected]>Cc David S. Miller <[email protected]>Cc Giuseppe Cavallaro <[email protected]>Cc Alexandre Torgue <[email protected]>Cc Corentin Labbe <[email protected]>Cc Andrew Lunn <[email protected]>Corentin Labbe (1):
net: ethernet: stmmac: dwmac-sun8i: Enable control of loopbackJose Abreu (13):
net: stmmac: Add MAC loopback callback to HWIF
net: stmmac: dwmac100: Add MAC loopback support
net: stmmac: dwmac1000: Add MAC loopback support
net: stmmac: dwmac4/5: Add MAC loopback support
net: stmmac: dwxgmac2: Add MAC loopback support
net: stmmac: Switch MMC functions to HWIF callbacks
net: stmmac: dwmac1000: Also pass control frames while in promisc mode
net: stmmac: dwmac4/5: Also pass control frames while in promisc mode
net: stmmac: dwxgmac2: Also pass control frames while in promisc mode
net: stmmac: Introduce selftests support
net: stmmac: dwmac1000: Fix Hash Filter
net: stmmac: dwmac1000: Clear unused address entries
net: stmmac: dwmac4/5: Fix Hash Filterdrivers/net/ethernet/stmicro/stmmac/Kconfig | 9 + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 + drivers/net/ethernet/stmicro/stmmac/common.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 13 + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 1 + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 22 +- .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 13 + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 3 + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 19 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 15 +- drivers/net/ethernet/stmicro/stmmac/hwif.c | 9 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 21 +
Quoted 12 lines
drivers/net/ethernet/stmicro/stmmac/mmc.h | 4 - drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 13 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 22 + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +- .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 846 +++++++++++++++++++++ 19 files changed, 1014 insertions(+), 13 deletions(-) create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.cSignature · 1 line
2.7.4
Tested-on: sun7i-a20-cubieboard2
Tested-on: sun50i-a64-bananapi-m64
Tested-on: meson-gxl-s905x-libretech-cc
For information the output is:
On sun50i-a64-bananapi-m64
ethtool --test eth0 offline
The test result is PASS
The test extra info:
1. MAC Loopback 0 2. PHY Loopback -95 3. MMC Counters -95 4. EEE -95 5. Hash Filter MC 0 6. Perfect Filter UC 0 7. MC Filter 0 8. UC Filter 0 9. Flow Control -95
with onine I got
dwmac-sun8i 1c30000.ethernet eth0: Only offline tests are supported
on sun7i-a20-cubieboard2:
ethtool --test eth0 offline
The test result is PASS
The test extra info:
1. MAC Loopback 0 2. PHY Loopback -95 3. MMC Counters -95 4. EEE -95 5. Hash Filter MC 0 6. Perfect Filter UC 0 7. MC Filter 0 8. UC Filter 0 9. Flow Control -95
With online I got:
sun7i-dwmac 1c50000.ethernet eth0: Only offline tests are supported
on meson-gxl-s905x-libretech-cc:
ethtool --test eth0 offline
The test result is FAIL
The test extra info:
1. MAC Loopback 0 2. PHY Loopback -95 3. MMC Counters -1 4. EEE -95 5. Hash Filter MC 0 6. Perfect Filter UC 0 7. MC Filter 0 8. UC Filter 0 9. Flow Control -95
with onine I got
meson8b-dwmac c9410000.ethernet eth0: Only offline tests are supported
I will try to investigate the MMC failure. Does -1 (vs other -EXXXX) is the right error code to return from the driver ?
From: Corentin Labbe <[email protected]>
Date: Wed, May 15, 2019 at 18:29:22
Quoted 1 line
I will try to investigate the MMC failure. Does -1 (vs other
-EXXXX) is the right error code to return from the driver ?
Thank you for testing!
Yes, I will fix to return a valid error code.
As per MMC failure this can be due to your HW not having all MMC counters available. Can you please remove all if conditions in stmmac_test_mmc() and just leave the "mmc_tx_framecount_g" check ?
Thanks,
Jose Miguel Abreu