Commit 4ec321c1 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2018-11-15' of... 

Merge tag 'iwlwifi-for-kalle-2018-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

First batch of iwlwifi fixes for 4.20

* New FW debugging infrastructure;
* Some more work on 802.11ax;
* Improve support for multiple RF modules with 22000 devices;
* Remove an unused FW parameter;
* Other debugging improvements;
parents b374e868 5d041c46

drivers/net/wireless/intel/iwlwifi/fw/acpi.h

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -26,6 +27,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -81,7 +83,7 @@ 
#define ACPI_WRDS_WIFI_DATA_SIZE	(ACPI_SAR_TABLE_SIZE + 2)

#define ACPI_EWRD_WIFI_DATA_SIZE	((ACPI_SAR_PROFILE_NUM - 1) * \

					 ACPI_SAR_TABLE_SIZE + 3)

#define ACPI_WGDS_WIFI_DATA_SIZE	18

#define ACPI_WGDS_WIFI_DATA_SIZE	19

#define ACPI_WRDD_WIFI_DATA_SIZE	2

#define ACPI_SPLC_WIFI_DATA_SIZE	2

drivers/net/wireless/intel/iwlwifi/fw/runtime.h

+5 −1
Original line number Diff line number Diff line
@@ -154,7 +154,11 @@ void iwl_fw_runtime_init(struct iwl_fw_runtime *fwrt, struct iwl_trans *trans, 
			const struct iwl_fw_runtime_ops *ops, void *ops_ctx,

			struct dentry *dbgfs_dir);



void iwl_fw_runtime_exit(struct iwl_fw_runtime *fwrt);

static inline void iwl_fw_runtime_free(struct iwl_fw_runtime *fwrt)

{

	kfree(fwrt->dump.d3_debug_data);

	fwrt->dump.d3_debug_data = NULL;

}



void iwl_fw_runtime_suspend(struct iwl_fw_runtime *fwrt);

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

+29 −9
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm) 
	IWL_DEBUG_RADIO(mvm, "Sending GEO_TX_POWER_LIMIT\n");



	BUILD_BUG_ON(ACPI_NUM_GEO_PROFILES * ACPI_WGDS_NUM_BANDS *

		     ACPI_WGDS_TABLE_SIZE !=  ACPI_WGDS_WIFI_DATA_SIZE);

		     ACPI_WGDS_TABLE_SIZE + 1 !=  ACPI_WGDS_WIFI_DATA_SIZE);



	BUILD_BUG_ON(ACPI_NUM_GEO_PROFILES > IWL_NUM_GEO_PROFILES);
@@ -928,6 +928,11 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm) 
	return -ENOENT;

}



static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm)

{

	return -ENOENT;

}



static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm)

{

	return 0;
@@ -954,8 +959,11 @@ static int iwl_mvm_sar_init(struct iwl_mvm *mvm) 
		IWL_DEBUG_RADIO(mvm,

				"WRDS SAR BIOS table invalid or unavailable. (%d)\n",

				ret);

		/* if not available, don't fail and don't bother with EWRD */

		return 0;

		/*

		 * If not available, don't fail and don't bother with EWRD.

		 * Return 1 to tell that we can't use WGDS either.

		 */

		return 1;

	}



	ret = iwl_mvm_sar_get_ewrd_table(mvm);
@@ -968,9 +976,13 @@ static int iwl_mvm_sar_init(struct iwl_mvm *mvm) 
	/* choose profile 1 (WRDS) as default for both chains */

	ret = iwl_mvm_sar_select_profile(mvm, 1, 1);



	/* if we don't have profile 0 from BIOS, just skip it */

	/*

	 * If we don't have profile 0 from BIOS, just skip it.  This

	 * means that SAR Geo will not be enabled either, even if we

	 * have other valid profiles.

	 */

	if (ret == -ENOENT)

		return 0;

		return 1;



	return ret;

}
@@ -1168,11 +1180,19 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
		iwl_mvm_unref(mvm, IWL_MVM_REF_UCODE_DOWN);



	ret = iwl_mvm_sar_init(mvm);

	if (ret)

		goto error;



	if (ret == 0) {

		ret = iwl_mvm_sar_geo_init(mvm);

	if (ret)

	} else if (ret > 0 && !iwl_mvm_sar_get_wgds_table(mvm)) {

		/*

		 * If basic SAR is not available, we check for WGDS,

		 * which should *not* be available either.  If it is

		 * available, issue an error, because we can't use SAR

		 * Geo without basic SAR.

		 */

		IWL_ERR(mvm, "BIOS contains WGDS but no WRDS\n");

	}



	if (ret < 0)

		goto error;



	iwl_mvm_leds_sync(mvm);

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+6 −6
Original line number Diff line number Diff line
@@ -301,8 +301,12 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy, 
		goto out;

	}



	if (changed)

		*changed = (resp->status == MCC_RESP_NEW_CHAN_PROFILE);

	if (changed) {

		u32 status = le32_to_cpu(resp->status);



		*changed = (status == MCC_RESP_NEW_CHAN_PROFILE ||

			    status == MCC_RESP_ILLEGAL);

	}



	regd = iwl_parse_nvm_mcc_info(mvm->trans->dev, mvm->cfg,

				      __le32_to_cpu(resp->n_channels),
@@ -4444,10 +4448,6 @@ static void iwl_mvm_mac_sta_statistics(struct ieee80211_hw *hw, 
		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);

	}



	if (!fw_has_capa(&mvm->fw->ucode_capa,

			 IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))

		return;



	/* if beacon filtering isn't on mac80211 does it anyway */

	if (!(vif->driver_flags & IEEE80211_VIF_BEACON_FILTER))

		return;

drivers/net/wireless/intel/iwlwifi/mvm/nvm.c

+2 −3
Original line number Diff line number Diff line
@@ -539,9 +539,8 @@ iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2, 
	}



	IWL_DEBUG_LAR(mvm,

		      "MCC response status: 0x%x. new MCC: 0x%x ('%c%c') change: %d n_chans: %d\n",

		      status, mcc, mcc >> 8, mcc & 0xff,

		      !!(status == MCC_RESP_NEW_CHAN_PROFILE), n_channels);

		      "MCC response status: 0x%x. new MCC: 0x%x ('%c%c') n_chans: %d\n",

		      status, mcc, mcc >> 8, mcc & 0xff, n_channels);



exit:

	iwl_free_resp(&cmd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE