Commit 21bdee92 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2020-01-11' of... 

Merge tag 'iwlwifi-for-kalle-2020-01-11' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

First batch of fixes intended for v5.5

* Don't send the PPAG command when PPAG is disabled, since it can
  cause problems;
* A few fixes for a HW bug;
* A fix for RS offload;
* A fix for 3168 devices where the NVM tables where the wrong tables
  were being read.
* Fix a couple of potential memory leaks in TXQ code;
* Disable L0S states in all hardware since our hardware doesn't
  officially support them anymore (and older versions of the hardware
  had instability in these states);
* Remove lar_disable parameter since it has been causing issues for
  some people who erroneously disable it;
* Force the debug monitor HW to stop also when debug is disabled,
  since it sometimes stays on and prevents low system power states;
parents 33328bfa 20560874

drivers/net/wireless/intel/iwlwifi/dvm/tx.c

+1 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, 
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct iwl_station_priv *sta_priv = NULL;

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];

	struct iwl_device_cmd *dev_cmd;

	struct iwl_device_tx_cmd *dev_cmd;

	struct iwl_tx_cmd *tx_cmd;

	__le16 fc;

	u8 hdr_len;
@@ -348,7 +348,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv, 
	if (unlikely(!dev_cmd))

		goto drop_unlock_priv;



	memset(dev_cmd, 0, sizeof(*dev_cmd));

	dev_cmd->hdr.cmd = REPLY_TX;

	tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload;

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

+5 −5
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) 
{

	union acpi_object *wifi_pkg, *data;

	bool enabled;

	int i, n_profiles, tbl_rev;

	int i, n_profiles, tbl_rev, pos;

	int ret = 0;



	data = iwl_acpi_get_object(fwrt->dev, ACPI_EWRD_METHOD);
@@ -390,10 +390,10 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) 
		goto out_free;

	}



	for (i = 0; i < n_profiles; i++) {

	/* the tables start at element 3 */

		int pos = 3;

	pos = 3;



	for (i = 0; i < n_profiles; i++) {

		/* The EWRD profiles officially go from 2 to 4, but we

		 * save them in sar_profiles[1-3] (because we don't

		 * have profile 0).  So in the array we start from 1.

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

+1 −6
Original line number Diff line number Diff line
@@ -2669,12 +2669,7 @@ int iwl_fw_dbg_stop_restart_recording(struct iwl_fw_runtime *fwrt, 
{

	int ret = 0;



	/* if the FW crashed or not debug monitor cfg was given, there is

	 * no point in changing the recording state

	 */

	if (test_bit(STATUS_FW_ERROR, &fwrt->trans->status) ||

	    (!fwrt->trans->dbg.dest_tlv &&

	     fwrt->trans->dbg.ini_dest == IWL_FW_INI_LOCATION_INVALID))

	if (test_bit(STATUS_FW_ERROR, &fwrt->trans->status))

		return 0;



	if (fw_has_capa(&fwrt->fw->ucode_capa,

drivers/net/wireless/intel/iwlwifi/iwl-csr.h

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ enum { 




/* CSR GIO */

#define CSR_GIO_REG_VAL_L0S_ENABLED	(0x00000002)

#define CSR_GIO_REG_VAL_L0S_DISABLED	(0x00000002)



/*

 * UCODE-DRIVER GP (general purpose) mailbox register 1

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

+8 −1
Original line number Diff line number Diff line
@@ -480,7 +480,14 @@ static int iwl_dbg_tlv_alloc_fragment(struct iwl_fw_runtime *fwrt, 
	if (!frag || frag->size || !pages)

		return -EIO;



	while (pages) {

	/*

	 * We try to allocate as many pages as we can, starting with

	 * the requested amount and going down until we can allocate

	 * something.  Because of DIV_ROUND_UP(), pages will never go

	 * down to 0 and stop the loop, so stop when pages reaches 1,

	 * which is too small anyway.

	 */

	while (pages > 1) {

		block = dma_alloc_coherent(fwrt->dev, pages * PAGE_SIZE,

					   &physical,

					   GFP_KERNEL | __GFP_NOWARN);

CRA Git | Maintained and supported by SUSTech CRA and CCSE