patch-2.3.43 linux/arch/arm/kernel/bios32.c

• Lines: 53
• Date: Sun Feb 6 17:45:25 2000
• Orig file: v2.3.42/linux/arch/arm/kernel/bios32.c
• Orig date: Fri Jan 21 18:19:15 2000

diff -u --recursive --new-file v2.3.42/linux/arch/arm/kernel/bios32.c linux/arch/arm/kernel/bios32.c
@@ -381,7 +381,7 @@
 	 * Assign any unassigned resources.  Note that we really ought to
 	 * have min/max stuff here - max mem address is 0x0fffffff
 	 */
-	pci_assign_unassigned_resources(hw_pci->io_start, hw_pci->mem_start);
+	pci_assign_unassigned_resources();
 	pci_fixup_irqs(hw_pci->swizzle, hw_pci->map_irq);
 	pci_set_bus_ranges();
 
@@ -404,17 +404,34 @@
 	return str;
 }
 
-/*
- * Assign new address to PCI resource.  We hope our resource information
- * is complete.
- *
- * Expects start=0, end=size-1, flags=resource type.
- */
-int pci_assign_resource(struct pci_dev *dev, int i)
+void pcibios_align_resource(void *data, struct resource *res, unsigned long size)
 {
-	return 0;
 }
 
-void pcibios_align_resource(void *data, struct resource *res, unsigned long size)
+int pcibios_enable_device(struct pci_dev *dev)
 {
+	u16 cmd, old_cmd;
+	int idx;
+	struct resource *r;
+
+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
+	old_cmd = cmd;
+	for (idx = 0; idx < 6; idx++) {
+		r = dev->resource + idx;
+		if (!r->start && r->end) {
+			printk(KERN_ERR "PCI: Device %s not available because"
+			       " of resource collisions\n", dev->slot_name);
+			return -EINVAL;
+		}
+		if (r->flags & IORESOURCE_IO)
+			cmd |= PCI_COMMAND_IO;
+		if (r->flags & IORESOURCE_MEM)
+			cmd |= PCI_COMMAND_MEMORY;
+	}
+	if (cmd != old_cmd) {
+		printk("PCI: enabling device %s (%04x -> %04x)\n",
+		       dev->slot_name, old_cmd, cmd);
+		pci_write_config_word(dev, PCI_COMMAND, cmd);
+	}
+	return 0;
 }