Skip to contentSkip to conversation

net/ibm/emac: bump version numbers for correct work with ethtool

PATCH In review Ivan Mikhaylov 2 participants 2 messages Sep 25, 2015 – Sep 29, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net/ibm/emac: bump version numbers for correct work with ethtool

The size of the MAC register dump used to be the size specified by the reg property in the device tree. Userland has no good way of finding out that size, and it was not specified consistently for each MAC type, so ethtool would end up printing junk at the end of the register dump if the device tree didn't match the size it assumed.

Using the new version numbers indicates unambiguously that the size of the MAC register dump is dependent only on the MAC type.

Fixes 5369c71f7ca2 ("net/ibm/emac: fix size of emac dump memory areas")
---
 drivers/net/ethernet/ibm/emac/core.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/ibm/emac/core.h +3 -3
index 28df374..ac02c67 100644
@@ -460,8 +460,8 @@ struct emac_ethtool_regs_subhdr {
 	u32 index;
 };
 
-#define EMAC_ETHTOOL_REGS_VER		0
-#define EMAC4_ETHTOOL_REGS_VER		1
-#define EMAC4SYNC_ETHTOOL_REGS_VER	2
+#define EMAC_ETHTOOL_REGS_VER		3
+#define EMAC4_ETHTOOL_REGS_VER		4
+#define EMAC4SYNC_ETHTOOL_REGS_VER	5
 
 #endif /* __IBM_NEWEMAC_CORE_H */
Signature · 1 line
1.7.9.5
maintainer
#1 lore raw

From: Ivan Mikhaylov <[email protected]>
Date: Fri, 25 Sep 2015 11:52:27 +0400

Quoted 6 lines

The size of the MAC register dump used to be the size specified by the reg property in the device tree. Userland has no good way of finding out that size, and it was not specified consistently for each MAC type, so ethtool would end up printing junk at the end of the register dump if the device tree didn't match the size it assumed.

Quoted 6 lines

Using the new version numbers indicates unambiguously that the size of the MAC register dump is dependent only on the MAC type.

Fixes 5369c71f7ca2 ("net/ibm/emac: fix size of emac dump memory areas")

Applied and queued up for -stable.