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

Commit 20d879e7 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2017-10-06-2' of... 

Merge tag 'iwlwifi-next-for-kalle-2017-10-06-2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

First batch of iwlwifi patches for 4.15 (v2)

* Cleanups: - remove an unused value that we read from the NVM;
            - remove link quality measurement code that was never used;
* One FW command API update;
* A fix and an addition for PCI devices for the A000 family;
* Tiny refactor of ref/unref code used by runtime-PM;
* Some debugging improvements;
* Implementation of a more flexible way to define command queue sizes;
* ACPI code refactoring;
* Some coding-style fixes;
* Avoid redundant command to the firmware;
* Add a struct with the format of one FW command;
* Change an error log to a warning when the FW API is not aligned with
  the driver (important during development);
* Change a WARN_ON to WARN_ONCE to make it more descriptive and less
  noisy (i.e. no repeated warnings on a firmware triggered error);
* Dump PCI registers when an error occurs, to make it easier to debug;
parents 073a435d f2abcfa6

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 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 fw/nvm.o

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



iwlwifi-objs += $(iwlwifi-m)

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

+52 −51
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ static const struct iwl_ht_params iwl_a000_ht_params = { 
	.rf_id = true,							\

	.gen2 = true,							\

	.ext_nvm = true,						\

	.dbgc_supported = true

	.dbgc_supported = true,						\

	.tx_cmd_queue_size = 32



const struct iwl_cfg iwla000_2ac_cfg_hr = {

	.name = "Intel(R) Dual Band Wireless AC a000",

drivers/net/wireless/intel/iwlwifi/fw/acpi.c

0 → 100644
+210 −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) 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.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program;

 *

 * 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 "iwl-debug.h"

#include "acpi.h"



void *iwl_acpi_get_object(struct device *dev, acpi_string method)

{

	acpi_handle root_handle;

	acpi_handle handle;

	struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};

	acpi_status status;



	root_handle = ACPI_HANDLE(dev);

	if (!root_handle) {

		IWL_DEBUG_DEV_RADIO(dev,

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

		return ERR_PTR(-ENOENT);

	}



	/* Get the method's handle */

	status = acpi_get_handle(root_handle, method, &handle);

	if (ACPI_FAILURE(status)) {

		IWL_DEBUG_DEV_RADIO(dev, "%s method not found\n", method);

		return ERR_PTR(-ENOENT);

	}



	/* Call the method with no arguments */

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

	if (ACPI_FAILURE(status)) {

		IWL_DEBUG_DEV_RADIO(dev, "%s invocation failed (0x%x)\n",

				    method, status);

		return ERR_PTR(-ENOENT);

	}



	return buf.pointer;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_object);



union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,

					 union acpi_object *data,

					 int data_size)

{

	int i;

	union acpi_object *wifi_pkg;



	/*

	 * We need at least one entry in the wifi package that

	 * describes the domain, and one more entry, otherwise there's

	 * no point in reading it.

	 */

	if (WARN_ON_ONCE(data_size < 2))

		return ERR_PTR(-EINVAL);



	/*

	 * We need at least two packages, one for the revision and one

	 * for the data itself.  Also check that the revision is valid

	 * (i.e. it is an integer set to 0).

	 */

	if (data->type != ACPI_TYPE_PACKAGE ||

	    data->package.count < 2 ||

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

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

		IWL_DEBUG_DEV_RADIO(dev, "Unsupported packages structure\n");

		return ERR_PTR(-EINVAL);

	}



	/* loop through all the packages to find the one for WiFi */

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

		union acpi_object *domain;



		wifi_pkg = &data->package.elements[i];



		/* skip entries that are not a package with the right size */

		if (wifi_pkg->type != ACPI_TYPE_PACKAGE ||

		    wifi_pkg->package.count != data_size)

			continue;



		domain = &wifi_pkg->package.elements[0];

		if (domain->type == ACPI_TYPE_INTEGER &&

		    domain->integer.value == ACPI_WIFI_DOMAIN)

			goto found;

	}



	return ERR_PTR(-ENOENT);



found:

	return wifi_pkg;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_wifi_pkg);



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

{

	union acpi_object *wifi_pkg, *data;

	u32 mcc_val;

	int ret;



	data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD);

	if (IS_ERR(data))

		return PTR_ERR(data);



	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE);

	if (IS_ERR(wifi_pkg)) {

		ret = PTR_ERR(wifi_pkg);

		goto out_free;

	}



	if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER) {

		ret = -EINVAL;

		goto out_free;

	}



	mcc_val = wifi_pkg->package.elements[1].integer.value;



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

	mcc[1] = mcc_val & 0xff;

	mcc[2] = '\0';



	ret = 0;

out_free:

	kfree(data);

	return ret;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_mcc);



u64 iwl_acpi_get_pwr_limit(struct device *dev)

{

	union acpi_object *data, *wifi_pkg;

	u64 dflt_pwr_limit;



	data = iwl_acpi_get_object(dev, ACPI_SPLC_METHOD);

	if (IS_ERR(data)) {

		dflt_pwr_limit = 0;

		goto out;

	}



	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data,

					 ACPI_SPLC_WIFI_DATA_SIZE);

	if (IS_ERR(wifi_pkg) ||

	    wifi_pkg->package.elements[1].integer.value != ACPI_TYPE_INTEGER) {

		dflt_pwr_limit = 0;

		goto out_free;

	}



	dflt_pwr_limit = wifi_pkg->package.elements[1].integer.value;

out_free:

	kfree(data);

out:

	return dflt_pwr_limit;

}

IWL_EXPORT_SYMBOL(iwl_acpi_get_pwr_limit);

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

0 → 100644
+138 −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) 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.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program;

 *

 * 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.

 *

 *****************************************************************************/

#ifndef __iwl_fw_acpi__

#define __iwl_fw_acpi__



#include <linux/acpi.h>



#define ACPI_WRDS_METHOD	"WRDS"

#define ACPI_EWRD_METHOD	"EWRD"

#define ACPI_WGDS_METHOD	"WGDS"

#define ACPI_WRDD_METHOD	"WRDD"

#define ACPI_SPLC_METHOD	"SPLC"



#define ACPI_WIFI_DOMAIN	(0x07)



#define ACPI_SAR_TABLE_SIZE		10

#define ACPI_SAR_PROFILE_NUM		4



#define ACPI_GEO_TABLE_SIZE		6

#define ACPI_NUM_GEO_PROFILES		3

#define ACPI_GEO_PER_CHAIN_SIZE		3



#define ACPI_SAR_NUM_CHAIN_LIMITS	2

#define ACPI_SAR_NUM_SUB_BANDS		5



#define ACPI_WRDS_WIFI_DATA_SIZE	(ACPI_SAR_TABLE_SIZE + 2)

#define ACPI_EWRD_WIFI_DATA_SIZE	((ACPI_SAR_PROFILE_NUM - 1) * \

					 ACPI_SAR_TABLE_SIZE + 3)

#define ACPI_WGDS_WIFI_DATA_SIZE	18

#define ACPI_WRDD_WIFI_DATA_SIZE	2

#define ACPI_SPLC_WIFI_DATA_SIZE	2



#define ACPI_WGDS_NUM_BANDS		2

#define ACPI_WGDS_TABLE_SIZE		3



#ifdef CONFIG_ACPI



void *iwl_acpi_get_object(struct device *dev, acpi_string method);

union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,

					 union acpi_object *data,

					 int data_size);



/**

 * iwl_acpi_get_mcc - read MCC from ACPI, 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_acpi_get_mcc(struct device *dev, char *mcc);



u64 iwl_acpi_get_pwr_limit(struct device *dev);



#else /* CONFIG_ACPI */



static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)

{

	return ERR_PTR(-ENOENT);

}



static inline union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,

						       union acpi_object *data,

						       int data_size)

{

	return ERR_PTR(-ENOENT);

}



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

{

	return -ENOENT;

}



static inline u64 iwl_acpi_get_pwr_limit(struct device *dev)

{

	return 0;

}



#endif /* CONFIG_ACPI */

#endif /* __iwl_fw_acpi__ */

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

+38 −3
Original line number Diff line number Diff line
@@ -116,14 +116,14 @@ struct iwl_binding_cmd { 
#define IWL_MVM_MAX_QUOTA 128



/**

 * struct iwl_time_quota_data - configuration of time quota per binding

 * struct iwl_time_quota_data_v1 - configuration of time quota per binding

 * @id_and_color: ID and color of the relevant Binding,

 *	&enum iwl_ctxt_id_and_color

 * @quota: absolute time quota in TU. The scheduler will try to divide the

 *	remainig quota (after Time Events) according to this quota.

 * @max_duration: max uninterrupted context duration in TU

 */

struct iwl_time_quota_data {

struct iwl_time_quota_data_v1 {

	__le32 id_and_color;

	__le32 quota;

	__le32 max_duration;
@@ -137,8 +137,43 @@ struct iwl_time_quota_data { 
 *	essentially zero.

 *	On CDB the fourth one is a regular binding.

 */

struct iwl_time_quota_cmd_v1 {

	struct iwl_time_quota_data_v1 quotas[MAX_BINDINGS];

} __packed; /* TIME_QUOTA_ALLOCATION_CMD_API_S_VER_1 */



enum iwl_quota_low_latency {

	IWL_QUOTA_LOW_LATENCY_NONE = 0,

	IWL_QUOTA_LOW_LATENCY_TX = BIT(0),

	IWL_QUOTA_LOW_LATENCY_RX = BIT(1),

	IWL_QUOTA_LOW_LATENCY_TX_RX =

		IWL_QUOTA_LOW_LATENCY_TX | IWL_QUOTA_LOW_LATENCY_RX,

};



/**

 * struct iwl_time_quota_data - configuration of time quota per binding

 * @id_and_color: ID and color of the relevant Binding.

 * @quota: absolute time quota in TU. The scheduler will try to divide the

 *	remainig quota (after Time Events) according to this quota.

 * @max_duration: max uninterrupted context duration in TU

 * @low_latency: low latency status, &enum iwl_quota_low_latency

 */

struct iwl_time_quota_data {

	__le32 id_and_color;

	__le32 quota;

	__le32 max_duration;

	__le32 low_latency;

} __packed; /* TIME_QUOTA_DATA_API_S_VER_2 */



/**

 * struct iwl_time_quota_cmd - configuration of time quota between bindings

 * ( TIME_QUOTA_CMD = 0x2c )

 * Note: on non-CDB the fourth one is the auxilary mac and is essentially zero.

 * On CDB the fourth one is a regular binding.

 *

 * @quotas: allocations per binding

 */

struct iwl_time_quota_cmd {

	struct iwl_time_quota_data quotas[MAX_BINDINGS];

} __packed; /* TIME_QUOTA_ALLOCATION_CMD_API_S_VER_1 */

} __packed; /* TIME_QUOTA_ALLOCATION_CMD_API_S_VER_2 */



#endif /* __iwl_fw_api_binding_h__ */