net: smc911x: Convert to DM
cover net: smc911x: Convert to DM
Perform DM conversion of the SMC911x driver. Note that as I do not have any hardware with this chip, I only compile-tested this conversion. But it seems Yamada-san has one, so please test.
Note that the DT compatible is set only for 9115 , so this might need to be changed.
Note that this is compile-tested, but not hardware tested, so please do send me patches, thanks.
Marek Vasut (12):
net: smc911x: Remove pkt_data_{push,pull}
net: smc911x: Replace malloc()+memset() with calloc()
net: smc911x: Rename smc911x_rx() to smc911x_recv()
net: smc911x: Invert the logic in smc911x_miiphy_{read,write}()
net: smc911x: Fix potential memleak() in init fail path
net: smc911x: Inline all functions from header file
net: smc911x: Drop weak alias from 32bit accessors
net: smc911x: Convert IO accessors to {read,write}{w,l}()
net: smc911x: Pass around driver private data
net: smc911x: Clean up the status handling in smc911x_recv()
net: smc911x: Split non-DM specific bits from common code
net: smc911x: Add DM support
board/renesas/blanche/blanche.c | 2 + drivers/net/smc911x.c | 523 +++++++++++++++++++++------ drivers/net/smc911x.h | 157 -------- examples/standalone/Makefile | 5 +- examples/standalone/smc911x_eeprom.c | 150 ++++++++ 5 files changed, 577 insertions(+), 260 deletions(-)
Signature · 1 line
2.25.0
PATCH 1/12 net: smc911x: Remove pkt_data_{push,pull}
These functions are never used and are likely a pre-DM remnant from times long past, just remove them.
--- drivers/net/smc911x.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/net/smc911x.c +2 -7
@@ -13,11 +13,6 @@#include "smc911x.h" -u32 pkt_data_pull (struct eth_device *dev,u32 addr) \ - __attribute__ ((weak,alias ("smc911x_reg_read" ))); -void pkt_data_push (struct eth_device *dev,u32 addr,u32 val) \ - __attribute__ ((weak,alias ("smc911x_reg_write" ))); -static void smc911x_handle_mac_address (struct eth_device *dev) {unsigned long addrh, addrl;
@@ -157,7 +152,7 @@ static int smc911x_send(struct eth_device *dev, void *packet, int length) tmplen = (length +3 ) /4 ;while (tmplen--) -pkt_data_push (dev,TX_DATA_FIFO , *data++); +smc911x_reg_write (dev,TX_DATA_FIFO , *data++);/* wait for transmission */ while (!((smc911x_reg_read(dev, TX_FIFO_INF) &
@@ -203,7 +198,7 @@ static int smc911x_rx(struct eth_device *dev) tmplen = (pktlen +3 ) /4 ;while (tmplen--) - *data++ =pkt_data_pull (dev,RX_DATA_FIFO ); + *data++ =smc911x_reg_read (dev,RX_DATA_FIFO );if (status &RX_STS_ES ) printf(DRIVERNAME
Signature · 1 line
2.25.0
PATCH 1/12 net: smc911x: Remove pkt_data_{push,pull}
Quoted 7 lines · Marek Vasut
These functions are never used and are likely a pre-DM remnant from times long past, just remove them.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>
PATCH 2/12 net: smc911x: Replace malloc()+memset() with calloc()
In reply to Marek VasutReplace combination of malloc()+memset() with calloc() as the behavior is exactly the same and the amount of code is reduced.
--- drivers/net/smc911x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/smc911x.c +1 -2
@@ -242,11 +242,10 @@ int smc911x_initialize(u8 dev_num, int base_addr)unsigned long addrl, addrh;struct eth_device *dev; - dev =malloc (sizeof (*dev)); + dev =calloc (1 ,sizeof (*dev));if (!dev) {return -1 ; } -memset (dev,0 ,sizeof (*dev)); dev->iobase = base_addr;
Signature · 1 line
2.25.0
PATCH 2/12 net: smc911x: Replace malloc()+memset() with calloc()
Quoted 7 lines · Marek Vasut
Replace combination of malloc()+memset() with
calloc()as the behavior is exactly the same and the amount of code is reduced.Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>
PATCH 2/12 net: smc911x: Replace malloc()+memset() with calloc()
In reply to Marek VasutQuoted 18 lines · Marek Vasut
Replace combination of malloc()+memset() with
calloc()as the behavior is exactly the same and the amount of code is reduced.Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>--- drivers/net/smc911x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/net/smc911x.c +0
-0@@ -242,11 +242,10 @@ int smc911x_initialize(u8 dev_num, int base_addr)unsigned long addrl, addrh;struct eth_device *dev;
drivers/net/smc911x.c int smc911x_initialize(u8 dev_num, int base_addr) · line 251
Quoted 10 lines
drivers/net/smc911x.c +1
-2- dev =malloc (sizeof (*dev)); + dev =calloc (1 ,sizeof (*dev));if (!dev) {return -1 ; } -memset (dev,0 ,sizeof (*dev)); dev->iobase = base_addr;
My personal preference is kzalloc(), but
the reason is just I am addicted to Linux. So, I do not mind this.
(Another reason I tend to avoid calloc() is I always forget the order of 'nmemb' and 'size' arguments)
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 3/12 net: smc911x: Rename smc911x_rx() to smc911x_recv()
In reply to Marek VasutRename the function to keep the naming scheme consistent, no functional change.
--- drivers/net/smc911x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/smc911x.c +2 -2
@@ -184,7 +184,7 @@ static void smc911x_halt(struct eth_device *dev)smc911x_handle_mac_address (dev); } -static int smc911x_rx (struct eth_device *dev) +static int smc911x_recv (struct eth_device *dev) {u32 *data = (u32 *)net_rx_packets[0 ];u32 pktlen, tmplen;
@@ -270,7 +270,7 @@ int smc911x_initialize(u8 dev_num, int base_addr) dev->init = smc911x_init; dev->halt = smc911x_halt; dev->send = smc911x_send; - dev->recv = smc911x_rx; + dev->recv = smc911x_recv;sprintf (dev->name,"%s-%hu" ,DRIVERNAME , dev_num);eth_register (dev);
Signature · 1 line
2.25.0
PATCH 4/12 net: smc911x: Invert the logic in smc911x_miiphy_{read, write}()
In reply to Marek VasutInvert the logic in the aforementioned functions to reduce indent, no functional change.
--- drivers/net/smc911x.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
drivers/net/smc911x.c +16 -11
@@ -216,24 +216,29 @@ static int smc911x_recv(struct eth_device *dev)static int smc911x_miiphy_read (struct mii_dev *bus,int phy,int devad,int reg) { -u16 val =0 ;struct eth_device *dev =eth_get_dev_by_name (bus->name); -if (dev) { -int retval =smc911x_eth_phy_read (dev, phy, reg, &val); -if (retval <0 ) -return retval; -return val; - } -return -ENODEV ; +u16 val =0 ; +int ret; + +if (!dev) +return -ENODEV ; + + ret =smc911x_eth_phy_read (dev, phy, reg, &val); +if (ret <0 ) +return ret; + +return val; }/* wrapper for smc911x_eth_phy_write */ static int smc911x_miiphy_write (struct mii_dev *bus,int phy,int devad,int reg,u16 val) {struct eth_device *dev =eth_get_dev_by_name (bus->name); -if (dev) -return smc911x_eth_phy_write (dev, phy, reg, val); -return -ENODEV ; + +if (!dev) +return -ENODEV ; + +return smc911x_eth_phy_write (dev, phy, reg, val); }#endif
Signature · 1 line
2.25.0
PATCH 5/12 net: smc911x: Fix potential memleak() in init fail path
In reply to Marek VasutFix memleak in the init fail path, where if allocation or registration of MDIO bus fails, then ethernet interface is not unregistered and the private data are not freed, yet the probe function reports a failure.
--- drivers/net/smc911x.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/net/smc911x.c +11 -3
@@ -249,7 +249,7 @@ int smc911x_initialize(u8 dev_num, int base_addr) dev =calloc (1 ,sizeof (*dev));if (!dev) { -return -1 ; +return -ENODEV ; } dev->iobase = base_addr;
@@ -283,15 +283,23 @@ int smc911x_initialize(u8 dev_num, int base_addr)#if defined(CONFIG_MII ) || defined(CONFIG_CMD_MII )int retval;struct mii_dev *mdiodev =mdio_alloc (); -if (!mdiodev) +if (!mdiodev) { +eth_unregister (dev); +free (dev);return -ENOMEM ; + } +strncpy (mdiodev->name, dev->name,MDIO_NAME_LEN ); mdiodev->read = smc911x_miiphy_read; mdiodev->write = smc911x_miiphy_write; retval =mdio_register (mdiodev); -if (retval <0 ) +if (retval <0 ) { +mdio_free (mdiodev); +eth_unregister (dev); +free (dev);return retval; + }#endif return 1 ;
Signature · 1 line
2.25.0
PATCH 5/12 net: smc911x: Fix potential memleak() in init fail path
Quoted 8 lines · Marek Vasut
Fix memleak in the init fail path, where if allocation or registration of MDIO bus fails, then ethernet interface is not unregistered and the private data are not freed, yet the probe function reports a failure.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>
PATCH 5/12 net: smc911x: Fix potential memleak() in init fail path
In reply to Marek VasutQuoted 17 lines · Marek Vasut
Fix memleak in the init fail path, where if allocation or registration of MDIO bus fails, then ethernet interface is not unregistered and the private data are not freed, yet the probe function reports a failure.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>--- drivers/net/smc911x.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/net/smc911x.c +0
-0
drivers/net/smc911x.c int smc911x_initialize(u8 dev_num, int base_addr) · line 253
Quoted 6 lines
drivers/net/smc911x.c +1
-1@@ -249,7 +249,7 @@ int smc911x_initialize(u8 dev_num, int base_addr) dev =calloc (1 ,sizeof (*dev));if (!dev) { -return -1 ; +return -ENODEV ; }
Our convention is to return -ENOMEM
when memory allocation fails.
If you like to do some additional cleanups here, you can remove the unneeded braces around the single statement, which will fix the checkpatch warning.
Quoted 14 lines
drivers/net/smc911x.c +5
-1dev->iobase = base_addr;@@ -283,15 +283,23 @@ int smc911x_initialize(u8 dev_num, int base_addr)#if defined(CONFIG_MII ) || defined(CONFIG_CMD_MII )int retval;struct mii_dev *mdiodev =mdio_alloc (); -if (!mdiodev) +if (!mdiodev) { +eth_unregister (dev); +free (dev);return -ENOMEM ; + } +strncpy (mdiodev->name, dev->name,MDIO_NAME_LEN );
drivers/net/smc911x.c int smc911x_initialize(u8 dev_num, int base_addr) · line 301
Quoted 10 lines
drivers/net/smc911x.c +4
-1mdiodev->read = smc911x_miiphy_read; mdiodev->write = smc911x_miiphy_write; retval =mdio_register (mdiodev); -if (retval <0 ) +if (retval <0 ) { +mdio_free (mdiodev); +eth_unregister (dev); +free (dev);return retval;
Using "goto <label>" is a general tip to simplify the failure path.
Quoted 7 lines
drivers/net/smc911x.c +1
-1+ }#endif return 1 ; --2.25.0
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 5/12 net: smc911x: Fix potential memleak() in init fail path
On 3/17/20 7:21 AM, Masahiro Yamada wrote:
[...]
Quoted 15 lines
Quoted 15 lines
drivers/net/smc911x.c +5
-1@@ -283,15 +283,23 @@ int smc911x_initialize(u8 dev_num, int base_addr)#if defined(CONFIG_MII ) || defined(CONFIG_CMD_MII )int retval;struct mii_dev *mdiodev =mdio_alloc (); -if (!mdiodev) +if (!mdiodev) { +eth_unregister (dev); +free (dev);return -ENOMEM ; + } +strncpy (mdiodev->name, dev->name,MDIO_NAME_LEN ); mdiodev->read = smc911x_miiphy_read; mdiodev->write = smc911x_miiphy_write;
Quoted 11 lines
drivers/net/smc911x.c int smc911x_initialize(u8 dev_num, int base_addr) · line 301
Quoted 7 lines
drivers/net/smc911x.c +4
-1retval =mdio_register (mdiodev); -if (retval <0 ) +if (retval <0 ) { +mdio_free (mdiodev); +eth_unregister (dev); +free (dev);return retval;Using "goto <label>" is a general tip to
simplify the failure path.
It's even better to pull the entire MII registration into a separate function to avoid all the ifdeffery, so I'll rather do that in a separate patch. And then it's possible to use the goto labels without it looking ugly.
Signature · 2 lines
Best regards, Marek Vasut
PATCH 6/12 net: smc911x: Inline all functions from header file
In reply to Marek VasutInline all the functions from the header file, as they are not used outside of the driver or the standalone EEPROM example.
Note that this does introduce considerable amount of duplication in the standalone EEPROM example, however that one has to be rewritten anyway, roughly such that the SMC911x driver would expose DM EEPROM interface and the standalone example would use that.
--- drivers/net/smc911x.c | 157 ++++++++++++++++++++++++++- drivers/net/smc911x.h | 157 --------------------------- examples/standalone/smc911x_eeprom.c | 156 ++++++++++++++++++++++++++ 3 files changed, 312 insertions(+), 158 deletions(-)
drivers/net/smc911x.c +156 -1
@@ -10,9 +10,165 @@#include <malloc.h> #include <net.h> #include <miiphy.h> +#include <linux/types.h> #include "smc911x.h" +struct chip_id { +u16 id; +char *name; +}; + +static const struct chip_id chip_ids[] = { + {CHIP_89218 ,"LAN89218" }, + {CHIP_9115 ,"LAN9115" }, + {CHIP_9116 ,"LAN9116" }, + {CHIP_9117 ,"LAN9117" }, + {CHIP_9118 ,"LAN9118" }, + {CHIP_9211 ,"LAN9211" }, + {CHIP_9215 ,"LAN9215" }, + {CHIP_9216 ,"LAN9216" }, + {CHIP_9217 ,"LAN9217" }, + {CHIP_9218 ,"LAN9218" }, + {CHIP_9220 ,"LAN9220" }, + {CHIP_9221 ,"LAN9221" }, + {0 ,NULL }, +}; + +#define DRIVERNAME "smc911x" + +#if defined (CONFIG_SMC911X_32_BIT ) && \ + defined (CONFIG_SMC911X_16_BIT ) +#error "SMC911X: Only one of CONFIG_SMC911X_32_BIT and \ + CONFIG_SMC911X_16_BIT shall be set" +#endif + +#if defined (CONFIG_SMC911X_32_BIT ) +static inline u32 __smc911x_reg_read (struct eth_device *dev,u32 offset) +{ +return *(volatile u32 *)(dev->iobase + offset); +} +u32 smc911x_reg_read (struct eth_device *dev,u32 offset) + __attribute__((weak,alias ("__smc911x_reg_read" ))); + +static inline void __smc911x_reg_write (struct eth_device *dev, +u32 offset,u32 val) +{ + *(volatile u32 *)(dev->iobase + offset) = val; +} +void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) + __attribute__((weak,alias ("__smc911x_reg_write" ))); +#elif defined (CONFIG_SMC911X_16_BIT ) +static inline u32 smc911x_reg_read (struct eth_device *dev,u32 offset) +{ +volatile u16 *addr_16 = (u16 *)(dev->iobase + offset); +return ((*addr_16 &0x0000ffff ) | (*(addr_16 +1 ) <<16 )); +} +static inline void smc911x_reg_write (struct eth_device *dev, +u32 offset,u32 val) +{ + *(volatile u16 *)(dev->iobase + offset) = (u16 )val; + *(volatile u16 *)(dev->iobase + offset +2 ) = (u16)(val >>16 ); +} +#else +#error "SMC911X: undefined bus width" +#endif /* CONFIG_SMC911X_16_BIT */ + +static u32 smc911x_get_mac_csr (struct eth_device *dev,u8 reg) +{ +while (smc911x_reg_read (dev,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) + ; +smc911x_reg_write (dev,MAC_CSR_CMD , +MAC_CSR_CMD_CSR_BUSY |MAC_CSR_CMD_R_NOT_W | reg); +while (smc911x_reg_read (dev,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) + ; + +return smc911x_reg_read (dev,MAC_CSR_DATA ); +} + +static void smc911x_set_mac_csr (struct eth_device *dev,u8 reg,u32 data) +{ +while (smc911x_reg_read (dev,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) + ; +smc911x_reg_write (dev,MAC_CSR_DATA , data); +smc911x_reg_write (dev,MAC_CSR_CMD ,MAC_CSR_CMD_CSR_BUSY | reg); +while (smc911x_reg_read (dev,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) + ; +} + +static int smc911x_detect_chip (struct eth_device *dev) +{ +unsigned long val, i; + + val =smc911x_reg_read (dev,BYTE_TEST ); +if (val ==0xffffffff ) { +/* Special case -- no chip present */ +return -1 ; + }else if (val !=0x87654321 ) { +printf (DRIVERNAME ": Invalid chip endian 0x%08lx\n" , val); +return -1 ; + } + + val =smc911x_reg_read (dev,ID_REV ) >>16 ; +for (i =0 ; chip_ids[i].id !=0 ; i++) { +if (chip_ids[i].id == val)break ; + } +if (!chip_ids[i].id) { +printf (DRIVERNAME ": Unknown chip ID %04lx\n" , val); +return -1 ; + } + + dev->priv = (void *)&chip_ids[i]; + +return 0 ; +} + +static void smc911x_reset (struct eth_device *dev) +{ +int timeout; + +/* +* Take out of PM setting first +* Device is already wake up if PMT_CTRL_READY bit is set +*/ +if ((smc911x_reg_read (dev,PMT_CTRL ) &PMT_CTRL_READY ) ==0 ) { +/* Write to the bytetest will take out of powerdown */ +smc911x_reg_write (dev,BYTE_TEST ,0x0 ); + + timeout =10 ; + +while (timeout-- && + !(smc911x_reg_read (dev,PMT_CTRL ) &PMT_CTRL_READY )) +udelay (10 ); +if (timeout <0 ) { +printf (DRIVERNAME +": timeout waiting for PM restore\n" ); +return ; + } + } + +/* Disable interrupts */ +smc911x_reg_write (dev,INT_EN ,0 ); + +smc911x_reg_write (dev,HW_CFG ,HW_CFG_SRST ); + + timeout =1000 ; +while (timeout-- &&smc911x_reg_read (dev,E2P_CMD ) &E2P_CMD_EPC_BUSY ) +udelay (10 ); + +if (timeout <0 ) { +printf (DRIVERNAME ": reset timeout\n" ); +return ; + } + +/* Reset the FIFO level and flow control settings */ +smc911x_set_mac_csr (dev,FLOW ,FLOW_FCPT |FLOW_FCEN ); +smc911x_reg_write (dev,AFC_CFG ,0x0050287F ); + +/* Set to LED outputs */ +smc911x_reg_write (dev,GPIO_CFG ,0x70070000 ); +} +static void smc911x_handle_mac_address (struct eth_device *dev) {unsigned long addrh, addrl;
@@ -117,7 +273,6 @@ static void smc911x_enable(struct eth_device *dev)smc911x_set_mac_csr (dev,MAC_CR ,MAC_CR_TXEN |MAC_CR_RXEN |MAC_CR_HBDIS ); - }static int smc911x_init (struct eth_device *dev,bd_t * bd)
drivers/net/smc911x.h +0 -157
167 lines not on this page · raw message
examples/standalone/smc911x_eeprom.c +156 -0
164 lines not on this page · raw message
Signature · 1 line
2.25.0
PATCH 6/12 net: smc911x: Inline all functions from header file
Quoted 4 lines · Marek Vasut
Inline all the functions from the header file, as they are not used outside of the driver or the standalone EEPROM example.
Quoted 8 lines
Note that this does introduce considerable amount of duplication in the standalone EEPROM example, however that one has to be rewritten anyway, roughly such that the SMC911x driver would expose DM EEPROM interface and the standalone example would use that.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>
PATCH 6/12 net: smc911x: Inline all functions from header file
In reply to Marek VasutQuoted 3 lines · Marek Vasut
Inline all the functions from the header file, as they are not used outside of the driver or the standalone EEPROM example.
Meh for 'static inline' in .c files,
but you will rip it off in the next commit.
So, the resulted code seems good.
(I would drop inline when I move the code, though...)
Quoted 10 lines
Note that this does introduce considerable amount of duplication in the standalone EEPROM example, however that one has to be rewritten anyway, roughly such that the SMC911x driver would expose DM EEPROM interface and the standalone example would use that.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>---
--
Best Regards
Masahiro Yamada
PATCH 7/12 net: smc911x: Drop weak alias from 32bit accessors
In reply to Marek VasutThese accessors are not overriden by any board, and even if they were, this is something which should be handled via DM now, so remove the weak alias option. Moreover, drop the inline keyword, as the compiler can decide better.
--- drivers/net/smc911x.c | 14 ++++---------- examples/standalone/smc911x_eeprom.c | 16 +++++----------- 2 files changed, 9 insertions(+), 21 deletions(-)
drivers/net/smc911x.c +4 -10
@@ -44,28 +44,22 @@ static const struct chip_id chip_ids[] = {#endif #if defined (CONFIG_SMC911X_32_BIT ) -static inline u32 __smc911x_reg_read (struct eth_device *dev,u32 offset) +static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) {return *(volatile u32 *)(dev->iobase + offset); } -u32 smc911x_reg_read (struct eth_device *dev,u32 offset) - __attribute__((weak,alias ("__smc911x_reg_read" ))); -static inline void __smc911x_reg_write (struct eth_device *dev, -u32 offset,u32 val) +static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) { *(volatile u32 *)(dev->iobase + offset) = val; } -void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) - __attribute__((weak,alias ("__smc911x_reg_write" )));#elif defined (CONFIG_SMC911X_16_BIT ) -static inline u32 smc911x_reg_read (struct eth_device *dev,u32 offset) +static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) {volatile u16 *addr_16 = (u16 *)(dev->iobase + offset);return ((*addr_16 &0x0000ffff ) | (*(addr_16 +1 ) <<16 )); } -static inline void smc911x_reg_write (struct eth_device *dev, -u32 offset,u32 val) +static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) { *(volatile u16 *)(dev->iobase + offset) = (u16 )val; *(volatile u16 *)(dev->iobase + offset +2 ) = (u16)(val >>16 );
examples/standalone/smc911x_eeprom.c +5 -11
@@ -51,28 +51,22 @@ static const struct chip_id chip_ids[] = { };#if defined (CONFIG_SMC911X_32_BIT ) -static inline u32 __smc911x_reg_read (struct eth_device *dev,u32 offset) +static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) {return *(volatile u32 *)(dev->iobase + offset); } -u32 smc911x_reg_read (struct eth_device *dev,u32 offset) - __attribute__((weak,alias ("__smc911x_reg_read" ))); -static inline void __smc911x_reg_write (struct eth_device *dev, -u32 offset,u32 val) +static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) { *(volatile u32 *)(dev->iobase + offset) = val; } -void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) - __attribute__((weak,alias ("__smc911x_reg_write" )));#elif defined (CONFIG_SMC911X_16_BIT ) -static inline u32 smc911x_reg_read (struct eth_device *dev,u32 offset) +static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) {volatile u16 *addr_16 = (u16 *)(dev->iobase + offset); -return ((*addr_16 &0x0000ffff ) | (*(addr_16 +1 ) <<16 )); +return (*addr_16 &0x0000ffff ) | (*(addr_16 +1 ) <<16 ); } -static inline void smc911x_reg_write (struct eth_device *dev, -u32 offset,u32 val) +static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) { *(volatile u16 *)(dev->iobase + offset) = (u16 )val; *(volatile u16 *)(dev->iobase + offset +2 ) = (u16)(val >>16 );
Signature · 1 line
2.25.0
PATCH 7/12 net: smc911x: Drop weak alias from 32bit accessors
Quoted 9 lines · Marek Vasut
These accessors are not overriden by any board, and even if they were, this is something which should be handled via DM now, so remove the weak alias option. Moreover, drop the inline keyword, as the compiler can decide better.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>
PATCH 7/12 net: smc911x: Drop weak alias from 32bit accessors
In reply to Marek VasutQuoted 9 lines · Marek Vasut
These accessors are not overriden by any board, and even if they were, this is something which should be handled via DM now, so remove the weak alias option. Moreover, drop the inline keyword, as the compiler can decide better.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>
This is good.
I would swap the patch order 06 and 07 so that
I would need to touch only one file, though.
Quoted 83 lines
--- drivers/net/smc911x.c | 14 ++++---------- examples/standalone/smc911x_eeprom.c | 16 +++++----------- 2 files changed, 9 insertions(+), 21 deletions(-)drivers/net/smc911x.c +4
-10@@ -44,28 +44,22 @@ static const struct chip_id chip_ids[] = {#endif #if defined (CONFIG_SMC911X_32_BIT ) -static inline u32 __smc911x_reg_read (struct eth_device *dev,u32 offset) +static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) {return *(volatile u32 *)(dev->iobase + offset); } -u32 smc911x_reg_read (struct eth_device *dev,u32 offset) - __attribute__((weak,alias ("__smc911x_reg_read" ))); -static inline void __smc911x_reg_write (struct eth_device *dev, -u32 offset,u32 val) +static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) { *(volatile u32 *)(dev->iobase + offset) = val; } -void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) - __attribute__((weak,alias ("__smc911x_reg_write" )));#elif defined (CONFIG_SMC911X_16_BIT ) -static inline u32 smc911x_reg_read (struct eth_device *dev,u32 offset) +static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) {volatile u16 *addr_16 = (u16 *)(dev->iobase + offset);return ((*addr_16 &0x0000ffff ) | (*(addr_16 +1 ) <<16 )); } -static inline void smc911x_reg_write (struct eth_device *dev, -u32 offset,u32 val) +static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) { *(volatile u16 *)(dev->iobase + offset) = (u16 )val; *(volatile u16 *)(dev->iobase + offset +2 ) = (u16)(val >>16 );examples/standalone/smc911x_eeprom.c +5
-12@@ -51,28 +51,22 @@ static const struct chip_id chip_ids[] = { };#if defined (CONFIG_SMC911X_32_BIT ) -static inline u32 __smc911x_reg_read (struct eth_device *dev,u32 offset) +static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) {return *(volatile u32 *)(dev->iobase + offset); } -u32 smc911x_reg_read (struct eth_device *dev,u32 offset) - __attribute__((weak,alias ("__smc911x_reg_read" ))); -static inline void __smc911x_reg_write (struct eth_device *dev, -u32 offset,u32 val) +static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) { *(volatile u32 *)(dev->iobase + offset) = val; } -void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) - __attribute__((weak,alias ("__smc911x_reg_write" )));#elif defined (CONFIG_SMC911X_16_BIT ) -static inline u32 smc911x_reg_read (struct eth_device *dev,u32 offset) +static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) {volatile u16 *addr_16 = (u16 *)(dev->iobase + offset); -return ((*addr_16 &0x0000ffff ) | (*(addr_16 +1 ) <<16 )); +return (*addr_16 &0x0000ffff ) | (*(addr_16 +1 ) <<16 ); } -static inline void smc911x_reg_write (struct eth_device *dev, -u32 offset,u32 val) +static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) { *(volatile u16 *)(dev->iobase + offset) = (u16 )val; *(volatile u16 *)(dev->iobase + offset +2 ) = (u16)(val >>16 ); --2.25.0
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 7/12 net: smc911x: Drop weak alias from 32bit accessors
In reply to Marek VasutQuoted 2 lines · Marek Vasut
These accessors are not overriden by any board, and even if they were,
One more nit.
overriden -> overridden
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 8/12 net: smc911x: Convert IO accessors to {read, write}{w, l}()
In reply to Marek VasutConvert the IO accessors to standard ones instead of using volatile void pointers, as those do not cover all the bus access details.
--- drivers/net/smc911x.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/smc911x.c +7 -6
@@ -10,6 +10,7 @@#include <malloc.h> #include <net.h> #include <miiphy.h> +#include <linux/io.h> #include <linux/types.h> #include "smc911x.h"
@@ -46,23 +47,23 @@ static const struct chip_id chip_ids[] = {#if defined (CONFIG_SMC911X_32_BIT )static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) { -return *(volatile u32 *)(dev->iobase + offset); +return readl (dev->iobase + offset); }static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) { - *(volatile u32 *)(dev->iobase + offset) = val; +writel (val, dev->iobase + offset); }#elif defined (CONFIG_SMC911X_16_BIT )static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) { -volatile u16 *addr_16 = (u16 *)(dev->iobase + offset); -return ((*addr_16 &0x0000ffff ) | (*(addr_16 +1 ) <<16 )); +return (readw (dev->iobase + offset) &0xffff ) | + (readw (dev->iobase + offset +2 ) <<16 ); }static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) { - *(volatile u16 *)(dev->iobase + offset) = (u16 )val; - *(volatile u16 *)(dev->iobase + offset +2 ) = (u16)(val >>16 ); +writew (val &0xffff , dev->iobase + offset); +writew (val >>16 , dev->iobase + offset +2 ); }#else #error "SMC911X: undefined bus width"
Signature · 1 line
2.25.0
PATCH 8/12 net: smc911x: Convert IO accessors to {read, write}{w, l}()
Quoted 7 lines · Marek Vasut
Convert the IO accessors to standard ones instead of using volatile void pointers, as those do not cover all the bus access details.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>
PATCH 9/12 net: smc911x: Pass around driver private data
In reply to Marek VasutIntroduce a private data structure for this driver with embedded struct eth_device and pass it around. This prepares the driver to work with both DM and non-DM systems.
--- drivers/net/smc911x.c | 234 ++++++++++++++++++++++-------------------- 1 file changed, 125 insertions(+), 109 deletions(-)
drivers/net/smc911x.c +125 -109
@@ -20,6 +20,13 @@ struct chip_id {char *name; }; +struct smc911x_priv { +struct eth_device dev; +phys_addr_t iobase; +const struct chip_id *chipid; +unsigned char enetaddr[6 ]; +}; +static const struct chip_id chip_ids[] = { {CHIP_89218 ,"LAN89218" }, {CHIP_9115 ,"LAN9115" },
@@ -45,57 +52,57 @@ static const struct chip_id chip_ids[] = {#endif #if defined (CONFIG_SMC911X_32_BIT ) -static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) +static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) { -return readl (dev->iobase + offset); +return readl (priv->iobase + offset); } -static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) +static void smc911x_reg_write (struct smc911x_priv *priv,u32 offset,u32 val) { -writel (val, dev->iobase + offset); +writel (val, priv->iobase + offset); }#elif defined (CONFIG_SMC911X_16_BIT ) -static u32 smc911x_reg_read (struct eth_device *dev,u32 offset) +static u32 smc911x_reg_read (struct smc911x_priv *priv,u32 offset) { -return (readw (dev->iobase + offset) &0xffff ) | - (readw (dev->iobase + offset +2 ) <<16 ); +return (readw (priv->iobase + offset) &0xffff ) | + (readw (priv->iobase + offset +2 ) <<16 ); } -static void smc911x_reg_write (struct eth_device *dev,u32 offset,u32 val) +static void smc911x_reg_write (struct smc911x_priv *priv,u32 offset,u32 val) { -writew (val &0xffff , dev->iobase + offset); -writew (val >>16 , dev->iobase + offset +2 ); +writew (val &0xffff , priv->iobase + offset); +writew (val >>16 , priv->iobase + offset +2 ); }#else #error "SMC911X: undefined bus width"#endif /* CONFIG_SMC911X_16_BIT */ -static u32 smc911x_get_mac_csr (struct eth_device *dev,u8 reg) +static u32 smc911x_get_mac_csr (struct smc911x_priv *priv,u8 reg) { -while (smc911x_reg_read (dev,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) +while (smc911x_reg_read (priv,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) ; -smc911x_reg_write (dev,MAC_CSR_CMD , +smc911x_reg_write (priv,MAC_CSR_CMD ,MAC_CSR_CMD_CSR_BUSY |MAC_CSR_CMD_R_NOT_W | reg); -while (smc911x_reg_read (dev,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) +while (smc911x_reg_read (priv,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) ; -return smc911x_reg_read (dev,MAC_CSR_DATA ); +return smc911x_reg_read (priv,MAC_CSR_DATA ); } -static void smc911x_set_mac_csr (struct eth_device *dev,u8 reg,u32 data) +static void smc911x_set_mac_csr (struct smc911x_priv *priv,u8 reg,u32 data) { -while (smc911x_reg_read (dev,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) +while (smc911x_reg_read (priv,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) ; -smc911x_reg_write (dev,MAC_CSR_DATA , data); -smc911x_reg_write (dev,MAC_CSR_CMD ,MAC_CSR_CMD_CSR_BUSY | reg); -while (smc911x_reg_read (dev,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) +smc911x_reg_write (priv,MAC_CSR_DATA , data); +smc911x_reg_write (priv,MAC_CSR_CMD ,MAC_CSR_CMD_CSR_BUSY | reg); +while (smc911x_reg_read (priv,MAC_CSR_CMD ) &MAC_CSR_CMD_CSR_BUSY ) ; } -static int smc911x_detect_chip (struct eth_device *dev) +static int smc911x_detect_chip (struct smc911x_priv *priv) {unsigned long val, i; - val =smc911x_reg_read (dev,BYTE_TEST ); + val =smc911x_reg_read (priv,BYTE_TEST );if (val ==0xffffffff ) {/* Special case -- no chip present */ return -1 ;
@@ -104,7 +111,7 @@ static int smc911x_detect_chip(struct eth_device *dev)return -1 ; } - val =smc911x_reg_read (dev,ID_REV ) >>16 ; + val =smc911x_reg_read (priv,ID_REV ) >>16 ;for (i =0 ; chip_ids[i].id !=0 ; i++) {if (chip_ids[i].id == val)break ; }
@@ -113,12 +120,12 @@ static int smc911x_detect_chip(struct eth_device *dev)return -1 ; } - dev->priv = (void *)&chip_ids[i]; + priv->chipid = &chip_ids[i];return 0 ; } -static void smc911x_reset (struct eth_device *dev) +static void smc911x_reset (struct smc911x_priv *priv) {int timeout;
@@ -126,14 +133,14 @@ static void smc911x_reset(struct eth_device *dev)* Take out of PM setting first * Device is already wake up if PMT_CTRL_READY bit is set */ -if ((smc911x_reg_read (dev,PMT_CTRL ) &PMT_CTRL_READY ) ==0 ) { +if ((smc911x_reg_read (priv,PMT_CTRL ) &PMT_CTRL_READY ) ==0 ) {/* Write to the bytetest will take out of powerdown */ -smc911x_reg_write (dev,BYTE_TEST ,0x0 ); +smc911x_reg_write (priv,BYTE_TEST ,0x0 ); timeout =10 ;while (timeout-- && - !(smc911x_reg_read (dev,PMT_CTRL ) &PMT_CTRL_READY )) + !(smc911x_reg_read (priv,PMT_CTRL ) &PMT_CTRL_READY ))udelay (10 );if (timeout <0 ) { printf(DRIVERNAME
@@ -143,12 +150,12 @@ static void smc911x_reset(struct eth_device *dev) }/* Disable interrupts */ -smc911x_reg_write (dev,INT_EN ,0 ); +smc911x_reg_write (priv,INT_EN ,0 ); -smc911x_reg_write (dev,HW_CFG ,HW_CFG_SRST ); +smc911x_reg_write (priv,HW_CFG ,HW_CFG_SRST ); timeout =1000 ; -while (timeout-- &&smc911x_reg_read (dev,E2P_CMD ) &E2P_CMD_EPC_BUSY ) +while (timeout-- &&smc911x_reg_read (priv,E2P_CMD ) &E2P_CMD_EPC_BUSY )udelay (10 );if (timeout <0 ) {
@@ -157,83 +164,83 @@ static void smc911x_reset(struct eth_device *dev) }/* Reset the FIFO level and flow control settings */ -smc911x_set_mac_csr (dev,FLOW ,FLOW_FCPT |FLOW_FCEN ); -smc911x_reg_write (dev,AFC_CFG ,0x0050287F ); +smc911x_set_mac_csr (priv,FLOW ,FLOW_FCPT |FLOW_FCEN ); +smc911x_reg_write (priv,AFC_CFG ,0x0050287F );/* Set to LED outputs */ -smc911x_reg_write (dev,GPIO_CFG ,0x70070000 ); +smc911x_reg_write (priv,GPIO_CFG ,0x70070000 ); } -static void smc911x_handle_mac_address (struct eth_device *dev) +static void smc911x_handle_mac_address (struct smc911x_priv *priv) {unsigned long addrh, addrl; -uchar *m = dev->enetaddr; +unsigned char *m = priv->enetaddr; addrl = m[0 ] | (m[1 ] <<8 ) | (m[2 ] <<16 ) | (m[3 ] <<24 ); addrh = m[4 ] | (m[5 ] <<8 ); -smc911x_set_mac_csr (dev,ADDRL , addrl); -smc911x_set_mac_csr (dev,ADDRH , addrh); +smc911x_set_mac_csr (priv,ADDRL , addrl); +smc911x_set_mac_csr (priv,ADDRH , addrh);printf (DRIVERNAME ": MAC %pM\n" , m); } -static int smc911x_eth_phy_read (struct eth_device *dev, +static int smc911x_eth_phy_read (struct smc911x_priv *priv,u8 phy,u8 reg,u16 *val) { -while (smc911x_get_mac_csr (dev,MII_ACC ) &MII_ACC_MII_BUSY ) +while (smc911x_get_mac_csr (priv,MII_ACC ) &MII_ACC_MII_BUSY ) ; -smc911x_set_mac_csr (dev,MII_ACC , phy <<11 | reg <<6 | +smc911x_set_mac_csr (priv,MII_ACC , phy <<11 | reg <<6 |MII_ACC_MII_BUSY ); -while (smc911x_get_mac_csr (dev,MII_ACC ) &MII_ACC_MII_BUSY ) +while (smc911x_get_mac_csr (priv,MII_ACC ) &MII_ACC_MII_BUSY ) ; - *val =smc911x_get_mac_csr (dev,MII_DATA ); + *val =smc911x_get_mac_csr (priv,MII_DATA );return 0 ; } -static int smc911x_eth_phy_write (struct eth_device *dev, +static int smc911x_eth_phy_write (struct smc911x_priv *priv,u8 phy,u8 reg,u16 val) { -while (smc911x_get_mac_csr (dev,MII_ACC ) &MII_ACC_MII_BUSY ) +while (smc911x_get_mac_csr (priv,MII_ACC ) &MII_ACC_MII_BUSY ) ; -smc911x_set_mac_csr (dev,MII_DATA , val); -smc911x_set_mac_csr (dev,MII_ACC , +smc911x_set_mac_csr (priv,MII_DATA , val); +smc911x_set_mac_csr (priv,MII_ACC , phy <<11 | reg <<6 |MII_ACC_MII_BUSY |MII_ACC_MII_WRITE ); -while (smc911x_get_mac_csr (dev,MII_ACC ) &MII_ACC_MII_BUSY ) +while (smc911x_get_mac_csr (priv,MII_ACC ) &MII_ACC_MII_BUSY ) ;return 0 ; } -static int smc911x_phy_reset (struct eth_device *dev) +static int smc911x_phy_reset (struct smc911x_priv *priv) {u32 reg; - reg =smc911x_reg_read (dev,PMT_CTRL ); + reg =smc911x_reg_read (priv,PMT_CTRL ); reg &= ~0xfffff030 ; reg |=PMT_CTRL_PHY_RST ; -smc911x_reg_write (dev,PMT_CTRL , reg); +smc911x_reg_write (priv,PMT_CTRL , reg);mdelay (100 );return 0 ; } -static void smc911x_phy_configure (struct eth_device *dev) +static void smc911x_phy_configure (struct smc911x_priv *priv) {int timeout;u16 status; -smc911x_phy_reset (dev); +smc911x_phy_reset (priv); -smc911x_eth_phy_write (dev,1 ,MII_BMCR ,BMCR_RESET ); +smc911x_eth_phy_write (priv,1 ,MII_BMCR ,BMCR_RESET );mdelay (1 ); -smc911x_eth_phy_write (dev,1 ,MII_ADVERTISE ,0x01e1 ); -smc911x_eth_phy_write (dev,1 ,MII_BMCR ,BMCR_ANENABLE | +smc911x_eth_phy_write (priv,1 ,MII_ADVERTISE ,0x01e1 ); +smc911x_eth_phy_write (priv,1 ,MII_BMCR ,BMCR_ANENABLE |BMCR_ANRESTART ); timeout =5000 ;
@@ -242,7 +249,7 @@ static void smc911x_phy_configure(struct eth_device *dev)if ((timeout--) ==0 ) goto err_out; -if (smc911x_eth_phy_read (dev,1 ,MII_BMSR , &status) !=0 ) +if (smc911x_eth_phy_read (priv,1 ,MII_BMSR , &status) !=0 ) goto err_out; }while (!(status &BMSR_LSTATUS ));
@@ -254,64 +261,66 @@ err_out:printf (DRIVERNAME ": autonegotiation timed out\n" ); } -static void smc911x_enable (struct eth_device *dev) +static void smc911x_enable (struct smc911x_priv *priv) {/* Enable TX */ -smc911x_reg_write (dev,HW_CFG ,8 <<16 |HW_CFG_SF ); +smc911x_reg_write (priv,HW_CFG ,8 <<16 |HW_CFG_SF ); -smc911x_reg_write (dev,GPT_CFG ,GPT_CFG_TIMER_EN |10000 ); +smc911x_reg_write (priv,GPT_CFG ,GPT_CFG_TIMER_EN |10000 ); -smc911x_reg_write (dev,TX_CFG ,TX_CFG_TX_ON ); +smc911x_reg_write (priv,TX_CFG ,TX_CFG_TX_ON );/* no padding to start of packets */ -smc911x_reg_write (dev,RX_CFG ,0 ); +smc911x_reg_write (priv,RX_CFG ,0 ); -smc911x_set_mac_csr (dev,MAC_CR ,MAC_CR_TXEN |MAC_CR_RXEN | +smc911x_set_mac_csr (priv,MAC_CR ,MAC_CR_TXEN |MAC_CR_RXEN |MAC_CR_HBDIS ); }static int smc911x_init (struct eth_device *dev,bd_t * bd) { -struct chip_id *id = dev->priv; + struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev); +const struct chip_id *id = priv->chipid;printf (DRIVERNAME ": detected %s controller\n" , id->name); -smc911x_reset (dev); +smc911x_reset (priv);/* Configure the PHY, initialize the link state */ -smc911x_phy_configure (dev); +smc911x_phy_configure (priv); -smc911x_handle_mac_address (dev); +smc911x_handle_mac_address (priv);/* Turn on Tx + Rx */ -smc911x_enable (dev); +smc911x_enable (priv);return 0 ; }static int smc911x_send (struct eth_device *dev,void *packet,int length) { + struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);u32 *data = (u32 *)packet;u32 tmplen;u32 status; -smc911x_reg_write (dev,TX_DATA_FIFO ,TX_CMD_A_INT_FIRST_SEG | +smc911x_reg_write (priv,TX_DATA_FIFO ,TX_CMD_A_INT_FIRST_SEG |TX_CMD_A_INT_LAST_SEG | length); -smc911x_reg_write (dev,TX_DATA_FIFO , length); +smc911x_reg_write (priv,TX_DATA_FIFO , length); tmplen = (length +3 ) /4 ;while (tmplen--) -smc911x_reg_write (dev,TX_DATA_FIFO , *data++); +smc911x_reg_write (priv,TX_DATA_FIFO , *data++);/* wait for transmission */ -while (!((smc911x_reg_read (dev,TX_FIFO_INF ) & +while (!((smc911x_reg_read (priv,TX_FIFO_INF ) &TX_FIFO_INF_TSUSED ) >>16 ));/* get status. Ignore 'no carrier' error, it has no meaning for * full duplex operation */ - status =smc911x_reg_read (dev,TX_STATUS_FIFO ) & + status =smc911x_reg_read (priv,TX_STATUS_FIFO ) & (TX_STS_LOC |TX_STS_LATE_COLL |TX_STS_MANY_COLL |TX_STS_MANY_DEFER |TX_STS_UNDERRUN );
@@ -330,25 +339,28 @@ static int smc911x_send(struct eth_device *dev, void *packet, int length)static void smc911x_halt (struct eth_device *dev) { -smc911x_reset (dev); -smc911x_handle_mac_address (dev); + struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev); + +smc911x_reset (priv); +smc911x_handle_mac_address (priv); }static int smc911x_recv (struct eth_device *dev) { + struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);u32 *data = (u32 *)net_rx_packets[0 ];u32 pktlen, tmplen;u32 status; -if ((smc911x_reg_read (dev,RX_FIFO_INF ) &RX_FIFO_INF_RXSUSED ) >>16 ) { - status =smc911x_reg_read (dev,RX_STATUS_FIFO ); +if ((smc911x_reg_read (priv,RX_FIFO_INF ) &RX_FIFO_INF_RXSUSED ) >>16 ) { + status =smc911x_reg_read (priv,RX_STATUS_FIFO ); pktlen = (status &RX_STS_PKT_LEN ) >>16 ; -smc911x_reg_write (dev,RX_CFG ,0 ); +smc911x_reg_write (priv,RX_CFG ,0 ); tmplen = (pktlen +3 ) /4 ;while (tmplen--) - *data++ =smc911x_reg_read (dev,RX_DATA_FIFO ); + *data++ =smc911x_reg_read (priv,RX_DATA_FIFO );if (status &RX_STS_ES ) printf(DRIVERNAME
@@ -367,87 +379,91 @@ static int smc911x_miiphy_read(struct mii_dev *bus, int phy, int devad, int reg) {struct eth_device *dev =eth_get_dev_by_name (bus->name); + struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);u16 val =0 ;int ret; -if (!dev) +if (!dev || !priv)return -ENODEV ; - ret =smc911x_eth_phy_read (dev, phy, reg, &val); + ret =smc911x_eth_phy_read (priv, phy, reg, &val);if (ret <0 )return ret;return val; } +/* wrapper for smc911x_eth_phy_write */ static int smc911x_miiphy_write (struct mii_dev *bus,int phy,int devad,int reg,u16 val) {struct eth_device *dev =eth_get_dev_by_name (bus->name); + struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev); -if (!dev) +if (!dev || !priv)return -ENODEV ; -return smc911x_eth_phy_write (dev, phy, reg, val); +return smc911x_eth_phy_write (priv, phy, reg, val); }#endif int smc911x_initialize (u8 dev_num,int base_addr) {unsigned long addrl, addrh; -struct eth_device *dev; +struct smc911x_priv *priv; - dev =calloc (1 ,sizeof (*dev)); -if (!dev) { + priv =calloc (1 ,sizeof (*priv)); +if (!priv)return -ENODEV ; - } - dev->iobase = base_addr; + priv->iobase = base_addr; + priv->dev.iobase = base_addr;/* Try to detect chip. Will fail if not present. */ -if (smc911x_detect_chip (dev)) { -free (dev); +if (smc911x_detect_chip (priv)) { +free (priv);return 0 ; } - addrh =smc911x_get_mac_csr (dev,ADDRH ); - addrl =smc911x_get_mac_csr (dev,ADDRL ); + addrh =smc911x_get_mac_csr (priv,ADDRH ); + addrl =smc911x_get_mac_csr (priv,ADDRL );if (!(addrl ==0xffffffff && addrh ==0x0000ffff )) {/* address is obtained from optional eeprom */ - dev->enetaddr[0 ] = addrl; - dev->enetaddr[1 ] = addrl >>8 ; - dev->enetaddr[2 ] = addrl >>16 ; - dev->enetaddr[3 ] = addrl >>24 ; - dev->enetaddr[4 ] = addrh; - dev->enetaddr[5 ] = addrh >>8 ; + priv->enetaddr[0 ] = addrl; + priv->enetaddr[1 ] = addrl >>8 ; + priv->enetaddr[2 ] = addrl >>16 ; + priv->enetaddr[3 ] = addrl >>24 ; + priv->enetaddr[4 ] = addrh; + priv->enetaddr[5 ] = addrh >>8 ; } - dev->init = smc911x_init; - dev->halt = smc911x_halt; - dev->send = smc911x_send; - dev->recv = smc911x_recv; -sprintf (dev->name,"%s-%hu" ,DRIVERNAME , dev_num); + priv->dev.init = smc911x_init; + priv->dev.halt = smc911x_halt; + priv->dev.send = smc911x_send; + priv->dev.recv = smc911x_recv; +sprintf (priv->dev.name,"%s-%hu" ,DRIVERNAME , dev_num); -eth_register (dev); +eth_register (&priv->dev);#if defined(CONFIG_MII ) || defined(CONFIG_CMD_MII )int retval;struct mii_dev *mdiodev =mdio_alloc (); +if (!mdiodev) { -eth_unregister (dev); -free (dev); +eth_unregister (&priv->dev); +free (priv);return -ENOMEM ; } -strncpy (mdiodev->name, dev->name,MDIO_NAME_LEN ); +strncpy (mdiodev->name, priv->dev.name,MDIO_NAME_LEN ); mdiodev->read = smc911x_miiphy_read; mdiodev->write = smc911x_miiphy_write; retval =mdio_register (mdiodev);if (retval <0 ) {mdio_free (mdiodev); -eth_unregister (dev); -free (dev); +eth_unregister (&priv->dev); +free (priv);return retval; }#endif
Signature · 1 line
2.25.0
PATCH 9/12 net: smc911x: Pass around driver private data
Quoted 8 lines · Marek Vasut
Introduce a private data structure for this driver with embedded struct
eth_deviceand pass it around. This prepares the driver to work with both DM and non-DM systems.Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>
PATCH 10/12 net: smc911x: Clean up the status handling in smc911x_recv()
In reply to Marek VasutInvest the status handling logic in smc911x_recv(), to make the function easier to read, no functional change.
--- drivers/net/smc911x.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/net/smc911x.c +17 -14
@@ -352,23 +352,26 @@ static int smc911x_recv(struct eth_device *dev)u32 pktlen, tmplen;u32 status; -if ((smc911x_reg_read (priv,RX_FIFO_INF ) &RX_FIFO_INF_RXSUSED ) >>16 ) { - status =smc911x_reg_read (priv,RX_STATUS_FIFO ); - pktlen = (status &RX_STS_PKT_LEN ) >>16 ; + status =smc911x_reg_read (priv,RX_FIFO_INF ); + status = (status &RX_FIFO_INF_RXSUSED ) >>16 ; +if (!status) +return 0 ; -smc911x_reg_write (priv,RX_CFG ,0 ); + status =smc911x_reg_read (priv,RX_STATUS_FIFO ); + pktlen = (status &RX_STS_PKT_LEN ) >>16 ; - tmplen = (pktlen +3 ) /4 ; -while (tmplen--) - *data++ =smc911x_reg_read (priv,RX_DATA_FIFO ); +smc911x_reg_write (priv,RX_CFG ,0 ); -if (status &RX_STS_ES ) -printf (DRIVERNAME -": dropped bad packet. Status: 0x%08x\n" , - status); -else -net_process_received_packet (net_rx_packets[0 ], pktlen); - } + tmplen = (pktlen +3 ) /4 ; +while (tmplen--) + *data++ =smc911x_reg_read (priv,RX_DATA_FIFO ); + +if (status &RX_STS_ES ) +printf (DRIVERNAME +": dropped bad packet. Status: 0x%08x\n" , + status); +else +net_process_received_packet (net_rx_packets[0 ], pktlen);return 0 ; }
Signature · 1 line
2.25.0
PATCH 10/12 net: smc911x: Clean up the status handling in smc911x_recv()
Quoted 16 lines · Marek Vasut
Invest the status handling logic in
smc911x_recv(), to make the function easier to read, no functional change.Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>--- drivers/net/smc911x.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)drivers/net/smc911x.c +0
-0
drivers/net/smc911x.c static int smc911x_recv(struct eth_device *dev) · line 358
Quoted 10 lines
drivers/net/smc911x.c +4
-3@@ -352,23 +352,26 @@ static int smc911x_recv(struct eth_device *dev)u32 pktlen, tmplen;u32 status; -if ((smc911x_reg_read (priv,RX_FIFO_INF ) &RX_FIFO_INF_RXSUSED ) >>16 ) { - status =smc911x_reg_read (priv,RX_STATUS_FIFO ); - pktlen = (status &RX_STS_PKT_LEN ) >>16 ; + status =smc911x_reg_read (priv,RX_FIFO_INF ); + status = (status &RX_FIFO_INF_RXSUSED ) >>16 ; +if (!status) +return 0 ;
If you are only interested in whether theRX_FIFO_INF_RXSUSED field is zero or not,
">> 16" seems unneeded.
status = smc911x_reg_read(priv, RX_FIFO_INF);
if (!(status & RX_FIFO_INF_RXSUSED))
return 0;is simpler.
Quoted 32 lines
drivers/net/smc911x.c +13
-12-smc911x_reg_write (priv,RX_CFG ,0 ); + status =smc911x_reg_read (priv,RX_STATUS_FIFO ); + pktlen = (status &RX_STS_PKT_LEN ) >>16 ; - tmplen = (pktlen +3 ) /4 ; -while (tmplen--) - *data++ =smc911x_reg_read (priv,RX_DATA_FIFO ); +smc911x_reg_write (priv,RX_CFG ,0 ); -if (status &RX_STS_ES ) -printf (DRIVERNAME -": dropped bad packet. Status: 0x%08x\n" , - status); -else -net_process_received_packet (net_rx_packets[0 ], pktlen); - } + tmplen = (pktlen +3 ) /4 ; +while (tmplen--) + *data++ =smc911x_reg_read (priv,RX_DATA_FIFO ); + +if (status &RX_STS_ES ) +printf (DRIVERNAME +": dropped bad packet. Status: 0x%08x\n" , + status); +else +net_process_received_packet (net_rx_packets[0 ], pktlen);return 0 ; } --2.25.0
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 10/12 net: smc911x: Clean up the status handling in smc911x_recv()
In reply to Marek VasutQuoted 3 lines · Marek Vasut
Invest the status handling logic in
smc911x_recv(), to make the function easier to read, no functional change.
Invest -> Invert
Quoted 55 lines
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>--- drivers/net/smc911x.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)drivers/net/smc911x.c +17
-15@@ -352,23 +352,26 @@ static int smc911x_recv(struct eth_device *dev)u32 pktlen, tmplen;u32 status; -if ((smc911x_reg_read (priv,RX_FIFO_INF ) &RX_FIFO_INF_RXSUSED ) >>16 ) { - status =smc911x_reg_read (priv,RX_STATUS_FIFO ); - pktlen = (status &RX_STS_PKT_LEN ) >>16 ; + status =smc911x_reg_read (priv,RX_FIFO_INF ); + status = (status &RX_FIFO_INF_RXSUSED ) >>16 ; +if (!status) +return 0 ; -smc911x_reg_write (priv,RX_CFG ,0 ); + status =smc911x_reg_read (priv,RX_STATUS_FIFO ); + pktlen = (status &RX_STS_PKT_LEN ) >>16 ; - tmplen = (pktlen +3 ) /4 ; -while (tmplen--) - *data++ =smc911x_reg_read (priv,RX_DATA_FIFO ); +smc911x_reg_write (priv,RX_CFG ,0 ); -if (status &RX_STS_ES ) -printf (DRIVERNAME -": dropped bad packet. Status: 0x%08x\n" , - status); -else -net_process_received_packet (net_rx_packets[0 ], pktlen); - } + tmplen = (pktlen +3 ) /4 ; +while (tmplen--) + *data++ =smc911x_reg_read (priv,RX_DATA_FIFO ); + +if (status &RX_STS_ES ) +printf (DRIVERNAME +": dropped bad packet. Status: 0x%08x\n" , + status); +else +net_process_received_packet (net_rx_packets[0 ], pktlen);return 0 ; } --2.25.0
PATCH 11/12 net: smc911x: Split non-DM specific bits from common code
In reply to Marek VasutSplit network handling functions into non-DM specific parts and common code in preparation for conversion to DM.
--- drivers/net/smc911x.c | 57 ++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 14 deletions(-)
drivers/net/smc911x.c +43 -14
@@ -277,9 +277,8 @@ static void smc911x_enable(struct smc911x_priv *priv) MAC_CR_HBDIS); } -static int smc911x_init (struct eth_device *dev,bd_t * bd) +static int smc911x_init_common (struct smc911x_priv *priv) { - struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);const struct chip_id *id = priv->chipid;printf (DRIVERNAME ": detected %s controller\n" , id->name);
@@ -297,9 +296,9 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd)return 0 ; } -static int smc911x_send (struct eth_device *dev,void *packet,int length) +static int smc911x_send_common (struct smc911x_priv *priv, +void *packet,int length) { - struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev);u32 *data = (u32 *)packet;u32 tmplen;u32 status;
@@ -337,18 +336,14 @@ static int smc911x_send(struct eth_device *dev, void *packet, int length)return -1 ; } -static void smc911x_halt (struct eth_device *dev) +static void smc911x_halt_common (struct smc911x_priv *priv) { - struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev); -smc911x_reset (priv);smc911x_handle_mac_address (priv); } -static int smc911x_recv (struct eth_device *dev) +static int smc911x_recv_common (struct smc911x_priv *priv,u32 *data) { - struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev); -u32 *data = (u32 *)net_rx_packets[0 ];u32 pktlen, tmplen;u32 status;
@@ -366,14 +361,14 @@ static int smc911x_recv(struct eth_device *dev)while (tmplen--) *data++ =smc911x_reg_read (priv,RX_DATA_FIFO ); -if (status &RX_STS_ES ) +if (status &RX_STS_ES ) {printf (DRIVERNAME ": dropped bad packet. Status: 0x%08x\n" , status); -else -net_process_received_packet (net_rx_packets[0 ], pktlen); +return 0 ; + } -return 0 ; +return pktlen; }#if defined(CONFIG_MII ) || defined(CONFIG_CMD_MII )
@@ -410,6 +405,40 @@ static int smc911x_miiphy_write(struct mii_dev *bus, int phy, int devad, }#endif +static int smc911x_init (struct eth_device *dev,bd_t *bd) +{ + struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev); + +return smc911x_init_common (priv); +} + +static void smc911x_halt (struct eth_device *dev) +{ + struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev); + +smc911x_halt_common (priv); +} + +static int smc911x_send (struct eth_device *dev,void *packet,int length) +{ + struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev); + +return smc911x_send_common (priv, packet, length); +} + +static int smc911x_recv (struct eth_device *dev) +{ + struct smc911x_priv *priv = container_of(dev, struct smc911x_priv, dev); +u32 *data = (u32 *)net_rx_packets[0 ]; +int ret; + + ret =smc911x_recv_common (priv, data); +if (ret) +net_process_received_packet (net_rx_packets[0 ], ret); + +return ret; +} +int smc911x_initialize (u8 dev_num,int base_addr) {unsigned long addrl, addrh;
Signature · 1 line
2.25.0
PATCH 11/12 net: smc911x: Split non-DM specific bits from common code
Quoted 7 lines · Marek Vasut
Split network handling functions into non-DM specific parts and common code in preparation for conversion to DM.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>
PATCH 12/12 net: smc911x: Add DM support
In reply to Marek VasutAdd support for U-Boot DM and DT probing. Furthermore, build the SMC911x standalone EEPROM example only for the non-DM case, as it is not converted yet.
--- board/renesas/blanche/blanche.c | 2 + drivers/net/smc911x.c | 114 ++++++++++++++++++++++++++++++++ examples/standalone/Makefile | 5 +- 3 files changed, 120 insertions(+), 1 deletion(-)
board/renesas/blanche/blanche.c +2 -0
@@ -313,6 +313,7 @@ int board_init(void) }/* Added for BLANCHE(R-CarV2H board) */ +#ifndef CONFIG_DM_ETH int board_eth_init (bd_t *bis) {int rc =0 ;
@@ -337,6 +338,7 @@ int board_eth_init(bd_t *bis) return rc; } +#endif int dram_init (void ) {
drivers/net/smc911x.c +114 -0
130 lines not on this page · raw message
examples/standalone/Makefile +4 -1
@@ -5,10 +5,13 @@ extra-y := hello_world extra-$(CONFIG_SMC91111) += smc91111_eeprom -extra-$(CONFIG_SMC911X) += smc911x_eeprom extra-$(CONFIG_SPI_FLASH_ATMEL) += atmel_df_pow2 extra-$(CONFIG_PPC) += sched +ifndef CONFIG_DM_ETH +extra-$(CONFIG_SMC911X) += smc911x_eeprom +endif + # # Some versions of make do not handle trailing white spaces properly; # leading to build failures. The problem was found with GNU Make 3.80.
Signature · 1 line
2.25.0
PATCH 12/12 net: smc911x: Add DM support
Quoted 10 lines · Marek Vasut
Add support for U-Boot DM and DT probing. Furthermore, build the SMC911x standalone EEPROM example only for the non-DM case, as it is not converted yet.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>--- board/renesas/blanche/blanche.c | 2 +
Do you need to touch this board in the same commit? It is unclear to me why.
One more thing, CONFIG_SMC911X_BASE is only used for non DM_ETH case.
So, can you hide this config option?
drivers/net/Kconfig +1 -0
@@ -390,6 +390,7 @@ if SMC911X config SMC911X_BASE hex "SMC911X Base Address" + depends on !DM_ETH help Define this to hold the physical address of the device (I/O space)
Lastly, mismatch between From: and Signed-off-by.
Without "+renesas" in From,
With "+renesas" in Signed-off-by.
So that you are paid correctly for this work. Just in case. :)
Anyway, this series worked for me with DM_ETH=y.
Good work. Thanks.
Quoted 183 lines
drivers/net/smc911x.c | 114 ++++++++++++++++++++++++++++++++ examples/standalone/Makefile | 5 +- 3 files changed, 120 insertions(+), 1 deletion(-)board/renesas/blanche/blanche.c +2
-0@@ -313,6 +313,7 @@ int board_init(void) }/* Added for BLANCHE(R-CarV2H board) */ +#ifndef CONFIG_DM_ETH int board_eth_init (bd_t *bis) {int rc =0 ;@@ -337,6 +338,7 @@ int board_eth_init(bd_t *bis) return rc; } +#endif int dram_init (void ) {drivers/net/smc911x.c +114
-0@@ -21,7 +21,9 @@ struct chip_id { };struct smc911x_priv { +#ifndef CONFIG_DM_ETH struct eth_device dev; +#endif phys_addr_t iobase;const struct chip_id *chipid;unsigned char enetaddr[6 ];@@ -371,6 +373,8 @@ static int smc911x_recv_common(struct smc911x_priv *priv, u32 *data)return pktlen; } +#ifndef CONFIG_DM_ETH +#if defined(CONFIG_MII ) || defined(CONFIG_CMD_MII )/* wrapper for smc911x_eth_phy_read */ static int smc911x_miiphy_read(struct mii_dev *bus, int phy, int devad,@@ -502,3 +506,113 @@ int smc911x_initialize(u8 dev_num, int base_addr)return 1 ; } + +#else /* ifdef CONFIG_DM_ETH */ + +static int smc911x_start (struct udevice *dev) +{ +struct eth_pdata *plat =dev_get_platdata (dev); +struct smc911x_priv *priv =dev_get_priv (dev); + +memcpy (priv->enetaddr, plat->enetaddr,sizeof (plat->enetaddr)); + +return smc911x_init_common (priv); +} + +static void smc911x_stop (struct udevice *dev) +{ +struct smc911x_priv *priv =dev_get_priv (dev); + +smc911x_halt_common (priv); +} + +static int smc911x_send (struct udevice *dev,void *packet,int length) +{ +struct smc911x_priv *priv =dev_get_priv (dev); +int ret; + + ret =smc911x_send_common (priv, packet, length); + +return ret ?0 : -ETIMEDOUT ; +} + +static int smc911x_recv (struct udevice *dev,int flags,uchar **packetp) +{ +struct smc911x_priv *priv =dev_get_priv (dev); +u32 *data = (u32 *)net_rx_packets[0 ]; +int ret; + + ret =smc911x_recv_common (priv, data); +if (ret) + *packetp = (void *)data; + +return ret ? ret : -EAGAIN ; +} + +static int smc911x_bind (struct udevice *dev) +{ +return device_set_name (dev, dev->name); +} + +static int smc911x_probe (struct udevice *dev) +{ +struct smc911x_priv *priv =dev_get_priv (dev); +unsigned long addrh, addrl; +int ret; + +/* Try to detect chip. Will fail if not present. */ + ret =smc911x_detect_chip (priv); +if (ret) +return ret; + + addrh =smc911x_get_mac_csr (priv,ADDRH ); + addrl =smc911x_get_mac_csr (priv,ADDRL ); +if (!(addrl ==0xffffffff && addrh ==0x0000ffff )) { +/* address is obtained from optional eeprom */ + priv->enetaddr[0 ] = addrl; + priv->enetaddr[1 ] = addrl >>8 ; + priv->enetaddr[2 ] = addrl >>16 ; + priv->enetaddr[3 ] = addrl >>24 ; + priv->enetaddr[4 ] = addrh; + priv->enetaddr[5 ] = addrh >>8 ; + } + +return 0 ; +} + +static int smc911x_ofdata_to_platdata (struct udevice *dev) +{ +struct smc911x_priv *priv =dev_get_priv (dev); +struct eth_pdata *pdata =dev_get_platdata (dev); + + pdata->iobase =devfdt_get_addr (dev); + priv->iobase = pdata->iobase; + +return 0 ; +} + +static const struct eth_ops smc911x_ops = { + .start = smc911x_start, + .send = smc911x_send, + .recv = smc911x_recv, + .stop = smc911x_stop, +}; + +static const struct udevice_id smc911x_ids[] = { + { .compatible ="smsc,lan9115" }, + { } +}; + +U_BOOT_DRIVER (smc911x) = { + .name ="eth_smc911x" , + .id =UCLASS_ETH , + .of_match = smc911x_ids, + .bind = smc911x_bind, + .ofdata_to_platdata = smc911x_ofdata_to_platdata, + .probe = smc911x_probe, + .ops = &smc911x_ops, + .priv_auto_alloc_size =sizeof (struct smc911x_priv ), + .platdata_auto_alloc_size =sizeof (struct eth_pdata ), + .flags =DM_FLAG_ALLOC_PRIV_DMA , +}; +#endif examples/standalone/Makefile +4
-2@@ -5,10 +5,13 @@ extra-y := hello_world extra-$(CONFIG_SMC91111) += smc91111_eeprom -extra-$(CONFIG_SMC911X) += smc911x_eeprom extra-$(CONFIG_SPI_FLASH_ATMEL) += atmel_df_pow2 extra-$(CONFIG_PPC) += sched +ifndef CONFIG_DM_ETH +extra-$(CONFIG_SMC911X) += smc911x_eeprom +endif + # # Some versions of make do not handle trailing white spaces properly; # leading to build failures. The problem was found with GNU Make 3.80. --2.25.0
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 12/12 net: smc911x: Add DM support
Quoted 13 lines · Masahiro Yamada
Quoted 10 lines · Marek Vasut
Add support for U-Boot DM and DT probing. Furthermore, build the SMC911x standalone EEPROM example only for the non-DM case, as it is not converted yet.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>--- board/renesas/blanche/blanche.c | 2 +
Quoted 2 lines
Do you need to touch this board in the same commit? It is unclear to me why.
Nope, that should be separate.
Quoted 19 lines
One more thing,
CONFIG_SMC911X_BASEis only used for nonDM_ETHcase.So, can you hide this config option?
drivers/net/Kconfig +1
-0@@ -390,6 +390,7 @@ if SMC911X config SMC911X_BASE hex "SMC911X Base Address" + depends on !DM_ETH help Define this to hold the physical address of the device (I/O space)
Quoted 4 lines
Lastly, mismatch between From: and Signed-off-by.
Without "+renesas" in From,
With "+renesas" in Signed-off-by.
Do you have a git config to handle that correctly with gmail ?
Signature · 2 lines
Best regards, Marek Vasut
PATCH 12/12 net: smc911x: Add DM support
In reply to Marek VasutQuoted 49 lines · Marek Vasut
Add support for U-Boot DM and DT probing. Furthermore, build the SMC911x standalone EEPROM example only for the non-DM case, as it is not converted yet.
Signed-off-by Marek Vasut <[email protected]>Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>--- board/renesas/blanche/blanche.c | 2 + drivers/net/smc911x.c | 114 ++++++++++++++++++++++++++++++++ examples/standalone/Makefile | 5 +- 3 files changed, 120 insertions(+), 1 deletion(-)board/renesas/blanche/blanche.c +2
-0@@ -313,6 +313,7 @@ int board_init(void) }/* Added for BLANCHE(R-CarV2H board) */ +#ifndef CONFIG_DM_ETH int board_eth_init (bd_t *bis) {int rc =0 ;@@ -337,6 +338,7 @@ int board_eth_init(bd_t *bis) return rc; } +#endif int dram_init (void ) {drivers/net/smc911x.c +2
-0@@ -21,7 +21,9 @@ struct chip_id { };struct smc911x_priv { +#ifndef CONFIG_DM_ETH struct eth_device dev; +#endif phys_addr_t iobase;const struct chip_id *chipid;unsigned char enetaddr[6 ];
drivers/net/smc911x.c static int smc911x_recv_common(struct smc911x_priv *priv, u32 *data) · line 376
Quoted 4 lines
drivers/net/smc911x.c +1
-0@@ -371,6 +373,8 @@ static int smc911x_recv_common(struct smc911x_priv *priv, u32 *data)return pktlen; } +#ifndef CONFIG_DM_ETH
Please use positive logic here.
Quoted 68 lines
drivers/net/smc911x.c +61
-0+#if defined(CONFIG_MII ) || defined(CONFIG_CMD_MII )/* wrapper for smc911x_eth_phy_read */ static int smc911x_miiphy_read(struct mii_dev *bus, int phy, int devad,@@ -502,3 +506,113 @@ int smc911x_initialize(u8 dev_num, int base_addr)return 1 ; } + +#else /* ifdef CONFIG_DM_ETH */ + +static int smc911x_start (struct udevice *dev) +{ +struct eth_pdata *plat =dev_get_platdata (dev); +struct smc911x_priv *priv =dev_get_priv (dev); + +memcpy (priv->enetaddr, plat->enetaddr,sizeof (plat->enetaddr)); + +return smc911x_init_common (priv); +} + +static void smc911x_stop (struct udevice *dev) +{ +struct smc911x_priv *priv =dev_get_priv (dev); + +smc911x_halt_common (priv); +} + +static int smc911x_send (struct udevice *dev,void *packet,int length) +{ +struct smc911x_priv *priv =dev_get_priv (dev); +int ret; + + ret =smc911x_send_common (priv, packet, length); + +return ret ?0 : -ETIMEDOUT ; +} + +static int smc911x_recv (struct udevice *dev,int flags,uchar **packetp) +{ +struct smc911x_priv *priv =dev_get_priv (dev); +u32 *data = (u32 *)net_rx_packets[0 ]; +int ret; + + ret =smc911x_recv_common (priv, data); +if (ret) + *packetp = (void *)data; + +return ret ? ret : -EAGAIN ; +} + +static int smc911x_bind (struct udevice *dev) +{ +return device_set_name (dev, dev->name); +} + +static int smc911x_probe (struct udevice *dev) +{ +struct smc911x_priv *priv =dev_get_priv (dev); +unsigned long addrh, addrl; +int ret; + +/* Try to detect chip. Will fail if not present. */ + ret =smc911x_detect_chip (priv); +if (ret) +return ret; + + addrh =smc911x_get_mac_csr (priv,ADDRH );
drivers/net/smc911x.c int smc911x_initialize(u8 dev_num, int base_addr) · line 578
Quoted 10 lines
drivers/net/smc911x.c +10
-0+ addrl =smc911x_get_mac_csr (priv,ADDRL ); +if (!(addrl ==0xffffffff && addrh ==0x0000ffff )) { +/* address is obtained from optional eeprom */ + priv->enetaddr[0 ] = addrl; + priv->enetaddr[1 ] = addrl >>8 ; + priv->enetaddr[2 ] = addrl >>16 ; + priv->enetaddr[3 ] = addrl >>24 ; + priv->enetaddr[4 ] = addrh; + priv->enetaddr[5 ] = addrh >>8 ; + }
Can you make a common function for sharing the MAC address parsing?
Quoted 62 lines
drivers/net/smc911x.c +40
-0+ +return 0 ; +} + +static int smc911x_ofdata_to_platdata (struct udevice *dev) +{ +struct smc911x_priv *priv =dev_get_priv (dev); +struct eth_pdata *pdata =dev_get_platdata (dev); + + pdata->iobase =devfdt_get_addr (dev); + priv->iobase = pdata->iobase; + +return 0 ; +} + +static const struct eth_ops smc911x_ops = { + .start = smc911x_start, + .send = smc911x_send, + .recv = smc911x_recv, + .stop = smc911x_stop, +}; + +static const struct udevice_id smc911x_ids[] = { + { .compatible ="smsc,lan9115" }, + { } +}; + +U_BOOT_DRIVER (smc911x) = { + .name ="eth_smc911x" , + .id =UCLASS_ETH , + .of_match = smc911x_ids, + .bind = smc911x_bind, + .ofdata_to_platdata = smc911x_ofdata_to_platdata, + .probe = smc911x_probe, + .ops = &smc911x_ops, + .priv_auto_alloc_size =sizeof (struct smc911x_priv ), + .platdata_auto_alloc_size =sizeof (struct eth_pdata ), + .flags =DM_FLAG_ALLOC_PRIV_DMA , +}; +#endif examples/standalone/Makefile +4
-2@@ -5,10 +5,13 @@ extra-y := hello_world extra-$(CONFIG_SMC91111) += smc91111_eeprom -extra-$(CONFIG_SMC911X) += smc911x_eeprom extra-$(CONFIG_SPI_FLASH_ATMEL) += atmel_df_pow2 extra-$(CONFIG_PPC) += sched +ifndef CONFIG_DM_ETH +extra-$(CONFIG_SMC911X) += smc911x_eeprom +endif + # # Some versions of make do not handle trailing white spaces properly; # leading to build failures. The problem was found with GNU Make 3.80. --2.25.0
cover net: smc911x: Convert to DM
In reply to Marek VasutHi Marek,
Quoted 4 lines · Marek Vasut
Perform DM conversion of the SMC911x driver. Note that as I do not have any hardware with this chip, I only compile-tested this conversion. But it seems Yamada-san has one, so please test.
With a quick test on my board, it worked for me.
I will leave comments to each patch, but
they are mostly nit-picking.
Thanks for the cleanups and the conversion.
Quoted 34 lines
Note that the DT compatible is set only for 9115 , so this might need to be changed.
Note that this is compile-tested, but not hardware tested, so please do send me patches, thanks.
Marek Vasut (12):
net: smc911x: Remove pkt_data_{push,pull}
net: smc911x: Replace malloc()+memset() withcalloc()
net: smc911x: Renamesmc911x_rx()tosmc911x_recv()
net: smc911x: Invert the logic in smc911x_miiphy_{read,write}()
net: smc911x: Fix potentialmemleak()in init fail path
net: smc911x: Inline all functions from header file
net: smc911x: Drop weak alias from 32bit accessors
net: smc911x: Convert IO accessors to {read,write}{w,l}()
net: smc911x: Pass around driver private data
net: smc911x: Clean up the status handling insmc911x_recv()
net: smc911x: Split non-DM specific bits from common code
net: smc911x: Add DM supportboard/renesas/blanche/blanche.c | 2 + drivers/net/smc911x.c | 523 +++++++++++++++++++++------ drivers/net/smc911x.h | 157 -------- examples/standalone/Makefile | 5 +- examples/standalone/smc911x_eeprom.c | 150 ++++++++ 5 files changed, 577 insertions(+), 260 deletions(-)Cc Joe Hershberger <[email protected]>Cc Masahiro Yamada <[email protected]>--
2.25.0
Signature · 2 lines
Best Regards Masahiro Yamada
cover net: smc911x: Convert to DM
Quoted 1 line · Masahiro Yamada
Hi Marek,
Hi,
Quoted 6 lines · Marek Vasut
Quoted 4 lines
Perform DM conversion of the SMC911x driver. Note that as I do not have any hardware with this chip, I only compile-tested this conversion. But it seems Yamada-san has one, so please test.
Quoted 6 lines
With a quick test on my board, it worked for me.
I will leave comments to each patch, but
they are mostly nit-picking.Thanks for the cleanups and the conversion.
I fixed most of those, thanks for testing.
I also got access to the V2H blanche and there it works too, so maybe some future revision of this could be queued up for next.
Signature · 2 lines
Best regards, Marek Vasut
cover net: smc911x: Convert to DM
Quoted 9 lines · Marek Vasut
Quoted 1 line · Masahiro Yamada
Hi Marek,
Hi,
Quoted 3 lines · Marek Vasut
Quoted 2 lines
Perform DM conversion of the SMC911x driver. Note that as I do not have
Thanks for taking this on.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
any hardware with this chip, I only compile-tested this conversion. But it seems Yamada-san has one, so please test.
I have a DM3730 with this chip. Without DM_ETH, the omap3_logic_defconfig doesn't compile with the following errors:
drivers/net/smc911x.c: In function ?smc911x_initialize?:drivers/net/smc911x.c:477:2: error: ?dev? undeclared (first use in this function)
477 | dev = kzalloc(sizeof(*priv), GFP_KERNEL);
| ^~~drivers/net/smc911x.c:477:2: note: each undeclared identifier is reported only once for each function it appears in drivers/net/smc911x.c:477:8: warning: implicit declaration of function ?kzalloc?; did you mean ?calloc?? [-Wimplicit-function-declaration]
477 | dev = kzalloc(sizeof(*priv), GFP_KERNEL);
| ^~~~~~~
| calloc
drivers/net/smc911x.c:477:31: error: ?GFP_KERNEL? undeclared (first
use in this function)
477 | dev = kzalloc(sizeof(*priv), GFP_KERNEL);
| ^~~~~~~~~~make[1]: *** [scripts/Makefile.build:279: drivers/net/smc911x.o] Error 1
Quoted 9 lines
Quoted 7 lines
With a quick test on my board, it worked for me.
I will leave comments to each patch, but
they are mostly nit-picking.Thanks for the cleanups and the conversion.
I fixed most of those, thanks for testing.
If I enable DM_ETH, I need to make a few changes to the device tree, but with those changes, I was able to get the Ethernet working. The OMAP3 boards have the Ethernet node attached to their GPMC bus which currently doesn't have a driver. Making the GPMC compatible with 'simple-bus' wasn't sufficient. With only that change, the system would hang while trying to probe the network interface.
What I ended up having to do was add the following to my root node:
ethernet at 08000000 {
compatible = "smsc,lan9221","smsc,lan9115";
reg = <0x08000000>;
bank-width = <2>;
vddvario-supply = <&vddvario>;
vdd33a-supply = <&vdd33a>;
reg-io-width = <4>;
smsc,save-mac-address;
};I didn't look to see if I needed all those entries, but I was able to get an IP address and ping a different computer.
If there is a future revision to fix the default build errors, I can add similar comments with my tested-by if you want to CC me.
adam
Quoted 7 lines
I also got access to the V2H blanche and there it works too, so maybe some future revision of this could be queued up for next.
--
Best regards,
Marek Vasut
cover net: smc911x: Convert to DM
Quoted 28 lines · Adam Ford
Quoted 9 lines · Marek Vasut
Quoted 1 line · Masahiro Yamada
Hi Marek,
Hi,
Quoted 3 lines · Marek Vasut
Quoted 2 lines
Perform DM conversion of the SMC911x driver. Note that as I do not have
Thanks for taking this on.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
any hardware with this chip, I only compile-tested this conversion. But it seems Yamada-san has one, so please test.
I have a DM3730 with this chip. Without
DM_ETH, theomap3_logic_defconfigdoesn't compile with the following errors:
drivers/net/smc911x.c: In function ?smc911x_initialize?:drivers/net/smc911x.c:477:2: error: ?dev? undeclared (first use in this function)477 | dev = kzalloc(sizeof(*priv), GFP_KERNEL); | ^~~
drivers/net/smc911x.c:477:2: note: each undeclared identifier is reported only once for each function it appears indrivers/net/smc911x.c:477:8: warning: implicit declaration of function ?kzalloc?; did you mean ?calloc?? [-Wimplicit-function-declaration]
Quoted 8 lines
477 | dev = kzalloc(sizeof(*priv), GFP_KERNEL); | ^~~~~~~ | calloc drivers/net/smc911x.c:477:31: error: ?GFP_KERNEL? undeclared (first use in this function) 477 | dev = kzalloc(sizeof(*priv), GFP_KERNEL); | ^~~~~~~~~~make[1]: *** [
scripts/Makefile.build:279:drivers/net/smc911x.o] Error 1
Well, replace the kzalloc with calloc.
Quoted 28 lines
Quoted 8 lines
Quoted 6 lines
With a quick test on my board, it worked for me.
I will leave comments to each patch, but
they are mostly nit-picking.Thanks for the cleanups and the conversion.
I fixed most of those, thanks for testing.
If I enable
DM_ETH, I need to make a few changes to the device tree, but with those changes, I was able to get the Ethernet working. The OMAP3 boards have the Ethernet node attached to their GPMC bus which currently doesn't have a driver. Making the GPMC compatible with 'simple-bus' wasn't sufficient. With only that change, the system would hang while trying to probe the network interface.What I ended up having to do was add the following to my root node:
ethernet at 08000000 { compatible = "smsc,lan9221","smsc,lan9115"; reg = <0x08000000>; bank-width = <2>; vddvario-supply = <&vddvario>; vdd33a-supply = <&vdd33a>; reg-io-width = <4>; smsc,save-mac-address; };
Quoted 4 lines
I didn't look to see if I needed all those entries, but I was able to get an IP address and ping a different computer.
If there is a future revision to fix the default build errors, I can add similar comments with my tested-by if you want to CC me.
I'm about to send a V3.