Commit 553217c2 authored by Tianhao Chai's avatar Tianhao Chai Committed by David S. Miller

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 causes the driver to perfer a valid MAC address from OF (if
present) over HW self-reported MAC and only fall back to a random MAC
address when neither of them is valid.
Signed-off-by: default avatarTianhao Chai <cth451@gmail.com>
Reviewed-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Reviewed-by: default avatarHector Martin <marcan@marcan.st>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 213f5f8f
...@@ -316,19 +316,23 @@ int aq_nic_ndev_register(struct aq_nic_s *self) ...@@ -316,19 +316,23 @@ int aq_nic_ndev_register(struct aq_nic_s *self)
aq_macsec_init(self); aq_macsec_init(self);
#endif #endif
if (platform_get_ethdev_address(&self->pdev->dev, self->ndev) != 0) {
// If DT has none or an invalid one, ask device for MAC address
mutex_lock(&self->fwreq_mutex); mutex_lock(&self->fwreq_mutex);
err = self->aq_fw_ops->get_mac_permanent(self->aq_hw, addr); err = self->aq_fw_ops->get_mac_permanent(self->aq_hw, addr);
mutex_unlock(&self->fwreq_mutex); mutex_unlock(&self->fwreq_mutex);
if (err) if (err)
goto err_exit; goto err_exit;
if (is_valid_ether_addr(addr) &&
aq_nic_is_valid_ether_addr(addr)) {
eth_hw_addr_set(self->ndev, addr); eth_hw_addr_set(self->ndev, addr);
} else {
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."); netdev_warn(self->ndev, "MAC is invalid, will use random.");
eth_hw_addr_random(self->ndev); eth_hw_addr_random(self->ndev);
} }
}
#if defined(AQ_CFG_MAC_ADDR_PERMANENT) #if defined(AQ_CFG_MAC_ADDR_PERMANENT)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment