mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 00:52:01 +00:00
b87e81e5c6
http://bugzilla.kernel.org/show_bug.cgi?id=10124
this change:
commit 08f1c192c3
Author: Muli Ben-Yehuda <muli@il.ibm.com>
Date: Sun Jul 22 00:23:39 2007 +0300
x86-64: introduce struct pci_sysdata to facilitate sharing of ->sysdata
This patch introduces struct pci_sysdata to x86 and x86-64, and
converts the existing two users (NUMA, Calgary) to use it.
This lays the groundwork for having other users of sysdata, such as
the PCI domains work.
The Calgary bits are tested, the NUMA bits just look ok.
replaces pcibios_scan_root by pci_scan_bus_parented...
but in pcibios_scan_root we have a check about scanned busses.
Cc: <yakui.zhao@intel.com>
Cc: Stian Jordet <stian@jordet.net>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <greg@kroah.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Yinghai Lu" <yhlu.kernel@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
292 lines
6.7 KiB
C
292 lines
6.7 KiB
C
#include <linux/pci.h>
|
|
#include <linux/acpi.h>
|
|
#include <linux/init.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/dmi.h>
|
|
#include <asm/numa.h>
|
|
#include "pci.h"
|
|
|
|
static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)
|
|
{
|
|
pci_probe |= PCI_CAN_SKIP_ISA_ALIGN;
|
|
printk(KERN_INFO "PCI: %s detected, can skip ISA alignment\n", d->ident);
|
|
return 0;
|
|
}
|
|
|
|
static struct dmi_system_id acpi_pciprobe_dmi_table[] __devinitdata = {
|
|
/*
|
|
* Systems where PCI IO resource ISA alignment can be skipped
|
|
* when the ISA enable bit in the bridge control is not set
|
|
*/
|
|
{
|
|
.callback = can_skip_ioresource_align,
|
|
.ident = "IBM System x3800",
|
|
.matches = {
|
|
DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "x3800"),
|
|
},
|
|
},
|
|
{
|
|
.callback = can_skip_ioresource_align,
|
|
.ident = "IBM System x3850",
|
|
.matches = {
|
|
DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "x3850"),
|
|
},
|
|
},
|
|
{
|
|
.callback = can_skip_ioresource_align,
|
|
.ident = "IBM System x3950",
|
|
.matches = {
|
|
DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "x3950"),
|
|
},
|
|
},
|
|
{}
|
|
};
|
|
|
|
struct pci_root_info {
|
|
char *name;
|
|
unsigned int res_num;
|
|
struct resource *res;
|
|
struct pci_bus *bus;
|
|
int busnum;
|
|
};
|
|
|
|
static acpi_status
|
|
resource_to_addr(struct acpi_resource *resource,
|
|
struct acpi_resource_address64 *addr)
|
|
{
|
|
acpi_status status;
|
|
|
|
status = acpi_resource_to_address64(resource, addr);
|
|
if (ACPI_SUCCESS(status) &&
|
|
(addr->resource_type == ACPI_MEMORY_RANGE ||
|
|
addr->resource_type == ACPI_IO_RANGE) &&
|
|
addr->address_length > 0 &&
|
|
addr->producer_consumer == ACPI_PRODUCER) {
|
|
return AE_OK;
|
|
}
|
|
return AE_ERROR;
|
|
}
|
|
|
|
static acpi_status
|
|
count_resource(struct acpi_resource *acpi_res, void *data)
|
|
{
|
|
struct pci_root_info *info = data;
|
|
struct acpi_resource_address64 addr;
|
|
acpi_status status;
|
|
|
|
if (info->res_num >= PCI_BUS_NUM_RESOURCES)
|
|
return AE_OK;
|
|
|
|
status = resource_to_addr(acpi_res, &addr);
|
|
if (ACPI_SUCCESS(status))
|
|
info->res_num++;
|
|
return AE_OK;
|
|
}
|
|
|
|
static acpi_status
|
|
setup_resource(struct acpi_resource *acpi_res, void *data)
|
|
{
|
|
struct pci_root_info *info = data;
|
|
struct resource *res;
|
|
struct acpi_resource_address64 addr;
|
|
acpi_status status;
|
|
unsigned long flags;
|
|
struct resource *root;
|
|
|
|
if (info->res_num >= PCI_BUS_NUM_RESOURCES)
|
|
return AE_OK;
|
|
|
|
status = resource_to_addr(acpi_res, &addr);
|
|
if (!ACPI_SUCCESS(status))
|
|
return AE_OK;
|
|
|
|
if (addr.resource_type == ACPI_MEMORY_RANGE) {
|
|
root = &iomem_resource;
|
|
flags = IORESOURCE_MEM;
|
|
if (addr.info.mem.caching == ACPI_PREFETCHABLE_MEMORY)
|
|
flags |= IORESOURCE_PREFETCH;
|
|
} else if (addr.resource_type == ACPI_IO_RANGE) {
|
|
root = &ioport_resource;
|
|
flags = IORESOURCE_IO;
|
|
} else
|
|
return AE_OK;
|
|
|
|
res = &info->res[info->res_num];
|
|
res->name = info->name;
|
|
res->flags = flags;
|
|
res->start = addr.minimum + addr.translation_offset;
|
|
res->end = res->start + addr.address_length - 1;
|
|
res->child = NULL;
|
|
|
|
if (insert_resource(root, res)) {
|
|
printk(KERN_ERR "PCI: Failed to allocate 0x%lx-0x%lx "
|
|
"from %s for %s\n", (unsigned long) res->start,
|
|
(unsigned long) res->end, root->name, info->name);
|
|
} else {
|
|
info->bus->resource[info->res_num] = res;
|
|
info->res_num++;
|
|
}
|
|
return AE_OK;
|
|
}
|
|
|
|
static void
|
|
adjust_transparent_bridge_resources(struct pci_bus *bus)
|
|
{
|
|
struct pci_dev *dev;
|
|
|
|
list_for_each_entry(dev, &bus->devices, bus_list) {
|
|
int i;
|
|
u16 class = dev->class >> 8;
|
|
|
|
if (class == PCI_CLASS_BRIDGE_PCI && dev->transparent) {
|
|
for(i = 3; i < PCI_BUS_NUM_RESOURCES; i++)
|
|
dev->subordinate->resource[i] =
|
|
dev->bus->resource[i - 3];
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
get_current_resources(struct acpi_device *device, int busnum,
|
|
struct pci_bus *bus)
|
|
{
|
|
struct pci_root_info info;
|
|
size_t size;
|
|
|
|
info.bus = bus;
|
|
info.res_num = 0;
|
|
acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource,
|
|
&info);
|
|
if (!info.res_num)
|
|
return;
|
|
|
|
size = sizeof(*info.res) * info.res_num;
|
|
info.res = kmalloc(size, GFP_KERNEL);
|
|
if (!info.res)
|
|
goto res_alloc_fail;
|
|
|
|
info.name = kmalloc(12, GFP_KERNEL);
|
|
if (!info.name)
|
|
goto name_alloc_fail;
|
|
sprintf(info.name, "PCI Bus #%02x", busnum);
|
|
|
|
info.res_num = 0;
|
|
acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
|
|
&info);
|
|
if (info.res_num)
|
|
adjust_transparent_bridge_resources(bus);
|
|
|
|
return;
|
|
|
|
name_alloc_fail:
|
|
kfree(info.res);
|
|
res_alloc_fail:
|
|
return;
|
|
}
|
|
|
|
struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
|
|
{
|
|
struct pci_bus *bus;
|
|
struct pci_sysdata *sd;
|
|
int pxm;
|
|
|
|
dmi_check_system(acpi_pciprobe_dmi_table);
|
|
|
|
if (domain && !pci_domains_supported) {
|
|
printk(KERN_WARNING "PCI: Multiple domains not supported "
|
|
"(dom %d, bus %d)\n", domain, busnum);
|
|
return NULL;
|
|
}
|
|
|
|
/* Allocate per-root-bus (not per bus) arch-specific data.
|
|
* TODO: leak; this memory is never freed.
|
|
* It's arguable whether it's worth the trouble to care.
|
|
*/
|
|
sd = kzalloc(sizeof(*sd), GFP_KERNEL);
|
|
if (!sd) {
|
|
printk(KERN_ERR "PCI: OOM, not probing PCI bus %02x\n", busnum);
|
|
return NULL;
|
|
}
|
|
|
|
sd->domain = domain;
|
|
sd->node = -1;
|
|
|
|
pxm = acpi_get_pxm(device->handle);
|
|
#ifdef CONFIG_ACPI_NUMA
|
|
if (pxm >= 0)
|
|
sd->node = pxm_to_node(pxm);
|
|
#endif
|
|
/*
|
|
* Maybe the desired pci bus has been already scanned. In such case
|
|
* it is unnecessary to scan the pci bus with the given domain,busnum.
|
|
*/
|
|
bus = pci_find_bus(domain, busnum);
|
|
if (bus) {
|
|
/*
|
|
* If the desired bus exits, the content of bus->sysdata will
|
|
* be replaced by sd.
|
|
*/
|
|
memcpy(bus->sysdata, sd, sizeof(*sd));
|
|
kfree(sd);
|
|
} else
|
|
bus = pci_scan_bus_parented(NULL, busnum, &pci_root_ops, sd);
|
|
|
|
if (!bus)
|
|
kfree(sd);
|
|
|
|
#ifdef CONFIG_ACPI_NUMA
|
|
if (bus != NULL) {
|
|
if (pxm >= 0) {
|
|
printk("bus %d -> pxm %d -> node %d\n",
|
|
busnum, pxm, pxm_to_node(pxm));
|
|
}
|
|
}
|
|
#endif
|
|
|
|
if (bus && (pci_probe & PCI_USE__CRS))
|
|
get_current_resources(device, busnum, bus);
|
|
|
|
return bus;
|
|
}
|
|
|
|
extern int pci_routeirq;
|
|
static int __init pci_acpi_init(void)
|
|
{
|
|
struct pci_dev *dev = NULL;
|
|
|
|
if (pcibios_scanned)
|
|
return 0;
|
|
|
|
if (acpi_noirq)
|
|
return 0;
|
|
|
|
printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
|
|
acpi_irq_penalty_init();
|
|
pcibios_scanned++;
|
|
pcibios_enable_irq = acpi_pci_irq_enable;
|
|
pcibios_disable_irq = acpi_pci_irq_disable;
|
|
|
|
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");
|
|
for_each_pci_dev(dev)
|
|
acpi_pci_irq_enable(dev);
|
|
} else
|
|
printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\". If it helps, post a report\n");
|
|
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
if (acpi_ioapic)
|
|
print_IO_APIC();
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
subsys_initcall(pci_acpi_init);
|