r8169: Load MAC address from device tree if present
PATCH v3 1/2 r8169: Load MAC address from device tree if present
From: Thierry Reding <[email protected]>
If the system was booted using a device tree and if the device tree contains a MAC address, use it instead of reading one from the EEPROM. This is useful in situations where the EEPROM isn't properly programmed or where the firmware wants to override the existing MAC address.
---
Applies on net-next.
Changes in v2:
- rewrite error check for readability
- initialize mac_addr array
drivers/net/ethernet/realtek/r8169.c | 36 ++++++++++++++++++---------- 1 file changed, 23 insertions(+), 13 deletions(-)
drivers/net/ethernet/realtek/r8169.c +23 -13
@@ -7110,6 +7110,21 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)return pci_alloc_irq_vectors (tp->pci_dev,1 ,1 , flags); } +static void rtl_read_mac_address (struct rtl8169_private *tp, +u8 mac_addr[ETH_ALEN ]) +{ +/* Get MAC address */ +switch (tp->mac_version) { + case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38: + case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51: + *(u32 *)&mac_addr[0 ] =rtl_eri_read (tp,0xe0 ,ERIAR_EXGMAC ); + *(u16 *)&mac_addr[4 ] =rtl_eri_read (tp,0xe4 ,ERIAR_EXGMAC ); +break ; +default : +break ; + } +} +DECLARE_RTL_COND (rtl_link_list_ready_cond) {return RTL_R8 (tp,MCU ) &LINK_LIST_RDY ;
@@ -7301,6 +7316,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)static int rtl_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data; +u8 mac_addr[ETH_ALEN ]__aligned(4) = {};struct rtl8169_private *tp;struct net_device *dev;int chipset, region, i;
@@ -7403,20 +7419,14 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)u64_stats_init (&tp->rx_stats.syncp);u64_stats_init (&tp->tx_stats.syncp); -/* Get MAC address */ -switch (tp->mac_version) { -u8 mac_addr[ETH_ALEN ]__aligned(4) ; - case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38: - case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51: - *(u32 *)&mac_addr[0 ] =rtl_eri_read (tp,0xe0 ,ERIAR_EXGMAC ); - *(u16 *)&mac_addr[4 ] =rtl_eri_read (tp,0xe4 ,ERIAR_EXGMAC ); +/* get MAC address */ + rc =eth_platform_get_mac_address (&pdev->dev, mac_addr); +if (rc) +rtl_read_mac_address (tp, mac_addr); + +if (is_valid_ether_addr (mac_addr)) +rtl_rar_set (tp, mac_addr); -if (is_valid_ether_addr (mac_addr)) -rtl_rar_set (tp, mac_addr); -break ; -default : -break ; - }for (i =0 ; i <ETH_ALEN ; i++) dev->dev_addr[i] =RTL_R8 (tp,MAC0 + i);
Signature · 1 line
2.19.1
PATCH v3 2/2 r8169: Avoid pointer aliasing
From: Thierry Reding <[email protected]>
Read MAC address 32-bit at a time and manually extract the individual bytes. This avoids pointer aliasing and gives the compiler a better chance of optimizing the operation.
---
Applies to net-next.
I tested this on a Jetson TX2 with an add-in Realtek ethernet card that has a properly programmed OTP to verify that I got the endianess right. Seems like everything works and the device behaves the same with or without this patch.
Changes in v3:
- align MAC address to u16 for is_valid_ether_addr()
drivers/net/ethernet/realtek/r8169.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/net/ethernet/realtek/r8169.c +13 -3
@@ -7113,12 +7113,21 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)static void rtl_read_mac_address (struct rtl8169_private *tp,u8 mac_addr[ETH_ALEN ]) { +u32 value; +/* Get MAC address */ switch (tp->mac_version) { case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38: case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51: - *(u32 *)&mac_addr[0 ] =rtl_eri_read (tp,0xe0 ,ERIAR_EXGMAC ); - *(u16 *)&mac_addr[4 ] =rtl_eri_read (tp,0xe4 ,ERIAR_EXGMAC ); + value =rtl_eri_read (tp,0xe0 ,ERIAR_EXGMAC ); + mac_addr[0 ] = (value >>0 ) &0xff ; + mac_addr[1 ] = (value >>8 ) &0xff ; + mac_addr[2 ] = (value >>16 ) &0xff ; + mac_addr[3 ] = (value >>24 ) &0xff ; + + value =rtl_eri_read (tp,0xe4 ,ERIAR_EXGMAC ); + mac_addr[4 ] = (value >>0 ) &0xff ; + mac_addr[5 ] = (value >>8 ) &0xff ;break ;default :break ;
@@ -7316,7 +7325,8 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)static int rtl_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data; -u8 mac_addr[ETH_ALEN ]__aligned(4) = {}; +/* align to u16 for is_valid_ether_addr() */ +u8 mac_addr[ETH_ALEN ]__aligned(2) = {};struct rtl8169_private *tp;struct net_device *dev;int chipset, region, i;
Signature · 1 line
2.19.1
Quoted 11 lines · Thierry Reding
From: Thierry Reding <[email protected]>
If the system was booted using a device tree and if the device tree contains a MAC address, use it instead of reading one from the EEPROM. This is useful in situations where the EEPROM isn't properly programmed or where the firmware wants to override the existing MAC address.
Signed-off-by Thierry Reding <[email protected]>---
Applies on net-next.
Quoted 6 lines
Changes in v2:
- rewrite error check for readability
- initializemac_addrarraydrivers/net/ethernet/realtek/r8169.c | 36 ++++++++++++++++++---------- 1 file changed, 23 insertions(+), 13 deletions(-)
Sorry, I forgot to include Heiner's Reviewed-by tag here, but with any luck patchwork will pick it up if I do this:
This patch previously:
Re: [PATCH v3 2/2] r8169: Avoid pointer aliasing
In reply to Thierry RedingQuoted 16 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Read MAC address 32-bit at a time and manually extract the individual bytes. This avoids pointer aliasing and gives the compiler a better chance of optimizing the operation.
Suggested-by Andrew Lunn <[email protected]>Signed-off-by Thierry Reding <[email protected]>---
Applies to net-next.I tested this on a Jetson TX2 with an add-in Realtek ethernet card that has a properly programmed OTP to verify that I got the endianess right. Seems like everything works and the device behaves the same with or without this patch.
Quoted 5 lines
Changes in v3:
- align MAC address to u16 foris_valid_ether_addr()drivers/net/ethernet/realtek/r8169.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
I also forgot Andrew's Reviewed-by here, but technically the patch has changed, so I'll leave it up to him to confirm he's still okay with this version.
Thierry
Re: [PATCH v3 2/2] r8169: Avoid pointer aliasing
In reply to Thierry RedingQuoted 11 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Read MAC address 32-bit at a time and manually extract the individual bytes. This avoids pointer aliasing and gives the compiler a better chance of optimizing the operation.
Suggested-by Andrew Lunn <[email protected]>Signed-off-by Thierry Reding <[email protected]>---
Applies to net-next.
Quoted 7 lines
I tested this on a Jetson TX2 with an add-in Realtek ethernet card that has a properly programmed OTP to verify that I got the endianess right. Seems like everything works and the device behaves the same with or without this patch.
Changes in v3:
- align MAC address to u16 foris_valid_ether_addr()
Hi Thierry
The point of this patch was to try to avoid the pointer aliasing, which is what leads to the alignment requirements. But if you are forced to align it because of is_valid_ether_addr() i would just drop this patch. Aliasing is going to happen whatever.
But if you want to keep it.
Andrew
Quoted 8 lines · Thierry Reding
From: Thierry Reding <[email protected]>
If the system was booted using a device tree and if the device tree contains a MAC address, use it instead of reading one from the EEPROM. This is useful in situations where the EEPROM isn't properly programmed or where the firmware wants to override the existing MAC address.
Signed-off-by Thierry Reding <[email protected]>
Andrew
From: Thierry Reding <[email protected]>
Date: Wed, 6 Feb 2019 13:30:17 +0100
Quoted 8 lines
From: Thierry Reding <[email protected]>
If the system was booted using a device tree and if the device tree contains a MAC address, use it instead of reading one from the EEPROM. This is useful in situations where the EEPROM isn't properly programmed or where the firmware wants to override the existing MAC address.
Signed-off-by Thierry Reding <[email protected]>
Applied.
Re: [PATCH v3 2/2] r8169: Avoid pointer aliasing
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Date: Wed, 6 Feb 2019 13:30:18 +0100
Quoted 8 lines
From: Thierry Reding <[email protected]>
Read MAC address 32-bit at a time and manually extract the individual bytes. This avoids pointer aliasing and gives the compiler a better chance of optimizing the operation.
Suggested-by Andrew Lunn <[email protected]>Signed-off-by Thierry Reding <[email protected]>
Applied.