Commit 7b834639 authored by Dedy Lansky's avatar Dedy Lansky Committed by Kalle Valo
Browse files

wil6210: use OEM MAC address from OTP 



In addition to existing MAC address field in OTP, new field added for
OEM MAC address.
wil6210 gives precedence to the new OEM MAC address and will use it if
its valid.

Signed-off-by: default avatarDedy Lansky <dlansky@codeaurora.org>
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent e4a29bdd

drivers/net/wireless/ath/wil6210/main.c

+15 −6
Original line number Diff line number Diff line
@@ -1413,6 +1413,13 @@ static int wil_get_otp_info(struct wil6210_priv *wil) 
	u8 mac[8];

	int mac_addr;



	/* OEM MAC has precedence */

	mac_addr = RGF_OTP_OEM_MAC;

	wil_memcpy_fromio_32(mac, wil->csr + HOSTADDR(mac_addr), sizeof(mac));



	if (is_valid_ether_addr(mac)) {

		wil_info(wil, "using OEM MAC %pM\n", mac);

	} else {

		if (wil->hw_version >= HW_VER_TALYN_MB)

			mac_addr = RGF_OTP_MAC_TALYN_MB;

		else
@@ -1420,6 +1427,8 @@ static int wil_get_otp_info(struct wil6210_priv *wil) 


		wil_memcpy_fromio_32(mac, wil->csr + HOSTADDR(mac_addr),

				     sizeof(mac));

	}



	if (!is_valid_ether_addr(mac)) {

		wil_err(wil, "Invalid MAC %pM\n", mac);

		return -EINVAL;

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ struct RGF_ICR { 
	#define REVISION_ID_SPARROW_D0	(0x3)



#define RGF_OTP_MAC_TALYN_MB		(0x8a0304)

#define RGF_OTP_OEM_MAC			(0x8a0334)

#define RGF_OTP_MAC			(0x8a0620)



/* Talyn-MB */

CRA Git | Maintained and supported by SUSTech CRA and CCSE