Re: [U-Boot] [RFC PATCH v4 17/23] dm: eth: Add support for ethprime env var

Hi Joe,

On 24 February 2015 at 17:02, Joe Hershberger joe.hershberger@ni.com wrote:

The ethprime env var is used to indicate the starting device if none is specified in ethact. Also support aliases specified in the ethprime var.

Signed-off-by: Joe Hershberger joe.hershberger@ni.com Reviewed-by: Simon Glass sjg@chromium.org

---

Changes in v4: -Load from ethprime on eth_initialize()

Changes in v3: -Added support for ethprime

Changes in v2: None

net/eth.c | 29 ++++++++++++++++++++++++++++- test/dm/eth.c | 20 ++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/net/eth.c b/net/eth.c index 8b853e8..3b3cd84 100644 --- a/net/eth.c +++ b/net/eth.c @@ -341,6 +341,18 @@ int eth_initialize(void) printf("No ethernet found.\n"); bootstage_error(BOOTSTAGE_ID_NET_ETH_START); } else {

•           char *ethprime = getenv("ethprime");
  

•           struct udevice *prime_dev = NULL;
  

•           if (ethprime)
  

•                   prime_dev = eth_get_dev_by_name(ethprime);
  

•           if (prime_dev) {
  

•                   eth_set_dev(prime_dev);
  

•                   eth_current_changed();
  

•           } else {
  

•                   eth_set_dev(NULL);
  

•           }
  

•           bootstage_mark(BOOTSTAGE_ID_NET_ETH_INIT);
            do {
                    if (num_devices)
  

@@ -348,6 +360,9 @@ int eth_initialize(void)

                    printf("eth%d: %s", dev->seq, dev->name);

•                   if (ethprime && dev == prime_dev)
  

•                           printf(" [PRIME]");
  

•                   eth_write_hwaddr(dev);
  
                    uclass_next_device(&dev);
  

@@ -896,8 +911,20 @@ void eth_set_current(void) act = getenv("ethact"); env_changed_id = env_id; }

•   if (act != NULL)
  

•   if (act == NULL) {
  

•           char *ethprime = getenv("ethprime");
  

•           struct udevice *dev = NULL;
  

•           if (ethprime)
  

•                   dev = eth_get_dev_by_name(ethprime);
  

This function can return either a net_device or a udevice. So if DM_ETH is not enabled, you will get a warning here.

•           if (dev)
  

•                   eth_set_dev(dev);
  

•           else
  

•                   eth_set_dev(NULL);
  

•   } else {
            eth_set_dev(eth_get_dev_by_name(act));
  

•   }
  
    eth_current_changed();
  

} diff --git a/test/dm/eth.c b/test/dm/eth.c index 5688b71..96e3c46 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -60,3 +60,23 @@ static int dm_test_eth_alias(struct dm_test_state *dms) return 0; } DM_TEST(dm_test_eth_alias, DM_TESTF_SCAN_FDT);

+static int dm_test_eth_prime(struct dm_test_state *dms) +{

•   NetPingIP = string_to_ip("1.1.2.2");
  

•   /* Expected to be "eth@10003000" because of ethprime variable */
  

•   setenv("ethact", NULL);
  

•   setenv("ethprime", "eth5");
  

•   ut_assertok(NetLoop(PING));
  

•   ut_asserteq_str("eth@10003000", getenv("ethact"));
  

•   /* Expected to be "eth@10002000" because it is first */
  

•   setenv("ethact", NULL);
  

•   setenv("ethprime", NULL);
  

•   ut_assertok(NetLoop(PING));
  

•   ut_asserteq_str("eth@10002000", getenv("ethact"));
  

•   return 0;
  

+}

+DM_TEST(dm_test_eth_prime, DM_TESTF_SCAN_FDT);

1.7.11.5

Regards, Simon