#include <command.h>
#include <net.h>
#include <miiphy.h>
+#include <phy.h>
void eth_parse_enetaddr(const char *addr, uchar *enetaddr)
{
return setenv(name, buf);
}
-int eth_getenv_enetaddr_by_index(int index, uchar *enetaddr)
+int eth_getenv_enetaddr_by_index(const char *base_name, int index,
+ uchar *enetaddr)
{
char enetvar[32];
- sprintf(enetvar, index ? "eth%daddr" : "ethaddr", index);
+ sprintf(enetvar, index ? "%s%daddr" : "%saddr", base_name, index);
return eth_getenv_enetaddr(enetvar, enetaddr);
}
-#ifdef CONFIG_NET_MULTI
-
static int eth_mac_skip(int index)
{
char enetvar[15];
int cpu_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init")));
int board_eth_init(bd_t *bis) __attribute__((weak, alias("__def_eth_init")));
-extern int mv6436x_eth_initialize(bd_t *);
-extern int mv6446x_eth_initialize(bd_t *);
-
#ifdef CONFIG_API
extern void (*push_packet)(volatile void *, int);
return eth_current;
}
-struct eth_device *eth_get_dev_by_name(char *devname)
+struct eth_device *eth_get_dev_by_name(const char *devname)
{
struct eth_device *dev, *target_dev;
+ BUG_ON(devname == NULL);
+
if (!eth_devices)
return NULL;
struct eth_device *eth_get_dev_by_index(int index)
{
struct eth_device *dev, *target_dev;
- int idx = 0;
if (!eth_devices)
return NULL;
dev = eth_devices;
target_dev = NULL;
do {
- if (idx == index) {
+ if (dev->index == index) {
target_dev = dev;
break;
}
dev = dev->next;
- idx++;
} while (dev != eth_devices);
return target_dev;
int eth_get_dev_index (void)
{
- struct eth_device *dev;
- int num = 0;
+ if (!eth_current) {
+ return -1;
+ }
- if (!eth_devices) {
- return (-1);
+ return eth_current->index;
+}
+
+static void eth_current_changed(void)
+{
+ char *act = getenv("ethact");
+ /* update current ethernet name */
+ if (eth_current) {
+ if (act == NULL || strcmp(act, eth_current->name) != 0)
+ setenv("ethact", eth_current->name);
}
+ /*
+ * remove the variable completely if there is no active
+ * interface
+ */
+ else if (act != NULL)
+ setenv("ethact", NULL);
+}
- for (dev = eth_devices; dev; dev = dev->next) {
- if (dev == eth_current)
- break;
- ++num;
+int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
+ int eth_number)
+{
+ unsigned char env_enetaddr[6];
+ int ret = 0;
+
+ eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr);
+
+ if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) {
+ if (memcmp(dev->enetaddr, "\0\0\0\0\0\0", 6) &&
+ memcmp(dev->enetaddr, env_enetaddr, 6)) {
+ printf("\nWarning: %s MAC addresses don't match:\n",
+ dev->name);
+ printf("Address in SROM is %pM\n",
+ dev->enetaddr);
+ printf("Address in environment is %pM\n",
+ env_enetaddr);
+ }
+
+ memcpy(dev->enetaddr, env_enetaddr, 6);
}
- if (dev) {
- return (num);
+ if (dev->write_hwaddr &&
+ !eth_mac_skip(eth_number) &&
+ is_valid_ether_addr(dev->enetaddr)) {
+ ret = dev->write_hwaddr(dev);
}
- return (0);
+ return ret;
}
-int eth_register(struct eth_device* dev)
+int eth_register(struct eth_device *dev)
{
struct eth_device *d;
+ static int index = 0;
+
+ assert(strlen(dev->name) < sizeof(dev->name));
if (!eth_devices) {
eth_current = eth_devices = dev;
-#ifdef CONFIG_NET_MULTI
- /* update current ethernet name */
- {
- char *act = getenv("ethact");
- if (act == NULL || strcmp(act, eth_current->name) != 0)
- setenv("ethact", eth_current->name);
- }
-#endif
+ eth_current_changed();
} else {
for (d=eth_devices; d->next!=eth_devices; d=d->next)
;
dev->state = ETH_STATE_INIT;
dev->next = eth_devices;
+ dev->index = index++;
return 0;
}
-int eth_initialize(bd_t *bis)
+int eth_unregister(struct eth_device *dev)
{
- unsigned char env_enetaddr[6];
- int eth_number = 0;
+ struct eth_device *cur;
+
+ /* No device */
+ if (!eth_devices)
+ return -1;
+
+ for (cur = eth_devices; cur->next != eth_devices && cur->next != dev;
+ cur = cur->next)
+ ;
+
+ /* Device not found */
+ if (cur->next != dev)
+ return -1;
+
+ cur->next = dev->next;
+ if (eth_devices == dev)
+ eth_devices = dev->next == eth_devices ? NULL : dev->next;
+
+ if (eth_current == dev) {
+ eth_current = eth_devices;
+ eth_current_changed();
+ }
+
+ return 0;
+}
+
+int eth_initialize(bd_t *bis)
+{
+ int num_devices = 0;
eth_devices = NULL;
eth_current = NULL;
- show_boot_progress (64);
+ bootstage_mark(BOOTSTAGE_ID_NET_ETH_START);
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
miiphy_init();
#endif
- /* Try board-specific initialization first. If it fails or isn't
- * present, try the cpu-specific initialization */
- if (board_eth_init(bis) < 0)
- cpu_eth_init(bis);
-#if defined(CONFIG_DB64360) || defined(CONFIG_CPCI750)
- mv6436x_eth_initialize(bis);
-#endif
-#if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx)
- mv6446x_eth_initialize(bis);
+#ifdef CONFIG_PHYLIB
+ phy_init();
#endif
+
+ /*
+ * If board-specific initialization exists, call it.
+ * If not, call a CPU-specific one
+ */
+ if (board_eth_init != __def_eth_init) {
+ if (board_eth_init(bis) < 0)
+ printf("Board Net Initialization Failed\n");
+ } else if (cpu_eth_init != __def_eth_init) {
+ if (cpu_eth_init(bis) < 0)
+ printf("CPU Net Initialization Failed\n");
+ } else
+ printf("Net Initialization Skipped\n");
+
if (!eth_devices) {
puts ("No ethernet found.\n");
- show_boot_progress (-64);
+ bootstage_error(BOOTSTAGE_ID_NET_ETH_START);
} else {
struct eth_device *dev = eth_devices;
char *ethprime = getenv ("ethprime");
- show_boot_progress (65);
+ bootstage_mark(BOOTSTAGE_ID_NET_ETH_INIT);
do {
- if (eth_number)
+ if (dev->index)
puts (", ");
printf("%s", dev->name);
if (strchr(dev->name, ' '))
puts("\nWarning: eth device name has a space!\n");
- eth_getenv_enetaddr_by_index(eth_number, env_enetaddr);
-
- if (memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) {
- if (memcmp(dev->enetaddr, "\0\0\0\0\0\0", 6) &&
- memcmp(dev->enetaddr, env_enetaddr, 6))
- {
- printf ("\nWarning: %s MAC addresses don't match:\n",
- dev->name);
- printf ("Address in SROM is %pM\n",
- dev->enetaddr);
- printf ("Address in environment is %pM\n",
- env_enetaddr);
- }
-
- memcpy(dev->enetaddr, env_enetaddr, 6);
- }
- if (dev->write_hwaddr &&
- !eth_mac_skip(eth_number) &&
- is_valid_ether_addr(dev->enetaddr)) {
- dev->write_hwaddr(dev);
- }
+ if (eth_write_hwaddr(dev, "eth", dev->index))
+ puts("\nWarning: failed to set MAC address\n");
- eth_number++;
dev = dev->next;
+ num_devices++;
} while(dev != eth_devices);
-#ifdef CONFIG_NET_MULTI
- /* update current ethernet name */
- if (eth_current) {
- char *act = getenv("ethact");
- if (act == NULL || strcmp(act, eth_current->name) != 0)
- setenv("ethact", eth_current->name);
- } else
- setenv("ethact", NULL);
-#endif
-
+ eth_current_changed();
putc ('\n');
}
- return eth_number;
+ return num_devices;
}
#ifdef CONFIG_MCAST_TFTP
int eth_init(bd_t *bis)
{
- int eth_number;
struct eth_device *old_current, *dev;
if (!eth_current) {
}
/* Sync environment with network devices */
- eth_number = 0;
dev = eth_devices;
do {
uchar env_enetaddr[6];
- if (eth_getenv_enetaddr_by_index(eth_number, env_enetaddr))
+ if (eth_getenv_enetaddr_by_index("eth", dev->index,
+ env_enetaddr))
memcpy(dev->enetaddr, env_enetaddr, 6);
- ++eth_number;
dev = dev->next;
} while (dev != eth_devices);
eth_current = eth_current->next;
-#ifdef CONFIG_NET_MULTI
- /* update current ethernet name */
- {
- char *act = getenv("ethact");
- if (act == NULL || strcmp(act, eth_current->name) != 0)
- setenv("ethact", eth_current->name);
- }
-#endif
+ eth_current_changed();
if (first_failed == eth_current) {
NetRestartWrap = 1;
}
}
-#ifdef CONFIG_NET_MULTI
void eth_set_current(void)
{
static char *act = NULL;
} while (old_current != eth_current);
}
- setenv("ethact", eth_current->name);
+ eth_current_changed();
}
-#endif
char *eth_get_name (void)
{
return (eth_current ? eth_current->name : "unknown");
}
-
-#else /* !CONFIG_NET_MULTI */
-
-#warning Ethernet driver is deprecated. Please update to use CONFIG_NET_MULTI
-
-extern int at91rm9200_miiphy_initialize(bd_t *bis);
-extern int mcf52x2_miiphy_initialize(bd_t *bis);
-extern int ns7520_miiphy_initialize(bd_t *bis);
-
-
-int eth_initialize(bd_t *bis)
-{
-#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
- miiphy_init();
-#endif
-
-#if defined(CONFIG_AT91RM9200)
- at91rm9200_miiphy_initialize(bis);
-#endif
-#if defined(CONFIG_MCF52x2)
- mcf52x2_miiphy_initialize(bis);
-#endif
-#if defined(CONFIG_DRIVER_NS7520_ETHERNET)
- ns7520_miiphy_initialize(bis);
-#endif
- return 0;
-}
-#endif