Skip to contentSkip to conversation

visws: pci support (8/13)

PATCH New Andrey Panin 1 participant 1 message Feb 14, 2003 PCI

lore
Share & tools
lore

Andrey Panin

author
#0 lore raw

PATCH 1/1 visws: pci support (8/13)

Hi.

This patch contains update of pci support for visws.

Please consider applying.

Best regards.

Signature · 2 lines
Andrey Panin		| Embedded systems software developer
[email protected]	| PGP key: wwwkeys.pgp.net
include/linux/pci_ids.h +1 -0
diff -urN -X /usr/share/dontdiff linux-2.5.60.vanilla/include/linux/pci_ids.h linux-2.5.60/include/linux/pci_ids.h
@@ -848,6 +848,7 @@
 
 #define PCI_VENDOR_ID_SGI		0x10a9
 #define PCI_DEVICE_ID_SGI_IOC3		0x0003
+#define PCI_VENDOR_ID_SGI_LITHIUM	0x1002
 
 #define PCI_VENDOR_ID_ACC		0x10aa
 #define PCI_DEVICE_ID_ACC_2056		0x0000
arch/i386/mach-visws/pci-visws.c +0 -141

141 lines not on this page · raw message

arch/i386/pci/Makefile +11 -2
diff -urN -X /usr/share/dontdiff linux-2.5.60.vanilla/arch/i386/pci/Makefile linux-2.5.60/arch/i386/pci/Makefile
@@ -3,6 +3,8 @@
 obj-$(CONFIG_PCI_BIOS)		+= pcbios.o
 obj-$(CONFIG_PCI_DIRECT)	+= direct.o
 
+obj-$(CONFIG_X86_VISWS)		+= visws.o
+
 ifdef	CONFIG_X86_NUMAQ
 obj-y		+= numa.o
 else

@@ -11,8 +13,15 @@
 ifdef	CONFIG_ACPI_PCI
 obj-y		+= acpi.o
 endif
-obj-y		+= legacy.o
 
+ifndef	CONFIG_X86_VISWS
+obj-y		+= legacy.o
+endif
 
 endif		# CONFIG_X86_NUMAQ
-obj-y		+= irq.o common.o
+
+ifndef	CONFIG_X86_VISWS
+obj-y		+= irq.o
+endif
+
+obj-y		+= common.o
arch/i386/pci/common.c +10 -7
diff -urN -X /usr/share/dontdiff linux-2.5.60.vanilla/arch/i386/pci/common.c linux-2.5.60/arch/i386/pci/common.c
@@ -180,13 +180,8 @@
 		return NULL;
 	}
 #endif
-	else if (!strcmp(str, "rom")) {
-		pci_probe |= PCI_ASSIGN_ROMS;
-		return NULL;
-	} else if (!strcmp(str, "assign-busses")) {
-		pci_probe |= PCI_ASSIGN_ALL_BUSSES;
-		return NULL;
-	} else if (!strcmp(str, "usepirqmask")) {
+#ifndef CONFIG_X86_VISWS
+	else if (!strcmp(str, "usepirqmask")) {
 		pci_probe |= PCI_USE_PIRQ_MASK;
 		return NULL;
 	} else if (!strncmp(str, "irqmask=", 8)) {

@@ -194,6 +189,14 @@
 		return NULL;
 	} else if (!strncmp(str, "lastbus=", 8)) {
 		pcibios_last_bus = simple_strtol(str+8, NULL, 0);
+		return NULL;
+	}
+#endif
+	else if (!strcmp(str, "rom")) {
+		pci_probe |= PCI_ASSIGN_ROMS;
+		return NULL;
+	} else if (!strcmp(str, "assign-busses")) {
+		pci_probe |= PCI_ASSIGN_ALL_BUSSES;
 		return NULL;
 	}
 	return str;
arch/i386/pci/direct.c +1 -1
diff -urN -X /usr/share/dontdiff linux-2.5.60.vanilla/arch/i386/pci/direct.c linux-2.5.60/arch/i386/pci/direct.c
@@ -83,7 +83,7 @@
 		PCI_FUNC(devfn), where, size, value);
 }
 
-static struct pci_ops pci_direct_conf1 = {
+struct pci_ops pci_direct_conf1 = {
 	.read =		pci_conf1_read,
 	.write =	pci_conf1_write,
 };
arch/i386/pci/visws.c +110 -0

110 lines not on this page · raw message

drivers/pci/Makefile +1 -0
diff -urN -X /usr/share/dontdiff linux-2.5.60.vanilla/drivers/pci/Makefile linux-2.5.60/drivers/pci/Makefile
@@ -22,6 +22,7 @@
 obj-$(CONFIG_PPC32) += setup-irq.o
 obj-$(CONFIG_DDB5476) += setup-bus.o
 obj-$(CONFIG_SGI_IP27) += setup-irq.o
+obj-$(CONFIG_X86_VISWS) += setup-irq.o
 
 # CompactPCI hotplug requires the pbus_* functions
 ifdef CONFIG_HOTPLUG_PCI_CPCI