Instead of programming the hardware directly in the board implementation, follow the flow documented in doc/README.enetaddr: set the enet[0-9]*addr environment variable and let the driver program the hardware.
This avoids duplicating the implementation as it already exists in the driver (drivers/net/fec_mxc.c: fec_set_hwaddr).
The mapping from the driver's index to the environment variable's name is documented in README: Note for Redundant Ethernet Interfaces. It is assumed that eth_devices for the controllers on the board are always indexed in the same order, i.e. FEC always has the index 2.
The FEC driver does *not* set the flag Set MAC Address on Transmit (bit set_eth0_mac_address used to do but this is unnecessary as the Linux networking stack fills in the MAC address.
Signed-off-by: Hannu Lounento hannu.lounento@ge.com Signed-off-by: Ian Ray ian.ray@ge.com Signed-off-by: Martyn Welch martyn.welch@collabora.co.uk --- board/ge/bx50v3/bx50v3.c | 79 ++++++++++++++++++++++----------------------- include/configs/ge_bx50v3.h | 2 ++ 2 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c index cb4deb0..0468dcf 100644 --- a/board/ge/bx50v3/bx50v3.c +++ b/board/ge/bx50v3/bx50v3.c @@ -19,6 +19,7 @@ #include <mmc.h> #include <fsl_esdhc.h> #include <miiphy.h> +#include <net.h> #include <netdev.h> #include <asm/arch/mxc_hdmi.h> #include <asm/arch/crm_regs.h> @@ -546,63 +547,54 @@ int overwrite_console(void) #define VPD_PRODUCT_B850 1 #define VPD_PRODUCT_B650 2 #define VPD_PRODUCT_B450 3 +#define VPD_HAS_MAC1 0x1 +#define VPD_MAC_ADDRESS_LENGTH 6
struct vpd_cache { - uint8_t product_id; - uint8_t macbits; - unsigned char mac1[6]; + u8 product_id; + u8 has; + unsigned char mac1[VPD_MAC_ADDRESS_LENGTH]; };
/* * Extracts MAC and product information from the VPD. */ -static int vpd_callback( - void *userdata, - uint8_t id, - uint8_t version, - uint8_t type, - size_t size, - uint8_t const *data) +static int vpd_callback(void *userdata, u8 id, u8 version, u8 type, + size_t size, u8 const *data) { struct vpd_cache *vpd = (struct vpd_cache *)userdata;
- if ( id == VPD_BLOCK_HWID - && version == 1 - && type != VPD_TYPE_INVALID - && size >= 1) { + if (id == VPD_BLOCK_HWID && version == 1 && type != VPD_TYPE_INVALID && + size >= 1) { vpd->product_id = data[0]; - - } else if ( id == VPD_BLOCK_NETWORK - && version == 1 - && type != VPD_TYPE_INVALID - && size >= 6) { - vpd->macbits |= 1; - memcpy(vpd->mac1, data, 6); + } else if (id == VPD_BLOCK_NETWORK && version == 1 && + type != VPD_TYPE_INVALID) { + if (size >= 6) { + vpd->has |= VPD_HAS_MAC1; + memcpy(vpd->mac1, data, VPD_MAC_ADDRESS_LENGTH); + } }
return 0; }
-static void set_eth0_mac_address(unsigned char * mac) -{ - uint32_t *ENET_TCR = (uint32_t*)0x21880c4; - uint32_t *ENET_PALR = (uint32_t*)0x21880e4; - uint32_t *ENET_PAUR = (uint32_t*)0x21880e8; - - *ENET_TCR |= 0x100; /* ADDINS */ - *ENET_PALR |= (mac[0] << 24) | (mac[1] << 16) | (mac[2] << 8) | mac[3]; - *ENET_PAUR |= (mac[4] << 24) | (mac[5] << 16); -} - static void process_vpd(struct vpd_cache *vpd) { - if ( vpd->product_id == VPD_PRODUCT_B850 - || vpd->product_id == VPD_PRODUCT_B650 - || vpd->product_id == VPD_PRODUCT_B450) { - if (vpd->macbits & 1) { - set_eth0_mac_address(vpd->mac1); - } + int fec_index = -1; + + switch (vpd->product_id) { + case VPD_PRODUCT_B450: + /* fall thru */ + case VPD_PRODUCT_B650: + fec_index = 1; + break; + case VPD_PRODUCT_B850: + fec_index = 2; + break; } + + if (fec_index >= 0 && (vpd->has & VPD_HAS_MAC1)) + eth_env_set_enetaddr_by_index("eth", fec_index, vpd->mac1); }
static int read_vpd(uint eeprom_bus) @@ -694,8 +686,6 @@ int board_init(void) setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info2); setup_i2c(3, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info3);
- read_vpd(CONFIG_SYS_I2C_EEPROM_BUS); - return 0; }
@@ -761,6 +751,8 @@ void pmic_init(void)
int board_late_init(void) { + read_vpd(CONFIG_SYS_I2C_EEPROM_BUS); + #ifdef CONFIG_CMD_BMODE add_board_boot_modes(board_boot_modes); #endif @@ -788,6 +780,13 @@ int board_late_init(void) return 0; }
+int last_stage_init(void) +{ + env_set("ethaddr", NULL); + + return 0; +} + int checkboard(void) { printf("BOARD: %s\n", CONFIG_BOARD_NAME); diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 4526d2f..94e406c 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -44,6 +44,8 @@ #define CONFIG_REVISION_TAG #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
+#define CONFIG_LAST_STAGE_INIT + #define CONFIG_MXC_GPIO #define CONFIG_MXC_UART