Commit 16cd04d6 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Greg Kroah-Hartman

[PATCH] PCI: [PATCH] pcibios_scan_acpi()

On Mon, Jun 23, 2003 at 02:39:05PM -0700, Greg KH wrote:
> > How about acpi_scan_pci_bus_root()?
>
> I agree, that sounds better.

I think it's too long ... so unless anyone has a better idea, I'm going with
pci_acpi_scan_root().  Here's the patch, presented in patch -p1 format to
make greg's scripts happy ;-)

ia64 needs to be passed the pci domain and the acpi handle corresponding
to each root bus.  Rather than change pcibios_scan_root to take additional
arguments, this patch introduces pci_acpi_scan_root().
parent cee71d5d
...@@ -3,6 +3,16 @@ ...@@ -3,6 +3,16 @@
#include <linux/init.h> #include <linux/init.h>
#include "pci.h" #include "pci.h"
struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
{
if (domain != 0) {
printk(KERN_WARNING "PCI: Multiple domains not supported\n");
return NULL;
}
return pcibios_scan_root(busnum);
}
static int __init pci_acpi_init(void) static int __init pci_acpi_init(void)
{ {
if (pcibios_scanned) if (pcibios_scanned)
......
...@@ -284,21 +284,21 @@ add_window (struct acpi_resource *res, void *data) ...@@ -284,21 +284,21 @@ add_window (struct acpi_resource *res, void *data)
} }
struct pci_bus * struct pci_bus *
pcibios_scan_root (void *handle, int seg, int bus) pci_acpi_scan_root (struct acpi_device *device, int domain, int bus)
{ {
struct pci_root_info info; struct pci_root_info info;
struct pci_controller *controller; struct pci_controller *controller;
unsigned int windows = 0; unsigned int windows = 0;
char *name; char *name;
printk("PCI: Probing PCI hardware on bus (%02x:%02x)\n", seg, bus); printk("PCI: Probing PCI hardware on bus (%04x:%02x)\n", domain, bus);
controller = alloc_pci_controller(seg); controller = alloc_pci_controller(domain);
if (!controller) if (!controller)
goto out1; goto out1;
controller->acpi_handle = handle; controller->acpi_handle = device->handle;
acpi_walk_resources(handle, METHOD_NAME__CRS, count_window, &windows); acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window, &windows);
controller->window = kmalloc(sizeof(*controller->window) * windows, GFP_KERNEL); controller->window = kmalloc(sizeof(*controller->window) * windows, GFP_KERNEL);
if (!controller->window) if (!controller->window)
goto out2; goto out2;
...@@ -307,10 +307,10 @@ pcibios_scan_root (void *handle, int seg, int bus) ...@@ -307,10 +307,10 @@ pcibios_scan_root (void *handle, int seg, int bus)
if (!name) if (!name)
goto out3; goto out3;
sprintf(name, "PCI Bus %02x:%02x", seg, bus); sprintf(name, "PCI Bus %04x:%02x", domain, bus);
info.controller = controller; info.controller = controller;
info.name = name; info.name = name;
acpi_walk_resources(handle, METHOD_NAME__CRS, add_window, &info); acpi_walk_resources(device->handle, METHOD_NAME__CRS, add_window, &info);
return scan_root_bus(bus, &pci_root_ops, controller); return scan_root_bus(bus, &pci_root_ops, controller);
......
...@@ -246,8 +246,6 @@ acpi_pci_root_add ( ...@@ -246,8 +246,6 @@ acpi_pci_root_add (
switch (status) { switch (status) {
case AE_OK: case AE_OK:
root->id.segment = (u16) value; root->id.segment = (u16) value;
printk("_SEG exists! Unsupported. Abort.\n");
BUG();
break; break;
case AE_NOT_FOUND: case AE_NOT_FOUND:
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_INFO,
...@@ -309,7 +307,7 @@ acpi_pci_root_add ( ...@@ -309,7 +307,7 @@ acpi_pci_root_add (
* PCI namespace does not get created until this call is made (and * PCI namespace does not get created until this call is made (and
* thus the root bridge's pci_dev does not exist). * thus the root bridge's pci_dev does not exist).
*/ */
root->bus = pcibios_scan_root(root->id.bus); root->bus = pci_acpi_scan_root(device, root->id.segment, root->id.bus);
if (!root->bus) { if (!root->bus) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Bus %02x:%02x not present in PCI namespace\n", "Bus %02x:%02x not present in PCI namespace\n",
......
...@@ -73,6 +73,10 @@ struct pci_bus; ...@@ -73,6 +73,10 @@ struct pci_bus;
int acpi_pci_bind (struct acpi_device *device); int acpi_pci_bind (struct acpi_device *device);
int acpi_pci_bind_root (struct acpi_device *device, struct acpi_pci_id *id, struct pci_bus *bus); int acpi_pci_bind_root (struct acpi_device *device, struct acpi_pci_id *id, struct pci_bus *bus);
/* Arch-defined function to add a bus to the system */
struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, int bus);
#endif /*CONFIG_ACPI_PCI*/ #endif /*CONFIG_ACPI_PCI*/
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#define PCIBIOS_MIN_MEM 0x10000000 #define PCIBIOS_MIN_MEM 0x10000000
void pcibios_config_init(void); void pcibios_config_init(void);
struct pci_bus * pcibios_scan_root(void *acpi_handle, int segment, int bus);
struct pci_dev; struct pci_dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment