net/ibm/emac: fix size of emac dump memory areas
Subsystems (2)
PATCH 2/2 net/ibm/emac: fix size of emac dump memory areas
Fix in send of emac regs dump to ethtool which
causing wrong data interpretation on ethtool
layer for MII and EMAC.
--- drivers/net/ethernet/ibm/emac/core.c | 14 ++++---------- drivers/net/ethernet/ibm/emac/core.h | 4 ---- 2 files changed, 4 insertions(+), 14 deletions(-)
drivers/net/ethernet/ibm/emac/core.c +4 -10
@@ -2084,12 +2084,8 @@ static void emac_ethtool_get_pauseparam(struct net_device *ndev,static int emac_get_regs_len (struct emac_instance *dev) { -if (emac_has_feature (dev,EMAC_FTR_EMAC4 )) -return sizeof (struct emac_ethtool_regs_subhdr ) + -EMAC4_ETHTOOL_REGS_SIZE (dev); -else return sizeof (struct emac_ethtool_regs_subhdr ) + -EMAC_ETHTOOL_REGS_SIZE (dev); +sizeof (struct emac_regs ); }static int emac_ethtool_get_regs_len (struct net_device *ndev)
@@ -2114,15 +2110,13 @@ static void *emac_dump_regs(struct emac_instance *dev, void *buf)struct emac_ethtool_regs_subhdr *hdr = buf; hdr->index = dev->cell_index; -if (emac_has_feature (dev,EMAC_FTR_EMAC4 )) { +if (emac_has_feature (dev,EMAC_FTR_EMAC4SYNC )) { hdr->version =EMAC4_ETHTOOL_REGS_VER ; -memcpy_fromio (hdr +1 , dev->emacp,EMAC4_ETHTOOL_REGS_SIZE (dev)); -return (void *)(hdr +1 ) +EMAC4_ETHTOOL_REGS_SIZE (dev); }else { hdr->version =EMAC_ETHTOOL_REGS_VER ; -memcpy_fromio (hdr +1 , dev->emacp,EMAC_ETHTOOL_REGS_SIZE (dev)); -return (void *)(hdr +1 ) +EMAC_ETHTOOL_REGS_SIZE (dev); } +memcpy_fromio (hdr +1 , dev->emacp,sizeof (struct emac_regs )); +return (void *)(hdr +1 ) +sizeof (struct emac_regs ); } static void emac_ethtool_get_regs(struct net_device *ndev,
drivers/net/ethernet/ibm/emac/core.h +0 -4
@@ -461,10 +461,6 @@ struct emac_ethtool_regs_subhdr { };#define EMAC_ETHTOOL_REGS_VER 0 -#define EMAC_ETHTOOL_REGS_SIZE (dev) ((dev)->rsrc_regs.end - \ - (dev)->rsrc_regs.start + 1)#define EMAC4_ETHTOOL_REGS_VER 1 -#define EMAC4_ETHTOOL_REGS_SIZE (dev) ((dev)->rsrc_regs.end - \ - (dev)->rsrc_regs.start + 1)#endif /* __IBM_NEWEMAC_CORE_H */
Signature · 1 line
1.7.9.5
Quoted 3 lines · Ivan Mikhaylov
Fix in send of emac regs dump to ethtool which
causing wrong data interpretation on ethtool
layer for MII and EMAC.
Please provide a better explanation. You removed the difference in register space size between EMAC and EMAC4, why ? You also changed a test regarding which version of the structure to use from EMAC4 to EMAC4SYNC, why ?
Quoted 58 lines
Signed-off-by Ivan Mikhaylov <[email protected]>--- drivers/net/ethernet/ibm/emac/core.c | 14 ++++---------- drivers/net/ethernet/ibm/emac/core.h | 4 ---- 2 files changed, 4 insertions(+), 14 deletions(-)drivers/net/ethernet/ibm/emac/core.c +4
-10@@ -2084,12 +2084,8 @@ static void emac_ethtool_get_pauseparam(struct net_device *ndev,static int emac_get_regs_len (struct emac_instance *dev) { -if (emac_has_feature (dev,EMAC_FTR_EMAC4 )) -return sizeof (struct emac_ethtool_regs_subhdr ) + -EMAC4_ETHTOOL_REGS_SIZE (dev); -else return sizeof (struct emac_ethtool_regs_subhdr ) + -EMAC_ETHTOOL_REGS_SIZE (dev); +sizeof (struct emac_regs ); }static int emac_ethtool_get_regs_len (struct net_device *ndev)@@ -2114,15 +2110,13 @@ static void *emac_dump_regs(struct emac_instance *dev, void *buf)struct emac_ethtool_regs_subhdr *hdr = buf; hdr->index = dev->cell_index; -if (emac_has_feature (dev,EMAC_FTR_EMAC4 )) { +if (emac_has_feature (dev,EMAC_FTR_EMAC4SYNC )) { hdr->version =EMAC4_ETHTOOL_REGS_VER ; -memcpy_fromio (hdr +1 , dev->emacp,EMAC4_ETHTOOL_REGS_SIZE (dev)); -return (void *)(hdr +1 ) +EMAC4_ETHTOOL_REGS_SIZE (dev); }else { hdr->version =EMAC_ETHTOOL_REGS_VER ; -memcpy_fromio (hdr +1 , dev->emacp,EMAC_ETHTOOL_REGS_SIZE (dev)); -return (void *)(hdr +1 ) +EMAC_ETHTOOL_REGS_SIZE (dev); } +memcpy_fromio (hdr +1 , dev->emacp,sizeof (struct emac_regs )); +return (void *)(hdr +1 ) +sizeof (struct emac_regs ); } static void emac_ethtool_get_regs(struct net_device *ndev,drivers/net/ethernet/ibm/emac/core.h +0
-4@@ -461,10 +461,6 @@ struct emac_ethtool_regs_subhdr { };#define EMAC_ETHTOOL_REGS_VER 0 -#define EMAC_ETHTOOL_REGS_SIZE (dev) ((dev)->rsrc_regs.end - \ - (dev)->rsrc_regs.start + 1)#define EMAC4_ETHTOOL_REGS_VER 1 -#define EMAC4_ETHTOOL_REGS_SIZE (dev) ((dev)->rsrc_regs.end - \ - (dev)->rsrc_regs.start + 1)#endif /* __IBM_NEWEMAC_CORE_H */
Quoted 9 lines · On Tue, 12 May 2015 17:12:00 +0400 Ivan Mikhaylov <[email protected]> wrote:
Quoted 4 lines · Ivan Mikhaylov
Fix in send of emac regs dump to ethtool which
causing wrong data interpretation on ethtool
layer for MII and EMAC.Please provide a better explanation. You removed the difference in register space size between EMAC and EMAC4, why ? You also changed a test regarding which version of the structure to use from EMAC4 to EMAC4SYNC, why ?
So, as I understand right, we have EMAC, EMAC4, EMAC4SYNC chips right now? But within driver structure there are only EMAC4/EMAC4SYNC that I'm seeing or is it include and EMAC? I thought that only EMAC4/EMAC4SYNC we have.
Anyway we have bug in ethtool, there size of emac_regs is defined and if we will provide wrong size of emac_regs structure that will cause problems in showing of some emac_regs fields for emac4sync + MII layer. Plus size of register space can be different on different platforms so because of this I removed macroses which doing this right from it. So just for example we have 0x100 for emac4sync in dts file, sizeof on ethtool is 152 always for emac_regs and we're reading MII values from emac area where is no data for MII.
I have to add emac4sync support to ethtool regdump as I see in plus to EMAC/EMAC4. What your opinion on this?