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

Commit f0ab68d2 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2018-03-02' of... 

Merge tag 'iwlwifi-for-kalle-2018-03-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

Second batch of iwlwifi fixes intended for 4.16:

* Fix CSA issues with count 0 and 1;
* Some firmware debugging fixes;
* Removed a wrong error message when removing keys;
* Fix a firmware sysassert most usually triggered in IBSS;
* A couple of fixes on multicast queues;
* A fix with CCMP 256;
parents 78dc897b de655fa8

drivers/net/wireless/intel/iwlwifi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ config IWLWIFI_BCAST_FILTERING 
config IWLWIFI_PCIE_RTPM

       bool "Enable runtime power management mode for PCIe devices"

       depends on IWLMVM && PM && EXPERT

       default false

       help

         Say Y here to enable runtime power management for PCIe

         devices.  If enabled, the device will go into low power mode

drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h

+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ enum { 
 * @TE_V2_NOTIF_HOST_FRAG_END:request/receive notification on frag end

 * @TE_V2_NOTIF_INTERNAL_FRAG_START: internal FW use.

 * @TE_V2_NOTIF_INTERNAL_FRAG_END: internal FW use.

 * @T2_V2_START_IMMEDIATELY: start time event immediately

 * @TE_V2_START_IMMEDIATELY: start time event immediately

 * @TE_V2_DEP_OTHER: depends on another time event

 * @TE_V2_DEP_TSF: depends on a specific time

 * @TE_V2_EVENT_SOCIOPATHIC: can't co-exist with other events of tha same MAC
@@ -230,7 +230,7 @@ enum iwl_time_event_policy { 
	TE_V2_NOTIF_HOST_FRAG_END = BIT(5),

	TE_V2_NOTIF_INTERNAL_FRAG_START = BIT(6),

	TE_V2_NOTIF_INTERNAL_FRAG_END = BIT(7),

	T2_V2_START_IMMEDIATELY = BIT(11),

	TE_V2_START_IMMEDIATELY = BIT(11),



	/* placement characteristics */

	TE_V2_DEP_OTHER = BIT(TE_V2_PLACEMENT_POS),

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

+11 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 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
@@ -33,6 +34,7 @@ 
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -942,7 +944,6 @@ void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt) 


out:

	iwl_fw_free_dump_desc(fwrt);

	fwrt->dump.trig = NULL;

	clear_bit(IWL_FWRT_STATUS_DUMPING, &fwrt->status);

	IWL_DEBUG_INFO(fwrt, "WRT dump done\n");

}
@@ -1112,6 +1113,14 @@ void iwl_fw_error_dump_wk(struct work_struct *work) 
	    fwrt->ops->dump_start(fwrt->ops_ctx))

		return;



	if (fwrt->ops && fwrt->ops->fw_running &&

	    !fwrt->ops->fw_running(fwrt->ops_ctx)) {

		IWL_ERR(fwrt, "Firmware not running - cannot dump error\n");

		iwl_fw_free_dump_desc(fwrt);

		clear_bit(IWL_FWRT_STATUS_DUMPING, &fwrt->status);

		goto out;

	}



	if (fwrt->trans->cfg->device_family == IWL_DEVICE_FAMILY_7000) {

		/* stop recording */

		iwl_fw_dbg_stop_recording(fwrt);
@@ -1145,7 +1154,7 @@ void iwl_fw_error_dump_wk(struct work_struct *work) 
			iwl_write_prph(fwrt->trans, DBGC_OUT_CTRL, out_ctrl);

		}

	}



out:

	if (fwrt->ops && fwrt->ops->dump_end)

		fwrt->ops->dump_end(fwrt->ops_ctx);

}

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

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 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
@@ -33,6 +34,7 @@ 
 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -91,6 +93,7 @@ static inline void iwl_fw_free_dump_desc(struct iwl_fw_runtime *fwrt) 
	if (fwrt->dump.desc != &iwl_dump_desc_assert)

		kfree(fwrt->dump.desc);

	fwrt->dump.desc = NULL;

	fwrt->dump.trig = NULL;

}



void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt);

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

+18 −0
Original line number Diff line number Diff line
@@ -75,6 +75,20 @@ static inline void iwl_fw_cancel_timestamp(struct iwl_fw_runtime *fwrt) 
	cancel_delayed_work_sync(&fwrt->timestamp.wk);

}



static inline void iwl_fw_suspend_timestamp(struct iwl_fw_runtime *fwrt)

{

	cancel_delayed_work_sync(&fwrt->timestamp.wk);

}



static inline void iwl_fw_resume_timestamp(struct iwl_fw_runtime *fwrt)

{

	if (!fwrt->timestamp.delay)

		return;



	schedule_delayed_work(&fwrt->timestamp.wk,

			      round_jiffies_relative(fwrt->timestamp.delay));

}



#else

static inline int iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt,

					  struct dentry *dbgfs_dir)
@@ -84,4 +98,8 @@ static inline int iwl_fwrt_dbgfs_register(struct iwl_fw_runtime *fwrt, 


static inline void iwl_fw_cancel_timestamp(struct iwl_fw_runtime *fwrt) {}



static inline void iwl_fw_suspend_timestamp(struct iwl_fw_runtime *fwrt) {}



static inline void iwl_fw_resume_timestamp(struct iwl_fw_runtime *fwrt) {}



#endif /* CONFIG_IWLWIFI_DEBUGFS */