Attachment 269781 Details for Bug 396701 – hack: PCI domains

[patch] hack: PCI domains

pci-domains-2.6.23.9.hack.patch (text/plain), 2.83 KB, created by Michal Schmidt on 2007-11-27 15:04:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Schmidt

Created: 2007-11-27 15:04:21 UTC

Size: 2.83 KB

patch

obsolete

>diff -Nurp -X linux/Documentation/dontdiff linux.orig/arch/i386/pci/acpi.c linux/arch/i386/pci/acpi.c
>--- linux.orig/arch/i386/pci/acpi.c	2007-11-26 12:51:43.000000000 -0500
>+++ linux/arch/i386/pci/acpi.c	2007-11-27 08:52:18.000000000 -0500
>@@ -21,12 +21,7 @@ struct pci_bus * __devinit pci_acpi_scan
> 		return NULL;
> 	}
> 
>-	if (domain != 0) {
>-		printk(KERN_WARNING "PCI: Multiple domains not supported\n");
>-		kfree(sd);
>-		return NULL;
>-	}
>-
>+	sd->domain = domain;
> 	sd->node = -1;
> 
> 	pxm = acpi_get_pxm(device->handle);
>diff -Nurp -X linux/Documentation/dontdiff linux.orig/arch/i386/pci/common.c linux/arch/i386/pci/common.c
>--- linux.orig/arch/i386/pci/common.c	2007-11-26 12:51:43.000000000 -0500
>+++ linux/arch/i386/pci/common.c	2007-11-27 08:53:36.000000000 -0500
>@@ -29,12 +29,14 @@ struct pci_raw_ops *raw_pci_ops;
> 
> static int pci_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *value)
> {
>-	return raw_pci_ops->read(0, bus->number, devfn, where, size, value);
>+	return raw_pci_ops->read(pci_domain_nr(bus), bus->number,
>+				 devfn, where, size, value);
> }
> 
> static int pci_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 value)
> {
>-	return raw_pci_ops->write(0, bus->number, devfn, where, size, value);
>+	return raw_pci_ops->write(pci_domain_nr(bus), bus->number,
>+				  devfn, where, size, value);
> }
> 
> struct pci_ops pci_root_ops = {
>diff -Nurp -X linux/Documentation/dontdiff linux.orig/include/asm-x86_64/pci.h linux/include/asm-x86_64/pci.h
>--- linux.orig/include/asm-x86_64/pci.h	2007-11-26 12:51:43.000000000 -0500
>+++ linux/include/asm-x86_64/pci.h	2007-11-27 08:55:16.000000000 -0500
>@@ -6,12 +6,24 @@
> #ifdef __KERNEL__
> 
> struct pci_sysdata {
>+	int		domain;		/* PCI domain */
> 	int		node;		/* NUMA node */
> 	void*		iommu;		/* IOMMU private data */
> };
> 
> extern struct pci_bus *pci_scan_bus_with_sysdata(int busno);
> 
>+static inline int pci_domain_nr(struct pci_bus *bus)
>+{
>+	struct pci_sysdata *sd = bus->sysdata;
>+	return sd->domain;
>+}
>+
>+static inline int pci_proc_domain(struct pci_bus *bus)
>+{
>+	return pci_domain_nr(bus);
>+}
>+
> #ifdef CONFIG_CALGARY_IOMMU
> static inline void* pci_iommu(struct pci_bus *bus)
> {
>diff -Nurp -X linux/Documentation/dontdiff linux.orig/include/linux/pci.h linux/include/linux/pci.h
>--- linux.orig/include/linux/pci.h	2007-11-26 12:51:43.000000000 -0500
>+++ linux/include/linux/pci.h	2007-11-27 08:57:01.000000000 -0500
>@@ -680,6 +680,7 @@ void ht_destroy_irq(unsigned int irq);
> extern void pci_block_user_cfg_access(struct pci_dev *dev);
> extern void pci_unblock_user_cfg_access(struct pci_dev *dev);
> 
>+#if 0
> /*
>  * PCI domain support.  Sometimes called PCI segment (eg by ACPI),
>  * a PCI domain is defined to be a set of PCI busses which share
>@@ -692,6 +693,7 @@ static inline int pci_proc_domain(struct
> 	return 0;
> }
> #endif
>+#endif
> 
> #else /* CONFIG_PCI is not enabled */
>

Actions: View | Diff

Attachments on bug 396701: 269781 | 269891