Skip to content

Commit

Permalink
wifi: ath11k: retrieve MAC address from system firmware if provided
Browse files Browse the repository at this point in the history
Devices may provide their own MAC address via system firmware (e.g.,
device tree), especially in the case where the device doesn't have a
useful EEPROM on which to store its MAC address (e.g., for integrated
ahb WCN6750).

Use the generic device helper to retrieve the MAC address, and (if
present) honor it above the MAC address advertised by the card.

Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.1.0.1-00887-QCAMSLSWPLZ-1

Signed-off-by: Jun Yu <junyuu@chromium.org>
  • Loading branch information
Jun Yu authored and intel-lab-lkp committed Sep 14, 2022
1 parent 97c9e37 commit 7a1539a
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/net/wireless/ath/ath11k/mac.c
Expand Up @@ -8,6 +8,7 @@
#include <linux/etherdevice.h>
#include <linux/bitfield.h>
#include <linux/inetdevice.h>
#include <linux/property.h>
#include <net/if_inet6.h>
#include <net/ipv6.h>

Expand Down Expand Up @@ -8982,6 +8983,7 @@ int ath11k_mac_register(struct ath11k_base *ab)
struct ath11k_pdev *pdev;
int i;
int ret;
u8 mac_addr[ETH_ALEN] = {0};

if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags))
return 0;
Expand All @@ -8994,13 +8996,18 @@ int ath11k_mac_register(struct ath11k_base *ab)
if (ret)
return ret;

device_get_mac_address(ab->dev, mac_addr, sizeof(ab->mac_addr));

for (i = 0; i < ab->num_radios; i++) {
pdev = &ab->pdevs[i];
ar = pdev->ar;
if (ab->pdevs_macaddr_valid) {
ether_addr_copy(ar->mac_addr, pdev->mac_addr);
} else {
ether_addr_copy(ar->mac_addr, ab->mac_addr);
if (is_zero_ether_addr(mac_addr))
ether_addr_copy(ar->mac_addr, ab->mac_addr);
else
ether_addr_copy(ar->mac_addr, mac_addr);
ar->mac_addr[4] += i;
}

Expand Down

0 comments on commit 7a1539a

Please sign in to comment.