2005-04-16 22:20:36 +00:00
|
|
|
#include <linux/pci.h>
|
|
|
|
#include <linux/acpi.h>
|
|
|
|
#include <linux/init.h>
|
2005-09-30 16:34:42 +00:00
|
|
|
#include <linux/irq.h>
|
2007-10-03 22:56:14 +00:00
|
|
|
#include <linux/dmi.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 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2005-09-12 16:49:24 +00:00
|
|
|
#include <asm/numa.h>
|
2008-12-27 13:02:28 +00:00
|
|
|
#include <asm/pci_x86.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-10-03 22:56:51 +00:00
|
|
|
struct pci_root_info {
|
2009-10-06 21:33:49 +00:00
|
|
|
struct acpi_device *bridge;
|
2012-04-03 01:31:53 +00:00
|
|
|
char name[16];
|
2012-04-03 01:31:53 +00:00
|
|
|
struct pci_sysdata sd;
|
2012-06-22 06:55:17 +00:00
|
|
|
#ifdef CONFIG_PCI_MMCONFIG
|
|
|
|
bool mcfg_added;
|
|
|
|
u16 segment;
|
|
|
|
u8 start_bus;
|
|
|
|
u8 end_bus;
|
|
|
|
#endif
|
2007-10-03 22:56:51 +00:00
|
|
|
};
|
|
|
|
|
2010-02-23 17:24:41 +00:00
|
|
|
static bool pci_use_crs = true;
|
2012-10-29 23:26:54 +00:00
|
|
|
static bool pci_ignore_seg = false;
|
2010-02-23 17:24:41 +00:00
|
|
|
|
|
|
|
static int __init set_use_crs(const struct dmi_system_id *id)
|
|
|
|
{
|
|
|
|
pci_use_crs = true;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-12-30 19:37:05 +00:00
|
|
|
static int __init set_nouse_crs(const struct dmi_system_id *id)
|
|
|
|
{
|
|
|
|
pci_use_crs = false;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-10-29 23:26:54 +00:00
|
|
|
static int __init set_ignore_seg(const struct dmi_system_id *id)
|
|
|
|
{
|
|
|
|
printk(KERN_INFO "PCI: %s detected: ignoring ACPI _SEG\n", id->ident);
|
|
|
|
pci_ignore_seg = true;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct dmi_system_id pci_crs_quirks[] __initconst = {
|
2010-02-23 17:24:41 +00:00
|
|
|
/* http://bugzilla.kernel.org/show_bug.cgi?id=14183 */
|
|
|
|
{
|
|
|
|
.callback = set_use_crs,
|
|
|
|
.ident = "IBM System x3800",
|
|
|
|
.matches = {
|
|
|
|
DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
|
|
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "x3800"),
|
|
|
|
},
|
|
|
|
},
|
x86/PCI: use host bridge _CRS info on ASRock ALiveSATA2-GLAN
This DMI quirk turns on "pci=use_crs" for the ALiveSATA2-GLAN because
amd_bus.c doesn't handle this system correctly.
The system has a single HyperTransport I/O chain, but has two PCI host
bridges to buses 00 and 80. amd_bus.c learns the MMIO range associated
with buses 00-ff and that this range is routed to the HT chain hosted at
node 0, link 0:
bus: [00, ff] on node 0 link 0
bus: 00 index 1 [mem 0x80000000-0xfcffffffff]
This includes the address space for both bus 00 and bus 80, and amd_bus.c
assumes it's all routed to bus 00.
We find device 80:01.0, which BIOS left in the middle of that space, but
we don't find a bridge from bus 00 to bus 80, so we conclude that 80:01.0
is unreachable from bus 00, and we move it from the original, working,
address to something outside the bus 00 aperture, which does not work:
pci 0000:80:01.0: reg 10: [mem 0xfebfc000-0xfebfffff 64bit]
pci 0000:80:01.0: BAR 0: assigned [mem 0xfd00000000-0xfd00003fff 64bit]
The BIOS told us everything we need to know to handle this correctly,
so we're better off if we just pay attention, which lets us leave the
80:01.0 device at the original, working, address:
ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-7f])
pci_root PNP0A03:00: host bridge window [mem 0x80000000-0xff37ffff]
ACPI: PCI Root Bridge [PCI1] (domain 0000 [bus 80-ff])
pci_root PNP0A08:00: host bridge window [mem 0xfebfc000-0xfebfffff]
This was a regression between 2.6.33 and 2.6.34. In 2.6.33, amd_bus.c
was used only when we found multiple HT chains. 3e3da00c01d050, which
enabled amd_bus.c even on systems with a single HT chain, caused this
failure.
This quirk was written by Graham. If we ever enable "pci=use_crs" for
machines from 2006 or earlir, this quirk should be removed.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16007
Cc: stable@kernel.org
Reported-by: Graham Ramsey <ramsey.graham@ntlworld.com>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-07-23 18:53:27 +00:00
|
|
|
/* https://bugzilla.kernel.org/show_bug.cgi?id=16007 */
|
|
|
|
/* 2006 AMD HT/VIA system with two host bridges */
|
|
|
|
{
|
|
|
|
.callback = set_use_crs,
|
|
|
|
.ident = "ASRock ALiveSATA2-GLAN",
|
|
|
|
.matches = {
|
|
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "ALiveSATA2-GLAN"),
|
|
|
|
},
|
|
|
|
},
|
2011-08-31 15:07:10 +00:00
|
|
|
/* https://bugzilla.kernel.org/show_bug.cgi?id=30552 */
|
|
|
|
/* 2006 AMD HT/VIA system with two host bridges */
|
|
|
|
{
|
|
|
|
.callback = set_use_crs,
|
|
|
|
.ident = "ASUS M2V-MX SE",
|
|
|
|
.matches = {
|
|
|
|
DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
|
|
|
|
DMI_MATCH(DMI_BOARD_NAME, "M2V-MX SE"),
|
|
|
|
DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
|
|
|
},
|
|
|
|
},
|
2012-02-28 18:51:10 +00:00
|
|
|
/* https://bugzilla.kernel.org/show_bug.cgi?id=42619 */
|
|
|
|
{
|
|
|
|
.callback = set_use_crs,
|
|
|
|
.ident = "MSI MS-7253",
|
|
|
|
.matches = {
|
|
|
|
DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
|
|
|
|
DMI_MATCH(DMI_BOARD_NAME, "MS-7253"),
|
|
|
|
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"),
|
|
|
|
},
|
|
|
|
},
|
2011-12-30 19:37:05 +00:00
|
|
|
|
2012-01-04 16:33:12 +00:00
|
|
|
/* Now for the blacklist.. */
|
|
|
|
|
|
|
|
/* https://bugzilla.redhat.com/show_bug.cgi?id=769657 */
|
|
|
|
{
|
|
|
|
.callback = set_nouse_crs,
|
|
|
|
.ident = "Dell Studio 1557",
|
|
|
|
.matches = {
|
|
|
|
DMI_MATCH(DMI_BOARD_VENDOR, "Dell Inc."),
|
|
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"),
|
|
|
|
DMI_MATCH(DMI_BIOS_VERSION, "A09"),
|
|
|
|
},
|
|
|
|
},
|
2012-01-04 16:30:52 +00:00
|
|
|
/* https://bugzilla.redhat.com/show_bug.cgi?id=769657 */
|
|
|
|
{
|
|
|
|
.callback = set_nouse_crs,
|
|
|
|
.ident = "Thinkpad SL510",
|
|
|
|
.matches = {
|
|
|
|
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
|
|
|
|
DMI_MATCH(DMI_BOARD_NAME, "2847DFG"),
|
|
|
|
DMI_MATCH(DMI_BIOS_VERSION, "6JET85WW (1.43 )"),
|
|
|
|
},
|
|
|
|
},
|
2012-10-29 23:26:54 +00:00
|
|
|
|
|
|
|
/* https://bugzilla.kernel.org/show_bug.cgi?id=15362 */
|
|
|
|
{
|
|
|
|
.callback = set_ignore_seg,
|
|
|
|
.ident = "HP xw9300",
|
|
|
|
.matches = {
|
|
|
|
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
|
|
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "HP xw9300 Workstation"),
|
|
|
|
},
|
|
|
|
},
|
2010-02-23 17:24:41 +00:00
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
|
|
|
void __init pci_acpi_crs_quirks(void)
|
|
|
|
{
|
|
|
|
int year;
|
|
|
|
|
|
|
|
if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year < 2008)
|
|
|
|
pci_use_crs = false;
|
|
|
|
|
2012-10-29 23:26:54 +00:00
|
|
|
dmi_check_system(pci_crs_quirks);
|
2010-02-23 17:24:41 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the user specifies "pci=use_crs" or "pci=nocrs" explicitly, that
|
|
|
|
* takes precedence over anything we figured out above.
|
|
|
|
*/
|
|
|
|
if (pci_probe & PCI_ROOT_NO_CRS)
|
|
|
|
pci_use_crs = false;
|
|
|
|
else if (pci_probe & PCI_USE__CRS)
|
|
|
|
pci_use_crs = true;
|
|
|
|
|
|
|
|
printk(KERN_INFO "PCI: %s host bridge windows from ACPI; "
|
|
|
|
"if necessary, use \"pci=%s\" and report a bug\n",
|
|
|
|
pci_use_crs ? "Using" : "Ignoring",
|
|
|
|
pci_use_crs ? "nocrs" : "use_crs");
|
|
|
|
}
|
|
|
|
|
2012-06-22 06:55:17 +00:00
|
|
|
#ifdef CONFIG_PCI_MMCONFIG
|
2012-12-21 22:02:53 +00:00
|
|
|
static int check_segment(u16 seg, struct device *dev, char *estr)
|
2012-06-22 06:55:17 +00:00
|
|
|
{
|
|
|
|
if (seg) {
|
|
|
|
dev_err(dev,
|
|
|
|
"%s can't access PCI configuration "
|
|
|
|
"space under this host bridge.\n",
|
|
|
|
estr);
|
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Failure in adding MMCFG information is not fatal,
|
|
|
|
* just can't access extended configuration space of
|
|
|
|
* devices under this host bridge.
|
|
|
|
*/
|
|
|
|
dev_warn(dev,
|
|
|
|
"%s can't access extended PCI configuration "
|
|
|
|
"space under this bridge.\n",
|
|
|
|
estr);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-12-21 22:02:53 +00:00
|
|
|
static int setup_mcfg_map(struct pci_root_info *info, u16 seg, u8 start,
|
|
|
|
u8 end, phys_addr_t addr)
|
2012-06-22 06:55:17 +00:00
|
|
|
{
|
|
|
|
int result;
|
|
|
|
struct device *dev = &info->bridge->dev;
|
|
|
|
|
|
|
|
info->start_bus = start;
|
|
|
|
info->end_bus = end;
|
|
|
|
info->mcfg_added = false;
|
|
|
|
|
|
|
|
/* return success if MMCFG is not in use */
|
|
|
|
if (raw_pci_ext_ops && raw_pci_ext_ops != &pci_mmcfg)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!(pci_probe & PCI_PROBE_MMCONF))
|
|
|
|
return check_segment(seg, dev, "MMCONFIG is disabled,");
|
|
|
|
|
|
|
|
result = pci_mmconfig_insert(dev, seg, start, end, addr);
|
|
|
|
if (result == 0) {
|
|
|
|
/* enable MMCFG if it hasn't been enabled yet */
|
|
|
|
if (raw_pci_ext_ops == NULL)
|
|
|
|
raw_pci_ext_ops = &pci_mmcfg;
|
|
|
|
info->mcfg_added = true;
|
|
|
|
} else if (result != -EEXIST)
|
|
|
|
return check_segment(seg, dev,
|
|
|
|
"fail to add MMCONFIG information,");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void teardown_mcfg_map(struct pci_root_info *info)
|
|
|
|
{
|
|
|
|
if (info->mcfg_added) {
|
|
|
|
pci_mmconfig_delete(info->segment, info->start_bus,
|
|
|
|
info->end_bus);
|
|
|
|
info->mcfg_added = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else
|
2012-12-21 22:02:53 +00:00
|
|
|
static int setup_mcfg_map(struct pci_root_info *info,
|
2012-06-22 06:55:17 +00:00
|
|
|
u16 seg, u8 start, u8 end,
|
|
|
|
phys_addr_t addr)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static void teardown_mcfg_map(struct pci_root_info *info)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-02-05 05:44:46 +00:00
|
|
|
static void validate_resources(struct device *dev, struct list_head *crs_res,
|
|
|
|
unsigned long type)
|
2007-10-03 22:56:51 +00:00
|
|
|
{
|
2015-02-05 05:44:46 +00:00
|
|
|
LIST_HEAD(list);
|
|
|
|
struct resource *res1, *res2, *root = NULL;
|
|
|
|
struct resource_entry *tmp, *entry, *entry2;
|
2009-05-27 19:41:44 +00:00
|
|
|
|
2015-02-05 05:44:46 +00:00
|
|
|
BUG_ON((type & (IORESOURCE_MEM | IORESOURCE_IO)) == 0);
|
|
|
|
root = (type & IORESOURCE_MEM) ? &iomem_resource : &ioport_resource;
|
2009-06-25 02:01:19 +00:00
|
|
|
|
2015-02-05 05:44:46 +00:00
|
|
|
list_splice_init(crs_res, &list);
|
|
|
|
resource_list_for_each_entry_safe(entry, tmp, &list) {
|
|
|
|
bool free = false;
|
|
|
|
resource_size_t end;
|
2010-09-22 17:09:19 +00:00
|
|
|
|
2015-02-05 05:44:46 +00:00
|
|
|
res1 = entry->res;
|
2010-09-22 17:09:19 +00:00
|
|
|
if (!(res1->flags & type))
|
2015-02-05 05:44:46 +00:00
|
|
|
goto next;
|
|
|
|
|
|
|
|
/* Exclude non-addressable range or non-addressable portion */
|
|
|
|
end = min(res1->end, root->end);
|
|
|
|
if (end <= res1->start) {
|
|
|
|
dev_info(dev, "host bridge window %pR (ignored, not CPU addressable)\n",
|
|
|
|
res1);
|
|
|
|
free = true;
|
|
|
|
goto next;
|
|
|
|
} else if (res1->end != end) {
|
|
|
|
dev_info(dev, "host bridge window %pR ([%#llx-%#llx] ignored, not CPU addressable)\n",
|
|
|
|
res1, (unsigned long long)end + 1,
|
|
|
|
(unsigned long long)res1->end);
|
|
|
|
res1->end = end;
|
|
|
|
}
|
2010-09-22 17:09:19 +00:00
|
|
|
|
2015-02-05 05:44:46 +00:00
|
|
|
resource_list_for_each_entry(entry2, crs_res) {
|
|
|
|
res2 = entry2->res;
|
2010-09-22 17:09:19 +00:00
|
|
|
if (!(res2->flags & type))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* I don't like throwing away windows because then
|
|
|
|
* our resources no longer match the ACPI _CRS, but
|
|
|
|
* the kernel resource tree doesn't allow overlaps.
|
|
|
|
*/
|
2012-04-26 07:32:55 +00:00
|
|
|
if (resource_overlaps(res1, res2)) {
|
2013-10-09 22:16:38 +00:00
|
|
|
res2->start = min(res1->start, res2->start);
|
|
|
|
res2->end = max(res1->end, res2->end);
|
2015-02-05 05:44:46 +00:00
|
|
|
dev_info(dev, "host bridge window expanded to %pR; %pR ignored\n",
|
2013-10-09 22:16:38 +00:00
|
|
|
res2, res1);
|
2015-02-05 05:44:46 +00:00
|
|
|
free = true;
|
|
|
|
goto next;
|
2010-09-22 17:09:19 +00:00
|
|
|
}
|
|
|
|
}
|
2015-02-05 05:44:46 +00:00
|
|
|
|
|
|
|
next:
|
|
|
|
resource_list_del(entry);
|
|
|
|
if (free)
|
|
|
|
resource_list_free_entry(entry);
|
|
|
|
else
|
|
|
|
resource_list_add_tail(entry, crs_res);
|
2010-09-22 17:09:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-03 01:31:53 +00:00
|
|
|
static void add_resources(struct pci_root_info *info,
|
2015-02-05 05:44:46 +00:00
|
|
|
struct list_head *resources,
|
|
|
|
struct list_head *crs_res)
|
2010-09-22 17:09:19 +00:00
|
|
|
{
|
2015-02-05 05:44:46 +00:00
|
|
|
struct resource_entry *entry, *tmp;
|
|
|
|
struct resource *res, *conflict, *root = NULL;
|
2010-09-22 17:09:19 +00:00
|
|
|
|
2015-02-05 05:44:46 +00:00
|
|
|
validate_resources(&info->bridge->dev, crs_res, IORESOURCE_MEM);
|
|
|
|
validate_resources(&info->bridge->dev, crs_res, IORESOURCE_IO);
|
2010-09-22 17:09:19 +00:00
|
|
|
|
2015-02-05 05:44:46 +00:00
|
|
|
resource_list_for_each_entry_safe(entry, tmp, crs_res) {
|
|
|
|
res = entry->res;
|
2010-09-22 17:09:19 +00:00
|
|
|
if (res->flags & IORESOURCE_MEM)
|
|
|
|
root = &iomem_resource;
|
|
|
|
else if (res->flags & IORESOURCE_IO)
|
|
|
|
root = &ioport_resource;
|
2009-10-06 21:33:49 +00:00
|
|
|
else
|
2015-02-05 05:44:46 +00:00
|
|
|
BUG_ON(res);
|
2010-09-22 17:09:19 +00:00
|
|
|
|
|
|
|
conflict = insert_resource_conflict(root, res);
|
2015-02-05 05:44:46 +00:00
|
|
|
if (conflict) {
|
2011-07-02 16:47:12 +00:00
|
|
|
dev_info(&info->bridge->dev,
|
|
|
|
"ignoring host bridge window %pR (conflicts with %s %pR)\n",
|
|
|
|
res, conflict->name, conflict);
|
2015-02-05 05:44:46 +00:00
|
|
|
resource_list_destroy_entry(entry);
|
|
|
|
}
|
2007-10-03 22:56:51 +00:00
|
|
|
}
|
|
|
|
|
2015-02-05 05:44:46 +00:00
|
|
|
list_splice_tail(crs_res, resources);
|
2012-04-03 01:31:53 +00:00
|
|
|
}
|
|
|
|
|
2015-02-05 05:44:46 +00:00
|
|
|
static void release_pci_root_info(struct pci_host_bridge *bridge)
|
2012-04-03 01:31:53 +00:00
|
|
|
{
|
|
|
|
struct resource *res;
|
2015-02-05 05:44:46 +00:00
|
|
|
struct resource_entry *entry;
|
|
|
|
struct pci_root_info *info = bridge->release_data;
|
2012-04-03 01:31:53 +00:00
|
|
|
|
2015-02-05 05:44:46 +00:00
|
|
|
resource_list_for_each_entry(entry, &bridge->windows) {
|
|
|
|
res = entry->res;
|
|
|
|
if (res->parent &&
|
|
|
|
(res->flags & (IORESOURCE_MEM | IORESOURCE_IO)))
|
|
|
|
release_resource(res);
|
2012-04-03 01:31:53 +00:00
|
|
|
}
|
|
|
|
|
2012-06-22 06:55:17 +00:00
|
|
|
teardown_mcfg_map(info);
|
2012-04-03 01:31:53 +00:00
|
|
|
kfree(info);
|
|
|
|
}
|
2012-06-22 06:55:17 +00:00
|
|
|
|
2015-04-30 04:41:28 +00:00
|
|
|
/*
|
|
|
|
* An IO port or MMIO resource assigned to a PCI host bridge may be
|
|
|
|
* consumed by the host bridge itself or available to its child
|
|
|
|
* bus/devices. The ACPI specification defines a bit (Producer/Consumer)
|
|
|
|
* to tell whether the resource is consumed by the host bridge itself,
|
|
|
|
* but firmware hasn't used that bit consistently, so we can't rely on it.
|
|
|
|
*
|
|
|
|
* On x86 and IA64 platforms, all IO port and MMIO resources are assumed
|
|
|
|
* to be available to child bus/devices except one special case:
|
|
|
|
* IO port [0xCF8-0xCFF] is consumed by the host bridge itself
|
|
|
|
* to access PCI configuration space.
|
|
|
|
*
|
|
|
|
* So explicitly filter out PCI CFG IO ports[0xCF8-0xCFF].
|
|
|
|
*/
|
|
|
|
static bool resource_is_pcicfg_ioport(struct resource *res)
|
|
|
|
{
|
|
|
|
return (res->flags & IORESOURCE_IO) &&
|
|
|
|
res->start == 0xCF8 && res->end == 0xCFF;
|
|
|
|
}
|
|
|
|
|
2014-01-24 17:44:42 +00:00
|
|
|
static void probe_pci_root_info(struct pci_root_info *info,
|
|
|
|
struct acpi_device *device,
|
2015-02-05 05:44:46 +00:00
|
|
|
int busnum, int domain,
|
|
|
|
struct list_head *list)
|
2007-10-03 22:56:51 +00:00
|
|
|
{
|
2015-02-05 05:44:46 +00:00
|
|
|
int ret;
|
2015-03-04 08:47:11 +00:00
|
|
|
struct resource_entry *entry, *tmp;
|
2007-10-03 22:56:51 +00:00
|
|
|
|
2012-05-18 01:51:12 +00:00
|
|
|
sprintf(info->name, "PCI Bus %04x:%02x", domain, busnum);
|
2012-04-03 01:31:53 +00:00
|
|
|
info->bridge = device;
|
2015-02-05 05:44:46 +00:00
|
|
|
ret = acpi_dev_get_resources(device, list,
|
|
|
|
acpi_dev_filter_resource_type_cb,
|
|
|
|
(void *)(IORESOURCE_IO | IORESOURCE_MEM));
|
|
|
|
if (ret < 0)
|
|
|
|
dev_warn(&device->dev,
|
|
|
|
"failed to parse _CRS method, error code %d\n", ret);
|
|
|
|
else if (ret == 0)
|
|
|
|
dev_dbg(&device->dev,
|
|
|
|
"no IO and memory resources present in _CRS\n");
|
|
|
|
else
|
2015-03-04 08:47:11 +00:00
|
|
|
resource_list_for_each_entry_safe(entry, tmp, list) {
|
2015-04-30 04:41:28 +00:00
|
|
|
if ((entry->res->flags & IORESOURCE_DISABLED) ||
|
|
|
|
resource_is_pcicfg_ioport(entry->res))
|
2015-03-04 08:47:11 +00:00
|
|
|
resource_list_destroy_entry(entry);
|
|
|
|
else
|
|
|
|
entry->res->name = info->name;
|
|
|
|
}
|
2007-10-03 22:56:51 +00:00
|
|
|
}
|
|
|
|
|
2012-12-21 22:02:53 +00:00
|
|
|
struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2010-03-11 19:20:11 +00:00
|
|
|
struct acpi_device *device = root->device;
|
2014-01-24 17:41:11 +00:00
|
|
|
struct pci_root_info *info;
|
2010-03-11 19:20:11 +00:00
|
|
|
int domain = root->segment;
|
|
|
|
int busnum = root->secondary.start;
|
2015-02-05 05:44:46 +00:00
|
|
|
struct resource_entry *res_entry;
|
|
|
|
LIST_HEAD(crs_res);
|
2011-10-28 22:28:14 +00:00
|
|
|
LIST_HEAD(resources);
|
2014-01-24 17:41:11 +00:00
|
|
|
struct pci_bus *bus;
|
2007-07-21 21:23:39 +00:00
|
|
|
struct pci_sysdata *sd;
|
x86: get mp_bus_to_node early
Currently, on an amd k8 system with multi ht chains, the numa_node of
pci devices under /sys/devices/pci0000:80/* is always 0, even if that
chain is on node 1 or 2 or 3.
Workaround: pcibus_to_node(bus) is used when we want to get the node that
pci_device is on.
In struct device, we already have numa_node member, and we could use
dev_to_node()/set_dev_node() to get and set numa_node in the device.
set_dev_node is called in pci_device_add() with pcibus_to_node(bus),
and pcibus_to_node uses bus->sysdata for nodeid.
The problem is when pci_add_device is called, bus->sysdata is not assigned
correct nodeid yet. The result is that numa_node will always be 0.
pcibios_scan_root and pci_scan_root could take sysdata. So we need to get
mp_bus_to_node mapping before these two are called, and thus
get_mp_bus_to_node could get correct node for sysdata in root bus.
In scanning of the root bus, all child busses will take parent bus sysdata.
So all pci_device->dev.numa_node will be assigned correctly and automatically.
Later we could use dev_to_node(&pci_dev->dev) to get numa_node, and we
could also could make other bus specific device get the correct numa_node
too.
This is an updated version of pci_sysdata and Jeff's pci_domain patch.
[ mingo@elte.hu: build fix ]
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-02-19 11:20:09 +00:00
|
|
|
int node;
|
2007-07-21 21:23:39 +00:00
|
|
|
|
2012-10-29 23:26:54 +00:00
|
|
|
if (pci_ignore_seg)
|
|
|
|
domain = 0;
|
|
|
|
|
2007-10-11 20:58:30 +00:00
|
|
|
if (domain && !pci_domains_supported) {
|
2009-11-04 17:32:47 +00:00
|
|
|
printk(KERN_WARNING "pci_bus %04x:%02x: "
|
|
|
|
"ignored (multiple domains not supported)\n",
|
|
|
|
domain, busnum);
|
2007-10-11 20:58:30 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-01-24 21:40:46 +00:00
|
|
|
node = acpi_get_node(device->handle);
|
2014-05-08 16:44:20 +00:00
|
|
|
if (node == NUMA_NO_NODE) {
|
2014-01-24 18:54:51 +00:00
|
|
|
node = x86_pci_root_bus_node(busnum);
|
2014-05-08 16:44:20 +00:00
|
|
|
if (node != 0 && node != NUMA_NO_NODE)
|
|
|
|
dev_info(&device->dev, FW_BUG "no _PXM; falling back to node %d from hardware (may be inconsistent with ACPI node numbers)\n",
|
|
|
|
node);
|
|
|
|
}
|
2008-02-20 20:41:52 +00:00
|
|
|
|
2014-01-24 21:51:49 +00:00
|
|
|
if (node != NUMA_NO_NODE && !node_online(node))
|
|
|
|
node = NUMA_NO_NODE;
|
x86: get mp_bus_to_node early
Currently, on an amd k8 system with multi ht chains, the numa_node of
pci devices under /sys/devices/pci0000:80/* is always 0, even if that
chain is on node 1 or 2 or 3.
Workaround: pcibus_to_node(bus) is used when we want to get the node that
pci_device is on.
In struct device, we already have numa_node member, and we could use
dev_to_node()/set_dev_node() to get and set numa_node in the device.
set_dev_node is called in pci_device_add() with pcibus_to_node(bus),
and pcibus_to_node uses bus->sysdata for nodeid.
The problem is when pci_add_device is called, bus->sysdata is not assigned
correct nodeid yet. The result is that numa_node will always be 0.
pcibios_scan_root and pci_scan_root could take sysdata. So we need to get
mp_bus_to_node mapping before these two are called, and thus
get_mp_bus_to_node could get correct node for sysdata in root bus.
In scanning of the root bus, all child busses will take parent bus sysdata.
So all pci_device->dev.numa_node will be assigned correctly and automatically.
Later we could use dev_to_node(&pci_dev->dev) to get numa_node, and we
could also could make other bus specific device get the correct numa_node
too.
This is an updated version of pci_sysdata and Jeff's pci_domain patch.
[ mingo@elte.hu: build fix ]
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-02-19 11:20:09 +00:00
|
|
|
|
2014-06-09 08:19:34 +00:00
|
|
|
info = kzalloc_node(sizeof(*info), GFP_KERNEL, node);
|
2012-04-03 01:31:53 +00:00
|
|
|
if (!info) {
|
2009-11-04 17:32:47 +00:00
|
|
|
printk(KERN_WARNING "pci_bus %04x:%02x: "
|
|
|
|
"ignored (out of memory)\n", domain, busnum);
|
2007-07-21 21:23:39 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2005-09-12 16:49:24 +00:00
|
|
|
|
2012-04-03 01:31:53 +00:00
|
|
|
sd = &info->sd;
|
2007-10-11 20:58:30 +00:00
|
|
|
sd->domain = domain;
|
x86: get mp_bus_to_node early
Currently, on an amd k8 system with multi ht chains, the numa_node of
pci devices under /sys/devices/pci0000:80/* is always 0, even if that
chain is on node 1 or 2 or 3.
Workaround: pcibus_to_node(bus) is used when we want to get the node that
pci_device is on.
In struct device, we already have numa_node member, and we could use
dev_to_node()/set_dev_node() to get and set numa_node in the device.
set_dev_node is called in pci_device_add() with pcibus_to_node(bus),
and pcibus_to_node uses bus->sysdata for nodeid.
The problem is when pci_add_device is called, bus->sysdata is not assigned
correct nodeid yet. The result is that numa_node will always be 0.
pcibios_scan_root and pci_scan_root could take sysdata. So we need to get
mp_bus_to_node mapping before these two are called, and thus
get_mp_bus_to_node could get correct node for sysdata in root bus.
In scanning of the root bus, all child busses will take parent bus sysdata.
So all pci_device->dev.numa_node will be assigned correctly and automatically.
Later we could use dev_to_node(&pci_dev->dev) to get numa_node, and we
could also could make other bus specific device get the correct numa_node
too.
This is an updated version of pci_sysdata and Jeff's pci_domain patch.
[ mingo@elte.hu: build fix ]
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-02-19 11:20:09 +00:00
|
|
|
sd->node = node;
|
ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node
Modify struct acpi_dev_node to contain a pointer to struct acpi_device
associated with the given device object (that is, its ACPI companion
device) instead of an ACPI handle corresponding to it. Introduce two
new macros for manipulating that pointer in a CONFIG_ACPI-safe way,
ACPI_COMPANION() and ACPI_COMPANION_SET(), and rework the
ACPI_HANDLE() macro to take the above changes into account.
Drop the ACPI_HANDLE_SET() macro entirely and rework its users to
use ACPI_COMPANION_SET() instead. For some of them who used to
pass the result of acpi_get_child() directly to ACPI_HANDLE_SET()
introduce a helper routine acpi_preset_companion() doing an
equivalent thing.
The main motivation for doing this is that there are things
represented by struct acpi_device objects that don't have valid
ACPI handles (so called fixed ACPI hardware features, such as
power and sleep buttons) and we would like to create platform
device objects for them and "glue" them to their ACPI companions
in the usual way (which currently is impossible due to the
lack of valid ACPI handles). However, there are more reasons
why it may be useful.
First, struct acpi_device pointers allow of much better type checking
than void pointers which are ACPI handles, so it should be more
difficult to write buggy code using modified struct acpi_dev_node
and the new macros. Second, the change should help to reduce (over
time) the number of places in which the result of ACPI_HANDLE() is
passed to acpi_bus_get_device() in order to obtain a pointer to the
struct acpi_device associated with the given "physical" device,
because now that pointer is returned by ACPI_COMPANION() directly.
Finally, the change should make it easier to write generic code that
will build both for CONFIG_ACPI set and unset without adding explicit
compiler directives to it.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com> # on Haswell
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Aaron Lu <aaron.lu@intel.com> # for ATA and SDIO part
2013-11-11 21:41:56 +00:00
|
|
|
sd->companion = device;
|
2014-01-24 17:38:40 +00:00
|
|
|
|
2008-04-15 21:34:49 +00:00
|
|
|
bus = pci_find_bus(domain, busnum);
|
|
|
|
if (bus) {
|
|
|
|
/*
|
2014-01-24 17:38:40 +00:00
|
|
|
* If the desired bus has been scanned already, replace
|
|
|
|
* its bus->sysdata.
|
2008-04-15 21:34:49 +00:00
|
|
|
*/
|
|
|
|
memcpy(bus->sysdata, sd, sizeof(*sd));
|
2012-04-03 01:31:53 +00:00
|
|
|
kfree(info);
|
2009-06-25 03:00:12 +00:00
|
|
|
} else {
|
2012-05-18 01:51:12 +00:00
|
|
|
/* insert busn res at first */
|
|
|
|
pci_add_resource(&resources, &root->secondary);
|
2015-02-05 05:44:46 +00:00
|
|
|
|
2012-01-18 00:41:21 +00:00
|
|
|
/*
|
|
|
|
* _CRS with no apertures is normal, so only fall back to
|
|
|
|
* defaults or native bridge info if we're ignoring _CRS.
|
|
|
|
*/
|
2015-02-05 05:44:46 +00:00
|
|
|
probe_pci_root_info(info, device, busnum, domain, &crs_res);
|
|
|
|
if (pci_use_crs) {
|
|
|
|
add_resources(info, &resources, &crs_res);
|
|
|
|
} else {
|
|
|
|
resource_list_for_each_entry(res_entry, &crs_res)
|
|
|
|
dev_printk(KERN_DEBUG, &device->dev,
|
|
|
|
"host bridge window %pR (ignored)\n",
|
|
|
|
res_entry->res);
|
|
|
|
resource_list_free(&crs_res);
|
2011-10-28 22:28:14 +00:00
|
|
|
x86_pci_root_bus_resources(busnum, &resources);
|
2012-04-03 01:31:53 +00:00
|
|
|
}
|
2012-04-03 01:31:53 +00:00
|
|
|
|
2012-06-22 06:55:17 +00:00
|
|
|
if (!setup_mcfg_map(info, domain, (u8)root->secondary.start,
|
|
|
|
(u8)root->secondary.end, root->mcfg_addr))
|
|
|
|
bus = pci_create_root_bus(NULL, busnum, &pci_root_ops,
|
|
|
|
sd, &resources);
|
|
|
|
|
2012-04-03 01:31:53 +00:00
|
|
|
if (bus) {
|
2012-05-18 01:51:12 +00:00
|
|
|
pci_scan_child_bus(bus);
|
2012-04-03 01:31:53 +00:00
|
|
|
pci_set_host_bridge_release(
|
|
|
|
to_pci_host_bridge(bus->bridge),
|
|
|
|
release_pci_root_info, info);
|
|
|
|
} else {
|
2015-02-05 05:44:46 +00:00
|
|
|
resource_list_free(&resources);
|
|
|
|
teardown_mcfg_map(info);
|
|
|
|
kfree(info);
|
2012-04-03 01:31:53 +00:00
|
|
|
}
|
2009-06-25 03:00:12 +00:00
|
|
|
}
|
2007-07-21 21:23:39 +00:00
|
|
|
|
PCI: Set PCI-E Max Payload Size on fabric
On a given PCI-E fabric, each device, bridge, and root port can have a
different PCI-E maximum payload size. There is a sizable performance
boost for having the largest possible maximum payload size on each PCI-E
device. However, if improperly configured, fatal bus errors can occur.
Thus, it is important to ensure that PCI-E payloads sends by a device
are never larger than the MPS setting of all devices on the way to the
destination.
This can be achieved two ways:
- A conservative approach is to use the smallest common denominator of
the entire tree below a root complex for every device on that fabric.
This means for example that having a 128 bytes MPS USB controller on one
leg of a switch will dramatically reduce performances of a video card or
10GE adapter on another leg of that same switch.
It also means that any hierarchy supporting hotplug slots (including
expresscard or thunderbolt I suppose, dbl check that) will have to be
entirely clamped to 128 bytes since we cannot predict what will be
plugged into those slots, and we cannot change the MPS on a "live"
system.
- A more optimal way is possible, if it falls within a couple of
constraints:
* The top-level host bridge will never generate packets larger than the
smallest TLP (or if it can be controlled independently from its MPS at
least)
* The device will never generate packets larger than MPS (which can be
configured via MRRS)
* No support of direct PCI-E <-> PCI-E transfers between devices without
some additional code to specifically deal with that case
Then we can use an approach that basically ignores downstream requests
and focuses exclusively on upstream requests. In that case, all we need
to care about is that a device MPS is no larger than its parent MPS,
which allows us to keep all switches/bridges to the max MPS supported by
their parent and eventually the PHB.
In this case, your USB controller would no longer "starve" your 10GE
Ethernet and your hotplug slots won't affect your global MPS.
Additionally, the hotplugged devices themselves can be configured to a
larger MPS up to the value configured in the hotplug bridge.
To choose between the two available options, two PCI kernel boot args
have been added to the PCI calls. "pcie_bus_safe" will provide the
former behavior, while "pcie_bus_perf" will perform the latter behavior.
By default, the latter behavior is used.
NOTE: due to the location of the enablement, each arch will need to add
calls to this function. This patch only enables x86.
This patch includes a number of changes recommended by Benjamin
Herrenschmidt.
Tested-by: Jordan_Hargrave@dell.com
Signed-off-by: Jon Mason <mason@myri.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2011-07-20 20:20:54 +00:00
|
|
|
/* After the PCI-E bus has been walked and all devices discovered,
|
|
|
|
* configure any settings of the fabric that might be necessary.
|
|
|
|
*/
|
|
|
|
if (bus) {
|
|
|
|
struct pci_bus *child;
|
2013-08-22 03:24:44 +00:00
|
|
|
list_for_each_entry(child, &bus->children, node)
|
|
|
|
pcie_bus_configure_settings(child);
|
PCI: Set PCI-E Max Payload Size on fabric
On a given PCI-E fabric, each device, bridge, and root port can have a
different PCI-E maximum payload size. There is a sizable performance
boost for having the largest possible maximum payload size on each PCI-E
device. However, if improperly configured, fatal bus errors can occur.
Thus, it is important to ensure that PCI-E payloads sends by a device
are never larger than the MPS setting of all devices on the way to the
destination.
This can be achieved two ways:
- A conservative approach is to use the smallest common denominator of
the entire tree below a root complex for every device on that fabric.
This means for example that having a 128 bytes MPS USB controller on one
leg of a switch will dramatically reduce performances of a video card or
10GE adapter on another leg of that same switch.
It also means that any hierarchy supporting hotplug slots (including
expresscard or thunderbolt I suppose, dbl check that) will have to be
entirely clamped to 128 bytes since we cannot predict what will be
plugged into those slots, and we cannot change the MPS on a "live"
system.
- A more optimal way is possible, if it falls within a couple of
constraints:
* The top-level host bridge will never generate packets larger than the
smallest TLP (or if it can be controlled independently from its MPS at
least)
* The device will never generate packets larger than MPS (which can be
configured via MRRS)
* No support of direct PCI-E <-> PCI-E transfers between devices without
some additional code to specifically deal with that case
Then we can use an approach that basically ignores downstream requests
and focuses exclusively on upstream requests. In that case, all we need
to care about is that a device MPS is no larger than its parent MPS,
which allows us to keep all switches/bridges to the max MPS supported by
their parent and eventually the PHB.
In this case, your USB controller would no longer "starve" your 10GE
Ethernet and your hotplug slots won't affect your global MPS.
Additionally, the hotplugged devices themselves can be configured to a
larger MPS up to the value configured in the hotplug bridge.
To choose between the two available options, two PCI kernel boot args
have been added to the PCI calls. "pcie_bus_safe" will provide the
former behavior, while "pcie_bus_perf" will perform the latter behavior.
By default, the latter behavior is used.
NOTE: due to the location of the enablement, each arch will need to add
calls to this function. This patch only enables x86.
This patch includes a number of changes recommended by Benjamin
Herrenschmidt.
Tested-by: Jordan_Hargrave@dell.com
Signed-off-by: Jon Mason <mason@myri.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2011-07-20 20:20:54 +00:00
|
|
|
}
|
|
|
|
|
2014-01-24 21:40:46 +00:00
|
|
|
if (bus && node != NUMA_NO_NODE)
|
2008-12-18 23:34:51 +00:00
|
|
|
dev_printk(KERN_DEBUG, &bus->dev, "on NUMA node %d\n", node);
|
2007-10-03 22:56:51 +00:00
|
|
|
|
2005-09-12 16:49:24 +00:00
|
|
|
return bus;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
ACPI / PCI: Set root bridge ACPI handle in advance
The ACPI handles of PCI root bridges need to be known to
acpi_bind_one(), so that it can create the appropriate
"firmware_node" and "physical_node" files for them, but currently
the way it gets to know those handles is not exactly straightforward
(to put it lightly).
This is how it works, roughly:
1. acpi_bus_scan() finds the handle of a PCI root bridge,
creates a struct acpi_device object for it and passes that
object to acpi_pci_root_add().
2. acpi_pci_root_add() creates a struct acpi_pci_root object,
populates its "device" field with its argument's address
(device->handle is the ACPI handle found in step 1).
3. The struct acpi_pci_root object created in step 2 is passed
to pci_acpi_scan_root() and used to get resources that are
passed to pci_create_root_bus().
4. pci_create_root_bus() creates a struct pci_host_bridge object
and passes its "dev" member to device_register().
5. platform_notify(), which for systems with ACPI is set to
acpi_platform_notify(), is called.
So far, so good. Now it starts to be "interesting".
6. acpi_find_bridge_device() is used to find the ACPI handle of
the given device (which is the PCI root bridge) and executes
acpi_pci_find_root_bridge(), among other things, for the
given device object.
7. acpi_pci_find_root_bridge() uses the name (sic!) of the given
device object to extract the segment and bus numbers of the PCI
root bridge and passes them to acpi_get_pci_rootbridge_handle().
8. acpi_get_pci_rootbridge_handle() browses the list of ACPI PCI
root bridges and finds the one that matches the given segment
and bus numbers. Its handle is then used to initialize the
ACPI handle of the PCI root bridge's device object by
acpi_bind_one(). However, this is *exactly* the ACPI handle we
started with in step 1.
Needless to say, this is quite embarassing, but it may be avoided
thanks to commit f3fd0c8 (ACPI: Allow ACPI handles of devices to be
initialized in advance), which makes it possible to initialize the
ACPI handle of a device before passing it to device_register().
Accordingly, add a new __weak routine, pcibios_root_bridge_prepare(),
defaulting to an empty implementation that can be replaced by the
interested architecutres (x86 and ia64 at the moment) with functions
that will set the root bridge's ACPI handle before its dev member is
passed to device_register(). Make both x86 and ia64 provide such
implementations of pcibios_root_bridge_prepare() and remove
acpi_pci_find_root_bridge() and acpi_get_pci_rootbridge_handle() that
aren't necessary any more.
Included is a fix for breakage on systems with non-ACPI PCI host
bridges from Bjorn Helgaas.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2013-01-09 21:33:37 +00:00
|
|
|
int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
|
|
|
|
{
|
|
|
|
struct pci_sysdata *sd = bridge->bus->sysdata;
|
|
|
|
|
ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node
Modify struct acpi_dev_node to contain a pointer to struct acpi_device
associated with the given device object (that is, its ACPI companion
device) instead of an ACPI handle corresponding to it. Introduce two
new macros for manipulating that pointer in a CONFIG_ACPI-safe way,
ACPI_COMPANION() and ACPI_COMPANION_SET(), and rework the
ACPI_HANDLE() macro to take the above changes into account.
Drop the ACPI_HANDLE_SET() macro entirely and rework its users to
use ACPI_COMPANION_SET() instead. For some of them who used to
pass the result of acpi_get_child() directly to ACPI_HANDLE_SET()
introduce a helper routine acpi_preset_companion() doing an
equivalent thing.
The main motivation for doing this is that there are things
represented by struct acpi_device objects that don't have valid
ACPI handles (so called fixed ACPI hardware features, such as
power and sleep buttons) and we would like to create platform
device objects for them and "glue" them to their ACPI companions
in the usual way (which currently is impossible due to the
lack of valid ACPI handles). However, there are more reasons
why it may be useful.
First, struct acpi_device pointers allow of much better type checking
than void pointers which are ACPI handles, so it should be more
difficult to write buggy code using modified struct acpi_dev_node
and the new macros. Second, the change should help to reduce (over
time) the number of places in which the result of ACPI_HANDLE() is
passed to acpi_bus_get_device() in order to obtain a pointer to the
struct acpi_device associated with the given "physical" device,
because now that pointer is returned by ACPI_COMPANION() directly.
Finally, the change should make it easier to write generic code that
will build both for CONFIG_ACPI set and unset without adding explicit
compiler directives to it.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com> # on Haswell
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Aaron Lu <aaron.lu@intel.com> # for ATA and SDIO part
2013-11-11 21:41:56 +00:00
|
|
|
ACPI_COMPANION_SET(&bridge->dev, sd->companion);
|
ACPI / PCI: Set root bridge ACPI handle in advance
The ACPI handles of PCI root bridges need to be known to
acpi_bind_one(), so that it can create the appropriate
"firmware_node" and "physical_node" files for them, but currently
the way it gets to know those handles is not exactly straightforward
(to put it lightly).
This is how it works, roughly:
1. acpi_bus_scan() finds the handle of a PCI root bridge,
creates a struct acpi_device object for it and passes that
object to acpi_pci_root_add().
2. acpi_pci_root_add() creates a struct acpi_pci_root object,
populates its "device" field with its argument's address
(device->handle is the ACPI handle found in step 1).
3. The struct acpi_pci_root object created in step 2 is passed
to pci_acpi_scan_root() and used to get resources that are
passed to pci_create_root_bus().
4. pci_create_root_bus() creates a struct pci_host_bridge object
and passes its "dev" member to device_register().
5. platform_notify(), which for systems with ACPI is set to
acpi_platform_notify(), is called.
So far, so good. Now it starts to be "interesting".
6. acpi_find_bridge_device() is used to find the ACPI handle of
the given device (which is the PCI root bridge) and executes
acpi_pci_find_root_bridge(), among other things, for the
given device object.
7. acpi_pci_find_root_bridge() uses the name (sic!) of the given
device object to extract the segment and bus numbers of the PCI
root bridge and passes them to acpi_get_pci_rootbridge_handle().
8. acpi_get_pci_rootbridge_handle() browses the list of ACPI PCI
root bridges and finds the one that matches the given segment
and bus numbers. Its handle is then used to initialize the
ACPI handle of the PCI root bridge's device object by
acpi_bind_one(). However, this is *exactly* the ACPI handle we
started with in step 1.
Needless to say, this is quite embarassing, but it may be avoided
thanks to commit f3fd0c8 (ACPI: Allow ACPI handles of devices to be
initialized in advance), which makes it possible to initialize the
ACPI handle of a device before passing it to device_register().
Accordingly, add a new __weak routine, pcibios_root_bridge_prepare(),
defaulting to an empty implementation that can be replaced by the
interested architecutres (x86 and ia64 at the moment) with functions
that will set the root bridge's ACPI handle before its dev member is
passed to device_register(). Make both x86 and ia64 provide such
implementations of pcibios_root_bridge_prepare() and remove
acpi_pci_find_root_bridge() and acpi_get_pci_rootbridge_handle() that
aren't necessary any more.
Included is a fix for breakage on systems with non-ACPI PCI host
bridges from Bjorn Helgaas.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2013-01-09 21:33:37 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-02 20:50:29 +00:00
|
|
|
int __init pci_acpi_init(void)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
struct pci_dev *dev = NULL;
|
|
|
|
|
|
|
|
if (acpi_noirq)
|
2009-08-29 14:24:51 +00:00
|
|
|
return -ENODEV;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
|
|
|
|
acpi_irq_penalty_init();
|
|
|
|
pcibios_enable_irq = acpi_pci_irq_enable;
|
2005-07-28 03:02:00 +00:00
|
|
|
pcibios_disable_irq = acpi_pci_irq_disable;
|
2009-08-29 15:47:33 +00:00
|
|
|
x86_init.pci.init_irq = x86_init_noop;
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
if (pci_routeirq) {
|
|
|
|
/*
|
|
|
|
* PCI IRQ routing is set up by pci_enable_device(), but we
|
|
|
|
* also do it here in case there are still broken drivers that
|
|
|
|
* don't use pci_enable_device().
|
|
|
|
*/
|
|
|
|
printk(KERN_INFO "PCI: Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n");
|
2005-11-07 07:39:36 +00:00
|
|
|
for_each_pci_dev(dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
acpi_pci_irq_enable(dev);
|
2008-02-18 16:44:13 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|