All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ath10k: retrieve MAC address from firmware if provided
@ 2018-08-10 23:39 ` Brian Norris
  0 siblings, 0 replies; 16+ messages in thread
From: Brian Norris @ 2018-08-10 23:39 UTC (permalink / raw)
  To: Kalle Valo
  Cc: ath10k, linux-wireless, Govind Singh, linux-kernel, Brian Norris

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
Wifi).

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

Signed-off-by: Brian Norris <briannorris@chromium.org>
---
 drivers/net/wireless/ath/ath10k/core.c | 3 +++
 drivers/net/wireless/ath/ath10k/wmi.c  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index c40cd129afe7..840c1f039098 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -19,6 +19,7 @@
 #include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/of.h>
+#include <linux/property.h>
 #include <linux/dmi.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
@@ -2602,6 +2603,8 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
 		ath10k_debug_print_board_info(ar);
 	}
 
+	device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr));
+
 	ret = ath10k_core_init_firmware_features(ar);
 	if (ret) {
 		ath10k_err(ar, "fatal problem with firmware features: %d\n",
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index fd612d2905b0..3cfd98de8ad2 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -5449,7 +5449,8 @@ int ath10k_wmi_event_ready(struct ath10k *ar, struct sk_buff *skb)
 		   arg.mac_addr,
 		   __le32_to_cpu(arg.status));
 
-	ether_addr_copy(ar->mac_addr, arg.mac_addr);
+	if (is_zero_ether_addr(ar->mac_addr))
+		ether_addr_copy(ar->mac_addr, arg.mac_addr);
 	complete(&ar->wmi.unified_ready);
 	return 0;
 }
-- 
2.18.0.597.ga71716f1ad-goog

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2018-09-03 21:15 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-10 23:39 [PATCH] ath10k: retrieve MAC address from firmware if provided Brian Norris
2018-08-10 23:39 ` Brian Norris
2018-08-11 18:26 ` Arend van Spriel
2018-08-11 18:26   ` Arend van Spriel
2018-08-13 17:14   ` Brian Norris
2018-08-13 17:14     ` Brian Norris
2018-08-13 18:29     ` Arend van Spriel
2018-08-13 18:29       ` Arend van Spriel
2018-08-28 14:33       ` Kalle Valo
2018-08-28 14:33         ` Kalle Valo
2018-08-29  0:14         ` Brian Norris
2018-08-29  0:14           ` Brian Norris
2018-09-03 16:49           ` Kalle Valo
2018-09-03 16:49             ` Kalle Valo
2018-09-03 16:54 ` Kalle Valo
2018-09-03 16:54 ` Kalle Valo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.