Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1529492
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 4.8 39/67] iwlwifi: pcie: fix SPLC structure parsing |
| Date | 2016-11-24 16:40 +0100 |
| Message-ID | <sH4i0-4Al-93@gated-at.bofh.it> (permalink) |
| References | <sH48h-4wC-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
4.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Coelho <luciano.coelho@intel.com>
commit e0d9727c111a5917a1184c71c1a8e6f78c7fc41d upstream.
The SPLC data parsing is too restrictive and was not trying find the
correct element for WiFi. This causes problems with some BIOSes where
the SPLC method exists, but doesn't have a WiFi entry on the first
element of the list. The domain type values are also incorrect
according to the specification.
Fix this by complying with the actual specification.
Additionally, replace all occurrences of SPLX to SPLC, since SPLX is
only a structure internal to the ACPI tables, and may not even exist.
Fixes: bcb079a14d75 ("iwlwifi: pcie: retrieve and parse ACPI power limitations")
Reported-by: Chris Rorvick <chris@rorvick.com>
Tested-by: Paul Bolle <pebolle@tiscali.nl>
Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 77 +++++++++++++++-----------
1 file changed, 47 insertions(+), 30 deletions(-)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -526,48 +526,64 @@ static const struct pci_device_id iwl_hw
MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
#ifdef CONFIG_ACPI
-#define SPL_METHOD "SPLC"
-#define SPL_DOMAINTYPE_MODULE BIT(0)
-#define SPL_DOMAINTYPE_WIFI BIT(1)
-#define SPL_DOMAINTYPE_WIGIG BIT(2)
-#define SPL_DOMAINTYPE_RFEM BIT(3)
+#define ACPI_SPLC_METHOD "SPLC"
+#define ACPI_SPLC_DOMAIN_WIFI (0x07)
-static u64 splx_get_pwr_limit(struct iwl_trans *trans, union acpi_object *splx)
+static u64 splc_get_pwr_limit(struct iwl_trans *trans, union acpi_object *splc)
{
- union acpi_object *limits, *domain_type, *power_limit;
+ union acpi_object *data_pkg, *dflt_pwr_limit;
+ int i;
- if (splx->type != ACPI_TYPE_PACKAGE ||
- splx->package.count != 2 ||
- splx->package.elements[0].type != ACPI_TYPE_INTEGER ||
- splx->package.elements[0].integer.value != 0) {
- IWL_ERR(trans, "Unsupported splx structure\n");
+ /* We need at least two elements, one for the revision and one
+ * for the data itself. Also check that the revision is
+ * supported (currently only revision 0).
+ */
+ if (splc->type != ACPI_TYPE_PACKAGE ||
+ splc->package.count < 2 ||
+ splc->package.elements[0].type != ACPI_TYPE_INTEGER ||
+ splc->package.elements[0].integer.value != 0) {
+ IWL_DEBUG_INFO(trans,
+ "Unsupported structure returned by the SPLC method. Ignoring.\n");
return 0;
}
- limits = &splx->package.elements[1];
- if (limits->type != ACPI_TYPE_PACKAGE ||
- limits->package.count < 2 ||
- limits->package.elements[0].type != ACPI_TYPE_INTEGER ||
- limits->package.elements[1].type != ACPI_TYPE_INTEGER) {
- IWL_ERR(trans, "Invalid limits element\n");
- return 0;
+ /* loop through all the packages to find the one for WiFi */
+ for (i = 1; i < splc->package.count; i++) {
+ union acpi_object *domain;
+
+ data_pkg = &splc->package.elements[i];
+
+ /* Skip anything that is not a package with the right
+ * amount of elements (i.e. at least 2 integers).
+ */
+ if (data_pkg->type != ACPI_TYPE_PACKAGE ||
+ data_pkg->package.count < 2 ||
+ data_pkg->package.elements[0].type != ACPI_TYPE_INTEGER ||
+ data_pkg->package.elements[1].type != ACPI_TYPE_INTEGER)
+ continue;
+
+ domain = &data_pkg->package.elements[0];
+ if (domain->integer.value == ACPI_SPLC_DOMAIN_WIFI)
+ break;
+
+ data_pkg = NULL;
}
- domain_type = &limits->package.elements[0];
- power_limit = &limits->package.elements[1];
- if (!(domain_type->integer.value & SPL_DOMAINTYPE_WIFI)) {
- IWL_DEBUG_INFO(trans, "WiFi power is not limited\n");
+ if (!data_pkg) {
+ IWL_DEBUG_INFO(trans,
+ "No element for the WiFi domain returned by the SPLC method.\n");
return 0;
}
- return power_limit->integer.value;
+ dflt_pwr_limit = &data_pkg->package.elements[1];
+ return dflt_pwr_limit->integer.value;
}
static void set_dflt_pwr_limit(struct iwl_trans *trans, struct pci_dev *pdev)
{
acpi_handle pxsx_handle;
acpi_handle handle;
- struct acpi_buffer splx = {ACPI_ALLOCATE_BUFFER, NULL};
+ struct acpi_buffer splc = {ACPI_ALLOCATE_BUFFER, NULL};
acpi_status status;
pxsx_handle = ACPI_HANDLE(&pdev->dev);
@@ -578,23 +594,24 @@ static void set_dflt_pwr_limit(struct iw
}
/* Get the method's handle */
- status = acpi_get_handle(pxsx_handle, (acpi_string)SPL_METHOD, &handle);
+ status = acpi_get_handle(pxsx_handle, (acpi_string)ACPI_SPLC_METHOD,
+ &handle);
if (ACPI_FAILURE(status)) {
- IWL_DEBUG_INFO(trans, "SPL method not found\n");
+ IWL_DEBUG_INFO(trans, "SPLC method not found\n");
return;
}
/* Call SPLC with no arguments */
- status = acpi_evaluate_object(handle, NULL, NULL, &splx);
+ status = acpi_evaluate_object(handle, NULL, NULL, &splc);
if (ACPI_FAILURE(status)) {
IWL_ERR(trans, "SPLC invocation failed (0x%x)\n", status);
return;
}
- trans->dflt_pwr_limit = splx_get_pwr_limit(trans, splx.pointer);
+ trans->dflt_pwr_limit = splc_get_pwr_limit(trans, splc.pointer);
IWL_DEBUG_INFO(trans, "Default power limit set to %lld\n",
trans->dflt_pwr_limit);
- kfree(splx.pointer);
+ kfree(splc.pointer);
}
#else /* CONFIG_ACPI */
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 4.8 00/67] 4.8.11-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:30 +0100
[PATCH 4.8 23/67] scripts/has-stack-protector: add -fno-PIE Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 66/67] gpio: pca953x: Move memcpy into mutex lock for set multiple Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 62/67] IB/hfi1: Remove incorrect IS_ERR check Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 34/67] clk: mmp: pxa910: fix return value check in pxa910_clk_init() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 33/67] virtio-net: drop legacy features in virtio 1 mode Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 38/67] rtc: omap: Fix selecting external osc Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 04/67] arm64: KVM: pmu: Fix AArch32 cycle counter access Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 60/67] IB/mlx5: Fix NULL pointer dereference on debug print Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 59/67] IB/mlx5: Fix fatal error dispatching Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 61/67] IB/core: Avoid unsigned int overflow in sg_alloc_table Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 07/67] ftrace: Add more checks for FTRACE_FL_DISABLED in processing ip records Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 55/67] IB/mlx4: Fix create CQ error flow Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 65/67] netfilter: nft_dynset: fix element timeout for HZ != 1000 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 21/67] Disable the __builtin_return_address() warning globally after all Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 56/67] IB/mlx5: Validate requested RQT size Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 64/67] IB/cm: Mark stale CM ids whenever the mad agent was unregistered Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 47/67] PM / sleep: fix device reference leak in test_suspend Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 37/67] clk: imx: fix integer overflow in AV PLL round rate Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 36/67] clk: mmp: mmp2: fix return value check in mmp2_clk_init() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 35/67] clk: mmp: pxa168: fix return value check in pxa168_clk_init() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 46/67] uwb: fix device reference leaks Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 67/67] gpio: pca953x: Fix corruption of other gpios in set_multiple. Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 54/67] IB/mlx4: Check gid_index return value Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 25/67] kbuild: Steal gccs pie from the very beginning Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 57/67] IB/mlx5: Use cache line size to select CQE stride Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 39/67] iwlwifi: pcie: fix SPLC structure parsing Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 53/67] IB/rxe: Clear queue buffer when modifying QP to reset Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 63/67] IB/uverbs: Fix leak of XRC target QPs Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 58/67] IB/mlx5: Fix memory leak in query device Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 08/67] genirq: Use irq type from irqdata instead of irqdesc Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:40 +0100
[PATCH 4.8 16/67] ALSA: usb-audio: Fix use-after-free of usb_device at disconnect Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 49/67] perf hists: Fix column length on --hierarchy Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 42/67] iwlwifi: mvm: fix d3_test with unified D0/D3 images Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 52/67] IB/rxe: Fix handling of erroneous WR Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 18/67] ALSA: hda - Fix mic regression by ASRock mobo fixup Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 44/67] mfd: core: Fix device reference leak in mfd_clone_cell Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 51/67] IB/rxe: Fix kernel panic in UDP tunnel with GRO and RX checksum Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 45/67] sunrpc: svc_age_temp_xprts_now should not call setsockopt non-tcp transports Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 43/67] iwlwifi: mvm: wake the wait queue when the RX sync counter is zero Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 10/67] IB/rdmavt: rdmavt can handle non aligned page maps Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 50/67] IB/rxe: Update qp state for user query Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
[PATCH 4.8 48/67] PM / sleep: dont suspend parent when async child suspend_{noirq, late} fails Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-11-24 16:50 +0100
Re: [PATCH 4.8 00/67] 4.8.11-stable review Guenter Roeck <linux@roeck-us.net> - 2016-11-25 01:50 +0100
csiph-web