net: usb: ax88179_178a: avoid the interface always configured as random address
Subsystems (5)
PATCH v3 1/1 net: usb: ax88179_178a: avoid the interface always configured as random address
After the commit d2689b6a86b9 ("net: usb: ax88179_178a: avoid two consecutive device resets"), reset is not executed from bind operation and mac address is not read from the device registers or the devicetree at that moment. Since the check to configure if the assigned mac address is random or not for the interface, happens after the bind operation from usbnet_probe, the interface keeps configured as random address, although the address is correctly read and set during open operation (the only reset now).
In order to keep only one reset for the device and to avoid the interface always configured as random address, after reset, configure correctly the suitable field from the driver, if the mac address is read successfully from the device registers or the devicetree.
---
v3:
- Send the patch separately to net.
v2:
- Split the fix and the improvement in two patches as Simon Horman
suggests.
v1: https://lore.kernel.org/netdev/[email protected]/
drivers/net/usb/ax88179_178a.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/ax88179_178a.c +1 -0
@@ -1273,6 +1273,7 @@ static void ax88179_get_mac_addr(struct usbnet *dev)if (is_valid_ether_addr (mac)) {eth_hw_addr_set (dev->net, mac); + dev->net->addr_assign_type =NET_ADDR_PERM ; }else {netdev_info (dev->net,"invalid MAC address, using random\n" );eth_hw_addr_random (dev->net);
Signature · 1 line
2.44.0
Quoted 18 lines · Jose Ignacio Tornos Martinez
After the commit
d2689b6a86b9("net: usb:ax88179_178a: avoid two consecutive device resets"), reset is not executed from bind operation and mac address is not read from the device registers or the devicetree at that moment. Since the check to configure if the assigned mac address is random or not for the interface, happens after the bind operation fromusbnet_probe, the interface keeps configured as random address, although the address is correctly read and set during open operation (the only reset now).In order to keep only one reset for the device and to avoid the interface always configured as random address, after reset, configure correctly the suitable field from the driver, if the mac address is read successfully from the device registers or the devicetree.
cc [email protected] # 6.6+Fixes d2689b6a86b9 ("net: usb: ax88179_178a: avoid two consecutive device resets")Reported-by Dave Stevenson <[email protected]>Signed-off-by Jose Ignacio Tornos Martinez <[email protected]>
Quoted 7 lines
---
v3:
- Send the patch separately to net.
v2:
- Split the fix and the improvement in two patches as Simon Horman
suggests.
v1: https://lore.kernel.org/netdev/[email protected]/
Thanks for the updates.
Jakub Kicinski
maintainerdrivers/net/usb/ax88179_178a.c static void ax88179_get_mac_addr(struct usbnet *dev) · line 1276
Quoted 3 lines · On Mon, 1 Apr 2024 10:19:50 +0200 Jose Ignacio Tornos Martinez wrote:
drivers/net/usb/ax88179_178a.c +1
-0if (is_valid_ether_addr (mac)) {eth_hw_addr_set (dev->net, mac); + dev->net->addr_assign_type =NET_ADDR_PERM ;
Are we 100% sure we won't read back the random address we wrote earlier? Maybe let's put the assignment under if (!is_local_ether_addr(mac)), just to be on the safe side?
Hello Jakub,
You are right, good catch.
For all the cases, the mac address is going to be stored in the chip registers just in case (original behavior), and if the mac address was invalid the first time, a random one will be stored, so that when the mac address is read again from the chip registers will be a locally administered address (random). I will complete as you say.
Thanks
Best regards
José Ignacio
PATCH v4 1/1 net: usb: ax88179_178a: avoid the interface always configured as random address
In reply to Jakub KicinskiAfter the commit d2689b6a86b9 ("net: usb: ax88179_178a: avoid two consecutive device resets"), reset is not executed from bind operation and mac address is not read from the device registers or the devicetree at that moment. Since the check to configure if the assigned mac address is random or not for the interface, happens after the bind operation from usbnet_probe, the interface keeps configured as random address, although the address is correctly read and set during open operation (the only reset now).
In order to keep only one reset for the device and to avoid the interface always configured as random address, after reset, configure correctly the suitable field from the driver, if the mac address is read successfully from the device registers or the devicetree. Take into account if a locally administered address (random) was previously stored.
---
v4:
- Add locally administerd address check as Jakub Kicinski suggests
v3:
- Send the patch separately to net.
v2:
- Split the fix and the improvement in two patches as Simon Horman
suggests.
v1: https://lore.kernel.org/netdev/[email protected]/
drivers/net/usb/ax88179_178a.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/usb/ax88179_178a.c +2 -0
@@ -1273,6 +1273,8 @@ static void ax88179_get_mac_addr(struct usbnet *dev)if (is_valid_ether_addr (mac)) {eth_hw_addr_set (dev->net, mac); +if (!is_local_ether_addr (mac)) + dev->net->addr_assign_type =NET_ADDR_PERM ; }else {netdev_info (dev->net,"invalid MAC address, using random\n" );eth_hw_addr_random (dev->net);
Signature · 1 line
2.44.0
Quoted 15 lines · Jose Ignacio Tornos Martinez
After the commit
d2689b6a86b9("net: usb:ax88179_178a: avoid two consecutive device resets"), reset is not executed from bind operation and mac address is not read from the device registers or the devicetree at that moment. Since the check to configure if the assigned mac address is random or not for the interface, happens after the bind operation fromusbnet_probe, the interface keeps configured as random address, although the address is correctly read and set during open operation (the only reset now).In order to keep only one reset for the device and to avoid the interface always configured as random address, after reset, configure correctly the suitable field from the driver, if the mac address is read successfully from the device registers or the devicetree. Take into account if a locally administered address (random) was previously stored.
Quoted 7 lines
cc [email protected] # 6.6+Fixes d2689b6a86b9 ("net: usb: ax88179_178a: avoid two consecutive device resets")Reported-by Dave Stevenson <[email protected]>Signed-off-by Jose Ignacio Tornos Martinez <[email protected]>---
v4:
- Add locally administerd address check as Jakub Kicinski suggests
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Wed, 3 Apr 2024 15:21:58 +0200 you wrote:
After the commit
d2689b6a86b9("net: usb:ax88179_178a: avoid two consecutive device resets"), reset is not executed from bind operation and mac address is not read from the device registers or the devicetree at that moment. Since the check to configure if the assigned mac address is random or not for the interface, happens after the bind operation fromusbnet_probe, the interface keeps configured as random address, although the address is correctly read and set during open operation (the only reset now).[...]
Here is the summary with links:
- [net,v4] net: usb: ax88179_178a: avoid the interface always configured as random address
https://git.kernel.org/netdev/net/c/2e91bb99b9d4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html