drivers: net: fsl_enetc: use write_hwaddr()
PATCH v2 1/2 drivers: net: fsl_enetc: use write_hwaddr()
Intead of setting the MAC address in enetc_start() use the proper write_hwaddr(). U-Boot takes care of the random MAC address, too.
---
changes since v1:
- none, but added a second patch which also handles the ls1028a
drivers/net/fsl_enetc.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/net/fsl_enetc.c +8 -9
@@ -267,14 +267,19 @@ static int enetc_remove(struct udevice *dev)return 0 ; } -/* ENETC Port MAC address registers, accepts big-endian format */ -static void enetc_set_primary_mac_addr (struct enetc_priv *priv,const u8 *addr) +static int enetc_write_hwaddr (struct udevice *dev) { +struct eth_pdata *plat =dev_get_platdata (dev); +struct enetc_priv *priv =dev_get_priv (dev); +u8 *addr = plat->enetaddr; +u16 lower = *(const u16 *)(addr +4 );u32 upper = *(const u32 *)addr;enetc_write_port (priv,ENETC_PSIPMAR0 , upper);enetc_write_port (priv,ENETC_PSIPMAR1 , lower); + +return 0 ; }/* Configure port parameters (# of rings, frame size, enable port) */
@@ -405,7 +410,6 @@ static void enetc_setup_rx_bdr(struct udevice *dev)*/ static int enetc_start (struct udevice *dev) { -struct eth_pdata *plat =dev_get_platdata (dev);struct enetc_priv *priv =dev_get_priv (dev);/* reset and enable the PCI device */
@@ -413,12 +417,6 @@ static int enetc_start(struct udevice *dev)dm_pci_clrset_config16 (dev,PCI_COMMAND ,0 ,PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ); -if (!is_valid_ethaddr (plat->enetaddr)) { -enetc_dbg (dev,"invalid MAC address, generate random ...\n" ); -net_random_ethaddr (plat->enetaddr); - } -enetc_set_primary_mac_addr (priv, plat->enetaddr); -enetc_enable_si_port (priv);/* setup Tx/Rx buffer descriptors */
@@ -548,6 +546,7 @@ static const struct eth_ops enetc_ops = { .send = enetc_send, .recv = enetc_recv, .stop = enetc_stop, + .write_hwaddr = enetc_write_hwaddr, };U_BOOT_DRIVER (eth_enetc) = {
Signature · 1 line
2.20.1
PATCH v2 2/2 drivers: net: fsl_enetc: add write_hwaddr() for LS1028A
The LS1028A SoC is special in the handling of the MAC addresses. We need to write to the IERB version of the PSIPMAR0/1 register. This value will be sampled into the corresponding port PSIPMAR0/1 register if the PCI memory access is enabled.
---
changes since v1:
- new patch
drivers/net/fsl_enetc.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
drivers/net/fsl_enetc.c +38 -0
@@ -267,12 +267,50 @@ static int enetc_remove(struct udevice *dev)return 0 ; } +/* +* LS1028A is the only part with IERB at this time and there are plans to +* change its structure, keep this LS1028A specific for now. +*/ +#define LS1028A_IERB_BASE 0x1f0800000ULL +#define LS1028A_IERB_PSIPMAR0 (pf, vf) (LS1028A_IERB_BASE + 0x8000 \ + + (pf) * 0x100 + (vf) * 8) +#define LS1028A_IERB_PSIPMAR1 (pf, vf) (LS1028A_IERB_PSIPMAR0(pf, vf) + 4) + +static int enetc_ls1028a_write_hwaddr (struct udevice *dev) +{ +struct pci_child_platdata *ppdata =dev_get_parent_platdata (dev); +const int devfn_to_pf[] = {0 ,1 ,2 ,-1 ,-1 ,-1 ,3 }; +struct eth_pdata *plat =dev_get_platdata (dev); +int devfn =PCI_FUNC (ppdata->devfn); +u8 *addr = plat->enetaddr; +u32 lower, upper; +int pf; + +if (devfn >=ARRAY_SIZE (devfn_to_pf)) +return 0 ; + + pf = devfn_to_pf[devfn]; +if (pf <0 ) +return 0 ; + + lower = *(const u16 *)(addr +4 ); + upper = *(const u32 *)addr; + +out_le32 (LS1028A_IERB_PSIPMAR0 (pf,0 ), upper); +out_le32 (LS1028A_IERB_PSIPMAR1 (pf,0 ), lower); + +return 0 ; +} +static int enetc_write_hwaddr (struct udevice *dev) {struct eth_pdata *plat =dev_get_platdata (dev);struct enetc_priv *priv =dev_get_priv (dev);u8 *addr = plat->enetaddr; +if (IS_ENABLED (CONFIG_ARCH_LS1028A )) +return enetc_ls1028a_write_hwaddr (dev); +u16 lower = *(const u16 *)(addr +4 );u32 upper = *(const u32 *)addr;
Signature · 1 line
2.20.1
PATCH v2 2/2 drivers: net: fsl_enetc: add write_hwaddr() for LS1028A
Quoted 8 lines
-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Michael Walle
Sent: Friday, December 20, 2019 6:47 PM
To: u-boot at lists.denx.de
Cc: Joe Hershberger <[email protected]>
Subject: [PATCH v2 2/2] drivers: net:fsl_enetc: addwrite_hwaddr()for LS1028A
Quoted 8 lines
The LS1028A SoC is special in the handling of the MAC addresses. We need to write to the IERB version of the PSIPMAR0/1 register. This value will be sampled into the corresponding port PSIPMAR0/1 register if the PCI memory access is enabled.
Signed-off-by Michael Walle <[email protected]>Signed-off-by Alex Marginean <[email protected]>---
patch applied in u-boot-fsl-qoriq/master
-priyankajain
PATCH v2 1/2 drivers: net: fsl_enetc: use write_hwaddr()
In reply to Michael WalleQuoted 7 lines
-----Original Message-----
From: U-Boot <[email protected]> On Behalf Of Michael Walle
Sent: Friday, December 20, 2019 6:47 PM
To: u-boot at lists.denx.de
Cc: Joe Hershberger <[email protected]>
Subject: [PATCH v2 1/2] drivers: net:fsl_enetc: usewrite_hwaddr()
Quoted 6 lines
Intead of setting the MAC address in
enetc_start()use the properwrite_hwaddr(). U-Boot takes care of the random MAC address, too.Signed-off-by Michael Walle <[email protected]>Signed-off-by Alex Marginean <[email protected]>---
patch applied in u-boot-fsl-qoriq/master
-priyankajain