From d0a428a6556ea5a006e22e28b0b1cd037885fe20 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 22 Nov 2023 01:07:12 +0000 Subject: [PATCH] add gmac0 read mac form eeprom,pcie30x1 --- kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 9f87f16..832f2b3 100644 --- a/kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -2349,12 +2349,14 @@ static unsigned char macaddr[6]; extern ssize_t at24_mac_read(unsigned char* addr); +extern ssize_t at24_mac1_read(unsigned char* addr); void rk_get_eth_addr(void *priv, unsigned char *addr) { struct rk_priv_data *bsp_priv = priv; struct device *dev = &bsp_priv->pdev->dev; unsigned char ethaddr[ETH_ALEN * MAX_ETH] = {0}; int ret,i, id = bsp_priv->bus_id; + printk("troy test id : %d\n",id); #if 0 rk_devinfo_get_eth_mac(addr); if (is_valid_ether_addr(addr)) @@ -2388,19 +2390,32 @@ } #endif #if 1 - if (at24_mac_read(macaddr) > 0) { - printk("ben %s: at24_mac_read Success!! \n", __func__); - memcpy(addr, macaddr, 6); - - printk("Read the Ethernet MAC address from :"); - for (i = 0; i < 5; i++) - printk("%2.2x:", addr[i]); - - printk("%2.2x\n", addr[i]); - } else { + if (id == 1 ){ + if (at24_mac_read(macaddr) > 0) { + printk("ben %s: at24_mac_read Success!! \n", __func__); + memcpy(addr, macaddr, 6); + printk("Read the Ethernet MAC address from :"); + for (i = 0; i < 5; i++) + printk("%2.2x:", addr[i]); + } else { printk("ben %s: at24_mac_read Failed!! \n", __func__); goto out; - } + } + } + else + { + if (at24_mac1_read(macaddr) > 0) { + printk("ben %s: at24_mac_read Success!! \n", __func__); + memcpy(addr, macaddr, 6); + printk("Read the Ethernet MAC address from :"); + for (i = 0; i < 5; i++) + printk("%2.2x:", addr[i]); + } else { + printk("ben %s: at24_mac_read Failed!! \n", __func__); + goto out; + } + } + #endif out: -- Gitblit v1.6.2