iwlwifi: mvm: support old method of NVM parsing (d4f3695e) · Commits · 戴 / test

drivers/net/wireless/intel/iwlwifi/mvm/constants.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,7 @@
		#define IWL_MVM_TOF_IS_RESPONDER 0
		#define IWL_MVM_SW_TX_CSUM_OFFLOAD 0
		#define IWL_MVM_HW_CSUM_DISABLE 0
		#define IWL_MVM_PARSE_NVM 0
		#define IWL_MVM_COLLECT_FW_ERR_DUMP 1
		#define IWL_MVM_RS_NUM_TRY_BEFORE_ANT_TOGGLE 1
		#define IWL_MVM_RS_HT_VHT_RETRIES_PER_RATE 2

+9 −1

Original line number	Diff line number	Diff line
		@@ -744,6 +744,14 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
		iwl_mvm_load_nvm_to_nic(mvm);
		}

		if (IWL_MVM_PARSE_NVM && read_nvm) {
		ret = iwl_nvm_init(mvm, true);
		if (ret) {
		IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);
		goto error;
		}
		}

		ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(REGULATORY_AND_NVM_GROUP,
		NVM_ACCESS_COMPLETE), 0,
		sizeof(nvm_complete), &nvm_complete);
		@@ -760,7 +768,7 @@ static int iwl_run_unified_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
		return ret;

		/* Read the NVM only at driver load time, no need to do this twice */
		if (read_nvm) {
		if (!IWL_MVM_PARSE_NVM && read_nvm) {
		ret = iwl_mvm_nvm_get_from_fw(mvm);
		if (ret) {
		IWL_ERR(mvm, "Failed to read NVM: %d\n", ret);