Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save cthbleachbit/85a4de21bbedb10d10972b5d5d8038f3 to your computer and use it in GitHub Desktop.
Save cthbleachbit/85a4de21bbedb10d10972b5d5d8038f3 to your computer and use it in GitHub Desktop.
From 5b80e738d593cb18e680a0ccd145ede2b4b57701 Mon Sep 17 00:00:00 2001
From: Tianhao Chai <cth451@gmail.com>
Date: Sun, 21 Nov 2021 15:44:07 -0600
Subject: [PATCH] ethernet: aquantia: Try MAC address from device tree
Apple M1 Mac minis (2020) with 10GE NICs do not have MAC address in the
card, but instead need to obtain MAC addresses from the device tree. In
this case the hardware will report an invalid MAC.
Currently atlantic driver does not query the DT for MAC address and will
randomly assign a MAC if the NIC doesn't have a permanent MAC burnt in.
This patch changes the bahavior so that a valid MAC address from OF (if
present) will take precedence over self-reported MAC and only fall back
to a random MAC address when neither of them is valid.
Signed-off-by: Tianhao Chai <cth451@gmail.com>
---
.../net/ethernet/aquantia/atlantic/aq_nic.c | 28 ++++++++++++-------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index 1acf544afeb4..ae6c4a044390 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -316,18 +316,26 @@ int aq_nic_ndev_register(struct aq_nic_s *self)
aq_macsec_init(self);
#endif
- mutex_lock(&self->fwreq_mutex);
- err = self->aq_fw_ops->get_mac_permanent(self->aq_hw, addr);
- mutex_unlock(&self->fwreq_mutex);
- if (err)
- goto err_exit;
+ if (eth_platform_get_mac_address(&self->pdev->dev, addr) == 0 &&
+ is_valid_ether_addr(addr)) {
+ // DT supplied a valid MAC address
+ eth_hw_addr_set(self->ndev, addr);
+ } else {
+ // If DT has none or an invalid one, ask device for MAC address
+ mutex_lock(&self->fwreq_mutex);
+ err = self->aq_fw_ops->get_mac_permanent(self->aq_hw, addr);
+ mutex_unlock(&self->fwreq_mutex);
- eth_hw_addr_set(self->ndev, addr);
+ if (err)
+ goto err_exit;
- if (!is_valid_ether_addr(self->ndev->dev_addr) ||
- !aq_nic_is_valid_ether_addr(self->ndev->dev_addr)) {
- netdev_warn(self->ndev, "MAC is invalid, will use random.");
- eth_hw_addr_random(self->ndev);
+ if (is_valid_ether_addr(addr) &&
+ aq_nic_is_valid_ether_addr(addr)) {
+ eth_hw_addr_set(self->ndev, addr);
+ } else {
+ netdev_warn(self->ndev, "MAC is invalid, will use random.");
+ eth_hw_addr_random(self->ndev);
+ }
}
#if defined(AQ_CFG_MAC_ADDR_PERMANENT)
--
2.30.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment