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

Commit d878b3af authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents 16e75453 f697267f

drivers/net/wireless/iwlwifi/Kconfig

+13 −12
Original line number Diff line number Diff line
@@ -20,16 +20,17 @@ config IWLWIFI 
		Intel 2000 Series Wi-Fi Adapters

		Intel 7260 Wi-Fi Adapter

		Intel 3160 Wi-Fi Adapter

		Intel 7265 Wi-Fi Adapter





	  This driver uses the kernel's mac80211 subsystem.



	  In order to use this driver, you will need a microcode (uCode)

	  In order to use this driver, you will need a firmware

	  image for it. You can obtain the microcode from:



	          <http://intellinuxwireless.org/>.

	          <http://wireless.kernel.org/en/users/Drivers/iwlwifi>.



	  The microcode is typically installed in /lib/firmware. You can

	  The firmware is typically installed in /lib/firmware. You can

	  look in the hotplug script /etc/hotplug/firmware.agent to

	  determine which directory FIRMWARE_DIR is set to when the script

	  runs.
@@ -39,9 +40,10 @@ config IWLWIFI 
	  say M here and read <file:Documentation/kbuild/modules.txt>.  The

	  module will be called iwlwifi.



if IWLWIFI



config IWLWIFI_LEDS

	bool

	depends on IWLWIFI

	depends on LEDS_CLASS=y || LEDS_CLASS=IWLWIFI

	select LEDS_TRIGGERS

	select MAC80211_LEDS
@@ -49,7 +51,7 @@ config IWLWIFI_LEDS 


config IWLDVM

	tristate "Intel Wireless WiFi DVM Firmware support"

	depends on IWLWIFI

	depends on m

	default IWLWIFI

	help

	  This is the driver that supports the DVM firmware which is
@@ -58,7 +60,7 @@ config IWLDVM 


config IWLMVM

	tristate "Intel Wireless WiFi MVM Firmware support"

	depends on IWLWIFI

	depends on m

	help

	  This is the driver that supports the MVM firmware which is

	  currently only available for 7260 and 3160 devices.
@@ -70,7 +72,7 @@ config IWLWIFI_OPMODE_MODULAR 
	default y if IWLMVM=m



comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM"

	depends on IWLWIFI && IWLDVM=n && IWLMVM=n

	depends on IWLDVM=n && IWLMVM=n



config IWLWIFI_BCAST_FILTERING

	bool "Enable broadcast filtering"
@@ -86,11 +88,9 @@ config IWLWIFI_BCAST_FILTERING 
	  expect incoming broadcasts for their normal operations.



menu "Debugging Options"

	depends on IWLWIFI



config IWLWIFI_DEBUG

	bool "Enable full debugging output in the iwlwifi driver"

	depends on IWLWIFI

	---help---

	  This option will enable debug tracing output for the iwlwifi drivers
@@ -115,7 +115,7 @@ config IWLWIFI_DEBUG 


config IWLWIFI_DEBUGFS

        bool "iwlwifi debugfs support"

        depends on IWLWIFI && MAC80211_DEBUGFS

        depends on MAC80211_DEBUGFS

        ---help---

	  Enable creation of debugfs files for the iwlwifi drivers. This

	  is a low-impact option that allows getting insight into the
@@ -123,13 +123,12 @@ config IWLWIFI_DEBUGFS 


config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE

        bool "Experimental uCode support"

        depends on IWLWIFI && IWLWIFI_DEBUG

        depends on IWLWIFI_DEBUG

        ---help---

	  Enable use of experimental ucode for testing and debugging.



config IWLWIFI_DEVICE_TRACING

	bool "iwlwifi device access tracing"

	depends on IWLWIFI

	depends on EVENT_TRACING

	help

	  Say Y here to trace all commands, including TX frames and IO
@@ -145,3 +144,5 @@ config IWLWIFI_DEVICE_TRACING 
	  If unsure, say Y so we can help you better when problems

	  occur.

endmenu



endif

drivers/net/wireless/iwlwifi/iwl-8000.c

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ 
#define NVM_HW_SECTION_NUM_FAMILY_8000		10

#define DEFAULT_NVM_FILE_FAMILY_8000		"iwl_nvm_8000.bin"



/* Max SDIO RX aggregation size of the ADDBA request/response */

#define MAX_RX_AGG_SIZE_8260_SDIO	28



static const struct iwl_base_params iwl8000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_8000,

	.num_of_queues = IWLAGN_NUM_QUEUES,
@@ -129,6 +132,7 @@ const struct iwl_cfg iwl8260_2ac_sdio_cfg = { 
	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.default_nvm_file = DEFAULT_NVM_FILE_FAMILY_8000,

	.max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,

};



MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_OK));

drivers/net/wireless/iwlwifi/iwl-config.h

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ struct iwl_pwr_tx_backoff { 
 * @d0i3: device uses d0i3 instead of d3

 * @nvm_hw_section_num: the ID of the HW NVM section

 * @pwr_tx_backoffs: translation table between power limits and backoffs

 * @max_rx_agg_size: max RX aggregation size of the ADDBA request/response

 *

 * We enable the driver to be backward compatible wrt. hardware features.

 * API differences in uCode shouldn't be handled here but through TLVs
@@ -276,6 +277,7 @@ struct iwl_cfg { 
	const struct iwl_pwr_tx_backoff *pwr_tx_backoffs;

	bool no_power_up_nic_in_init;

	const char *default_nvm_file;

	unsigned int max_rx_agg_size;

};



/*

drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h

+15 −2
Original line number Diff line number Diff line
@@ -70,21 +70,24 @@ 
/**

 * enum iwl_fw_error_dump_type - types of data in the dump file

 * @IWL_FW_ERROR_DUMP_SRAM:

 * @IWL_FW_ERROR_DUMP_REG:

 * @IWL_FW_ERROR_DUMP_CSR: Control Status Registers - from offset 0

 * @IWL_FW_ERROR_DUMP_RXF:

 * @IWL_FW_ERROR_DUMP_TXCMD: last TX command data, structured as

 *	&struct iwl_fw_error_dump_txcmd packets

 * @IWL_FW_ERROR_DUMP_DEV_FW_INFO:  struct %iwl_fw_error_dump_info

 *	info on the device / firmware.

 * @IWL_FW_ERROR_DUMP_FW_MONITOR: firmware monitor

 * @IWL_FW_ERROR_DUMP_PRPH: range of periphery registers - there can be several

 *	sections like this in a single file.

 */

enum iwl_fw_error_dump_type {

	IWL_FW_ERROR_DUMP_SRAM = 0,

	IWL_FW_ERROR_DUMP_REG = 1,

	IWL_FW_ERROR_DUMP_CSR = 1,

	IWL_FW_ERROR_DUMP_RXF = 2,

	IWL_FW_ERROR_DUMP_TXCMD = 3,

	IWL_FW_ERROR_DUMP_DEV_FW_INFO = 4,

	IWL_FW_ERROR_DUMP_FW_MONITOR = 5,

	IWL_FW_ERROR_DUMP_PRPH = 6,



	IWL_FW_ERROR_DUMP_MAX,

};
@@ -162,6 +165,16 @@ struct iwl_fw_error_dump_fw_mon { 
	u8 data[];

} __packed;



/**

 * struct iwl_fw_error_dump_prph - periphery registers data

 * @prph_start: address of the first register in this chunk

 * @data: the content of the registers

 */

struct iwl_fw_error_dump_prph {

	__le32 prph_start;

	__le32 data[];

};



/**

 * iwl_fw_error_next_data - advance fw error dump data pointer

 * @data: previous data block

drivers/net/wireless/iwlwifi/iwl-modparams.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ enum iwl_disable_11n { 
 * @wd_disable: disable stuck queue check, default = 1

 * @bt_coex_active: enable bt coex, default = true

 * @led_mode: system default, default = 0

 * @power_save: disable power save, default = false

 * @power_save: enable power save, default = false

 * @power_level: power level, default = 1

 * @debug_level: levels are IWL_DL_*

 * @ant_coupling: antenna coupling in dB, default = 0