Commit 0f673c16 authored by Johannes Berg's avatar Johannes Berg Committed by Kalle Valo
Browse files

iwlwifi: pnvm: accept multiple HW-type TLVs 



Some products (So) may have two different types of products
with different mac-type that are otherwise equivalent, and
have the same PNVM data, so the PNVM file will contain two
(or perhaps later more) HW-type TLVs. Accept the file and
use the data section that contains any matching entry.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210719140154.a6a86e903035.Ic0b1b75c45d386698859f251518e8a5144431938@changeid
parent 09cfae9f

drivers/net/wireless/intel/iwlwifi/fw/pnvm.c

+16 −9
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data, 
	u32 sha1 = 0;

	u16 mac_type = 0, rf_id = 0;

	u8 *pnvm_data = NULL, *tmp;

	bool hw_match = false;

	u32 size = 0;

	int ret;
@@ -83,6 +84,9 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data, 
				break;

			}



			if (hw_match)

				break;



			mac_type = le16_to_cpup((__le16 *)data);

			rf_id = le16_to_cpup((__le16 *)(data + sizeof(__le16)));
@@ -90,15 +94,9 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data, 
				     "Got IWL_UCODE_TLV_HW_TYPE mac_type 0x%0x rf_id 0x%0x\n",

				     mac_type, rf_id);



			if (mac_type != CSR_HW_REV_TYPE(trans->hw_rev) ||

			    rf_id != CSR_HW_RFID_TYPE(trans->hw_rf_id)) {

				IWL_DEBUG_FW(trans,

					     "HW mismatch, skipping PNVM section, mac_type 0x%0x, rf_id 0x%0x.\n",

					     CSR_HW_REV_TYPE(trans->hw_rev), trans->hw_rf_id);

				ret = -ENOENT;

				goto out;

			}



			if (mac_type == CSR_HW_REV_TYPE(trans->hw_rev) &&

			    rf_id == CSR_HW_RFID_TYPE(trans->hw_rf_id))

				hw_match = true;

			break;

		case IWL_UCODE_TLV_SEC_RT: {

			struct iwl_pnvm_section *section = (void *)data;
@@ -149,6 +147,15 @@ static int iwl_pnvm_handle_section(struct iwl_trans *trans, const u8 *data, 
	}



done:

	if (!hw_match) {

		IWL_DEBUG_FW(trans,

			     "HW mismatch, skipping PNVM section (need mac_type 0x%x rf_id 0x%x)\n",

			     CSR_HW_REV_TYPE(trans->hw_rev),

			     CSR_HW_RFID_TYPE(trans->hw_rf_id));

		ret = -ENOENT;

		goto out;

	}



	if (!size) {

		IWL_DEBUG_FW(trans, "Empty PNVM, skipping.\n");

		ret = -ENOENT;