---

yaml
---
r: 358427
b: refs/heads/master
c: 10c463a
h: refs/heads/master
i:
  358425: 1741ff2
  358423: 826a60f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecb87e6609d3a559eacf7a61f5b4e088a797d07c
+refs/heads/master: 10c463a7a3b96285133c37e230781a1274abbd31

trunk/arch/ia64/pci/pci.c

@@ -396,14 +396,6 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
 	return NULL;
 }
 
-int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
-{
-	struct pci_controller *controller = bridge->bus->sysdata;
-
-	ACPI_HANDLE_SET(&bridge->dev, controller->acpi_handle);
-	return 0;
-}
-
 static int __devinit is_valid_resource(struct pci_dev *dev, int idx)
 {
 	unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;

trunk/arch/x86/include/asm/pci.h

@@ -14,9 +14,6 @@
 struct pci_sysdata {
 	int		domain;		/* PCI domain */
 	int		node;		/* NUMA node */
-#ifdef CONFIG_ACPI
-	void		*acpi;		/* ACPI-specific data */
-#endif
 #ifdef CONFIG_X86_64
 	void		*iommu;		/* IOMMU private data */
 #endif

trunk/arch/x86/pci/acpi.c

@@ -522,7 +522,6 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
 	sd = &info->sd;
 	sd->domain = domain;
 	sd->node = node;
-	sd->acpi = device->handle;
 	/*
 	 * 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.
@@ -594,14 +593,6 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
 	return bus;
 }
 
-int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
-{
-	struct pci_sysdata *sd = bridge->bus->sysdata;
-
-	ACPI_HANDLE_SET(&bridge->dev, sd->acpi);
-	return 0;
-}
-
 int __init pci_acpi_init(void)
 {
 	struct pci_dev *dev = NULL;

trunk/arch/x86/pci/i386.c

@@ -51,7 +51,6 @@ struct pcibios_fwaddrmap {
 
 static LIST_HEAD(pcibios_fwaddrmappings);
 static DEFINE_SPINLOCK(pcibios_fwaddrmap_lock);
-static bool pcibios_fw_addr_done;
 
 /* Must be called with 'pcibios_fwaddrmap_lock' lock held. */
 static struct pcibios_fwaddrmap *pcibios_fwaddrmap_lookup(struct pci_dev *dev)
@@ -73,9 +72,6 @@ pcibios_save_fw_addr(struct pci_dev *dev, int idx, resource_size_t fw_addr)
 	unsigned long flags;
 	struct pcibios_fwaddrmap *map;
 
-	if (pcibios_fw_addr_done)
-		return;
-
 	spin_lock_irqsave(&pcibios_fwaddrmap_lock, flags);
 	map = pcibios_fwaddrmap_lookup(dev);
 	if (!map) {
@@ -101,9 +97,6 @@ resource_size_t pcibios_retrieve_fw_addr(struct pci_dev *dev, int idx)
 	struct pcibios_fwaddrmap *map;
 	resource_size_t fw_addr = 0;
 
-	if (pcibios_fw_addr_done)
-		return 0;
-
 	spin_lock_irqsave(&pcibios_fwaddrmap_lock, flags);
 	map = pcibios_fwaddrmap_lookup(dev);
 	if (map)
@@ -113,7 +106,7 @@ resource_size_t pcibios_retrieve_fw_addr(struct pci_dev *dev, int idx)
 	return fw_addr;
 }
 
-static void __init pcibios_fw_addr_list_del(void)
+static void pcibios_fw_addr_list_del(void)
 {
 	unsigned long flags;
 	struct pcibios_fwaddrmap *entry, *next;
@@ -125,7 +118,6 @@ static void __init pcibios_fw_addr_list_del(void)
 		kfree(entry);
 	}
 	spin_unlock_irqrestore(&pcibios_fwaddrmap_lock, flags);
-	pcibios_fw_addr_done = true;
 }
 
 static int
@@ -201,46 +193,46 @@ EXPORT_SYMBOL(pcibios_align_resource);
  *	    as well.
  */
 
-static void pcibios_allocate_bridge_resources(struct pci_dev *dev)
+static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
 {
+	struct pci_bus *bus;
+	struct pci_dev *dev;
 	int idx;
 	struct resource *r;
 
-	for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
-		r = &dev->resource[idx];
-		if (!r->flags)
-			continue;
-		if (!r->start || pci_claim_resource(dev, idx) < 0) {
-			/*
-			 * Something is wrong with the region.
-			 * Invalidate the resource to prevent
-			 * child resource allocations in this
-			 * range.
-			 */
-			r->start = r->end = 0;
-			r->flags = 0;
+	/* Depth-First Search on bus tree */
+	list_for_each_entry(bus, bus_list, node) {
+		if ((dev = bus->self)) {
+			for (idx = PCI_BRIDGE_RESOURCES;
+			    idx < PCI_NUM_RESOURCES; idx++) {
+				r = &dev->resource[idx];
+				if (!r->flags)
+					continue;
+				if (!r->start ||
+				    pci_claim_resource(dev, idx) < 0) {
+					/*
+					 * Something is wrong with the region.
+					 * Invalidate the resource to prevent
+					 * child resource allocations in this
+					 * range.
+					 */
+					r->start = r->end = 0;
+					r->flags = 0;
+				}
+			}
 		}
+		pcibios_allocate_bus_resources(&bus->children);
 	}
 }
 
-static void pcibios_allocate_bus_resources(struct pci_bus *bus)
-{
-	struct pci_bus *child;
-
-	/* Depth-First Search on bus tree */
-	if (bus->self)
-		pcibios_allocate_bridge_resources(bus->self);
-	list_for_each_entry(child, &bus->children, node)
-		pcibios_allocate_bus_resources(child);
-}
-
 struct pci_check_idx_range {
 	int start;
 	int end;
 };
 
-static void pcibios_allocate_dev_resources(struct pci_dev *dev, int pass)
+static void __init pcibios_allocate_resources(int pass)
 {
+	struct pci_dev *dev = NULL;
 	int idx, disabled, i;
 	u16 command;
 	struct resource *r;
@@ -252,13 +244,14 @@ static void pcibios_allocate_dev_resources(struct pci_dev *dev, int pass)
 #endif
 	};
 
-	pci_read_config_word(dev, PCI_COMMAND, &command);
-	for (i = 0; i < ARRAY_SIZE(idx_range); i++)
+	for_each_pci_dev(dev) {
+		pci_read_config_word(dev, PCI_COMMAND, &command);
+		for (i = 0; i < ARRAY_SIZE(idx_range); i++)
 		for (idx = idx_range[i].start; idx <= idx_range[i].end; idx++) {
 			r = &dev->resource[idx];
-			if (r->parent)	/* Already allocated */
+			if (r->parent)		/* Already allocated */
 				continue;
-			if (!r->start)	/* Address not assigned at all */
+			if (!r->start)		/* Address not assigned at all */
 				continue;
 			if (r->flags & IORESOURCE_IO)
 				disabled = !(command & PCI_COMMAND_IO);
@@ -277,107 +270,57 @@ static void pcibios_allocate_dev_resources(struct pci_dev *dev, int pass)
 				}
 			}
 		}
-	if (!pass) {
-		r = &dev->resource[PCI_ROM_RESOURCE];
-		if (r->flags & IORESOURCE_ROM_ENABLE) {
-			/* Turn the ROM off, leave the resource region,
-			 * but keep it unregistered. */
-			u32 reg;
-			dev_dbg(&dev->dev, "disabling ROM %pR\n", r);
-			r->flags &= ~IORESOURCE_ROM_ENABLE;
-			pci_read_config_dword(dev, dev->rom_base_reg, &reg);
-			pci_write_config_dword(dev, dev->rom_base_reg,
+		if (!pass) {
+			r = &dev->resource[PCI_ROM_RESOURCE];
+			if (r->flags & IORESOURCE_ROM_ENABLE) {
+				/* Turn the ROM off, leave the resource region,
+				 * but keep it unregistered. */
+				u32 reg;
+				dev_dbg(&dev->dev, "disabling ROM %pR\n", r);
+				r->flags &= ~IORESOURCE_ROM_ENABLE;
+				pci_read_config_dword(dev,
+						dev->rom_base_reg, &reg);
+				pci_write_config_dword(dev, dev->rom_base_reg,
 						reg & ~PCI_ROM_ADDRESS_ENABLE);
+			}
 		}
 	}
 }
 
-static void pcibios_allocate_resources(struct pci_bus *bus, int pass)
-{
-	struct pci_dev *dev;
-	struct pci_bus *child;
-
-	list_for_each_entry(dev, &bus->devices, bus_list) {
-		pcibios_allocate_dev_resources(dev, pass);
-
-		child = dev->subordinate;
-		if (child)
-			pcibios_allocate_resources(child, pass);
-	}
-}
-
-static void pcibios_allocate_dev_rom_resource(struct pci_dev *dev)
+static int __init pcibios_assign_resources(void)
 {
+	struct pci_dev *dev = NULL;
 	struct resource *r;
 
-	/*
-	 * Try to use BIOS settings for ROMs, otherwise let
-	 * pci_assign_unassigned_resources() allocate the new
-	 * addresses.
-	 */
-	r = &dev->resource[PCI_ROM_RESOURCE];
-	if (!r->flags || !r->start)
-		return;
-
-	if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
-		r->end -= r->start;
-		r->start = 0;
-	}
-}
-static void pcibios_allocate_rom_resources(struct pci_bus *bus)
-{
-	struct pci_dev *dev;
-	struct pci_bus *child;
-
-	list_for_each_entry(dev, &bus->devices, bus_list) {
-		pcibios_allocate_dev_rom_resource(dev);
-
-		child = dev->subordinate;
-		if (child)
-			pcibios_allocate_rom_resources(child);
+	if (!(pci_probe & PCI_ASSIGN_ROMS)) {
+		/*
+		 * Try to use BIOS settings for ROMs, otherwise let
+		 * pci_assign_unassigned_resources() allocate the new
+		 * addresses.
+		 */
+		for_each_pci_dev(dev) {
+			r = &dev->resource[PCI_ROM_RESOURCE];
+			if (!r->flags || !r->start)
+				continue;
+			if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
+				r->end -= r->start;
+				r->start = 0;
+			}
+		}
 	}
-}
-
-static int __init pcibios_assign_resources(void)
-{
-	struct pci_bus *bus;
-
-	if (!(pci_probe & PCI_ASSIGN_ROMS))
-		list_for_each_entry(bus, &pci_root_buses, node)
-			pcibios_allocate_rom_resources(bus);
 
 	pci_assign_unassigned_resources();
 	pcibios_fw_addr_list_del();
 
 	return 0;
 }
 
-void pcibios_resource_survey_bus(struct pci_bus *bus)
-{
-	dev_printk(KERN_DEBUG, &bus->dev, "Allocating resources\n");
-
-	pcibios_allocate_bus_resources(bus);
-
-	pcibios_allocate_resources(bus, 0);
-	pcibios_allocate_resources(bus, 1);
-
-	if (!(pci_probe & PCI_ASSIGN_ROMS))
-		pcibios_allocate_rom_resources(bus);
-}
-
 void __init pcibios_resource_survey(void)
 {
-	struct pci_bus *bus;
-
 	DBG("PCI: Allocating resources\n");
-
-	list_for_each_entry(bus, &pci_root_buses, node)
-		pcibios_allocate_bus_resources(bus);
-
-	list_for_each_entry(bus, &pci_root_buses, node)
-		pcibios_allocate_resources(bus, 0);
-	list_for_each_entry(bus, &pci_root_buses, node)
-		pcibios_allocate_resources(bus, 1);
+	pcibios_allocate_bus_resources(&pci_root_buses);
+	pcibios_allocate_resources(0);
+	pcibios_allocate_resources(1);
 
 	e820_reserve_resources_late();
 	/*

trunk/drivers/acpi/Makefile

@@ -37,7 +37,7 @@ acpi-y				+= resource.o
 acpi-y				+= processor_core.o
 acpi-y				+= ec.o
 acpi-$(CONFIG_ACPI_DOCK)	+= dock.o
-acpi-y				+= pci_root.o pci_link.o pci_irq.o
+acpi-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
 acpi-y				+= acpi_platform.o
 acpi-y				+= power.o
 acpi-y				+= event.o

trunk/drivers/acpi/acpi_memhotplug.c

@@ -157,26 +157,38 @@ static int
 acpi_memory_get_device(acpi_handle handle,
 		       struct acpi_memory_device **mem_device)
 {
+	acpi_status status;
+	acpi_handle phandle;
 	struct acpi_device *device = NULL;
+	struct acpi_device *pdevice = NULL;
 	int result;
 
+
 	if (!acpi_bus_get_device(handle, &device) && device)
 		goto end;
 
+	status = acpi_get_parent(handle, &phandle);
+	if (ACPI_FAILURE(status)) {
+		ACPI_EXCEPTION((AE_INFO, status, "Cannot find acpi parent"));
+		return -EINVAL;
+	}
+
+	/* Get the parent device */
+	result = acpi_bus_get_device(phandle, &pdevice);
+	if (result) {
+		acpi_handle_warn(phandle, "Cannot get acpi bus device\n");
+		return -EINVAL;
+	}
+
 	/*
 	 * Now add the notified device.  This creates the acpi_device
 	 * and invokes .add function
 	 */
-	result = acpi_bus_scan(handle);
+	result = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE);
 	if (result) {
 		acpi_handle_warn(handle, "Cannot add acpi bus\n");
 		return -EINVAL;
 	}
-	result = acpi_bus_get_device(handle, &device);
-	if (result) {
-		acpi_handle_warn(handle, "Missing device object\n");
-		return -EINVAL;
-	}
 
       end:
 	*mem_device = acpi_driver_data(device);
@@ -361,7 +373,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
 			break;
 		}
 
-		ej_event->device = device;
+		ej_event->handle = handle;
 		ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
 		acpi_os_hotplug_execute(acpi_bus_hot_remove_device,
 					(void *)ej_event);