From 78d0d911b328ecc15f9b57bb49b2d64e5c9b9fec Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 1 Jan 2015 12:28:46 -0600 Subject: [PATCH] TM4C129X Ethernet: Add logic to get pre-programmed MAC address from user FLASH registers --- arch/arm/src/tiva/Kconfig | 15 ++-- arch/arm/src/tiva/lm3s_ethernet.c | 4 +- arch/arm/src/tiva/tiva_ethernet.h | 15 ++++ arch/arm/src/tiva/tm4c_ethernet.c | 9 +++ configs/dk-tm4c129x/src/Makefile | 4 + configs/dk-tm4c129x/src/tm4c_ethernet.c | 99 +++++++++++++++++++++++++ configs/eagle100/include/board.h | 15 ---- configs/eagle100/src/up_ethernet.c | 3 +- configs/ekk-lm3s9b96/include/board.h | 15 ---- configs/ekk-lm3s9b96/src/up_ethernet.c | 3 +- configs/lm3s6432-s2e/include/board.h | 15 ---- configs/lm3s6432-s2e/src/up_ethernet.c | 3 +- configs/lm3s6965-ek/include/board.h | 15 ---- configs/lm3s6965-ek/src/up_ethernet.c | 3 +- configs/lm3s8962-ek/include/board.h | 15 ---- configs/lm3s8962-ek/src/up_ethernet.c | 3 +- 16 files changed, 147 insertions(+), 89 deletions(-) create mode 100644 configs/dk-tm4c129x/src/tm4c_ethernet.c diff --git a/arch/arm/src/tiva/Kconfig b/arch/arm/src/tiva/Kconfig index a26a0d25c4..1e48c668f1 100644 --- a/arch/arm/src/tiva/Kconfig +++ b/arch/arm/src/tiva/Kconfig @@ -655,13 +655,6 @@ config TIVA_ETHLEDS ---help--- Enable to use Ethernet LEDs on the board. -config TIVA_BOARDMAC - bool "Board MAC" - default n - ---help--- - If the board-specific logic can provide a MAC address (via - tiva_ethernetmac()), then this should be selected. - config TIVA_ETHHDUPLEX bool "Force Half Duplex" default n @@ -889,6 +882,14 @@ config TIVA_ETHERNET_REGDEBUG Enable very low-level register access debug. Depends on DEBUG. endmenu # Tiva Ethernet Configuration + +config TIVA_BOARDMAC + bool "Board MAC" + default n + ---help--- + If the board-specific logic can provide a MAC address (via + tiva_ethernetmac()), then this should be selected. + endif # TIVA_ETHERNET if TIVA_SSI diff --git a/arch/arm/src/tiva/lm3s_ethernet.c b/arch/arm/src/tiva/lm3s_ethernet.c index 22cb53d8ae..899ceb2a8e 100644 --- a/arch/arm/src/tiva/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm3s_ethernet.c @@ -1410,7 +1410,7 @@ static inline int tiva_ethinitialize(int intf) #endif priv->ld_dev.d_private = (void*)priv; /* Used to recover private state from dev */ - /* Create a watchdog for timing polling for and timing of transmisstions */ + /* Create a watchdog for timing polling for and timing of transmissions */ #if TIVA_NETHCONTROLLERS > 1 # error "A mechanism to associate base address an IRQ with an interface is needed" @@ -1422,7 +1422,7 @@ static inline int tiva_ethinitialize(int intf) /* If the board can provide us with a MAC address, get the address * from the board now. The MAC will not be applied until tiva_ifup() - * is caleld (and the MAC can be overwritten with a netdev ioctl call). + * is called (and the MAC can be overwritten with a netdev ioctl call). */ #ifdef CONFIG_TIVA_BOARDMAC diff --git a/arch/arm/src/tiva/tiva_ethernet.h b/arch/arm/src/tiva/tiva_ethernet.h index 660f46300c..534d234375 100644 --- a/arch/arm/src/tiva/tiva_ethernet.h +++ b/arch/arm/src/tiva/tiva_ethernet.h @@ -98,6 +98,21 @@ extern "C" int tiva_ethinitialize(int intf); #endif +/**************************************************************************** + * Name: tiva_ethernetmac + * + * Description: + * For the Ethernet Eval Kits, the MAC address will be stored in the non- + * volatile USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, + * this function will obtain the MAC address from these registers. + * + ****************************************************************************/ + +#ifdef CONFIG_TIVA_BOARDMAC +struct ether_addr; +void tiva_ethernetmac(struct ether_addr *ethaddr); +#endif + #undef EXTERN #if defined(__cplusplus) } diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c index 80524f6ea0..74ae68bcd4 100644 --- a/arch/arm/src/tiva/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c_ethernet.c @@ -3938,6 +3938,15 @@ int tiva_ethinitialize(int intf) priv->txpoll = wd_create(); /* Create periodic poll timer */ priv->txtimeout = wd_create(); /* Create TX timeout timer */ + /* If the board can provide us with a MAC address, get the address + * from the board now. The MAC will not be applied until tiva_ifup() + * is called (and the MAC can be overwritten with a netdev ioctl call). + */ + +#ifdef CONFIG_TIVA_BOARDMAC + tiva_ethernetmac(&priv->dev.d_mac); +#endif + /* Enable power and clocking to the Ethernet MAC * * - Enable Power: Applies power (only) to the EMAC peripheral. This is not diff --git a/configs/dk-tm4c129x/src/Makefile b/configs/dk-tm4c129x/src/Makefile index d3365f77b8..99739fa76b 100644 --- a/configs/dk-tm4c129x/src/Makefile +++ b/configs/dk-tm4c129x/src/Makefile @@ -51,6 +51,10 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += tm4c_buttons.c endif +ifeq ($(CONFIG_TIVA_ETHERNET),y) +CSRCS += tm4c_ethernet.c +endif + ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += tm4c_nsh.c endif diff --git a/configs/dk-tm4c129x/src/tm4c_ethernet.c b/configs/dk-tm4c129x/src/tm4c_ethernet.c new file mode 100644 index 0000000000..9394a4522b --- /dev/null +++ b/configs/dk-tm4c129x/src/tm4c_ethernet.c @@ -0,0 +1,99 @@ +/************************************************************************************ + * configs/dk-tm4c129x/src/tm4c_ethernet.c + * + * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Authors: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ************************************************************************************/ + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include + +#include +#include +#include + +#include +#include + +#include "up_arch.h" +#include "chip.h" +#include "chip/tiva_flash.h" +#include "tiva_ethernet.h" + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + +/************************************************************************************ + * Private Functions + ************************************************************************************/ + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +/************************************************************************************ + * Name: tiva_ethernetmac + * + * Description: + * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile + * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function + * will obtain the MAC address from these registers. + * + ************************************************************************************/ + +#ifdef CONFIG_TIVA_BOARDMAC +void tiva_ethernetmac(struct ether_addr *ethaddr) +{ + uint32_t user0; + uint32_t user1; + + /* Get the current value of the user registers */ + + user0 = getreg32(TIVA_FLASH_USERREG0); + user1 = getreg32(TIVA_FLASH_USERREG1); + + nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff); + DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff); + + /* Re-format that MAC address the way that uIP expects to see it */ + + ethaddr->ether_addr_octet[0] = ((user0 >> 0) & 0xff); + ethaddr->ether_addr_octet[1] = ((user0 >> 8) & 0xff); + ethaddr->ether_addr_octet[2] = ((user0 >> 16) & 0xff); + ethaddr->ether_addr_octet[3] = ((user1 >> 0) & 0xff); + ethaddr->ether_addr_octet[4] = ((user1 >> 8) & 0xff); + ethaddr->ether_addr_octet[5] = ((user1 >> 16) & 0xff); +} +#endif diff --git a/configs/eagle100/include/board.h b/configs/eagle100/include/board.h index 9b9f52007f..f1b11bb3b9 100644 --- a/configs/eagle100/include/board.h +++ b/configs/eagle100/include/board.h @@ -123,20 +123,5 @@ void tiva_boardinitialize(void); -/************************************************************************************ - * Name: tiva_ethernetmac - * - * Description: - * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function - * will obtain the MAC address from these registers. - * - ************************************************************************************/ - -#ifdef CONFIG_TIVA_BOARDMAC -struct ether_addr; -void tiva_ethernetmac(struct ether_addr *ethaddr); -#endif - #endif /* __ASSEMBLY__ */ #endif /* __ARCH_BOARD_BOARD_H */ diff --git a/configs/eagle100/src/up_ethernet.c b/configs/eagle100/src/up_ethernet.c index 1b619ed972..47ba597f59 100644 --- a/configs/eagle100/src/up_ethernet.c +++ b/configs/eagle100/src/up_ethernet.c @@ -49,9 +49,10 @@ #include "up_arch.h" #include "chip.h" +#include "tiva_ethernet.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/ekk-lm3s9b96/include/board.h b/configs/ekk-lm3s9b96/include/board.h index 755e74b502..2a93d45d18 100644 --- a/configs/ekk-lm3s9b96/include/board.h +++ b/configs/ekk-lm3s9b96/include/board.h @@ -124,20 +124,5 @@ void tiva_boardinitialize(void); -/************************************************************************************ - * Name: tiva_ethernetmac - * - * Description: - * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function - * will obtain the MAC address from these registers. - * - ************************************************************************************/ - -#ifdef CONFIG_TIVA_BOARDMAC -struct ether_addr; -void tiva_ethernetmac(struct ether_addr *ethaddr); -#endif - #endif /* __ASSEMBLY__ */ #endif /* __ARCH_BOARD_BOARD_H */ diff --git a/configs/ekk-lm3s9b96/src/up_ethernet.c b/configs/ekk-lm3s9b96/src/up_ethernet.c index e62fc15206..26e3630a12 100644 --- a/configs/ekk-lm3s9b96/src/up_ethernet.c +++ b/configs/ekk-lm3s9b96/src/up_ethernet.c @@ -50,9 +50,10 @@ #include "up_arch.h" #include "chip.h" +#include "tiva_ethernet.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/lm3s6432-s2e/include/board.h b/configs/lm3s6432-s2e/include/board.h index af6144c237..bedf9c86cf 100644 --- a/configs/lm3s6432-s2e/include/board.h +++ b/configs/lm3s6432-s2e/include/board.h @@ -125,20 +125,5 @@ void tiva_boardinitialize(void); -/************************************************************************************ - * Name: tiva_ethernetmac - * - * Description: - * For the MDL-S2E Reference Design, the MAC address will be stored in the - * non-volatile USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, - * this function will obtain the MAC address from these registers. - * - ************************************************************************************/ - -#ifdef CONFIG_TIVA_BOARDMAC -struct ether_addr; -void tiva_ethernetmac(struct ether_addr *ethaddr); -#endif - #endif /* __ASSEMBLY__ */ #endif /* __ARCH_BOARD_BOARD_H */ diff --git a/configs/lm3s6432-s2e/src/up_ethernet.c b/configs/lm3s6432-s2e/src/up_ethernet.c index 7bffdb3cab..19ee2bbc11 100644 --- a/configs/lm3s6432-s2e/src/up_ethernet.c +++ b/configs/lm3s6432-s2e/src/up_ethernet.c @@ -49,9 +49,10 @@ #include "up_arch.h" #include "chip.h" +#include "tiva_ethernet.h" /************************************************************************************ - * Definitions + * Pre-processor oDefinitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/lm3s6965-ek/include/board.h b/configs/lm3s6965-ek/include/board.h index fdbc0dd10f..96ddd01360 100644 --- a/configs/lm3s6965-ek/include/board.h +++ b/configs/lm3s6965-ek/include/board.h @@ -123,20 +123,5 @@ void tiva_boardinitialize(void); -/************************************************************************************ - * Name: tiva_ethernetmac - * - * Description: - * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function - * will obtain the MAC address from these registers. - * - ************************************************************************************/ - -#ifdef CONFIG_TIVA_BOARDMAC -struct ether_addr; -void tiva_ethernetmac(struct ether_addr *ethaddr); -#endif - #endif /* __ASSEMBLY__ */ #endif /* __ARCH_BOARD_BOARD_H */ diff --git a/configs/lm3s6965-ek/src/up_ethernet.c b/configs/lm3s6965-ek/src/up_ethernet.c index 4ae9ef0e94..6a7e0133f1 100644 --- a/configs/lm3s6965-ek/src/up_ethernet.c +++ b/configs/lm3s6965-ek/src/up_ethernet.c @@ -49,9 +49,10 @@ #include "up_arch.h" #include "chip.h" +#include "tiva_ethernet.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/lm3s8962-ek/include/board.h b/configs/lm3s8962-ek/include/board.h index 180e44dd35..8a1384d91a 100644 --- a/configs/lm3s8962-ek/include/board.h +++ b/configs/lm3s8962-ek/include/board.h @@ -123,20 +123,5 @@ void tiva_boardinitialize(void); -/************************************************************************************ - * Name: tiva_ethernetmac - * - * Description: - * For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile - * USER0 and USER1 registers. If CONFIG_TIVA_BOARDMAC is defined, this function - * will obtain the MAC address from these registers. - * - ************************************************************************************/ - -#ifdef CONFIG_TIVA_BOARDMAC -struct ether_addr; -void tiva_ethernetmac(struct ether_addr *ethaddr); -#endif - #endif /* __ASSEMBLY__ */ #endif /* __ARCH_BOARD_BOARD_H */ diff --git a/configs/lm3s8962-ek/src/up_ethernet.c b/configs/lm3s8962-ek/src/up_ethernet.c index bc20ea0f10..6202313305 100644 --- a/configs/lm3s8962-ek/src/up_ethernet.c +++ b/configs/lm3s8962-ek/src/up_ethernet.c @@ -49,9 +49,10 @@ #include "up_arch.h" #include "chip.h" +#include "tiva_ethernet.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************