xilinx: Move zynq_board_read_rom_ethaddr to shared location
PATCH 1/2 xilinx: Move zynq_board_read_rom_ethaddr to shared location
Zynq and ZynqMP are sharing similar code and there is no reason to do code duplication. Move zynq_board_read_rom_ethaddr() to common file for easier conversion to DM.
Use ZynqMP version that's why also add CONFIG_ZYNQ_EEPROM_BUS to Syzygy which is only one Zynq board which is using this feature.
---
board/opalkelly/zynq/board.c | 2 ++ board/xilinx/common/board.c | 25 +++++++++++++++++++++++++ board/xilinx/zynq/Makefile | 1 + board/xilinx/zynq/board.c | 13 ------------- board/xilinx/zynqmp/Makefile | 1 + board/xilinx/zynqmp/zynqmp.c | 17 ----------------- include/configs/syzygy_hub.h | 1 + 7 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 board/xilinx/common/board.c
board/opalkelly/zynq/board.c +2 -0
@@ -1 +1,3 @@ +#include "../../xilinx/common/board.c" +#include "../../xilinx/zynq/board.c"
board/xilinx/common/board.c new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2014 - 2019 Xilinx, Inc. +* Michal Simek <[email protected]> +*/ + +#include <common.h> +#include <dm/uclass.h> +#include <i2c.h> + +int zynq_board_read_rom_ethaddr (unsigned char *ethaddr) +{ +#if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR ) && \ + defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET ) && \ + defined(CONFIG_ZYNQ_EEPROM_BUS ) +i2c_set_bus_num (CONFIG_ZYNQ_EEPROM_BUS ); + +if (eeprom_read (CONFIG_ZYNQ_GEM_EEPROM_ADDR , +CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET , + ethaddr,6 )) +printf ("I2C EEPROM MAC address read failed\n" ); +#endif + +return 0 ; +}
board/xilinx/zynq/Makefile +1 -0
@@ -4,6 +4,7 @@ # Wolfgang Denk, DENX Software Engineering, wd at denx.de. obj-y := board.o +obj-y += ../common/board.o ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE))
board/xilinx/zynq/board.c +0 -13
@@ -77,19 +77,6 @@ int board_late_init(void)return 0 ; } -int zynq_board_read_rom_ethaddr (unsigned char *ethaddr) -{ -#if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR ) && \ - defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET ) -if (eeprom_read (CONFIG_ZYNQ_GEM_EEPROM_ADDR , -CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET , - ethaddr,6 )) -printf ("I2C EEPROM MAC address read failed\n" ); -#endif - -return 0 ; -} -#if !defined(CONFIG_SYS_SDRAM_BASE ) && !defined(CONFIG_SYS_SDRAM_SIZE )int dram_init_banksize (void ) {
board/xilinx/zynqmp/Makefile +1 -0
@@ -4,6 +4,7 @@ # Michal Simek <[email protected]> obj-y := zynqmp.o +obj-y += ../common/board.o ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"") PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE))
board/xilinx/zynqmp/zynqmp.c +0 -17
@@ -20,7 +20,6 @@#include <usb.h> #include <dwc3-uboot.h> #include <zynqmppl.h> -#include <i2c.h> #include <g_dnl.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -409,22 +408,6 @@ int board_early_init_r(void)return 0 ; } -int zynq_board_read_rom_ethaddr (unsigned char *ethaddr) -{ -#if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR ) && \ - defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET ) && \ - defined(CONFIG_ZYNQ_EEPROM_BUS ) -i2c_set_bus_num (CONFIG_ZYNQ_EEPROM_BUS ); - -if (eeprom_read (CONFIG_ZYNQ_GEM_EEPROM_ADDR , -CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET , - ethaddr,6 )) -printf ("I2C EEPROM MAC address read failed\n" ); -#endif - -return 0 ; -} -unsigned long do_go_exec (ulong (*entry)(int ,char *const []),int argc,char *const argv[]) {
include/configs/syzygy_hub.h +1 -0
@@ -12,6 +12,7 @@#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x57 +#define CONFIG_ZYNQ_EEPROM_BUS 0#define CONFIG_EXTRA_ENV_SETTINGS \ "fit_image=fit.itb\0" \
Signature · 1 line
1.9.1
PATCH 2/2 xilinx: common: Add support for DM_I2C zynq_board_read_rom_ethaddr()
It is much easier to point to eeprom which stores information like MAC address directly via DT. eeprom which contains this information is pointed by /chosen/xlnx,eeprom parameter.
For example:
chosen {
bootargs = "earlycon";
stdout-path = "serial0:115200n8";
+ xlnx,eeprom = &eeprom;
};---
board/xilinx/common/board.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
board/xilinx/common/board.c +32 -0
@@ -8,6 +8,7 @@#include <dm/uclass.h> #include <i2c.h> +#if !defined(CONFIG_DM_I2C )int zynq_board_read_rom_ethaddr (unsigned char *ethaddr) { #if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR) && \
@@ -23,3 +24,34 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr) return 0; } + +#else +int zynq_board_read_rom_ethaddr (unsigned char *ethaddr) +{ +int ret = -EINVAL ; + +#if defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET ) +struct udevice *dev; +ofnode eeprom; + + eeprom =ofnode_get_chosen_node ("xlnx,eeprom" ); +if (!ofnode_valid (eeprom)) +return -ENODEV ; + +debug ("%s: Path to EEPROM %s\n" , __func__, +ofnode_get_chosen_prop ("xlnx,eeprom" )); + + ret =uclass_get_device_by_ofnode (UCLASS_I2C_EEPROM , eeprom, &dev); +if (ret) +return ret; + + ret =dm_i2c_read (dev,CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET , ethaddr,6 ); +if (ret) +debug ("%s: I2C EEPROM MAC address read failed\n" , __func__); +else +debug ("%s: I2C EEPROM MAC %pM\n" , __func__, ethaddr); +#endif + +return ret; +} +#endif
Signature · 1 line
1.9.1
PATCH 2/2 xilinx: common: Add support for DM_I2C zynq_board_read_rom_ethaddr()
It would even be better to adopt the Linux kernel way of storing MAC address through nvmem. That works for basically any board - and you get rid of the vendor prefix. Any nvmem provider can store the data, not just I2C eeproms. It reduces the total code size since all gem drivers can call the same function.
Example:
eeprom: eeprom at 50 {
compatible = "at24,24c04";
reg = <0x50>;
#address-cells = <1>;
#size-cells = <1>;
/* NVMEM entries */
gem0_mac: mac at 0x1e8 {
reg = <0x1e8 6>;
};
};&gem0 {
/* MAC address stored in NVMEM */
nvmem-cells = <&gem0_mac>;
nvmem-cell-names = "mac-address";
};Quoted 65 lines · Michal Simek
It is much easier to point to eeprom which stores information like MAC address directly via DT. eeprom which contains this information is pointed by /chosen/xlnx,eeprom parameter.
For example:
chosen { bootargs = "earlycon"; stdout-path = "serial0:115200n8"; + xlnx,eeprom = &eeprom; };Signed-off-by Michal Simek <[email protected]>---
board/xilinx/common/board.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)board/xilinx/common/board.c +32
-0@@ -8,6 +8,7 @@#include <dm/uclass.h> #include <i2c.h> +#if !defined(CONFIG_DM_I2C )int zynq_board_read_rom_ethaddr (unsigned char *ethaddr) { #if defined(CONFIG_ZYNQ_GEM_EEPROM_ADDR) && \@@ -23,3 +24,34 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr) return 0; } + +#else +int zynq_board_read_rom_ethaddr (unsigned char *ethaddr) +{ +int ret = -EINVAL ; + +#if defined(CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET ) +struct udevice *dev; +ofnode eeprom; + + eeprom =ofnode_get_chosen_node ("xlnx,eeprom" ); +if (!ofnode_valid (eeprom)) +return -ENODEV ; + +debug ("%s: Path to EEPROM %s\n" , __func__, +ofnode_get_chosen_prop ("xlnx,eeprom" )); + + ret =uclass_get_device_by_ofnode (UCLASS_I2C_EEPROM , eeprom, &dev); +if (ret) +return ret; + + ret =dm_i2c_read (dev,CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET , ethaddr,6 ); +if (ret) +debug ("%s: I2C EEPROM MAC address read failed\n" , __func__); +else +debug ("%s: I2C EEPROM MAC %pM\n" , __func__, ethaddr); +#endif + +return ret; +} +#endif