Merge tag 'iwlwifi-next-for-kalle-2016-07-06' of... (26124f4b) · Commits · 戴 / test

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ iwlwifi-objs += iwl-eeprom-read.o iwl-eeprom-parse.o
		iwlwifi-objs += iwl-phy-db.o iwl-nvm-parse.o
		iwlwifi-objs += pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
		iwlwifi-$(CONFIG_IWLDVM) += iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o
		iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o iwl-8000.o iwl-9000.o
		iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o iwl-8000.o iwl-9000.o iwl-a000.o
		iwlwifi-objs += iwl-trans.o

		iwlwifi-objs += $(iwlwifi-m)

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

+0 −17

Original line number	Diff line number	Diff line
		@@ -205,23 +205,6 @@ static const __le32 iwlagn_def_3w_lookup[IWLAGN_BT_DECISION_LUT_SIZE] = {
		cpu_to_le32(0xf0005000),
		};


		/* Loose Coex */
		static const __le32 iwlagn_loose_lookup[IWLAGN_BT_DECISION_LUT_SIZE] = {
		cpu_to_le32(0xaaaaaaaa),
		cpu_to_le32(0xaaaaaaaa),
		cpu_to_le32(0xaeaaaaaa),
		cpu_to_le32(0xaaaaaaaa),
		cpu_to_le32(0xcc00ff28),
		cpu_to_le32(0x0000aaaa),
		cpu_to_le32(0xcc00aaaa),
		cpu_to_le32(0x0000aaaa),
		cpu_to_le32(0x00000000),
		cpu_to_le32(0x00000000),
		cpu_to_le32(0xf0005000),
		cpu_to_le32(0xf0005000),
		};

		/* Full concurrency */
		static const __le32 iwlagn_concurrent_lookup[IWLAGN_BT_DECISION_LUT_SIZE] = {
		cpu_to_le32(0xaaaaaaaa),

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1337,6 +1337,8 @@ static struct iwl_op_mode iwl_op_mode_dvm_start(struct iwl_trans trans,
		trans_cfg.command_groups_size = ARRAY_SIZE(iwl_dvm_groups);

		trans_cfg.cmd_fifo = IWLAGN_CMD_FIFO_NUM;
		trans_cfg.cb_data_offs = offsetof(struct ieee80211_tx_info,
		driver_data[2]);

		WARN_ON(sizeof(priv->transport_queue_stop) * BITS_PER_BYTE <
		priv->cfg->base_params->num_of_queues);

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -523,11 +523,6 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,
		return ret;
		}

		if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION &&
		priv->cfg->ht_params && priv->cfg->ht_params->smps_mode)
		ieee80211_request_smps(ctx->vif,
		priv->cfg->ht_params->smps_mode);

		return 0;
		}

drivers/net/wireless/intel/iwlwifi/iwl-a000.c

0 → 100644

+131 −0

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) 2015-2016 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.
		*
		* BSD LICENSE
		*
		* Copyright(c) 2015-2016 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 <linux/module.h>
		#include <linux/stringify.h>
		#include "iwl-config.h"
		#include "iwl-agn-hw.h"

		/* Highest firmware API version supported */
		#define IWL_A000_UCODE_API_MAX 24

		/* Lowest firmware API version supported */
		#define IWL_A000_UCODE_API_MIN 24

		/* NVM versions */
		#define IWL_A000_NVM_VERSION 0x0a1d
		#define IWL_A000_TX_POWER_VERSION 0xffff /* meaningless */

		/* Memory offsets and lengths */
		#define IWL_A000_DCCM_OFFSET 0x800000
		#define IWL_A000_DCCM_LEN 0x18000
		#define IWL_A000_DCCM2_OFFSET 0x880000
		#define IWL_A000_DCCM2_LEN 0x8000
		#define IWL_A000_SMEM_OFFSET 0x400000
		#define IWL_A000_SMEM_LEN 0x68000

		#define IWL_A000_FW_PRE "iwlwifi-Qu-a0-jf-b0-"
		#define IWL_A000_MODULE_FIRMWARE(api) \
		IWL_A000_FW_PRE "-" __stringify(api) ".ucode"

		#define NVM_HW_SECTION_NUM_FAMILY_A000 10

		static const struct iwl_base_params iwl_a000_base_params = {
		.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_A000,
		.num_of_queues = 31,
		.shadow_ram_support = true,
		.led_compensation = 57,
		.wd_timeout = IWL_LONG_WD_TIMEOUT,
		.max_event_log_size = 512,
		.shadow_reg_enable = true,
		.pcie_l1_allowed = true,
		};

		static const struct iwl_ht_params iwl_a000_ht_params = {
		.stbc = true,
		.ldpc = true,
		.ht40_bands = BIT(NL80211_BAND_2GHZ) \| BIT(NL80211_BAND_5GHZ),
		};

		#define IWL_DEVICE_A000 \
		.ucode_api_max = IWL_A000_UCODE_API_MAX, \
		.ucode_api_min = IWL_A000_UCODE_API_MIN, \
		.device_family = IWL_DEVICE_FAMILY_8000, \
		.max_inst_size = IWL60_RTC_INST_SIZE, \
		.max_data_size = IWL60_RTC_DATA_SIZE, \
		.base_params = &iwl_a000_base_params, \
		.led_mode = IWL_LED_RF_STATE, \
		.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_A000, \
		.non_shared_ant = ANT_A, \
		.dccm_offset = IWL_A000_DCCM_OFFSET, \
		.dccm_len = IWL_A000_DCCM_LEN, \
		.dccm2_offset = IWL_A000_DCCM2_OFFSET, \
		.dccm2_len = IWL_A000_DCCM2_LEN, \
		.smem_offset = IWL_A000_SMEM_OFFSET, \
		.smem_len = IWL_A000_SMEM_LEN, \
		.features = IWL_TX_CSUM_NETIF_FLAGS \| NETIF_F_RXCSUM, \
		.apmg_not_supported = true, \
		.mq_rx_supported = true, \
		.vht_mu_mimo_supported = true, \
		.mac_addr_from_csr = true, \
		.use_tfh = true

		const struct iwl_cfg iwla000_2ac_cfg = {
		.name = "Intel(R) Dual Band Wireless AC a000",
		.fw_name_pre = IWL_A000_FW_PRE,
		IWL_DEVICE_A000,
		.ht_params = &iwl_a000_ht_params,
		.nvm_ver = IWL_A000_NVM_VERSION,
		.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
		.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
		};

		MODULE_FIRMWARE(IWL_A000_MODULE_FIRMWARE(IWL_A000_UCODE_API_MAX));

Admin message