Revert "iwlwifi: implement fseq version mismatch warning" (07fb3299) · Commits · e / devices / android_kernel_oneplus_sm7250

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/common_rx.c

deleted100644 → 0

+0 −88

Original line number	Diff line number	Diff line
		/******************************************************************************
		*
		* This file is provided under a dual BSD/GPLv2 license. When using or
		* redistributing this file, you may do so under either license.
		*
		* GPL LICENSE SUMMARY
		*
		* Copyright(c) 2017 Intel Deutschland GmbH
		*
		* 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
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* The full GNU General Public License is included in this distribution
		* in the file called COPYING.
		*
		* Contact Information:
		* Intel Linux Wireless <linuxwifi@intel.com>
		* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
		*
		* BSD LICENSE
		*
		* Copyright(c) 2017 Intel Deutschland GmbH
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		*
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		* * Neither the name Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*
		*****************************************************************************/
		#include "iwl-drv.h"
		#include "runtime.h"
		#include "fw/api/commands.h"
		#include "fw/api/alive.h"

		static void iwl_fwrt_fseq_ver_mismatch(struct iwl_fw_runtime *fwrt,
		struct iwl_rx_cmd_buffer *rxb)
		{
		struct iwl_rx_packet *pkt = rxb_addr(rxb);
		struct iwl_fseq_ver_mismatch_ntf fseq = (void )pkt->data;

		IWL_ERR(fwrt, "FSEQ version mismatch (aux: %d, wifi: %d)\n",
		__le32_to_cpu(fseq->aux_read_fseq_ver),
		__le32_to_cpu(fseq->wifi_fseq_ver));
		}

		void iwl_fwrt_handle_notification(struct iwl_fw_runtime *fwrt,
		struct iwl_rx_cmd_buffer *rxb)
		{
		struct iwl_rx_packet *pkt = rxb_addr(rxb);
		u32 cmd = WIDE_ID(pkt->hdr.group_id, pkt->hdr.cmd);

		switch (cmd) {
		case WIDE_ID(SYSTEM_GROUP, FSEQ_VER_MISMATCH_NTF):
		iwl_fwrt_fseq_ver_mismatch(fwrt, rxb);
		break;
		default:
		break;
		}
		}
		IWL_EXPORT_SYMBOL(iwl_fwrt_handle_notification);

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -168,7 +168,4 @@ void iwl_free_fw_paging(struct iwl_fw_runtime *fwrt);

		void iwl_get_shared_mem_conf(struct iwl_fw_runtime *fwrt);

		void iwl_fwrt_handle_notification(struct iwl_fw_runtime *fwrt,
		struct iwl_rx_cmd_buffer *rxb);

		#endif /* __iwl_fw_runtime_h__ */

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -1013,10 +1013,8 @@ static void iwl_mvm_rx_common(struct iwl_mvm *mvm,
		list_add_tail(&entry->list, &mvm->async_handlers_list);
		spin_unlock(&mvm->async_handlers_lock);
		schedule_work(&mvm->async_handlers_wk);
		return;
		break;
		}

		iwl_fwrt_handle_notification(&mvm->fwrt, rxb);
		}

		static void iwl_mvm_rx(struct iwl_op_mode *op_mode,