net: stmmac: hwif.c cleanups
Subsystems (4)
cover net: stmmac: hwif.c cleanups
Hi,
This series cleans up hwif.c:
- move the reading of the version information out of stmmac_hwif_init() into its own function, stmmac_get_version(), storing the result in a new struct.
- simplify stmmac_get_version().
- read the version register once, passing it to stmmac_get_id() and stmmac_get_dev_id().
- move stmmac_get_id() and stmmac_get_dev_id() into stmmac_get_version()
- define version register fields and use FIELD_GET() to decode
- start tackling the big loop in stmmac_hwif_init() - provide a function, stmmac_hwif_find(), which looks up the hwif entry, thus making a much smaller loop, which improves readability of this code.
- change the use of '^' to '!=' when comparing the dev_id, which is what is really meant here.
- reorganise the test after calling stmmac_hwif_init() so that we handle the error case in the indented code, and the success case with no indent, which is the classical arrangement.
drivers/net/ethernet/stmicro/stmmac/common.h | 3 + drivers/net/ethernet/stmicro/stmmac/hwif.c | 166 +++++++++++++++------------ 2 files changed, 98 insertions(+), 71 deletions(-)
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
PATCH 1/8 net: stmmac: move version handling into own function
Move the version handling out of stmmac_hwif_init() and into its own function, returning the version information through a structure.
--- drivers/net/ethernet/stmicro/stmmac/hwif.c | 42 +++++++++++++++------- 1 file changed, 29 insertions(+), 13 deletions(-)
drivers/net/ethernet/stmicro/stmmac/hwif.c +29 -13
@@ -13,6 +13,11 @@#include "dwmac4_descs.h" #include "dwxgmac2.h" +struct stmmac_version { +u8 snpsver; +u8 dev_id; +}; +static u32 stmmac_get_id (struct stmmac_priv *priv,u32 id_reg) {u32 reg =readl (priv->ioaddr + id_reg);
@@ -40,6 +45,24 @@ static u32 stmmac_get_dev_id(struct stmmac_priv *priv, u32 id_reg)return (reg &GENMASK (15 ,8 )) >>8 ; } +static void stmmac_get_version (struct stmmac_priv *priv, +struct stmmac_version *ver) +{ +enum dwmac_core_type core_type = priv->plat->core_type; + + ver->dev_id =0 ; + +if (core_type ==DWMAC_CORE_GMAC ) { + ver->snpsver =stmmac_get_id (priv,GMAC_VERSION ); + }else if (dwmac_is_xmac (core_type)) { + ver->snpsver =stmmac_get_id (priv,GMAC4_VERSION ); +if (core_type ==DWMAC_CORE_XGMAC ) + ver->dev_id =stmmac_get_dev_id (priv,GMAC4_VERSION ); + }else { + ver->snpsver =0 ; + } +} +static void stmmac_dwmac_mode_quirk (struct stmmac_priv *priv) {struct mac_device_info *mac = priv->hw;
@@ -292,23 +315,15 @@ int stmmac_hwif_init(struct stmmac_priv *priv) {enum dwmac_core_type core_type = priv->plat->core_type;const struct stmmac_hwif_entry *entry; +struct stmmac_version version;struct mac_device_info *mac;bool needs_setup = true; -u32 id, dev_id =0 ;int i, ret; -if (core_type ==DWMAC_CORE_GMAC ) { - id =stmmac_get_id (priv,GMAC_VERSION ); - }else if (dwmac_is_xmac (core_type)) { - id =stmmac_get_id (priv,GMAC4_VERSION ); -if (core_type ==DWMAC_CORE_XGMAC ) - dev_id =stmmac_get_dev_id (priv,GMAC4_VERSION ); - }else { - id =0 ; - } +stmmac_get_version (priv, &version);/* Save ID for later use */ - priv->synopsys_id = id; + priv->synopsys_id = version.snpsver;/* Lets assume some safe values first */ if (core_type ==DWMAC_CORE_GMAC4 ) {
@@ -342,7 +357,8 @@ int stmmac_hwif_init(struct stmmac_priv *priv)/* Use synopsys_id var because some setups can override this */ if (priv->synopsys_id < entry->min_id)continue ; -if (core_type ==DWMAC_CORE_XGMAC && (dev_id ^ entry->dev_id)) +if (core_type ==DWMAC_CORE_XGMAC && + (version.dev_id ^ entry->dev_id))continue ;/* Only use generic HW helpers if needed */
@@ -378,7 +394,7 @@ int stmmac_hwif_init(struct stmmac_priv *priv) }dev_err (priv->device,"Failed to find HW IF (id=0x%x, gmac=%d/%d)\n" , - id, core_type ==DWMAC_CORE_GMAC , + version.snpsver, core_type ==DWMAC_CORE_GMAC , core_type ==DWMAC_CORE_GMAC4 );return -EINVAL ; }
Signature · 1 line
2.47.3
Re: [PATCH net-next 1/8] net: stmmac: move version handling into own function
Quoted 4 lines · Russell King (Oracle)
Move the version handling out of
stmmac_hwif_init()and into its own function, returning the version information through a structure.Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
PATCH 2/8 net: stmmac: simplify stmmac_get_version()
In reply to Russell King (Oracle)We can simplify stmmac_get_version() by pre-initialising the version members to zero, detecting the MAC100 core and returning, otherwise determining the version register offset separately from calling stmmac_get_id() and stmmac_get_dev_id(). Do this.
--- drivers/net/ethernet/stmicro/stmmac/hwif.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/net/ethernet/stmicro/stmmac/hwif.c +13 -9
@@ -49,18 +49,22 @@ static void stmmac_get_version(struct stmmac_priv *priv, struct stmmac_version *ver) {enum dwmac_core_type core_type = priv->plat->core_type; +unsigned int version_offset; + ver->snpsver =0 ; ver->dev_id =0 ; -if (core_type ==DWMAC_CORE_GMAC ) { - ver->snpsver =stmmac_get_id (priv,GMAC_VERSION ); - }else if (dwmac_is_xmac (core_type)) { - ver->snpsver =stmmac_get_id (priv,GMAC4_VERSION ); -if (core_type ==DWMAC_CORE_XGMAC ) - ver->dev_id =stmmac_get_dev_id (priv,GMAC4_VERSION ); - }else { - ver->snpsver =0 ; - } +if (core_type ==DWMAC_CORE_MAC100 ) +return ; + +if (core_type ==DWMAC_CORE_GMAC ) + version_offset =GMAC_VERSION ; +else + version_offset =GMAC4_VERSION ; + + ver->snpsver =stmmac_get_id (priv, version_offset); +if (core_type ==DWMAC_CORE_XGMAC ) + ver->dev_id =stmmac_get_dev_id (priv, verison_offset); }static void stmmac_dwmac_mode_quirk (struct stmmac_priv *priv)
Signature · 1 line
2.47.3
Re: [PATCH net-next 2/8] net: stmmac: simplify stmmac_get_version()
Quoted 6 lines · Russell King (Oracle)
We can simplify
stmmac_get_version()by pre-initialising the version members to zero, detecting the MAC100 core and returning, otherwise determining the version register offset separately from callingstmmac_get_id()andstmmac_get_dev_id(). Do this.Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
Re: [PATCH net-next 2/8] net: stmmac: simplify stmmac_get_version()
Quoted 9 lines · Andrew Lunn
Quoted 6 lines · Russell King (Oracle)
We can simplify
stmmac_get_version()by pre-initialising the version members to zero, detecting the MAC100 core and returning, otherwise determining the version register offset separately from callingstmmac_get_id()andstmmac_get_dev_id(). Do this.Signed-off-by Russell King (Oracle) <[email protected]>Reviewed-by Andrew Lunn <[email protected]>
Hi Andrew,
It seems I had a typo "verison" which should've been "version" in this patch, which carried through patches 3 and 4. Are you happy for me to retain your r-b with this typo fixed please?
Thanks.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Re: [PATCH net-next 2/8] net: stmmac: simplify stmmac_get_version()
Quoted 5 lines
Hi Andrew,
It seems I had a typo "verison" which should've been "version" in this patch, which carried through patches 3 and 4. Are you happy for me to retain your r-b with this typo fixed please?
Sure.
Andrew
PATCH 3/8 net: stmmac: consolidate version reading and validation
In reply to Russell King (Oracle)There is no need to read the version register twice, once in stmmac_get_id() and then again in stmmac_get_dev_id(). Consolidate this into stmmac_get_version() and pass each of these this value.
As both functions unnecessarily issue the same warning for a zero register value, also move this into stmmac_get_version().
--- drivers/net/ethernet/stmicro/stmmac/hwif.c | 29 ++++++++-------------- 1 file changed, 11 insertions(+), 18 deletions(-)
drivers/net/ethernet/stmicro/stmmac/hwif.c +11 -18
@@ -18,30 +18,16 @@ struct stmmac_version {u8 dev_id; }; -static u32 stmmac_get_id (struct stmmac_priv *priv,u32 id_reg) +static u32 stmmac_get_id (struct stmmac_priv *priv,u32 reg) { -u32 reg =readl (priv->ioaddr + id_reg); - -if (!reg) { -dev_info (priv->device,"Version ID not available\n" ); -return 0x0 ; - } -dev_info (priv->device,"User ID: 0x%x, Synopsys ID: 0x%x\n" , (unsigned int )(reg &GENMASK (15 ,8 )) >>8 , (unsigned int )(reg &GENMASK (7 ,0 )));return reg &GENMASK (7 ,0 ); } -static u32 stmmac_get_dev_id (struct stmmac_priv *priv,u32 id_reg) +static u32 stmmac_get_dev_id (struct stmmac_priv *priv,u32 reg) { -u32 reg =readl (priv->ioaddr + id_reg); - -if (!reg) { -dev_info (priv->device,"Version ID not available\n" ); -return 0x0 ; - } -return (reg &GENMASK (15 ,8 )) >>8 ; }
@@ -50,6 +36,7 @@ static void stmmac_get_version(struct stmmac_priv *priv, {enum dwmac_core_type core_type = priv->plat->core_type;unsigned int version_offset; +u32 version; ver->snpsver =0 ; ver->dev_id =0 ;
@@ -62,9 +49,15 @@ static void stmmac_get_version(struct stmmac_priv *priv,else version_offset =GMAC4_VERSION ; - ver->snpsver =stmmac_get_id (priv, version_offset); + version =readl (priv->ioaddr + version_offset); +if (version ==0 ) { +dev_info (priv->device,"Version ID not available\n" ); +return ; + } + + ver->snpsver =stmmac_get_id (priv, version);if (core_type ==DWMAC_CORE_XGMAC ) - ver->dev_id =stmmac_get_dev_id (priv, verison_offset); + ver->dev_id =stmmac_get_dev_id (priv, verison); }static void stmmac_dwmac_mode_quirk (struct stmmac_priv *priv)
Signature · 1 line
2.47.3
Re: [PATCH net-next 3/8] net: stmmac: consolidate version reading and validation
Quoted 8 lines · Russell King (Oracle)
There is no need to read the version register twice, once in
stmmac_get_id()and then again instmmac_get_dev_id(). Consolidate this intostmmac_get_version()and pass each of these this value.As both functions unnecessarily issue the same warning for a zero register value, also move this into
stmmac_get_version().Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
PATCH 4/8 net: stmmac: move stmmac_get_*id() into stmmac_get_version()
In reply to Russell King (Oracle)Move the contents of both stmmac_get_id() and stmmac_get_dev_id() into stmmac_get_version() as it no longer makes sense for these to be separate functions.
--- drivers/net/ethernet/stmicro/stmmac/hwif.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
drivers/net/ethernet/stmicro/stmmac/hwif.c +6 -15
@@ -18,19 +18,6 @@ struct stmmac_version {u8 dev_id; }; -static u32 stmmac_get_id (struct stmmac_priv *priv,u32 reg) -{ -dev_info (priv->device,"User ID: 0x%x, Synopsys ID: 0x%x\n" , - (unsigned int )(reg &GENMASK (15 ,8 )) >>8 , - (unsigned int )(reg &GENMASK (7 ,0 ))); -return reg &GENMASK (7 ,0 ); -} - -static u32 stmmac_get_dev_id (struct stmmac_priv *priv,u32 reg) -{ -return (reg &GENMASK (15 ,8 )) >>8 ; -} -static void stmmac_get_version (struct stmmac_priv *priv,struct stmmac_version *ver) {
@@ -55,9 +42,13 @@ static void stmmac_get_version(struct stmmac_priv *priv,return ; } - ver->snpsver =stmmac_get_id (priv, version); +dev_info (priv->device,"User ID: 0x%x, Synopsys ID: 0x%x\n" , + (unsigned int )(version &GENMASK (15 ,8 )) >>8 , + (unsigned int )(version &GENMASK (7 ,0 ))); + + ver->snpsver = version &GENMASK (7 ,0 );if (core_type ==DWMAC_CORE_XGMAC ) - ver->dev_id =stmmac_get_dev_id (priv, verison); + ver->dev_id = (version &GENMASK (15 ,8 )) >>8 ; }static void stmmac_dwmac_mode_quirk (struct stmmac_priv *priv)
Signature · 1 line
2.47.3
Re: [PATCH net-next 4/8] net: stmmac: move stmmac_get_*id() into stmmac_get_version()
Quoted 5 lines · Russell King (Oracle)
Move the contents of both
stmmac_get_id()andstmmac_get_dev_id()intostmmac_get_version()as it no longer makes sense for these to be separate functions.Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
PATCH 5/8 net: stmmac: use FIELD_GET() for version register
In reply to Russell King (Oracle)Provide field definitions in common.h, and use these with FIELD_GET() to extract the fields from the version register.
--- drivers/net/ethernet/stmicro/stmmac/common.h | 3 +++ drivers/net/ethernet/stmicro/stmmac/hwif.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/common.h +3 -0
@@ -26,6 +26,9 @@#include "hwif.h" #include "mmc.h" +#define DWMAC_SNPSVER GENMASK_U32(7, 0) +#define DWMAC_USERVER GENMASK_U32(15, 8) +/* Synopsys Core versions */ #define DWMAC_CORE_3_40 0x34#define DWMAC_CORE_3_50 0x35
drivers/net/ethernet/stmicro/stmmac/hwif.c +4 -4
@@ -43,12 +43,12 @@ static void stmmac_get_version(struct stmmac_priv *priv, }dev_info (priv->device,"User ID: 0x%x, Synopsys ID: 0x%x\n" , - (unsigned int )(version &GENMASK (15 ,8 )) >>8 , - (unsigned int )(version &GENMASK (7 ,0 ))); +FIELD_GET (DWMAC_USERVER , version), +FIELD_GET (DWMAC_SNPSVER , version)); - ver->snpsver = version &GENMASK (7 ,0 ); + ver->snpsver =FIELD_GET (DWMAC_SNPSVER , version);if (core_type ==DWMAC_CORE_XGMAC ) - ver->dev_id = (version &GENMASK (15 ,8 )) >>8 ; + ver->dev_id =FIELD_GET (DWMAC_USERVER , version); }static void stmmac_dwmac_mode_quirk (struct stmmac_priv *priv)
Signature · 1 line
2.47.3
Re: [PATCH net-next 5/8] net: stmmac: use FIELD_GET() for version register
Quoted 4 lines · Russell King (Oracle)
Provide field definitions in
common.h, and use these withFIELD_GET()to extract the fields from the version register.Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
PATCH 6/8 net: stmmac: provide function to lookup hwif
In reply to Russell King (Oracle)Provide a function to lookup the hwif entry given the core type, Synopsys version, and device ID (used for XGMAC cores).
--- drivers/net/ethernet/stmicro/stmmac/hwif.c | 40 +++++++++++++++------- 1 file changed, 28 insertions(+), 12 deletions(-)
drivers/net/ethernet/stmicro/stmmac/hwif.c +28 -12
@@ -299,6 +299,30 @@ static const struct stmmac_hwif_entry { }, }; +static const struct stmmac_hwif_entry * +stmmac_hwif_find (enum dwmac_core_type core_type,u8 snpsver,u8 dev_id) +{ +const struct stmmac_hwif_entry *entry; +int i; + +for (i =ARRAY_SIZE (stmmac_hw) -1 ; i >=0 ; i--) { + entry = &stmmac_hw[i]; + +if (core_type != entry->core_type) +continue ; +/* Use synopsys_id var because some setups can override this */ +if (snpsver < entry->min_id) +continue ; +if (core_type ==DWMAC_CORE_XGMAC && + (dev_id ^ entry->dev_id)) +continue ; + +return entry; + } + +return NULL ; +} +int stmmac_hwif_init (struct stmmac_priv *priv) {enum dwmac_core_type core_type = priv->plat->core_type;
@@ -306,7 +330,7 @@ int stmmac_hwif_init(struct stmmac_priv *priv)struct stmmac_version version;struct mac_device_info *mac;bool needs_setup = true; -int i, ret; +int ret;stmmac_get_version (priv, &version);
@@ -337,18 +361,10 @@ int stmmac_hwif_init(struct stmmac_priv *priv)return -ENOMEM ;/* Fallback to generic HW */ -for (i =ARRAY_SIZE (stmmac_hw) -1 ; i >=0 ; i--) { - entry = &stmmac_hw[i]; - -if (core_type != entry->core_type) -continue ; -/* Use synopsys_id var because some setups can override this */ -if (priv->synopsys_id < entry->min_id) -continue ; -if (core_type ==DWMAC_CORE_XGMAC && - (version.dev_id ^ entry->dev_id)) -continue ; +/* Use synopsys_id var because some setups can override this */ + entry =stmmac_hwif_find (core_type, priv->synopsys_id, version.dev_id); +if (entry) {/* Only use generic HW helpers if needed */ mac->desc = mac->desc ? : entry->desc; mac->dma = mac->dma ? : entry->dma;
Signature · 1 line
2.47.3
Re: [PATCH net-next 6/8] net: stmmac: provide function to lookup hwif
Quoted 4 lines · Russell King (Oracle)
Provide a function to lookup the hwif entry given the core type, Synopsys version, and device ID (used for XGMAC cores).
Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
PATCH 7/8 net: stmmac: use != rather than ^ for comparing dev_id
In reply to Russell King (Oracle)Use the more usual not-equals rather than exclusive-or operator when comparing the dev_id in stmmac_hwif_find().
--- drivers/net/ethernet/stmicro/stmmac/hwif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/hwif.c +1 -1
@@ -314,7 +314,7 @@ stmmac_hwif_find(enum dwmac_core_type core_type, u8 snpsver, u8 dev_id)if (snpsver < entry->min_id)continue ;if (core_type ==DWMAC_CORE_XGMAC && - (dev_id ^ entry->dev_id)) + dev_id != entry->dev_id)continue ;return entry;
Signature · 1 line
2.47.3
Re: [PATCH net-next 7/8] net: stmmac: use != rather than ^ for comparing dev_id
Quoted 4 lines · Russell King (Oracle)
Use the more usual not-equals rather than exclusive-or operator when comparing the
dev_idinstmmac_hwif_find().Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
PATCH 8/8 net: stmmac: reorganise stmmac_hwif_init()
In reply to Russell King (Oracle)Reorganise stmmac_hwif_init() to handle the error case of stmmac_hwif_find() in the indented block, which follows normal programming pattern.
--- drivers/net/ethernet/stmicro/stmmac/hwif.c | 72 ++++++++++++---------- 1 file changed, 38 insertions(+), 34 deletions(-)
drivers/net/ethernet/stmicro/stmmac/hwif.c +38 -34
@@ -364,41 +364,45 @@ int stmmac_hwif_init(struct stmmac_priv *priv)/* Use synopsys_id var because some setups can override this */ entry =stmmac_hwif_find (core_type, priv->synopsys_id, version.dev_id); -if (entry) { -/* Only use generic HW helpers if needed */ - mac->desc = mac->desc ? : entry->desc; - mac->dma = mac->dma ? : entry->dma; - mac->mac = mac->mac ? : entry->mac; - mac->ptp = mac->ptp ? : entry->hwtimestamp; - mac->mode = mac->mode ? : entry->mode; - mac->tc = mac->tc ? : entry->tc; - mac->mmc = mac->mmc ? : entry->mmc; - mac->est = mac->est ? : entry->est; - mac->vlan = mac->vlan ? : entry->vlan; - - priv->hw = mac; - priv->fpe_cfg.reg = entry->regs.fpe_reg; - priv->ptpaddr = priv->ioaddr + entry->regs.ptp_off; - priv->mmcaddr = priv->ioaddr + entry->regs.mmc_off; -memcpy (&priv->ptp_clock_ops, entry->ptp, -sizeof (struct ptp_clock_info )); -if (entry->est) - priv->estaddr = priv->ioaddr + entry->regs.est_off; - -/* Entry found */ -if (needs_setup) { - ret = entry->setup (priv); -if (ret) -return ret; - } +if (!entry) { +dev_err (priv->device, +"Failed to find HW IF (id=0x%x, gmac=%d/%d)\n" , + version.snpsver, core_type ==DWMAC_CORE_GMAC , + core_type ==DWMAC_CORE_GMAC4 ); + +return -EINVAL ; + } -/* Save quirks, if needed for posterior use */ - priv->hwif_quirks = entry->quirks; -return 0 ; +/* Only use generic HW helpers if needed */ + mac->desc = mac->desc ? : entry->desc; + mac->dma = mac->dma ? : entry->dma; + mac->mac = mac->mac ? : entry->mac; + mac->ptp = mac->ptp ? : entry->hwtimestamp; + mac->mode = mac->mode ? : entry->mode; + mac->tc = mac->tc ? : entry->tc; + mac->mmc = mac->mmc ? : entry->mmc; + mac->est = mac->est ? : entry->est; + mac->vlan = mac->vlan ? : entry->vlan; + + priv->hw = mac; + priv->fpe_cfg.reg = entry->regs.fpe_reg; + priv->ptpaddr = priv->ioaddr + entry->regs.ptp_off; + priv->mmcaddr = priv->ioaddr + entry->regs.mmc_off; +memcpy (&priv->ptp_clock_ops, entry->ptp, +sizeof (struct ptp_clock_info )); + +if (entry->est) + priv->estaddr = priv->ioaddr + entry->regs.est_off; + +/* Entry found */ +if (needs_setup) { + ret = entry->setup (priv); +if (ret) +return ret; } -dev_err (priv->device,"Failed to find HW IF (id=0x%x, gmac=%d/%d)\n" , - version.snpsver, core_type ==DWMAC_CORE_GMAC , - core_type ==DWMAC_CORE_GMAC4 ); -return -EINVAL ; +/* Save quirks, if needed for posterior use */ + priv->hwif_quirks = entry->quirks; + +return 0 ; }
Signature · 1 line
2.47.3
Re: [PATCH net-next 8/8] net: stmmac: reorganise stmmac_hwif_init()
Quoted 5 lines · Russell King (Oracle)
Reorganise
stmmac_hwif_init()to handle the error case ofstmmac_hwif_find()in the indented block, which follows normal programming pattern.Signed-off-by Russell King (Oracle) <[email protected]>
Andrew
Hello Russell,
Quoted 25 lines · Russell King (Oracle)
Hi,
This series cleans up
hwif.c:- move the reading of the version information out of
stmmac_hwif_init()into its own function,stmmac_get_version(), storing the result in a new struct.- simplify
stmmac_get_version().- read the version register once, passing it to
stmmac_get_id()andstmmac_get_dev_id().- move
stmmac_get_id()andstmmac_get_dev_id()intostmmac_get_version()- define version register fields and use
FIELD_GET()to decode- start tackling the big loop in
stmmac_hwif_init()- provide a function,stmmac_hwif_find(), which looks up the hwif entry, thus making a much smaller loop, which improves readability of this code.- change the use of '^' to '!=' when comparing the
dev_id, which is what is really meant here.
Quoted 7 lines
- reorganise the test after calling
stmmac_hwif_init()so that we handle the error case in the indented code, and the success case with no indent, which is the classical arrangement.drivers/net/ethernet/stmicro/stmmac/common.h | 3 + drivers/net/ethernet/stmicro/stmmac/hwif.c | 166 +++++++++++++++------------ 2 files changed, 98 insertions(+), 71 deletions(-)
I didn't have the bandwidth to do a full review, however I ran tests with this series on dwmac-socfpga and dwmac-stm32, no regressions found.
For the series,
Maxime
Quoted 36 lines · Maxime Chevallier
Hello Russell,
Quoted 25 lines · Russell King (Oracle)
Hi,
This series cleans up
hwif.c:- move the reading of the version information out of
stmmac_hwif_init()into its own function,stmmac_get_version(), storing the result in a new struct.- simplify
stmmac_get_version().- read the version register once, passing it to
stmmac_get_id()andstmmac_get_dev_id().- move
stmmac_get_id()andstmmac_get_dev_id()intostmmac_get_version()- define version register fields and use
FIELD_GET()to decode- start tackling the big loop in
stmmac_hwif_init()- provide a function,stmmac_hwif_find(), which looks up the hwif entry, thus making a much smaller loop, which improves readability of this code.- change the use of '^' to '!=' when comparing the
dev_id, which is what is really meant here.Quoted 7 lines
- reorganise the test after calling
stmmac_hwif_init()so that we handle the error case in the indented code, and the success case with no indent, which is the classical arrangement.drivers/net/ethernet/stmicro/stmmac/common.h | 3 + drivers/net/ethernet/stmicro/stmmac/hwif.c | 166 +++++++++++++++------------ 2 files changed, 98 insertions(+), 71 deletions(-)
Quoted 6 lines
I didn't have the bandwidth to do a full review, however I ran tests with this series on dwmac-socfpga and dwmac-stm32, no regressions found.
For the series,
Tested-by Maxime Chevallier <[email protected]>
Thanks, it's good to have someone else testing. I do need to post v2 with some tweaks to patches 2, 3 and 4 due to a typo that gets eliminated in later patches. "verison*" -> "version*" in one instance.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Maxime Chevallier
maintainerHi Russell,
Quoted 40 lines · Russell King (Oracle)
Quoted 39 lines · Maxime Chevallier
Hello Russell,
Quoted 25 lines · Russell King (Oracle)
Hi,
This series cleans up
hwif.c:- move the reading of the version information out of
stmmac_hwif_init()into its own function,stmmac_get_version(), storing the result in a new struct.- simplify
stmmac_get_version().- read the version register once, passing it to
stmmac_get_id()andstmmac_get_dev_id().- move
stmmac_get_id()andstmmac_get_dev_id()intostmmac_get_version()- define version register fields and use
FIELD_GET()to decode- start tackling the big loop in
stmmac_hwif_init()- provide a function,stmmac_hwif_find(), which looks up the hwif entry, thus making a much smaller loop, which improves readability of this code.- change the use of '^' to '!=' when comparing the
dev_id, which is what is really meant here.Quoted 7 lines
- reorganise the test after calling
stmmac_hwif_init()so that we handle the error case in the indented code, and the success case with no indent, which is the classical arrangement.drivers/net/ethernet/stmicro/stmmac/common.h | 3 + drivers/net/ethernet/stmicro/stmmac/hwif.c | 166 +++++++++++++++------------ 2 files changed, 98 insertions(+), 71 deletions(-)I didn't have the bandwidth to do a full review, however I ran tests with this series on dwmac-socfpga and dwmac-stm32, no regressions found.
Quoted 8 lines
Quoted 3 lines
For the series,
Tested-by Maxime Chevallier <[email protected]>Thanks, it's good to have someone else testing. I do need to post v2 with some tweaks to patches 2, 3 and 4 due to a typo that gets eliminated in later patches. "verison*" -> "version*" in one instance.
If it's only typos, feel free to keep the t-b tag :)
Thanks,
Maxime