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

Commit 9c95fd66 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2016-09-19-2' of... 

Merge tag 'iwlwifi-next-for-kalle-2016-09-19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* added support for MU-MIMO sniffer
* added support for RRM by scan
* added support for packet injection
* migrate to devm memory allocation handling
* some fixes, mostly in DQA and new HW support
* other generic cleanups
parents 80ba4f1d 0979a913

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

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ 
#define CREATE_TRACE_POINTS

#include "iwl-devtrace.h"



EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_iowrite8);

EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ioread32);

EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_iowrite32);

EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_event);

EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_error);

EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_cont_event);

drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h

+5 −0
Original line number Diff line number Diff line
@@ -256,6 +256,10 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_api_t; 
 *	instead of 3.

 * @IWL_UCODE_TLV_API_TX_POWER_CHAIN: TX power API has larger command size

 *	(command version 3) that supports per-chain limits

 * @IWL_UCODE_TLV_API_SCAN_TSF_REPORT: Scan start time reported in scan

 *	iteration complete notification, and the timestamp reported for RX

 *	received during scan, are reported in TSF of the mac specified in the

 *	scan request.

 *

 * @NUM_IWL_UCODE_TLV_API: number of bits used

 */
@@ -267,6 +271,7 @@ enum iwl_ucode_tlv_api { 
	IWL_UCODE_TLV_API_NEW_VERSION           = (__force iwl_ucode_tlv_api_t)20,

	IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY	= (__force iwl_ucode_tlv_api_t)24,

	IWL_UCODE_TLV_API_TX_POWER_CHAIN	= (__force iwl_ucode_tlv_api_t)27,

	IWL_UCODE_TLV_API_SCAN_TSF_REPORT	= (__force iwl_ucode_tlv_api_t)28,



	NUM_IWL_UCODE_TLV_API

#ifdef __CHECKER__

drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.c

+6 −2
Original line number Diff line number Diff line
@@ -99,8 +99,12 @@ void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait, 
				continue;



			for (i = 0; i < w->n_cmds; i++) {

				if (w->cmds[i] ==

				    WIDE_ID(pkt->hdr.group_id, pkt->hdr.cmd)) {

				u16 rec_id = WIDE_ID(pkt->hdr.group_id,

						     pkt->hdr.cmd);



				if (w->cmds[i] == rec_id ||

				    (!iwl_cmd_groupid(w->cmds[i]) &&

				     DEF_ID(w->cmds[i]) == rec_id)) {

					found = true;

					break;

				}

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+99 −5
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include <linux/export.h>

#include <linux/etherdevice.h>

#include <linux/pci.h>

#include <linux/acpi.h>

#include "iwl-drv.h"

#include "iwl-modparams.h"

#include "iwl-nvm-parse.h"
@@ -564,11 +565,16 @@ static void iwl_set_hw_address_from_csr(struct iwl_trans *trans, 
	__le32 mac_addr0 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR0_STRAP));

	__le32 mac_addr1 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR1_STRAP));



	/* If OEM did not fuse address - get it from OTP */

	if (!mac_addr0 && !mac_addr1) {

	iwl_flip_hw_address(mac_addr0, mac_addr1, data->hw_addr);

	/*

	 * If the OEM fused a valid address, use it instead of the one in the

	 * OTP

	 */

	if (is_valid_ether_addr(data->hw_addr))

		return;



	mac_addr0 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR0_OTP));

	mac_addr1 = cpu_to_le32(iwl_read32(trans, CSR_MAC_ADDR1_OTP));

	}



	iwl_flip_hw_address(mac_addr0, mac_addr1, data->hw_addr);

}
@@ -899,3 +905,91 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 
	return regd;

}

IWL_EXPORT_SYMBOL(iwl_parse_nvm_mcc_info);



#ifdef CONFIG_ACPI

#define WRDD_METHOD		"WRDD"

#define WRDD_WIFI		(0x07)

#define WRDD_WIGIG		(0x10)



static u32 iwl_wrdd_get_mcc(struct device *dev, union acpi_object *wrdd)

{

	union acpi_object *mcc_pkg, *domain_type, *mcc_value;

	u32 i;



	if (wrdd->type != ACPI_TYPE_PACKAGE ||

	    wrdd->package.count < 2 ||

	    wrdd->package.elements[0].type != ACPI_TYPE_INTEGER ||

	    wrdd->package.elements[0].integer.value != 0) {

		IWL_DEBUG_EEPROM(dev, "Unsupported wrdd structure\n");

		return 0;

	}



	for (i = 1 ; i < wrdd->package.count ; ++i) {

		mcc_pkg = &wrdd->package.elements[i];



		if (mcc_pkg->type != ACPI_TYPE_PACKAGE ||

		    mcc_pkg->package.count < 2 ||

		    mcc_pkg->package.elements[0].type != ACPI_TYPE_INTEGER ||

		    mcc_pkg->package.elements[1].type != ACPI_TYPE_INTEGER) {

			mcc_pkg = NULL;

			continue;

		}



		domain_type = &mcc_pkg->package.elements[0];

		if (domain_type->integer.value == WRDD_WIFI)

			break;



		mcc_pkg = NULL;

	}



	if (mcc_pkg) {

		mcc_value = &mcc_pkg->package.elements[1];

		return mcc_value->integer.value;

	}



	return 0;

}



int iwl_get_bios_mcc(struct device *dev, char *mcc)

{

	acpi_handle root_handle;

	acpi_handle handle;

	struct acpi_buffer wrdd = {ACPI_ALLOCATE_BUFFER, NULL};

	acpi_status status;

	u32 mcc_val;



	root_handle = ACPI_HANDLE(dev);

	if (!root_handle) {

		IWL_DEBUG_EEPROM(dev,

				 "Could not retrieve root port ACPI handle\n");

		return -ENOENT;

	}



	/* Get the method's handle */

	status = acpi_get_handle(root_handle, (acpi_string)WRDD_METHOD,

				 &handle);

	if (ACPI_FAILURE(status)) {

		IWL_DEBUG_EEPROM(dev, "WRD method not found\n");

		return -ENOENT;

	}



	/* Call WRDD with no arguments */

	status = acpi_evaluate_object(handle, NULL, NULL, &wrdd);

	if (ACPI_FAILURE(status)) {

		IWL_DEBUG_EEPROM(dev, "WRDC invocation failed (0x%x)\n",

				 status);

		return -ENOENT;

	}



	mcc_val = iwl_wrdd_get_mcc(dev, wrdd.pointer);

	kfree(wrdd.pointer);

	if (!mcc_val)

		return -ENOENT;



	mcc[0] = (mcc_val >> 8) & 0xff;

	mcc[1] = mcc_val & 0xff;

	mcc[2] = '\0';

	return 0;

}

IWL_EXPORT_SYMBOL(iwl_get_bios_mcc);

#endif

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h

+19 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2008 - 2015 Intel Corporation. All rights reserved.

 * Copyright(c) 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
@@ -93,4 +94,21 @@ struct ieee80211_regdomain * 
iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,

		       int num_of_ch, __le32 *channels, u16 fw_mcc);



#ifdef CONFIG_ACPI

/**

 * iwl_get_bios_mcc - read MCC from BIOS, if available

 *

 * @dev: the struct device

 * @mcc: output buffer (3 bytes) that will get the MCC

 *

 * This function tries to read the current MCC from ACPI if available.

 */

int iwl_get_bios_mcc(struct device *dev, char *mcc);

#else

static inline int iwl_get_bios_mcc(struct device *dev, char *mcc)

{

	return -ENOENT;

}

#endif



#endif /* __iwl_nvm_parse_h__ */