2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* pci_root.c - ACPI PCI Root Bridge Driver ($Revision: 40 $)
|
|
|
|
*
|
|
|
|
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
|
|
|
|
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
|
|
|
|
*
|
|
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
|
|
* your option) any later version.
|
|
|
|
*
|
|
|
|
* 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; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
|
|
*
|
|
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/types.h>
|
2012-09-18 14:21:31 +08:00
|
|
|
#include <linux/mutex.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/pm.h>
|
2010-02-18 06:44:09 +08:00
|
|
|
#include <linux/pm_runtime.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/pci.h>
|
2008-11-11 06:30:45 +08:00
|
|
|
#include <linux/pci-acpi.h>
|
2011-03-21 11:29:20 +08:00
|
|
|
#include <linux/pci-aspm.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/acpi.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <acpi/acpi_bus.h>
|
|
|
|
#include <acpi/acpi_drivers.h>
|
2011-01-07 07:55:09 +08:00
|
|
|
#include <acpi/apei.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-11-07 08:41:48 +08:00
|
|
|
#include "internal.h"
|
|
|
|
|
2009-07-29 04:45:54 +08:00
|
|
|
#define PREFIX "ACPI: "
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#define _COMPONENT ACPI_PCI_COMPONENT
|
2007-02-13 11:42:12 +08:00
|
|
|
ACPI_MODULE_NAME("pci_root");
|
2005-04-17 06:20:36 +08:00
|
|
|
#define ACPI_PCI_ROOT_CLASS "pci_bridge"
|
|
|
|
#define ACPI_PCI_ROOT_DEVICE_NAME "PCI Root Bridge"
|
2013-01-30 21:27:33 +08:00
|
|
|
static int acpi_pci_root_add(struct acpi_device *device,
|
|
|
|
const struct acpi_device_id *not_used);
|
|
|
|
static void acpi_pci_root_remove(struct acpi_device *device);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-09-06 05:07:39 +08:00
|
|
|
#define ACPI_PCIE_REQ_SUPPORT (OSC_PCI_EXT_CONFIG_SUPPORT \
|
|
|
|
| OSC_PCI_ASPM_SUPPORT \
|
|
|
|
| OSC_PCI_CLOCK_PM_SUPPORT \
|
|
|
|
| OSC_PCI_MSI_SUPPORT)
|
2011-01-07 07:55:09 +08:00
|
|
|
|
2010-01-11 00:15:36 +08:00
|
|
|
static const struct acpi_device_id root_device_ids[] = {
|
2007-07-23 20:44:41 +08:00
|
|
|
{"PNP0A03", 0},
|
|
|
|
{"", 0},
|
|
|
|
};
|
|
|
|
|
2013-01-30 21:27:33 +08:00
|
|
|
static struct acpi_scan_handler pci_root_handler = {
|
2007-07-23 20:44:41 +08:00
|
|
|
.ids = root_device_ids,
|
2013-01-30 21:27:33 +08:00
|
|
|
.attach = acpi_pci_root_add,
|
|
|
|
.detach = acpi_pci_root_remove,
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2009-02-09 14:59:29 +08:00
|
|
|
static DEFINE_MUTEX(osc_lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-06-11 03:55:14 +08:00
|
|
|
/**
|
|
|
|
* acpi_is_root_bridge - determine whether an ACPI CA node is a PCI root bridge
|
|
|
|
* @handle - the ACPI CA node in question.
|
|
|
|
*
|
|
|
|
* Note: we could make this API take a struct acpi_device * instead, but
|
|
|
|
* for now, it's more convenient to operate on an acpi_handle.
|
|
|
|
*/
|
|
|
|
int acpi_is_root_bridge(acpi_handle handle)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct acpi_device *device;
|
|
|
|
|
|
|
|
ret = acpi_bus_get_device(handle, &device);
|
|
|
|
if (ret)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = acpi_match_device_ids(device, root_device_ids);
|
|
|
|
if (ret)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(acpi_is_root_bridge);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static acpi_status
|
2005-08-05 12:44:28 +08:00
|
|
|
get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2010-03-12 03:20:06 +08:00
|
|
|
struct resource *res = data;
|
2005-04-17 06:20:36 +08:00
|
|
|
struct acpi_resource_address64 address;
|
2012-06-22 13:48:50 +08:00
|
|
|
acpi_status status;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-06-22 13:48:50 +08:00
|
|
|
status = acpi_resource_to_address64(resource, &address);
|
|
|
|
if (ACPI_FAILURE(status))
|
2005-04-17 06:20:36 +08:00
|
|
|
return AE_OK;
|
|
|
|
|
2005-08-05 12:44:28 +08:00
|
|
|
if ((address.address_length > 0) &&
|
2010-03-12 03:20:06 +08:00
|
|
|
(address.resource_type == ACPI_BUS_NUMBER_RANGE)) {
|
|
|
|
res->start = address.minimum;
|
|
|
|
res->end = address.minimum + address.address_length - 1;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return AE_OK;
|
|
|
|
}
|
|
|
|
|
2009-06-19 04:46:52 +08:00
|
|
|
static acpi_status try_get_root_bridge_busnr(acpi_handle handle,
|
2010-03-12 03:20:06 +08:00
|
|
|
struct resource *res)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
acpi_status status;
|
|
|
|
|
2010-03-12 03:20:06 +08:00
|
|
|
res->start = -1;
|
2005-08-05 12:44:28 +08:00
|
|
|
status =
|
|
|
|
acpi_walk_resources(handle, METHOD_NAME__CRS,
|
2010-03-12 03:20:06 +08:00
|
|
|
get_root_bridge_busnr_callback, res);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (ACPI_FAILURE(status))
|
|
|
|
return status;
|
2010-03-12 03:20:06 +08:00
|
|
|
if (res->start == -1)
|
2005-04-17 06:20:36 +08:00
|
|
|
return AE_ERROR;
|
|
|
|
return AE_OK;
|
|
|
|
}
|
|
|
|
|
2013-09-06 05:07:45 +08:00
|
|
|
struct pci_osc_bit_struct {
|
|
|
|
u32 bit;
|
|
|
|
char *desc;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct pci_osc_bit_struct pci_osc_support_bit[] = {
|
|
|
|
{ OSC_PCI_EXT_CONFIG_SUPPORT, "ExtendedConfig" },
|
|
|
|
{ OSC_PCI_ASPM_SUPPORT, "ASPM" },
|
|
|
|
{ OSC_PCI_CLOCK_PM_SUPPORT, "ClockPM" },
|
|
|
|
{ OSC_PCI_SEGMENT_GROUPS_SUPPORT, "Segments" },
|
|
|
|
{ OSC_PCI_MSI_SUPPORT, "MSI" },
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct pci_osc_bit_struct pci_osc_control_bit[] = {
|
|
|
|
{ OSC_PCI_EXPRESS_NATIVE_HP_CONTROL, "PCIeHotplug" },
|
|
|
|
{ OSC_PCI_SHPC_NATIVE_HP_CONTROL, "SHPCHotplug" },
|
|
|
|
{ OSC_PCI_EXPRESS_PME_CONTROL, "PME" },
|
|
|
|
{ OSC_PCI_EXPRESS_AER_CONTROL, "AER" },
|
|
|
|
{ OSC_PCI_EXPRESS_CAPABILITY_CONTROL, "PCIeCapability" },
|
|
|
|
};
|
|
|
|
|
|
|
|
static void decode_osc_bits(struct acpi_pci_root *root, char *msg, u32 word,
|
|
|
|
struct pci_osc_bit_struct *table, int size)
|
|
|
|
{
|
|
|
|
char buf[80];
|
|
|
|
int i, len = 0;
|
|
|
|
struct pci_osc_bit_struct *entry;
|
|
|
|
|
|
|
|
buf[0] = '\0';
|
|
|
|
for (i = 0, entry = table; i < size; i++, entry++)
|
|
|
|
if (word & entry->bit)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, "%s%s",
|
|
|
|
len ? " " : "", entry->desc);
|
|
|
|
|
|
|
|
dev_info(&root->device->dev, "_OSC: %s [%s]\n", msg, buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void decode_osc_support(struct acpi_pci_root *root, char *msg, u32 word)
|
|
|
|
{
|
|
|
|
decode_osc_bits(root, msg, word, pci_osc_support_bit,
|
|
|
|
ARRAY_SIZE(pci_osc_support_bit));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void decode_osc_control(struct acpi_pci_root *root, char *msg, u32 word)
|
|
|
|
{
|
|
|
|
decode_osc_bits(root, msg, word, pci_osc_control_bit,
|
|
|
|
ARRAY_SIZE(pci_osc_control_bit));
|
|
|
|
}
|
|
|
|
|
2009-10-29 11:04:50 +08:00
|
|
|
static u8 pci_osc_uuid_str[] = "33DB4D5B-1FF7-401C-9657-7441C03DD766";
|
2009-02-09 14:59:29 +08:00
|
|
|
|
|
|
|
static acpi_status acpi_pci_run_osc(acpi_handle handle,
|
|
|
|
const u32 *capbuf, u32 *retval)
|
|
|
|
{
|
2009-10-29 11:04:50 +08:00
|
|
|
struct acpi_osc_context context = {
|
|
|
|
.uuid_str = pci_osc_uuid_str,
|
|
|
|
.rev = 1,
|
|
|
|
.cap.length = 12,
|
|
|
|
.cap.pointer = (void *)capbuf,
|
|
|
|
};
|
2009-02-09 14:59:29 +08:00
|
|
|
acpi_status status;
|
|
|
|
|
2009-10-29 11:04:50 +08:00
|
|
|
status = acpi_run_osc(handle, &context);
|
|
|
|
if (ACPI_SUCCESS(status)) {
|
|
|
|
*retval = *((u32 *)(context.ret.pointer + 8));
|
|
|
|
kfree(context.ret.pointer);
|
2009-02-09 14:59:29 +08:00
|
|
|
}
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
2010-08-21 07:53:27 +08:00
|
|
|
static acpi_status acpi_pci_query_osc(struct acpi_pci_root *root,
|
|
|
|
u32 support,
|
|
|
|
u32 *control)
|
2009-02-09 14:59:29 +08:00
|
|
|
{
|
|
|
|
acpi_status status;
|
2010-08-21 07:53:27 +08:00
|
|
|
u32 result, capbuf[3];
|
|
|
|
|
|
|
|
support &= OSC_PCI_SUPPORT_MASKS;
|
|
|
|
support |= root->osc_support_set;
|
2009-02-09 14:59:29 +08:00
|
|
|
|
2013-09-06 05:05:54 +08:00
|
|
|
capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE;
|
|
|
|
capbuf[OSC_SUPPORT_DWORD] = support;
|
2010-08-21 07:53:27 +08:00
|
|
|
if (control) {
|
|
|
|
*control &= OSC_PCI_CONTROL_MASKS;
|
2013-09-06 05:05:54 +08:00
|
|
|
capbuf[OSC_CONTROL_DWORD] = *control | root->osc_control_set;
|
2010-08-21 07:53:27 +08:00
|
|
|
} else {
|
PCI / ACPI: Don't query OSC support with all possible controls
Found problem on system that firmware that could handle pci aer.
Firmware get error reporting after pci injecting error, before os boots.
But after os boots, firmware can not get report anymore, even pci=noaer
is passed.
Root cause: BIOS _OSC has problem with query bit checking.
It turns out that BIOS vendor is copying example code from ACPI Spec.
In ACPI Spec 5.0, page 290:
If (Not(And(CDW1,1))) // Query flag clear?
{ // Disable GPEs for features granted native control.
If (And(CTRL,0x01)) // Hot plug control granted?
{
Store(0,HPCE) // clear the hot plug SCI enable bit
Store(1,HPCS) // clear the hot plug SCI status bit
}
...
}
When Query flag is set, And(CDW1,1) will be 1, Not(1) will return 0xfffffffe.
So it will get into code path that should be for control set only.
BIOS acpi code should be changed to "If (LEqual(And(CDW1,1), 0)))"
Current kernel code is using _OSC query to notify firmware about support
from OS and then use _OSC to set control bits.
During query support, current code is using all possible controls.
So will execute code that should be only for control set stage.
That will have problem when pci=noaer or aer firmware_first is used.
As firmware have that control set for os aer already in query support stage,
but later will not os aer handling.
We should avoid passing all possible controls, just use osc_control_set
instead.
That should workaround BIOS bugs with affected systems on the field
as more bios vendors are copying sample code from ACPI spec.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2013-03-28 12:28:58 +08:00
|
|
|
/* Run _OSC query only with existing controls. */
|
2013-09-06 05:05:54 +08:00
|
|
|
capbuf[OSC_CONTROL_DWORD] = root->osc_control_set;
|
2010-08-21 07:53:27 +08:00
|
|
|
}
|
2009-02-09 14:59:29 +08:00
|
|
|
|
|
|
|
status = acpi_pci_run_osc(root->device->handle, capbuf, &result);
|
|
|
|
if (ACPI_SUCCESS(status)) {
|
2010-08-21 07:53:27 +08:00
|
|
|
root->osc_support_set = support;
|
ACPI/PCI: Do not preserve _OSC control bits returned by a query
There is the assumption in acpi_pci_osc_control_set() that it is
always sufficient to compare the mask of _OSC control bits to be
requested with the result of an _OSC query where all of the known
control bits have been checked. However, in general, that need not
be the case. For example, if an _OSC feature A depends on an _OSC
feature B and control of A, B plus another _OSC feature C is
requested simultaneously, the BIOS may return A, B, C, while it would
only return C if A and C were requested without B.
That may result in passing a wrong mask of _OSC control bits to an
_OSC control request, in which case the BIOS may only grant control
of a subset of the requested features. Moreover, acpi_pci_run_osc()
will return error code if that happens and the caller of
acpi_pci_osc_control_set() will not know that it's been granted
control of some _OSC features. Consequently, the system will
generally not work as expected.
Apart from this acpi_pci_osc_control_set() always uses the mask
of _OSC control bits returned by the very first invocation of
acpi_pci_query_osc(), but that is done with the second argument
equal to OSC_PCI_SEGMENT_GROUPS_SUPPORT which generally happens
to affect the returned _OSC control bits.
For these reasons, make acpi_pci_osc_control_set() always check if
control of the requested _OSC features will be granted before making
the final control request. As a result, the osc_control_qry and
osc_queried members of struct acpi_pci_root are not necessary any
more, so drop them and remove the remaining code referring to them.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-08-24 05:55:59 +08:00
|
|
|
if (control)
|
2010-08-21 07:53:27 +08:00
|
|
|
*control = result;
|
2009-02-09 14:59:29 +08:00
|
|
|
}
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
static acpi_status acpi_pci_osc_support(struct acpi_pci_root *root, u32 flags)
|
|
|
|
{
|
|
|
|
acpi_status status;
|
|
|
|
|
|
|
|
mutex_lock(&osc_lock);
|
2010-08-21 07:53:27 +08:00
|
|
|
status = acpi_pci_query_osc(root, flags, NULL);
|
2009-02-09 14:59:29 +08:00
|
|
|
mutex_unlock(&osc_lock);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
2009-07-24 07:03:00 +08:00
|
|
|
struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle)
|
2009-02-09 14:59:29 +08:00
|
|
|
{
|
|
|
|
struct acpi_pci_root *root;
|
2012-09-18 14:23:23 +08:00
|
|
|
struct acpi_device *device;
|
2009-06-19 04:47:02 +08:00
|
|
|
|
2012-09-18 14:23:23 +08:00
|
|
|
if (acpi_bus_get_device(handle, &device) ||
|
|
|
|
acpi_match_device_ids(device, root_device_ids))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
root = acpi_driver_data(device);
|
|
|
|
|
|
|
|
return root;
|
2009-02-09 14:59:29 +08:00
|
|
|
}
|
2009-07-24 07:03:00 +08:00
|
|
|
EXPORT_SYMBOL_GPL(acpi_pci_find_root);
|
2009-02-09 14:59:29 +08:00
|
|
|
|
2009-06-11 03:55:20 +08:00
|
|
|
struct acpi_handle_node {
|
|
|
|
struct list_head node;
|
|
|
|
acpi_handle handle;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* acpi_get_pci_dev - convert ACPI CA handle to struct pci_dev
|
|
|
|
* @handle: the handle in question
|
|
|
|
*
|
|
|
|
* Given an ACPI CA handle, the desired PCI device is located in the
|
|
|
|
* list of PCI devices.
|
|
|
|
*
|
|
|
|
* If the device is found, its reference count is increased and this
|
|
|
|
* function returns a pointer to its data structure. The caller must
|
|
|
|
* decrement the reference count by calling pci_dev_put().
|
|
|
|
* If no device is found, %NULL is returned.
|
|
|
|
*/
|
|
|
|
struct pci_dev *acpi_get_pci_dev(acpi_handle handle)
|
|
|
|
{
|
|
|
|
int dev, fn;
|
|
|
|
unsigned long long adr;
|
|
|
|
acpi_status status;
|
|
|
|
acpi_handle phandle;
|
|
|
|
struct pci_bus *pbus;
|
|
|
|
struct pci_dev *pdev = NULL;
|
|
|
|
struct acpi_handle_node *node, *tmp;
|
|
|
|
struct acpi_pci_root *root;
|
|
|
|
LIST_HEAD(device_list);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Walk up the ACPI CA namespace until we reach a PCI root bridge.
|
|
|
|
*/
|
|
|
|
phandle = handle;
|
|
|
|
while (!acpi_is_root_bridge(phandle)) {
|
|
|
|
node = kzalloc(sizeof(struct acpi_handle_node), GFP_KERNEL);
|
|
|
|
if (!node)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&node->node);
|
|
|
|
node->handle = phandle;
|
|
|
|
list_add(&node->node, &device_list);
|
|
|
|
|
|
|
|
status = acpi_get_parent(phandle, &phandle);
|
|
|
|
if (ACPI_FAILURE(status))
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
root = acpi_pci_find_root(phandle);
|
|
|
|
if (!root)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
pbus = root->bus;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now, walk back down the PCI device tree until we return to our
|
|
|
|
* original handle. Assumes that everything between the PCI root
|
|
|
|
* bridge and the device we're looking for must be a P2P bridge.
|
|
|
|
*/
|
|
|
|
list_for_each_entry(node, &device_list, node) {
|
|
|
|
acpi_handle hnd = node->handle;
|
|
|
|
status = acpi_evaluate_integer(hnd, "_ADR", NULL, &adr);
|
|
|
|
if (ACPI_FAILURE(status))
|
|
|
|
goto out;
|
|
|
|
dev = (adr >> 16) & 0xffff;
|
|
|
|
fn = adr & 0xffff;
|
|
|
|
|
|
|
|
pdev = pci_get_slot(pbus, PCI_DEVFN(dev, fn));
|
2009-06-26 07:05:35 +08:00
|
|
|
if (!pdev || hnd == handle)
|
2009-06-11 03:55:20 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
pbus = pdev->subordinate;
|
|
|
|
pci_dev_put(pdev);
|
2009-10-13 07:01:57 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This function may be called for a non-PCI device that has a
|
|
|
|
* PCI parent (eg. a disk under a PCI SATA controller). In that
|
|
|
|
* case pdev->subordinate will be NULL for the parent.
|
|
|
|
*/
|
|
|
|
if (!pbus) {
|
|
|
|
dev_dbg(&pdev->dev, "Not a PCI-to-PCI bridge\n");
|
|
|
|
pdev = NULL;
|
|
|
|
break;
|
|
|
|
}
|
2009-06-11 03:55:20 +08:00
|
|
|
}
|
|
|
|
out:
|
|
|
|
list_for_each_entry_safe(node, tmp, &device_list, node)
|
|
|
|
kfree(node);
|
|
|
|
|
|
|
|
return pdev;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(acpi_get_pci_dev);
|
|
|
|
|
2009-02-09 14:59:29 +08:00
|
|
|
/**
|
2010-08-24 05:53:11 +08:00
|
|
|
* acpi_pci_osc_control_set - Request control of PCI root _OSC features.
|
|
|
|
* @handle: ACPI handle of a PCI root bridge (or PCIe Root Complex).
|
|
|
|
* @mask: Mask of _OSC bits to request control of, place to store control mask.
|
|
|
|
* @req: Mask of _OSC bits the control of is essential to the caller.
|
2009-02-09 14:59:29 +08:00
|
|
|
*
|
2010-08-24 05:53:11 +08:00
|
|
|
* Run _OSC query for @mask and if that is successful, compare the returned
|
|
|
|
* mask of control bits with @req. If all of the @req bits are set in the
|
|
|
|
* returned mask, run _OSC request for it.
|
|
|
|
*
|
|
|
|
* The variable at the @mask address may be modified regardless of whether or
|
|
|
|
* not the function returns success. On success it will contain the mask of
|
|
|
|
* _OSC bits the BIOS has granted control of, but its contents are meaningless
|
|
|
|
* on failure.
|
2009-02-09 14:59:29 +08:00
|
|
|
**/
|
2010-08-24 05:53:11 +08:00
|
|
|
acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req)
|
2009-02-09 14:59:29 +08:00
|
|
|
{
|
2010-08-24 05:53:11 +08:00
|
|
|
struct acpi_pci_root *root;
|
2013-09-06 05:07:41 +08:00
|
|
|
acpi_status status = AE_OK;
|
2010-08-24 05:53:11 +08:00
|
|
|
u32 ctrl, capbuf[3];
|
2009-02-09 14:59:29 +08:00
|
|
|
|
2010-08-24 05:53:11 +08:00
|
|
|
if (!mask)
|
|
|
|
return AE_BAD_PARAMETER;
|
|
|
|
|
|
|
|
ctrl = *mask & OSC_PCI_CONTROL_MASKS;
|
|
|
|
if ((ctrl & req) != req)
|
2009-02-09 14:59:29 +08:00
|
|
|
return AE_TYPE;
|
|
|
|
|
|
|
|
root = acpi_pci_find_root(handle);
|
|
|
|
if (!root)
|
|
|
|
return AE_NOT_EXIST;
|
|
|
|
|
|
|
|
mutex_lock(&osc_lock);
|
2010-08-24 05:53:11 +08:00
|
|
|
|
|
|
|
*mask = ctrl | root->osc_control_set;
|
2009-02-09 14:59:29 +08:00
|
|
|
/* No need to evaluate _OSC if the control was already granted. */
|
2010-08-24 05:53:11 +08:00
|
|
|
if ((root->osc_control_set & ctrl) == ctrl)
|
2009-02-09 14:59:29 +08:00
|
|
|
goto out;
|
|
|
|
|
2010-08-24 05:53:11 +08:00
|
|
|
/* Need to check the available controls bits before requesting them. */
|
|
|
|
while (*mask) {
|
|
|
|
status = acpi_pci_query_osc(root, root->osc_support_set, mask);
|
|
|
|
if (ACPI_FAILURE(status))
|
|
|
|
goto out;
|
|
|
|
if (ctrl == *mask)
|
|
|
|
break;
|
2013-09-06 05:07:45 +08:00
|
|
|
decode_osc_control(root, "platform does not support",
|
|
|
|
ctrl & ~(*mask));
|
2010-08-24 05:53:11 +08:00
|
|
|
ctrl = *mask;
|
|
|
|
}
|
ACPI/PCI: Do not preserve _OSC control bits returned by a query
There is the assumption in acpi_pci_osc_control_set() that it is
always sufficient to compare the mask of _OSC control bits to be
requested with the result of an _OSC query where all of the known
control bits have been checked. However, in general, that need not
be the case. For example, if an _OSC feature A depends on an _OSC
feature B and control of A, B plus another _OSC feature C is
requested simultaneously, the BIOS may return A, B, C, while it would
only return C if A and C were requested without B.
That may result in passing a wrong mask of _OSC control bits to an
_OSC control request, in which case the BIOS may only grant control
of a subset of the requested features. Moreover, acpi_pci_run_osc()
will return error code if that happens and the caller of
acpi_pci_osc_control_set() will not know that it's been granted
control of some _OSC features. Consequently, the system will
generally not work as expected.
Apart from this acpi_pci_osc_control_set() always uses the mask
of _OSC control bits returned by the very first invocation of
acpi_pci_query_osc(), but that is done with the second argument
equal to OSC_PCI_SEGMENT_GROUPS_SUPPORT which generally happens
to affect the returned _OSC control bits.
For these reasons, make acpi_pci_osc_control_set() always check if
control of the requested _OSC features will be granted before making
the final control request. As a result, the osc_control_qry and
osc_queried members of struct acpi_pci_root are not necessary any
more, so drop them and remove the remaining code referring to them.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-08-24 05:55:59 +08:00
|
|
|
|
2010-08-24 05:53:11 +08:00
|
|
|
if ((ctrl & req) != req) {
|
2013-09-06 05:07:45 +08:00
|
|
|
decode_osc_control(root, "not requesting control; platform does not support",
|
|
|
|
req & ~(ctrl));
|
2009-02-09 14:59:29 +08:00
|
|
|
status = AE_SUPPORT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-09-06 05:05:54 +08:00
|
|
|
capbuf[OSC_QUERY_DWORD] = 0;
|
|
|
|
capbuf[OSC_SUPPORT_DWORD] = root->osc_support_set;
|
|
|
|
capbuf[OSC_CONTROL_DWORD] = ctrl;
|
2010-08-24 05:53:11 +08:00
|
|
|
status = acpi_pci_run_osc(handle, capbuf, mask);
|
2009-02-09 14:59:29 +08:00
|
|
|
if (ACPI_SUCCESS(status))
|
2010-08-24 05:53:11 +08:00
|
|
|
root->osc_control_set = *mask;
|
2009-02-09 14:59:29 +08:00
|
|
|
out:
|
|
|
|
mutex_unlock(&osc_lock);
|
|
|
|
return status;
|
|
|
|
}
|
2009-02-09 15:00:04 +08:00
|
|
|
EXPORT_SYMBOL(acpi_pci_osc_control_set);
|
2009-02-09 14:59:29 +08:00
|
|
|
|
2013-09-06 05:07:41 +08:00
|
|
|
static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm,
|
|
|
|
int *clear_aspm)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2013-09-06 05:07:45 +08:00
|
|
|
u32 support, control, requested;
|
2013-09-06 05:07:41 +08:00
|
|
|
acpi_status status;
|
|
|
|
struct acpi_device *device = root->device;
|
2013-05-29 08:31:27 +08:00
|
|
|
acpi_handle handle = device->handle;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-12-21 15:21:13 +08:00
|
|
|
/*
|
2008-11-11 06:30:45 +08:00
|
|
|
* All supported architectures that use ACPI have support for
|
|
|
|
* PCI domains, so we indicate this in _OSC support capabilities.
|
2006-12-21 15:21:13 +08:00
|
|
|
*/
|
2013-09-06 05:07:43 +08:00
|
|
|
support = OSC_PCI_SEGMENT_GROUPS_SUPPORT;
|
2012-10-30 14:27:13 +08:00
|
|
|
if (pci_ext_cfg_avail())
|
2013-09-06 05:07:42 +08:00
|
|
|
support |= OSC_PCI_EXT_CONFIG_SUPPORT;
|
2013-09-06 05:07:42 +08:00
|
|
|
if (pcie_aspm_support_enabled())
|
2013-09-06 05:07:42 +08:00
|
|
|
support |= OSC_PCI_ASPM_SUPPORT | OSC_PCI_CLOCK_PM_SUPPORT;
|
2008-11-11 06:31:05 +08:00
|
|
|
if (pci_msi_enabled())
|
2013-09-06 05:07:42 +08:00
|
|
|
support |= OSC_PCI_MSI_SUPPORT;
|
2013-09-06 05:07:45 +08:00
|
|
|
|
|
|
|
decode_osc_support(root, "OS supports", support);
|
2013-09-06 05:07:42 +08:00
|
|
|
status = acpi_pci_osc_support(root, support);
|
|
|
|
if (ACPI_FAILURE(status)) {
|
2013-09-06 05:07:43 +08:00
|
|
|
dev_info(&device->dev, "_OSC failed (%s); disabling ASPM\n",
|
|
|
|
acpi_format_exception(status));
|
2013-09-06 05:07:42 +08:00
|
|
|
*no_aspm = 1;
|
2013-09-06 05:07:43 +08:00
|
|
|
return;
|
2012-07-31 04:40:32 +08:00
|
|
|
}
|
2013-04-02 05:47:39 +08:00
|
|
|
|
2013-09-06 05:07:43 +08:00
|
|
|
if (pcie_ports_disabled) {
|
|
|
|
dev_info(&device->dev, "PCIe port services disabled; not requesting _OSC control\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-09-06 05:50:52 +08:00
|
|
|
if ((support & ACPI_PCIE_REQ_SUPPORT) != ACPI_PCIE_REQ_SUPPORT) {
|
2013-09-06 05:07:45 +08:00
|
|
|
decode_osc_support(root, "not requesting OS control; OS requires",
|
|
|
|
ACPI_PCIE_REQ_SUPPORT);
|
2013-09-06 05:50:52 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
control = OSC_PCI_EXPRESS_CAPABILITY_CONTROL
|
|
|
|
| OSC_PCI_EXPRESS_NATIVE_HP_CONTROL
|
|
|
|
| OSC_PCI_EXPRESS_PME_CONTROL;
|
|
|
|
|
|
|
|
if (pci_aer_available()) {
|
|
|
|
if (aer_acpi_firmware_first())
|
2013-09-06 05:07:45 +08:00
|
|
|
dev_info(&device->dev,
|
|
|
|
"PCIe AER handled by firmware\n");
|
2013-09-06 05:50:52 +08:00
|
|
|
else
|
|
|
|
control |= OSC_PCI_EXPRESS_AER_CONTROL;
|
|
|
|
}
|
2011-01-07 07:55:09 +08:00
|
|
|
|
2013-09-06 05:07:45 +08:00
|
|
|
requested = control;
|
2013-09-06 05:50:52 +08:00
|
|
|
status = acpi_pci_osc_control_set(handle, &control,
|
|
|
|
OSC_PCI_EXPRESS_CAPABILITY_CONTROL);
|
|
|
|
if (ACPI_SUCCESS(status)) {
|
2013-09-06 05:07:45 +08:00
|
|
|
decode_osc_control(root, "OS now controls", control);
|
2013-09-06 05:50:52 +08:00
|
|
|
if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM) {
|
PCI/ACPI: Fix _OSC ordering to allow PCIe hotplug use when available
This fixes the problem of acpiphp claiming slots that should be managed
by pciehp, which may keep ExpressCard slots from working.
The acpiphp driver claims PCIe slots unless the BIOS has granted us
control of PCIe native hotplug via _OSC. Prior to v3.10, the acpiphp
.add method (add_bridge()) was always called *after* we had requested
native hotplug control with _OSC.
But after 3b63aaa70e ("PCI: acpiphp: Do not use ACPI PCI subdriver
mechanism"), which appeared in v3.10, acpiphp initialization is done
during the bus scan via the pcibios_add_bus() hook, and this happens
*before* we request native hotplug control.
Therefore, acpiphp doesn't know yet whether the BIOS will grant control,
and it claims slots that we should be handling with native hotplug.
This patch requests native hotplug control earlier, so we know whether
the BIOS granted it to us before we initialize acpiphp.
To avoid reintroducing the ASPM issue fixed by b8178f130e ('Revert
"PCI/ACPI: Request _OSC control before scanning PCI root bus"'), we run
_OSC earlier but defer the actual ASPM calls until after the bus scan is
complete.
Tested successfully by myself.
[bhelgaas: changelog, mark for stable]
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=60736
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
CC: stable@vger.kernel.org # v3.10+
CC: Len Brown <lenb@kernel.org>
CC: "Rafael J. Wysocki" <rjw@sisk.pl>
2013-08-30 04:17:05 +08:00
|
|
|
/*
|
2013-09-06 05:50:52 +08:00
|
|
|
* We have ASPM control, but the FADT indicates
|
|
|
|
* that it's unsupported. Clear it.
|
PCI/ACPI: Fix _OSC ordering to allow PCIe hotplug use when available
This fixes the problem of acpiphp claiming slots that should be managed
by pciehp, which may keep ExpressCard slots from working.
The acpiphp driver claims PCIe slots unless the BIOS has granted us
control of PCIe native hotplug via _OSC. Prior to v3.10, the acpiphp
.add method (add_bridge()) was always called *after* we had requested
native hotplug control with _OSC.
But after 3b63aaa70e ("PCI: acpiphp: Do not use ACPI PCI subdriver
mechanism"), which appeared in v3.10, acpiphp initialization is done
during the bus scan via the pcibios_add_bus() hook, and this happens
*before* we request native hotplug control.
Therefore, acpiphp doesn't know yet whether the BIOS will grant control,
and it claims slots that we should be handling with native hotplug.
This patch requests native hotplug control earlier, so we know whether
the BIOS granted it to us before we initialize acpiphp.
To avoid reintroducing the ASPM issue fixed by b8178f130e ('Revert
"PCI/ACPI: Request _OSC control before scanning PCI root bus"'), we run
_OSC earlier but defer the actual ASPM calls until after the bus scan is
complete.
Tested successfully by myself.
[bhelgaas: changelog, mark for stable]
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=60736
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
CC: stable@vger.kernel.org # v3.10+
CC: Len Brown <lenb@kernel.org>
CC: "Rafael J. Wysocki" <rjw@sisk.pl>
2013-08-30 04:17:05 +08:00
|
|
|
*/
|
2013-09-06 05:50:52 +08:00
|
|
|
*clear_aspm = 1;
|
2011-03-21 11:29:20 +08:00
|
|
|
}
|
2011-04-30 06:21:38 +08:00
|
|
|
} else {
|
2013-09-06 05:07:45 +08:00
|
|
|
decode_osc_control(root, "OS requested", requested);
|
|
|
|
decode_osc_control(root, "platform willing to grant", control);
|
|
|
|
dev_info(&device->dev, "_OSC failed (%s); disabling ASPM\n",
|
|
|
|
acpi_format_exception(status));
|
|
|
|
|
2013-09-06 05:50:52 +08:00
|
|
|
/*
|
|
|
|
* We want to disable ASPM here, but aspm_disabled
|
|
|
|
* needs to remain in its state from boot so that we
|
|
|
|
* properly handle PCIe 1.1 devices. So we set this
|
|
|
|
* flag here, to defer the action until after the ACPI
|
|
|
|
* root scan.
|
|
|
|
*/
|
|
|
|
*no_aspm = 1;
|
2011-01-07 07:55:09 +08:00
|
|
|
}
|
2013-09-06 05:07:41 +08:00
|
|
|
}
|
|
|
|
|
2013-01-30 21:27:33 +08:00
|
|
|
static int acpi_pci_root_add(struct acpi_device *device,
|
|
|
|
const struct acpi_device_id *not_used)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2009-06-19 04:46:52 +08:00
|
|
|
unsigned long long segment, bus;
|
|
|
|
acpi_status status;
|
|
|
|
int result;
|
|
|
|
struct acpi_pci_root *root;
|
2013-05-29 08:31:27 +08:00
|
|
|
acpi_handle handle = device->handle;
|
2013-09-06 05:07:41 +08:00
|
|
|
int no_aspm = 0, clear_aspm = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-03-12 03:20:06 +08:00
|
|
|
root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
|
|
|
|
if (!root)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2009-06-19 04:46:52 +08:00
|
|
|
segment = 0;
|
2013-05-29 08:31:27 +08:00
|
|
|
status = acpi_evaluate_integer(handle, METHOD_NAME__SEG, NULL,
|
2009-06-19 04:46:52 +08:00
|
|
|
&segment);
|
|
|
|
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
|
2013-05-29 08:10:05 +08:00
|
|
|
dev_err(&device->dev, "can't evaluate _SEG\n");
|
2010-03-12 03:20:06 +08:00
|
|
|
result = -ENODEV;
|
|
|
|
goto end;
|
2009-06-19 04:46:52 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-06-19 04:46:52 +08:00
|
|
|
/* Check _CRS first, then _BBN. If no _BBN, default to zero. */
|
2010-03-12 03:20:06 +08:00
|
|
|
root->secondary.flags = IORESOURCE_BUS;
|
2013-05-29 08:31:27 +08:00
|
|
|
status = try_get_root_bridge_busnr(handle, &root->secondary);
|
2009-06-19 04:46:52 +08:00
|
|
|
if (ACPI_FAILURE(status)) {
|
2010-03-12 03:20:06 +08:00
|
|
|
/*
|
|
|
|
* We need both the start and end of the downstream bus range
|
|
|
|
* to interpret _CBA (MMCONFIG base address), so it really is
|
|
|
|
* supposed to be in _CRS. If we don't find it there, all we
|
|
|
|
* can do is assume [_BBN-0xFF] or [0-0xFF].
|
|
|
|
*/
|
|
|
|
root->secondary.end = 0xFF;
|
2013-05-29 08:10:05 +08:00
|
|
|
dev_warn(&device->dev,
|
|
|
|
FW_BUG "no secondary bus range in _CRS\n");
|
2013-05-29 08:31:27 +08:00
|
|
|
status = acpi_evaluate_integer(handle, METHOD_NAME__BBN,
|
2011-06-20 07:51:37 +08:00
|
|
|
NULL, &bus);
|
2010-03-12 03:20:06 +08:00
|
|
|
if (ACPI_SUCCESS(status))
|
|
|
|
root->secondary.start = bus;
|
|
|
|
else if (status == AE_NOT_FOUND)
|
|
|
|
root->secondary.start = 0;
|
|
|
|
else {
|
2013-05-29 08:10:05 +08:00
|
|
|
dev_err(&device->dev, "can't evaluate _BBN\n");
|
2010-03-12 03:20:06 +08:00
|
|
|
result = -ENODEV;
|
|
|
|
goto end;
|
2009-06-19 04:46:52 +08:00
|
|
|
}
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-05-20 04:54:39 +08:00
|
|
|
root->device = device;
|
2009-06-19 04:47:07 +08:00
|
|
|
root->segment = segment & 0xFFFF;
|
2005-04-17 06:20:36 +08:00
|
|
|
strcpy(acpi_device_name(device), ACPI_PCI_ROOT_DEVICE_NAME);
|
|
|
|
strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
|
2008-09-23 05:37:34 +08:00
|
|
|
device->driver_data = root;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-05-29 08:10:05 +08:00
|
|
|
pr_info(PREFIX "%s [%s] (domain %04x %pR)\n",
|
2005-08-05 12:44:28 +08:00
|
|
|
acpi_device_name(device), acpi_device_bid(device),
|
2010-03-12 03:20:06 +08:00
|
|
|
root->segment, &root->secondary);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-05-29 08:31:27 +08:00
|
|
|
root->mcfg_addr = acpi_pci_root_get_mcfg_addr(handle);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-09-06 05:07:41 +08:00
|
|
|
negotiate_os_control(root, &no_aspm, &clear_aspm);
|
2011-01-07 07:55:09 +08:00
|
|
|
|
PCI/ACPI: Fix _OSC ordering to allow PCIe hotplug use when available
This fixes the problem of acpiphp claiming slots that should be managed
by pciehp, which may keep ExpressCard slots from working.
The acpiphp driver claims PCIe slots unless the BIOS has granted us
control of PCIe native hotplug via _OSC. Prior to v3.10, the acpiphp
.add method (add_bridge()) was always called *after* we had requested
native hotplug control with _OSC.
But after 3b63aaa70e ("PCI: acpiphp: Do not use ACPI PCI subdriver
mechanism"), which appeared in v3.10, acpiphp initialization is done
during the bus scan via the pcibios_add_bus() hook, and this happens
*before* we request native hotplug control.
Therefore, acpiphp doesn't know yet whether the BIOS will grant control,
and it claims slots that we should be handling with native hotplug.
This patch requests native hotplug control earlier, so we know whether
the BIOS granted it to us before we initialize acpiphp.
To avoid reintroducing the ASPM issue fixed by b8178f130e ('Revert
"PCI/ACPI: Request _OSC control before scanning PCI root bus"'), we run
_OSC earlier but defer the actual ASPM calls until after the bus scan is
complete.
Tested successfully by myself.
[bhelgaas: changelog, mark for stable]
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=60736
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
CC: stable@vger.kernel.org # v3.10+
CC: Len Brown <lenb@kernel.org>
CC: "Rafael J. Wysocki" <rjw@sisk.pl>
2013-08-30 04:17:05 +08:00
|
|
|
/*
|
|
|
|
* TBD: Need PCI interface for enumeration/configuration of roots.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Scan the Root Bridge
|
|
|
|
* --------------------
|
|
|
|
* Must do this prior to any attempt to bind the root device, as the
|
|
|
|
* PCI namespace does not get created until this call is made (and
|
|
|
|
* thus the root bridge's pci_dev does not exist).
|
|
|
|
*/
|
|
|
|
root->bus = pci_acpi_scan_root(root);
|
|
|
|
if (!root->bus) {
|
|
|
|
dev_err(&device->dev,
|
|
|
|
"Bus %04x:%02x not present in PCI namespace\n",
|
|
|
|
root->segment, (unsigned int)root->secondary.start);
|
2013-11-14 07:54:17 +08:00
|
|
|
device->driver_data = NULL;
|
PCI/ACPI: Fix _OSC ordering to allow PCIe hotplug use when available
This fixes the problem of acpiphp claiming slots that should be managed
by pciehp, which may keep ExpressCard slots from working.
The acpiphp driver claims PCIe slots unless the BIOS has granted us
control of PCIe native hotplug via _OSC. Prior to v3.10, the acpiphp
.add method (add_bridge()) was always called *after* we had requested
native hotplug control with _OSC.
But after 3b63aaa70e ("PCI: acpiphp: Do not use ACPI PCI subdriver
mechanism"), which appeared in v3.10, acpiphp initialization is done
during the bus scan via the pcibios_add_bus() hook, and this happens
*before* we request native hotplug control.
Therefore, acpiphp doesn't know yet whether the BIOS will grant control,
and it claims slots that we should be handling with native hotplug.
This patch requests native hotplug control earlier, so we know whether
the BIOS granted it to us before we initialize acpiphp.
To avoid reintroducing the ASPM issue fixed by b8178f130e ('Revert
"PCI/ACPI: Request _OSC control before scanning PCI root bus"'), we run
_OSC earlier but defer the actual ASPM calls until after the bus scan is
complete.
Tested successfully by myself.
[bhelgaas: changelog, mark for stable]
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=60736
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
CC: stable@vger.kernel.org # v3.10+
CC: Len Brown <lenb@kernel.org>
CC: "Rafael J. Wysocki" <rjw@sisk.pl>
2013-08-30 04:17:05 +08:00
|
|
|
result = -ENODEV;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (clear_aspm) {
|
|
|
|
dev_info(&device->dev, "Disabling ASPM (FADT indicates it is unsupported)\n");
|
|
|
|
pcie_clear_aspm(root->bus);
|
|
|
|
}
|
|
|
|
if (no_aspm)
|
|
|
|
pcie_no_aspm();
|
|
|
|
|
2010-02-18 06:44:09 +08:00
|
|
|
pci_acpi_add_bus_pm_notifier(device, root->bus);
|
|
|
|
if (device->wakeup.flags.run_wake)
|
|
|
|
device_set_run_wake(root->bus->bridge, true);
|
|
|
|
|
2012-11-04 12:39:31 +08:00
|
|
|
if (system_state != SYSTEM_BOOTING) {
|
|
|
|
pcibios_resource_survey_bus(root->bus);
|
2013-07-23 05:37:18 +08:00
|
|
|
pci_assign_unassigned_root_bus_resources(root->bus);
|
2013-05-29 08:04:46 +08:00
|
|
|
}
|
2012-10-31 04:31:32 +08:00
|
|
|
|
2009-06-19 04:46:57 +08:00
|
|
|
pci_bus_add_devices(root->bus);
|
2013-01-30 21:27:33 +08:00
|
|
|
return 1;
|
2012-12-21 07:36:45 +08:00
|
|
|
|
|
|
|
end:
|
|
|
|
kfree(root);
|
|
|
|
return result;
|
2005-04-28 15:25:45 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-01-30 21:27:33 +08:00
|
|
|
static void acpi_pci_root_remove(struct acpi_device *device)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2009-06-19 04:46:57 +08:00
|
|
|
struct acpi_pci_root *root = acpi_driver_data(device);
|
2012-09-18 14:20:34 +08:00
|
|
|
|
2012-10-31 04:31:43 +08:00
|
|
|
pci_stop_root_bus(root->bus);
|
|
|
|
|
2010-02-18 06:44:09 +08:00
|
|
|
device_set_run_wake(root->bus->bridge, false);
|
|
|
|
pci_acpi_remove_bus_pm_notifier(device);
|
|
|
|
|
2012-10-31 04:31:43 +08:00
|
|
|
pci_remove_root_bus(root->bus);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
kfree(root);
|
|
|
|
}
|
|
|
|
|
2013-01-30 21:27:33 +08:00
|
|
|
void __init acpi_pci_root_init(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2011-01-17 03:44:22 +08:00
|
|
|
acpi_hest_init();
|
|
|
|
|
2013-01-30 21:27:33 +08:00
|
|
|
if (!acpi_pci_disabled) {
|
|
|
|
pci_acpi_crs_quirks();
|
|
|
|
acpi_scan_add_handler(&pci_root_handler);
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2013-01-22 05:20:48 +08:00
|
|
|
/* Support root bridge hotplug */
|
|
|
|
|
|
|
|
static void handle_root_bridge_insertion(acpi_handle handle)
|
|
|
|
{
|
|
|
|
struct acpi_device *device;
|
|
|
|
|
|
|
|
if (!acpi_bus_get_device(handle, &device)) {
|
2013-05-29 08:10:05 +08:00
|
|
|
dev_printk(KERN_DEBUG, &device->dev,
|
|
|
|
"acpi device already exists; ignoring notify\n");
|
2013-01-22 05:20:48 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (acpi_bus_scan(handle))
|
2013-05-29 08:10:05 +08:00
|
|
|
acpi_handle_err(handle, "cannot add bridge to acpi list\n");
|
2013-01-22 05:20:48 +08:00
|
|
|
}
|
|
|
|
|
ACPI / hotplug: Consolidate deferred execution of ACPI hotplug routines
There are two different interfaces for queuing up work items on the
ACPI hotplug workqueue, alloc_acpi_hp_work() used by PCI and PCI host
bridge hotplug code and acpi_os_hotplug_execute() used by the common
ACPI hotplug code and docking stations. They both are somewhat
cumbersome to use and work slightly differently.
The users of alloc_acpi_hp_work() have to submit a work function that
will extract the necessary data items from a struct acpi_hp_work
object allocated by alloc_acpi_hp_work() and then will free that
object, while it would be more straightforward to simply use a work
function with one more argument and let the interface take care of
the execution details.
The users of acpi_os_hotplug_execute() also have to deal with the
fact that it takes only one argument in addition to the work function
pointer, although acpi_os_execute_deferred() actually takes care of
the allocation and freeing of memory, so it would have been able to
pass more arguments to the work function if it hadn't been
constrained by the connection with acpi_os_execute().
Moreover, while alloc_acpi_hp_work() makes GFP_KERNEL memory
allocations, which is correct, because hotplug work items are
always queued up from process context, acpi_os_hotplug_execute()
uses GFP_ATOMIC, as that is needed by acpi_os_execute(). Also,
acpi_os_execute_deferred() queued up by it waits for the ACPI event
workqueues to flush before executing the work function, whereas
alloc_acpi_hp_work() can't do anything similar. That leads to
somewhat arbitrary differences in behavior between various ACPI
hotplug code paths and has to be straightened up.
For this reason, replace both alloc_acpi_hp_work() and
acpi_os_hotplug_execute() with a single interface,
acpi_hotplug_execute(), combining their behavior and being more
friendly to its users than any of the two.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
2013-11-07 08:45:40 +08:00
|
|
|
static void hotplug_event_root(void *data, u32 type)
|
2013-01-22 05:20:48 +08:00
|
|
|
{
|
ACPI / hotplug: Consolidate deferred execution of ACPI hotplug routines
There are two different interfaces for queuing up work items on the
ACPI hotplug workqueue, alloc_acpi_hp_work() used by PCI and PCI host
bridge hotplug code and acpi_os_hotplug_execute() used by the common
ACPI hotplug code and docking stations. They both are somewhat
cumbersome to use and work slightly differently.
The users of alloc_acpi_hp_work() have to submit a work function that
will extract the necessary data items from a struct acpi_hp_work
object allocated by alloc_acpi_hp_work() and then will free that
object, while it would be more straightforward to simply use a work
function with one more argument and let the interface take care of
the execution details.
The users of acpi_os_hotplug_execute() also have to deal with the
fact that it takes only one argument in addition to the work function
pointer, although acpi_os_execute_deferred() actually takes care of
the allocation and freeing of memory, so it would have been able to
pass more arguments to the work function if it hadn't been
constrained by the connection with acpi_os_execute().
Moreover, while alloc_acpi_hp_work() makes GFP_KERNEL memory
allocations, which is correct, because hotplug work items are
always queued up from process context, acpi_os_hotplug_execute()
uses GFP_ATOMIC, as that is needed by acpi_os_execute(). Also,
acpi_os_execute_deferred() queued up by it waits for the ACPI event
workqueues to flush before executing the work function, whereas
alloc_acpi_hp_work() can't do anything similar. That leads to
somewhat arbitrary differences in behavior between various ACPI
hotplug code paths and has to be straightened up.
For this reason, replace both alloc_acpi_hp_work() and
acpi_os_hotplug_execute() with a single interface,
acpi_hotplug_execute(), combining their behavior and being more
friendly to its users than any of the two.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
2013-11-07 08:45:40 +08:00
|
|
|
acpi_handle handle = data;
|
2013-01-22 05:20:48 +08:00
|
|
|
struct acpi_pci_root *root;
|
|
|
|
|
2013-03-11 13:05:16 +08:00
|
|
|
acpi_scan_lock_acquire();
|
2013-01-22 05:20:48 +08:00
|
|
|
|
2013-03-11 13:05:16 +08:00
|
|
|
root = acpi_pci_find_root(handle);
|
2013-01-22 05:20:48 +08:00
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
case ACPI_NOTIFY_BUS_CHECK:
|
|
|
|
/* bus enumerate */
|
2013-05-29 08:10:05 +08:00
|
|
|
acpi_handle_printk(KERN_DEBUG, handle,
|
|
|
|
"Bus check notify on %s\n", __func__);
|
2013-05-08 01:06:03 +08:00
|
|
|
if (root)
|
|
|
|
acpiphp_check_host_bridge(handle);
|
|
|
|
else
|
2013-01-22 05:20:48 +08:00
|
|
|
handle_root_bridge_insertion(handle);
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ACPI_NOTIFY_DEVICE_CHECK:
|
|
|
|
/* device check */
|
2013-05-29 08:10:05 +08:00
|
|
|
acpi_handle_printk(KERN_DEBUG, handle,
|
|
|
|
"Device check notify on %s\n", __func__);
|
2013-01-22 05:20:48 +08:00
|
|
|
if (!root)
|
|
|
|
handle_root_bridge_insertion(handle);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ACPI_NOTIFY_EJECT_REQUEST:
|
|
|
|
/* request device eject */
|
2013-05-29 08:10:05 +08:00
|
|
|
acpi_handle_printk(KERN_DEBUG, handle,
|
|
|
|
"Device eject notify on %s\n", __func__);
|
2013-11-07 08:42:09 +08:00
|
|
|
if (!root)
|
|
|
|
break;
|
|
|
|
|
|
|
|
get_device(&root->device->dev);
|
|
|
|
|
|
|
|
acpi_scan_lock_release();
|
|
|
|
|
|
|
|
acpi_bus_device_eject(root->device, ACPI_NOTIFY_EJECT_REQUEST);
|
|
|
|
return;
|
2013-01-22 05:20:48 +08:00
|
|
|
default:
|
2013-05-29 08:10:05 +08:00
|
|
|
acpi_handle_warn(handle,
|
|
|
|
"notify_handler: unknown event type 0x%x\n",
|
|
|
|
type);
|
2013-01-22 05:20:48 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-03-11 13:05:16 +08:00
|
|
|
acpi_scan_lock_release();
|
2013-01-22 05:20:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_hotplug_event_root(acpi_handle handle, u32 type,
|
|
|
|
void *context)
|
|
|
|
{
|
ACPI / hotplug: Consolidate deferred execution of ACPI hotplug routines
There are two different interfaces for queuing up work items on the
ACPI hotplug workqueue, alloc_acpi_hp_work() used by PCI and PCI host
bridge hotplug code and acpi_os_hotplug_execute() used by the common
ACPI hotplug code and docking stations. They both are somewhat
cumbersome to use and work slightly differently.
The users of alloc_acpi_hp_work() have to submit a work function that
will extract the necessary data items from a struct acpi_hp_work
object allocated by alloc_acpi_hp_work() and then will free that
object, while it would be more straightforward to simply use a work
function with one more argument and let the interface take care of
the execution details.
The users of acpi_os_hotplug_execute() also have to deal with the
fact that it takes only one argument in addition to the work function
pointer, although acpi_os_execute_deferred() actually takes care of
the allocation and freeing of memory, so it would have been able to
pass more arguments to the work function if it hadn't been
constrained by the connection with acpi_os_execute().
Moreover, while alloc_acpi_hp_work() makes GFP_KERNEL memory
allocations, which is correct, because hotplug work items are
always queued up from process context, acpi_os_hotplug_execute()
uses GFP_ATOMIC, as that is needed by acpi_os_execute(). Also,
acpi_os_execute_deferred() queued up by it waits for the ACPI event
workqueues to flush before executing the work function, whereas
alloc_acpi_hp_work() can't do anything similar. That leads to
somewhat arbitrary differences in behavior between various ACPI
hotplug code paths and has to be straightened up.
For this reason, replace both alloc_acpi_hp_work() and
acpi_os_hotplug_execute() with a single interface,
acpi_hotplug_execute(), combining their behavior and being more
friendly to its users than any of the two.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
2013-11-07 08:45:40 +08:00
|
|
|
acpi_hotplug_execute(hotplug_event_root, handle, type);
|
2013-01-22 05:20:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static acpi_status __init
|
|
|
|
find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
|
|
|
|
{
|
2013-01-22 05:20:49 +08:00
|
|
|
acpi_status status;
|
2013-01-22 05:20:48 +08:00
|
|
|
int *count = (int *)context;
|
|
|
|
|
|
|
|
if (!acpi_is_root_bridge(handle))
|
|
|
|
return AE_OK;
|
|
|
|
|
|
|
|
(*count)++;
|
|
|
|
|
2013-01-22 05:20:49 +08:00
|
|
|
status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
|
|
|
|
handle_hotplug_event_root, NULL);
|
|
|
|
if (ACPI_FAILURE(status))
|
2013-05-29 08:10:05 +08:00
|
|
|
acpi_handle_printk(KERN_DEBUG, handle,
|
|
|
|
"notify handler is not installed, exit status: %u\n",
|
|
|
|
(unsigned int)status);
|
2013-01-22 05:20:49 +08:00
|
|
|
else
|
2013-05-29 08:10:05 +08:00
|
|
|
acpi_handle_printk(KERN_DEBUG, handle,
|
|
|
|
"notify handler is installed\n");
|
2013-01-22 05:20:48 +08:00
|
|
|
|
|
|
|
return AE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init acpi_pci_root_hp_init(void)
|
|
|
|
{
|
|
|
|
int num = 0;
|
|
|
|
|
|
|
|
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
|
|
|
|
ACPI_UINT32_MAX, find_root_bridges, NULL, &num, NULL);
|
|
|
|
|
|
|
|
printk(KERN_DEBUG "Found %d acpi root devices\n", num);
|
|
|
|
}
|