# Re: \[PATCHv3\] ethernet: aquantia: Try MAC address from device tree

- From: Hector Martin \<hidden\>
- Date: 2021-12-01 13:08:59 
- List: netdev
- Page: https://ratatoskr.run/netdev/2021/12/1592849
- Thread: https://ratatoskr.run/netdev/2021/12/1592404/t.md

```text
On 01/12/2021 11.57, Tianhao Chai wrote:
> 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: Tianhao Chai <redacted>
> ---
>   .../net/ethernet/aquantia/atlantic/aq_nic.c   | 24 +++++++++++--------
>   1 file changed, 14 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..2a1ab154f681 100644
> --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
> +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
> @@ -316,18 +316,22 @@ 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 (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);
> +		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)
>

Reviewed-by: Hector Martin <redacted>

-- 
Hector Martin (marcan@marcan.st)
Public Key: https://mrcn.st/pub
```