diff mbox series

net: ethernet: freescale: set FEC ethtool regs version

Message ID 20190214161536.19646-1-vivien.didelot@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series net: ethernet: freescale: set FEC ethtool regs version | expand

Commit Message

Vivien Didelot Feb. 14, 2019, 4:15 p.m. UTC 
From: Vivien Didelot <vivien.didelot@savoirfairelinux.com>

Currently the ethtool_regs version is set to 0 for FEC devices.

Use this field to store the register dump version exposed by the
kernel. The choosen version 2 corresponds to the kernel compile test:

        #if defined(CONFIG_M523x) || defined(CONFIG_M527x)
        || defined(CONFIG_M528x) || defined(CONFIG_M520x)
        || defined(CONFIG_M532x) || defined(CONFIG_ARM)
        || defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST)

and version 1 corresponds to the opposite. Binaries of ethtool unaware
of this version will dump the whole set as usual.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
---
 drivers/net/ethernet/freescale/fec_main.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

David Miller Feb. 14, 2019, 5:46 p.m. UTC | #1 
From: Vivien Didelot <vivien.didelot@gmail.com>
Date: Thu, 14 Feb 2019 11:15:35 -0500

> From: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
> 
> Currently the ethtool_regs version is set to 0 for FEC devices.
> 
> Use this field to store the register dump version exposed by the
> kernel. The choosen version 2 corresponds to the kernel compile test:
> 
>         #if defined(CONFIG_M523x) || defined(CONFIG_M527x)
>         || defined(CONFIG_M528x) || defined(CONFIG_M520x)
>         || defined(CONFIG_M532x) || defined(CONFIG_ARM)
>         || defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST)
> 
> and version 1 corresponds to the opposite. Binaries of ethtool unaware
> of this version will dump the whole set as usual.
> 
> Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

Applied, thanks Vivien.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 2370dc204202..697c2427f2b7 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -2098,6 +2098,7 @@  static int fec_enet_get_regs_len(struct net_device *ndev)
 #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
 	defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \
 	defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST)
+static __u32 fec_enet_register_version = 2;
 static u32 fec_enet_register_offset[] = {
 	FEC_IEVENT, FEC_IMASK, FEC_R_DES_ACTIVE_0, FEC_X_DES_ACTIVE_0,
 	FEC_ECNTRL, FEC_MII_DATA, FEC_MII_SPEED, FEC_MIB_CTRLSTAT, FEC_R_CNTRL,
@@ -2128,6 +2129,7 @@  static u32 fec_enet_register_offset[] = {
 	IEEE_R_FDXFC, IEEE_R_OCTETS_OK
 };
 #else
+static __u32 fec_enet_register_version = 1;
 static u32 fec_enet_register_offset[] = {
 	FEC_ECNTRL, FEC_IEVENT, FEC_IMASK, FEC_IVEC, FEC_R_DES_ACTIVE_0,
 	FEC_R_DES_ACTIVE_1, FEC_R_DES_ACTIVE_2, FEC_X_DES_ACTIVE_0,
@@ -2149,6 +2151,8 @@  static void fec_enet_get_regs(struct net_device *ndev,
 	u32 *buf = (u32 *)regbuf;
 	u32 i, off;
 
+	regs->version = fec_enet_register_version;
+
 	memset(buf, 0, regs->len);
 
 	for (i = 0; i < ARRAY_SIZE(fec_enet_register_offset); i++) {