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

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

Merge tag 'iwlwifi-next-for-kalle-2018-08-02' of... 

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

More iwlwifi patches for 4.19

* New PCI IDs for 22000 and 22560;
* Some fixes and an improvement in debug dumps and recording;
* Remove some old dead code;
* Fix compilation when only IPv6 is not enabled;
* Continued work on 22560 devices;
parents 24ebfcbd 45904e7e

drivers/net/wireless/intel/iwlwifi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o 
iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= fw/notif-wait.o

iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o fw/dbg.o

iwlwifi-$(CONFIG_IWLMVM) += fw/common_rx.o

iwlwifi-$(CONFIG_ACPI) += fw/acpi.o

iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += fw/debugfs.o

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#define IWL_22000_UCODE_API_MAX	38



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	24

#define IWL_22000_UCODE_API_MIN	39



/* NVM versions */

#define IWL_22000_NVM_VERSION		0x0a1d

drivers/net/wireless/intel/iwlwifi/fw/api/alive.h

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

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

 * Copyright(c) 2016 - 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
@@ -30,6 +31,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -187,20 +189,4 @@ struct iwl_card_state_notif { 
	__le32 flags;

} __packed; /* CARD_STATE_NTFY_API_S_VER_1 */



/**

 * struct iwl_fseq_ver_mismatch_nty - Notification about version

 *

 * This notification does not have a direct impact on the init flow.

 * It means that another core (not WiFi) has initiated the FSEQ flow

 * and updated the FSEQ version.  The driver only prints an error when

 * this occurs.

 *

 * @aux_read_fseq_ver: auxiliary read FSEQ version

 * @wifi_fseq_ver: FSEQ version (embedded in WiFi)

 */

struct iwl_fseq_ver_mismatch_ntf {

	__le32 aux_read_fseq_ver;

	__le32 wifi_fseq_ver;

} __packed; /* FSEQ_VER_MISMATCH_NTFY_API_S_VER_1 */



#endif /* __iwl_fw_api_alive_h__ */

drivers/net/wireless/intel/iwlwifi/fw/api/commands.h

+0 −7
Original line number Diff line number Diff line
@@ -647,13 +647,6 @@ enum iwl_system_subcmd_ids { 
	 * @INIT_EXTENDED_CFG_CMD: &struct iwl_init_extended_cfg_cmd

	 */

	INIT_EXTENDED_CFG_CMD = 0x03,



	/**

	 * @FSEQ_VER_MISMATCH_NTF: Notification about fseq version

	 *	mismatch during init.  The format is specified in

	 *	&struct iwl_fseq_ver_mismatch_ntf.

	 */

	FSEQ_VER_MISMATCH_NTF = 0xFF,

};



#endif /* __iwl_fw_api_commands_h__ */

drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h

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

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

 * Copyright(c) 2016 - 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
@@ -30,6 +31,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

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

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright (C) 2018 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -87,6 +89,11 @@ enum iwl_data_path_subcmd_ids { 
	 */

	STA_HE_CTXT_CMD = 0x7,



	/**

	 * @RFH_QUEUE_CONFIG_CMD: &struct iwl_rfh_queue_config

	 */

	RFH_QUEUE_CONFIG_CMD = 0xD,



	/**

	 * @TLC_MNG_CONFIG_CMD: &struct iwl_tlc_config_cmd

	 */