Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6c934b3 authored by Haim Dreyfuss's avatar Haim Dreyfuss Committed by Luca Coelho
Browse files

iwlwifi: check for valid ethernet address provided by OEM 



In 9000 family products we added an option to let the OEM fuse the
mac address via registers. If these registers are zeroed we use the OTP
address instead. Make sure that the address provided by the OEM is valid
and, if not, fall back to the OTP address as well.

Fixes: commit 17c867bf ("iwlwifi: add support for getting HW address from CSR")
Signed-off-by: default avatarHaim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 91b08c2d

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+10 −5
Original line number Diff line number Diff line
@@ -564,11 +564,16 @@ static void iwl_set_hw_address_from_csr(struct iwl_trans *trans, 
	__le32 mac_addr0 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR0_STRAP));

	__le32 mac_addr1 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR1_STRAP));



	/* If OEM did not fuse address - get it from OTP */

	if (!mac_addr0 && !mac_addr1) {

	iwl_flip_hw_address(mac_addr0, mac_addr1, data->hw_addr);

	/*

	 * If the OEM fused a valid address, use it instead of the one in the

	 * OTP

	 */

	if (is_valid_ether_addr(data->hw_addr))

		return;



	mac_addr0 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR0_OTP));

	mac_addr1 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR1_OTP));

	}



	iwl_flip_hw_address(mac_addr0, mac_addr1, data->hw_addr);

}