net: Use phys_addr_t for SMC net device addresses
PATCH 1/1 net: Use phys_addr_t for SMC net device addresses
From: Peter Hoyes <[email protected]>
Use same type as eth_device->iobase and support addresses greater than INT_MAX.
--- drivers/net/smc91111.c | 2 +- drivers/net/smc911x.c | 2 +- include/netdev.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/smc91111.c +1 -1
@@ -1269,7 +1269,7 @@ static void print_packet( byte * buf, int length ) }#endif -int smc91111_initialize (u8 dev_num,int base_addr) +int smc91111_initialize (u8 dev_num,phys_addr_t base_addr) {struct smc91111_priv *priv;struct eth_device *dev;
drivers/net/smc911x.c +1 -1
@@ -478,7 +478,7 @@ static int smc911x_recv(struct eth_device *dev)return ret; } -int smc911x_initialize (u8 dev_num,int base_addr) +int smc911x_initialize (u8 dev_num,phys_addr_t base_addr) {struct smc911x_priv *priv;int ret;
include/netdev.h +2 -2
@@ -70,8 +70,8 @@ int rtl8169_initialize(struct bd_info *bis);int scc_initialize (struct bd_info *bis);int sh_eth_initialize (struct bd_info *bis);int skge_initialize (struct bd_info *bis); -int smc91111_initialize (u8 dev_num,int base_addr); -int smc911x_initialize (u8 dev_num,int base_addr); +int smc91111_initialize (u8 dev_num,phys_addr_t base_addr); +int smc911x_initialize (u8 dev_num,phys_addr_t base_addr);int uec_standard_init (struct bd_info *bis);int uli526x_initialize (struct bd_info *bis);int armada100_fec_register (unsigned long base_addr);
Signature · 1 line
2.25.1
Quoted 55 lines · Peter Hoyes
From: Peter Hoyes <[email protected]>
Use same type as
eth_device->iobaseand support addresses greater thanINT_MAX.Signed-off-by Peter Hoyes <[email protected]>--- drivers/net/smc91111.c | 2 +- drivers/net/smc911x.c | 2 +- include/netdev.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)drivers/net/smc91111.c +1
-1@@ -1269,7 +1269,7 @@ static void print_packet( byte * buf, int length ) }#endif -int smc91111_initialize (u8 dev_num,int base_addr) +int smc91111_initialize (u8 dev_num,phys_addr_t base_addr) {struct smc91111_priv *priv;struct eth_device *dev;drivers/net/smc911x.c +1
-1@@ -478,7 +478,7 @@ static int smc911x_recv(struct eth_device *dev)return ret; } -int smc911x_initialize (u8 dev_num,int base_addr) +int smc911x_initialize (u8 dev_num,phys_addr_t base_addr) {struct smc911x_priv *priv;int ret;include/netdev.h +2
-3@@ -70,8 +70,8 @@ int rtl8169_initialize(struct bd_info *bis);int scc_initialize (struct bd_info *bis);int sh_eth_initialize (struct bd_info *bis);int skge_initialize (struct bd_info *bis); -int smc91111_initialize (u8 dev_num,int base_addr); -int smc911x_initialize (u8 dev_num,int base_addr); +int smc91111_initialize (u8 dev_num,phys_addr_t base_addr); +int smc911x_initialize (u8 dev_num,phys_addr_t base_addr);int uec_standard_init (struct bd_info *bis);int uli526x_initialize (struct bd_info *bis);int armada100_fec_register (unsigned long base_addr); --
Quoted 2 lines
2.25.1
Quoted 4 lines · On Fri, 9 Jul 2021 10:52:06 +0100 Peter Hoyes <[email protected]> wrote:
From: Peter Hoyes <[email protected]>
Use same type as
eth_device->iobaseand support addresses greater thanINT_MAX.
Indeed, a signed(!) int is really a poor choice for a base address.
Quoted 1 line
Signed-off-by Peter Hoyes <[email protected]>
Cheers,
Andre
Quoted 47 lines
--- drivers/net/smc91111.c | 2 +- drivers/net/smc911x.c | 2 +- include/netdev.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)drivers/net/smc91111.c +1
-1@@ -1269,7 +1269,7 @@ static void print_packet( byte * buf, int length ) }#endif -int smc91111_initialize (u8 dev_num,int base_addr) +int smc91111_initialize (u8 dev_num,phys_addr_t base_addr) {struct smc91111_priv *priv;struct eth_device *dev;drivers/net/smc911x.c +1
-1@@ -478,7 +478,7 @@ static int smc911x_recv(struct eth_device *dev)return ret; } -int smc911x_initialize (u8 dev_num,int base_addr) +int smc911x_initialize (u8 dev_num,phys_addr_t base_addr) {struct smc911x_priv *priv;int ret;include/netdev.h +2
-2@@ -70,8 +70,8 @@ int rtl8169_initialize(struct bd_info *bis);int scc_initialize (struct bd_info *bis);int sh_eth_initialize (struct bd_info *bis);int skge_initialize (struct bd_info *bis); -int smc91111_initialize (u8 dev_num,int base_addr); -int smc911x_initialize (u8 dev_num,int base_addr); +int smc91111_initialize (u8 dev_num,phys_addr_t base_addr); +int smc911x_initialize (u8 dev_num,phys_addr_t base_addr);int uec_standard_init (struct bd_info *bis);int uli526x_initialize (struct bd_info *bis);int armada100_fec_register (unsigned long base_addr);
Quoted 57 lines · Andre Przywara
Quoted 4 lines · On Fri, 9 Jul 2021 10:52:06 +0100 Peter Hoyes <[email protected]> wrote:
From: Peter Hoyes <[email protected]>
Use same type as
eth_device->iobaseand support addresses greater thanINT_MAX.Indeed, a signed(!) int is really a poor choice for a base address.
Quoted 1 line
Signed-off-by Peter Hoyes <[email protected]>Reviewed-by Andre Przywara <[email protected]>Cheers,
AndreQuoted 39 lines
--- drivers/net/smc91111.c | 2 +- drivers/net/smc911x.c | 2 +- include/netdev.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)drivers/net/smc91111.c +1
-1@@ -1269,7 +1269,7 @@ static void print_packet( byte * buf, int length ) }#endif -int smc91111_initialize (u8 dev_num,int base_addr) +int smc91111_initialize (u8 dev_num,phys_addr_t base_addr) {struct smc91111_priv *priv;struct eth_device *dev;drivers/net/smc911x.c +1
-1@@ -478,7 +478,7 @@ static int smc911x_recv(struct eth_device *dev)return ret; } -int smc911x_initialize (u8 dev_num,int base_addr) +int smc911x_initialize (u8 dev_num,phys_addr_t base_addr) {struct smc911x_priv *priv;int ret;include/netdev.h +0
-0@@ -70,8 +70,8 @@ int rtl8169_initialize(struct bd_info *bis);int scc_initialize (struct bd_info *bis);int sh_eth_initialize (struct bd_info *bis);
Quoted 9 lines
include/netdev.h int rtl8169_initialize(struct bd_info *bis); · line 77
Quoted 8 lines
include/netdev.h +2
-2int skge_initialize (struct bd_info *bis); -int smc91111_initialize (u8 dev_num,int base_addr); -int smc911x_initialize (u8 dev_num,int base_addr); +int smc91111_initialize (u8 dev_num,phys_addr_t base_addr); +int smc911x_initialize (u8 dev_num,phys_addr_t base_addr);int uec_standard_init (struct bd_info *bis);int uli526x_initialize (struct bd_info *bis);int armada100_fec_register (unsigned long base_addr);
Applied to u-boot-net/network-master
Thanks,
Ramon.