mv643xx_eth: move mac_addr inside of mv643xx_eth_platform_data
Subsystems (4)
PATCH 1/2 mv643xx_eth: move mac_addr inside of mv643xx_eth_platform_data
The information contained within platform_data should be self-contained. Replace the pointer to a MAC address with the actual MAC address in struct mv643xx_eth_platform_data.
drivers/net/mv643xx_eth.c +3 -1
@@ -1380,7 +1380,9 @@ static int mv643xx_eth_probe(struct plat pd = pdev->dev.platform_data;if (pd) { -if (pd->mac_addr) +static u8 zero_mac_addr[6 ] = {0 }; + +if (memcmp (pd->mac_addr, zero_mac_addr,6 ) !=0 )memcpy (dev->dev_addr, pd->mac_addr,6 );if (pd->phy_addr || pd->force_phy_addr)
include/linux/mv643xx.h +1 -1
@@ -1289,7 +1289,6 @@ struct mv64xxx_i2c_pdata {#define MV643XX_ETH_NAME "mv643xx_eth"struct mv643xx_eth_platform_data { -char *mac_addr;/* pointer to mac address */ u16 force_phy_addr;/* force override if phy_addr == 0 */ u16 phy_addr;
@@ -1304,6 +1303,7 @@ struct mv643xx_eth_platform_data {u32 tx_sram_size;u32 rx_sram_addr;u32 rx_sram_size; + u8 mac_addr[6]; /* mac address if non-zero*/ };#endif /* __ASM_MV643XX_H */
arch/mips/momentum/jaguar_atx/platform.c +4 -16
@@ -47,11 +47,7 @@ static struct resource mv64x60_eth0_reso }, }; -static char eth0_mac_addr[ETH_ALEN ]; -static struct mv643xx_eth_platform_data eth0_pd = { - .mac_addr = eth0_mac_addr, - .tx_sram_addr =MV_SRAM_BASE_ETH0 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -80,11 +76,7 @@ static struct resource mv64x60_eth1_reso }, }; -static char eth1_mac_addr[ETH_ALEN ]; -static struct mv643xx_eth_platform_data eth1_pd = { - .mac_addr = eth1_mac_addr, - .tx_sram_addr =MV_SRAM_BASE_ETH1 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -113,11 +105,7 @@ static struct resource mv64x60_eth2_reso }, }; -static char eth2_mac_addr[ETH_ALEN ]; - -static struct mv643xx_eth_platform_data eth2_pd = { - .mac_addr = eth2_mac_addr, -}; +static struct mv643xx_eth_platform_data eth2_pd;static struct platform_device eth2_device = { .name =MV643XX_ETH_NAME ,
@@ -200,9 +188,9 @@ static int __init mv643xx_eth_add_pds(voint ret;get_mac (mac); -eth_mac_add (eth0_mac_addr, mac,0 ); -eth_mac_add (eth1_mac_addr, mac,1 ); -eth_mac_add (eth2_mac_addr, mac,2 ); +eth_mac_add (eth0_pd.mac_addr, mac,0 ); +eth_mac_add (eth1_pd.mac_addr, mac,1 ); +eth_mac_add (eth2_pd.mac_addr, mac,2 ); ret =platform_add_devices (mv643xx_eth_pd_devs,ARRAY_SIZE (mv643xx_eth_pd_devs));
arch/mips/momentum/ocelot_3/platform.c +4 -16
@@ -47,11 +47,7 @@ static struct resource mv64x60_eth0_reso }, }; -static char eth0_mac_addr[ETH_ALEN ]; -static struct mv643xx_eth_platform_data eth0_pd = { - .mac_addr = eth0_mac_addr, - .tx_sram_addr =MV_SRAM_BASE_ETH0 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -80,11 +76,7 @@ static struct resource mv64x60_eth1_reso }, }; -static char eth1_mac_addr[ETH_ALEN ]; -static struct mv643xx_eth_platform_data eth1_pd = { - .mac_addr = eth1_mac_addr, - .tx_sram_addr =MV_SRAM_BASE_ETH1 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -113,11 +105,7 @@ static struct resource mv64x60_eth2_reso }, }; -static char eth2_mac_addr[ETH_ALEN ]; - -static struct mv643xx_eth_platform_data eth2_pd = { - .mac_addr = eth2_mac_addr, -}; +static struct mv643xx_eth_platform_data eth2_pd;static struct platform_device eth2_device = { .name =MV643XX_ETH_NAME ,
@@ -200,9 +188,9 @@ static int __init mv643xx_eth_add_pds(voint ret;get_mac (mac); -eth_mac_add (eth0_mac_addr, mac,0 ); -eth_mac_add (eth1_mac_addr, mac,1 ); -eth_mac_add (eth2_mac_addr, mac,2 ); +eth_mac_add (eth0_pd.mac_addr, mac,0 ); +eth_mac_add (eth1_pd.mac_addr, mac,1 ); +eth_mac_add (eth2_pd.mac_addr, mac,2 ); ret =platform_add_devices (mv643xx_eth_pd_devs,ARRAY_SIZE (mv643xx_eth_pd_devs));
arch/mips/momentum/ocelot_c/platform.c +2 -10
@@ -46,11 +46,7 @@ static struct resource mv64x60_eth0_reso }, }; -static char eth0_mac_addr[ETH_ALEN ]; -static struct mv643xx_eth_platform_data eth0_pd = { - .mac_addr = eth0_mac_addr, - .tx_sram_addr =MV_SRAM_BASE_ETH0 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -79,11 +75,7 @@ static struct resource mv64x60_eth1_reso }, }; -static char eth1_mac_addr[ETH_ALEN ]; -static struct mv643xx_eth_platform_data eth1_pd = { - .mac_addr = eth1_mac_addr, - .tx_sram_addr =MV_SRAM_BASE_ETH1 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -174,8 +166,8 @@ static int __init mv643xx_eth_add_pds(voint ret;get_mac (mac); -eth_mac_add (eth0_mac_addr, mac,0 ); -eth_mac_add (eth1_mac_addr, mac,1 ); +eth_mac_add (eth0_pd.mac_addr, mac,0 ); +eth_mac_add (eth1_pd.mac_addr, mac,1 ); ret =platform_add_devices (mv643xx_eth_pd_devs,ARRAY_SIZE (mv643xx_eth_pd_devs));
Re: [PATCH 2/2] mv643xx_eth: Place explicit port number in mv643xx_eth_platform_data
We had been using the platform_device.id field to identify which ethernet port is used for mv643xx_eth device. This is not correct in general. It will be incorrect, for example, if a hardware platform uses a single port but not the first port. Here, we add an explicit port_number field to struct mv643xx_eth_platform_data.
This makes the mv643xx_eth_platform_data structure required, but that isn't an issue since all users currently provide it already.
arch/mips/momentum/jaguar_atx/platform.c +0 -0
arch/mips/momentum/jaguar_atx/platform.c +7 -1
@@ -48,6 +48,8 @@ static struct resource mv64x60_eth0_reso };static struct mv643xx_eth_platform_data eth0_pd = { + .port_number =0 , + .tx_sram_addr =MV_SRAM_BASE_ETH0 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -77,6 +79,8 @@ static struct resource mv64x60_eth1_reso };static struct mv643xx_eth_platform_data eth1_pd = { + .port_number =1 , + .tx_sram_addr =MV_SRAM_BASE_ETH1 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -105,7 +109,9 @@ static struct resource mv64x60_eth2_reso }, }; -static struct mv643xx_eth_platform_data eth2_pd; +static struct mv643xx_eth_platform_data eth2_pd = { + .port_number =2 , +};static struct platform_device eth2_device = { .name =MV643XX_ETH_NAME ,
arch/mips/momentum/ocelot_3/platform.c +7 -1
@@ -48,6 +48,8 @@ static struct resource mv64x60_eth0_reso };static struct mv643xx_eth_platform_data eth0_pd = { + .port_number =0 , + .tx_sram_addr =MV_SRAM_BASE_ETH0 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -77,6 +79,8 @@ static struct resource mv64x60_eth1_reso };static struct mv643xx_eth_platform_data eth1_pd = { + .port_number =1 , + .tx_sram_addr =MV_SRAM_BASE_ETH1 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -105,7 +109,9 @@ static struct resource mv64x60_eth2_reso }, }; -static struct mv643xx_eth_platform_data eth2_pd; +static struct mv643xx_eth_platform_data eth2_pd = { + .port_number =2 , +};static struct platform_device eth2_device = { .name =MV643XX_ETH_NAME ,
arch/mips/momentum/ocelot_c/platform.c +4 -0
@@ -47,6 +47,8 @@ static struct resource mv64x60_eth0_reso };static struct mv643xx_eth_platform_data eth0_pd = { + .port_number =0 , + .tx_sram_addr =MV_SRAM_BASE_ETH0 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
@@ -76,6 +78,8 @@ static struct resource mv64x60_eth1_reso };static struct mv643xx_eth_platform_data eth1_pd = { + .port_number =1 , + .tx_sram_addr =MV_SRAM_BASE_ETH1 , .tx_sram_size =MV_SRAM_TXRING_SIZE , .tx_queue_size =MV_SRAM_TXRING_SIZE /16 ,
arch/powerpc/platforms/chrp/pegasos_eth.c +2 -0
@@ -58,6 +58,7 @@ static struct resource mv643xx_eth0_resostatic struct mv643xx_eth_platform_data eth0_pd = { + .port_number =0 , .tx_sram_addr =PEGASOS2_SRAM_BASE_ETH0 , .tx_sram_size =PEGASOS2_SRAM_TXRING_SIZE , .tx_queue_size =PEGASOS2_SRAM_TXRING_SIZE /16 ,
@@ -87,6 +88,7 @@ static struct resource mv643xx_eth1_reso };static struct mv643xx_eth_platform_data eth1_pd = { + .port_number =1 , .tx_sram_addr =PEGASOS2_SRAM_BASE_ETH1 , .tx_sram_size =PEGASOS2_SRAM_TXRING_SIZE , .tx_queue_size =PEGASOS2_SRAM_TXRING_SIZE /16 ,
arch/ppc/syslib/mv64x60.c +9 -3
@@ -339,7 +339,9 @@ static struct resource mv64x60_eth0_reso }, }; -static struct mv643xx_eth_platform_data eth0_pd; +static struct mv643xx_eth_platform_data eth0_pd = { + .port_number =0 , +};static struct platform_device eth0_device = { .name =MV643XX_ETH_NAME ,
@@ -362,7 +364,9 @@ static struct resource mv64x60_eth1_reso }, }; -static struct mv643xx_eth_platform_data eth1_pd; +static struct mv643xx_eth_platform_data eth1_pd = { + .port_number =1 , +};static struct platform_device eth1_device = { .name =MV643XX_ETH_NAME ,
@@ -385,7 +389,9 @@ static struct resource mv64x60_eth2_reso }, }; -static struct mv643xx_eth_platform_data eth2_pd; +static struct mv643xx_eth_platform_data eth2_pd = { + .port_number =2 , +};static struct platform_device eth2_device = { .name =MV643XX_ETH_NAME ,
drivers/net/mv643xx_eth.c +29 -25
90 lines not on this page · raw message
include/linux/mv643xx.h +1 -0
@@ -1289,6 +1289,7 @@ struct mv64xxx_i2c_pdata {#define MV643XX_ETH_NAME "mv643xx_eth"struct mv643xx_eth_platform_data { +int port_number;u16 force_phy_addr;/* force override if phy_addr == 0 */ u16 phy_addr;
Quoted 11 lines · On Wed, 28 Feb 2007 15:40:31 -0700 "Dale Farnsworth" <[email protected]>…
The information contained within
platform_datashould be self-contained. Replace the pointer to a MAC address with the actual MAC address in structmv643xx_eth_platform_data.Signed-off-by Dale Farnsworth <[email protected]>Index:
b/drivers/net/mv643xx_eth.c
===================================================================
drivers/net/mv643xx_eth.c static int mv643xx_eth_probe(struct plat · line 1386
Quoted 8 lines
drivers/net/mv643xx_eth.c +3
-1@@ -1380,7 +1380,9 @@ static int mv643xx_eth_probe(struct plat pd = pdev->dev.platform_data;if (pd) { -if (pd->mac_addr) +static u8 zero_mac_addr[6 ] = {0 }; + +if (memcmp (pd->mac_addr, zero_mac_addr,6 ) !=0 )memcpy (dev->dev_addr, pd->mac_addr,6 );
is_zero_ether_addr() is faster/cleaner for this
Signature · 1 line
Stephen Hemminger <[email protected]>
Quoted 15 lines · Stephen Hemminger
Quoted 12 lines · On Wed, 28 Feb 2007 15:40:31 -0700 "Dale Farnsworth" <[email protected]>…
The information contained within
platform_datashould be self-contained. Replace the pointer to a MAC address with the actual MAC address in structmv643xx_eth_platform_data.Signed-off-by Dale Farnsworth <[email protected]>Index:
b/drivers/net/mv643xx_eth.c
===================================================================drivers/net/mv643xx_eth.c +0
-0@@ -1380,7 +1380,9 @@ static int mv643xx_eth_probe(struct plat
Quoted 10 lines
drivers/net/mv643xx_eth.c static int mv643xx_eth_probe(struct plat · line 1386
Quoted 7 lines
drivers/net/mv643xx_eth.c +3
-1pd = pdev->dev.platform_data;if (pd) { -if (pd->mac_addr) +static u8 zero_mac_addr[6 ] = {0 }; + +if (memcmp (pd->mac_addr, zero_mac_addr,6 ) !=0 )memcpy (dev->dev_addr, pd->mac_addr,6 );
is_zero_ether_addr()is faster/cleaner for this
Thanks. I follow up with a modified patch in a day or two.
-Dale