Re: [PATCHv2] ethernet: aquantia: Try MAC address from device tree

From: Julian Wiedmann
Date: Tue Nov 30 2021 - 02:00:19 EST


On 30.11.21 06:51, 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 <cth451@xxxxxxxxx>
> ---
> .../net/ethernet/aquantia/atlantic/aq_nic.c | 27 ++++++++++++-------
> 1 file changed, 17 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..ad89721c1cf6 100644
> --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
> +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
> @@ -316,18 +316,25 @@ 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) {
> + // DT supplied a valid MAC address
> + eth_hw_addr_set(self->ndev, addr);

Can you use platform_get_ethdev_address() instead?