diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-21 11:34:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-21 11:34:09 -0700 |
| commit | 22b41dd0ee0eedc4cc950b64185a8579763ce4ce (patch) | |
| tree | 2ab52d7c7bd2427bdcaab5220d0226704fc4f295 /pci | |
| parent | 47fc8ed39343700b4bedc64121982f217695a5f6 (diff) | |
| download | patches-22b41dd0ee0eedc4cc950b64185a8579763ce4ce.tar.gz | |
refresh to 2.6.17-git2
Diffstat (limited to 'pci')
18 files changed, 69 insertions, 843 deletions
diff --git a/pci/64bit-resource-c99-changes-for-struct-resource-declarations.patch b/pci/64bit-resource-c99-changes-for-struct-resource-declarations.patch index 1922ae3bb4c52..3ef7dd562401f 100644 --- a/pci/64bit-resource-c99-changes-for-struct-resource-declarations.patch +++ b/pci/64bit-resource-c99-changes-for-struct-resource-declarations.patch @@ -13,25 +13,9 @@ Cc: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - arch/arm/kernel/setup.c | 42 ++++++++- - arch/mips/au1000/common/pci.c | 16 +-- - arch/mips/cobalt/setup.c | 41 +++++++-- - arch/mips/ddb5xxx/ddb5476/setup.c | 37 ++++++-- - arch/mips/ite-boards/generic/it8172_setup.c | 74 +++++++++++++--- - arch/mips/jmr3927/rbhma3100/setup.c | 59 ++++++++++--- - arch/mips/pci/ops-it8172.c | 34 +++---- - arch/mips/pci/pci-ddb5074.c | 16 +-- - arch/mips/pci/pci-ddb5476.c | 16 +-- - arch/mips/pci/pci-ddb5477.c | 32 +++---- - arch/mips/pci/pci-jmr3927.c | 16 +-- - arch/mips/pci/pci-ocelot.c | 8 - - arch/mips/pci/pci-yosemite.c | 10 +- - arch/mips/philips/pnx8550/common/pci.c | 16 +-- - arch/mips/philips/pnx8550/common/setup.c | 25 ++++- - arch/mips/sni/setup.c | 126 +++++++++++++++++++++++----- - arch/mips/tx4938/toshiba_rbtx4938/setup.c | 5 - - drivers/video/console/vgacon.c | 12 +- - 18 files changed, 430 insertions(+), 155 deletions(-) + arch/arm/kernel/setup.c | 42 +++++++++++++++++++++++++++++++++++------ + drivers/video/console/vgacon.c | 12 +++++------ + 2 files changed, 42 insertions(+), 12 deletions(-) --- gregkh-2.6.orig/arch/arm/kernel/setup.c +++ gregkh-2.6/arch/arm/kernel/setup.c @@ -91,752 +75,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; #define lp0 io_res[0] ---- gregkh-2.6.orig/arch/mips/au1000/common/pci.c -+++ gregkh-2.6/arch/mips/au1000/common/pci.c -@@ -40,17 +40,17 @@ - - /* TBD */ - static struct resource pci_io_resource = { -- "pci IO space", -- (u32)PCI_IO_START, -- (u32)PCI_IO_END, -- IORESOURCE_IO -+ .start = PCI_IO_START, -+ .end = PCI_IO_END, -+ .name = "PCI IO space", -+ .flags = IORESOURCE_IO - }; - - static struct resource pci_mem_resource = { -- "pci memory space", -- (u32)PCI_MEM_START, -- (u32)PCI_MEM_END, -- IORESOURCE_MEM -+ .start = PCI_MEM_START, -+ .end = PCI_MEM_END, -+ .name = "PCI memory space", -+ .flags = IORESOURCE_MEM - }; - - extern struct pci_ops au1x_pci_ops; ---- gregkh-2.6.orig/arch/mips/cobalt/setup.c -+++ gregkh-2.6/arch/mips/cobalt/setup.c -@@ -68,19 +68,46 @@ static void __init cobalt_timer_setup(st - extern struct pci_ops gt64111_pci_ops; - - static struct resource cobalt_mem_resource = { -- "PCI memory", GT64111_MEM_BASE, GT64111_MEM_END, IORESOURCE_MEM -+ .start = GT64111_MEM_BASE, -+ .end = GT64111_MEM_END, -+ .name = "PCI memory", -+ .flags = IORESOURCE_MEM - }; - - static struct resource cobalt_io_resource = { -- "PCI I/O", 0x1000, 0xffff, IORESOURCE_IO -+ .start = 0x1000, -+ .end = 0xffff, -+ .name = "PCI I/O", -+ .flags = IORESOURCE_IO - }; - - static struct resource cobalt_io_resources[] = { -- { "dma1", 0x00, 0x1f, IORESOURCE_BUSY }, -- { "timer", 0x40, 0x5f, IORESOURCE_BUSY }, -- { "keyboard", 0x60, 0x6f, IORESOURCE_BUSY }, -- { "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY }, -- { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY }, -+ { -+ .start = 0x00, -+ .end = 0x1f, -+ .name = "dma1", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x40, -+ .end = 0x5f, -+ .name = "timer", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x60, -+ .end = 0x6f, -+ .name = "keyboard", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x80, -+ .end = 0x8f, -+ .name = "dma page reg", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0xc0, -+ .end = 0xdf, -+ .name = "dma2", -+ .flags = IORESOURCE_BUSY -+ }, - }; - - #define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource)) ---- gregkh-2.6.orig/arch/mips/ddb5xxx/ddb5476/setup.c -+++ gregkh-2.6/arch/mips/ddb5xxx/ddb5476/setup.c -@@ -109,17 +109,42 @@ static struct { - struct resource dma2; - } ddb5476_ioport = { - { -- "dma1", 0x00, 0x1f, IORESOURCE_BUSY}, { -- "timer", 0x40, 0x5f, IORESOURCE_BUSY}, { -- "rtc", 0x70, 0x7f, IORESOURCE_BUSY}, { -- "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY}, { -- "dma2", 0xc0, 0xdf, IORESOURCE_BUSY} -+ .start = 0x00, -+ .end = 0x1f, -+ .name = "dma1", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x40, -+ .end = 0x5f, -+ .name = "timer", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x70, -+ .end = 0x7f, -+ .name = "rtc", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x80, -+ .end = 0x8f, -+ .name = "dma page reg", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0xc0, -+ .end = 0xdf, -+ .name = "dma2", -+ .flags = IORESOURCE_BUSY -+ } - }; - - static struct { - struct resource nile4; - } ddb5476_iomem = { -- { "Nile 4", DDB_BASE, DDB_BASE + DDB_SIZE - 1, IORESOURCE_BUSY} -+ { -+ .start = DDB_BASE, -+ .end = DDB_BASE + DDB_SIZE - 1, -+ .name = "Nile 4", -+ .flags = IORESOURCE_BUSY -+ } - }; - - ---- gregkh-2.6.orig/arch/mips/ite-boards/generic/it8172_setup.c -+++ gregkh-2.6/arch/mips/ite-boards/generic/it8172_setup.c -@@ -72,11 +72,29 @@ struct { - struct resource flash; - struct resource boot; - } it8172_resources = { -- { "RAM", 0, 0, IORESOURCE_MEM }, /* to be initted */ -- { "PCI Mem", 0x10000000, 0x13FFFFFF, IORESOURCE_MEM }, -- { "PCI I/O", 0x14000000, 0x17FFFFFF }, -- { "Flash", 0x08000000, 0x0CFFFFFF }, -- { "Boot ROM", 0x1FC00000, 0x1FFFFFFF } -+ { -+ .start = 0, /* to be initted */ -+ .end = 0, -+ .name = "RAM", -+ .flags = IORESOURCE_MEM -+ }, { -+ .start = 0x10000000, -+ .end = 0x13FFFFFF, -+ .name = "PCI Mem", -+ .flags = IORESOURCE_MEM -+ }, { -+ .start = 0x14000000, -+ .end = 0x17FFFFFF -+ .name = "PCI I/O", -+ }, { -+ .start = 0x08000000, -+ .end = 0x0CFFFFFF -+ .name = "Flash", -+ }, { -+ .start = 0x1FC00000, -+ .end = 0x1FFFFFFF -+ .name = "Boot ROM", -+ } - }; - #else - struct { -@@ -89,14 +107,44 @@ struct { - struct resource flash; - struct resource boot; - } it8172_resources = { -- { "RAM", 0, 0, IORESOURCE_MEM }, /* to be initted */ -- { "PCI Mem0", 0x0C000000, 0x0FFFFFFF, IORESOURCE_MEM }, -- { "PCI Mem1", 0x10000000, 0x13FFFFFF, IORESOURCE_MEM }, -- { "PCI I/O", 0x14000000, 0x17FFFFFF }, -- { "PCI Mem2", 0x1A000000, 0x1BFFFFFF, IORESOURCE_MEM }, -- { "PCI Mem3", 0x1C000000, 0x1FBFFFFF, IORESOURCE_MEM }, -- { "Flash", 0x08000000, 0x0CFFFFFF }, -- { "Boot ROM", 0x1FC00000, 0x1FFFFFFF } -+ { -+ .start = 0, /* to be initted */ -+ .end = 0, -+ .name = "RAM", -+ .flags = IORESOURCE_MEM -+ }, { -+ .start = 0x0C000000, -+ .end = 0x0FFFFFFF, -+ .name = "PCI Mem0", -+ .flags = IORESOURCE_MEM -+ }, { -+ .start = 0x10000000, -+ .end = 0x13FFFFFF, -+ .name = "PCI Mem1", -+ .flags = IORESOURCE_MEM -+ }, { -+ .start = 0x14000000, -+ .end = 0x17FFFFFF -+ .name = "PCI I/O", -+ }, { -+ .start = 0x1A000000, -+ .end = 0x1BFFFFFF, -+ .name = "PCI Mem2", -+ .flags = IORESOURCE_MEM -+ }, { -+ .start = 0x1C000000, -+ .end = 0x1FBFFFFF, -+ .name = "PCI Mem3", -+ .flags = IORESOURCE_MEM -+ }, { -+ .start = 0x08000000, -+ .end = 0x0CFFFFFF -+ .name = "Flash", -+ }, { -+ .start = 0x1FC00000, -+ .end = 0x1FFFFFFF -+ .name = "Boot ROM", -+ } - }; - #endif - ---- gregkh-2.6.orig/arch/mips/jmr3927/rbhma3100/setup.c -+++ gregkh-2.6/arch/mips/jmr3927/rbhma3100/setup.c -@@ -82,17 +82,54 @@ struct { - struct resource sio0; - struct resource sio1; - } jmr3927_resources = { -- { "RAM0", 0, 0x01FFFFFF, IORESOURCE_MEM }, -- { "RAM1", 0x02000000, 0x03FFFFFF, IORESOURCE_MEM }, -- { "PCIMEM", 0x08000000, 0x07FFFFFF, IORESOURCE_MEM }, -- { "IOB", 0x10000000, 0x13FFFFFF }, -- { "IOC", 0x14000000, 0x14FFFFFF }, -- { "PCIIO", 0x15000000, 0x15FFFFFF }, -- { "JMY1394", 0x1D000000, 0x1D3FFFFF }, -- { "ROM1", 0x1E000000, 0x1E3FFFFF }, -- { "ROM0", 0x1FC00000, 0x1FFFFFFF }, -- { "SIO0", 0xFFFEF300, 0xFFFEF3FF }, -- { "SIO1", 0xFFFEF400, 0xFFFEF4FF }, -+ { -+ .start = 0, -+ .end = 0x01FFFFFF, -+ .name = "RAM0", -+ .flags = IORESOURCE_MEM -+ }, { -+ .start = 0x02000000, -+ .end = 0x03FFFFFF, -+ .name = "RAM1", -+ .flags = IORESOURCE_MEM -+ }, { -+ .start = 0x08000000, -+ .end = 0x07FFFFFF, -+ .name = "PCIMEM", -+ .flags = IORESOURCE_MEM -+ }, { -+ .start = 0x10000000, -+ .end = 0x13FFFFFF, -+ .name = "IOB" -+ }, { -+ .start = 0x14000000, -+ .end = 0x14FFFFFF, -+ .name = "IOC" -+ }, { -+ .start = 0x15000000, -+ .end = 0x15FFFFFF, -+ .name = "PCIIO" -+ }, { -+ .start = 0x1D000000, -+ .end = 0x1D3FFFFF, -+ .name = "JMY1394" -+ }, { -+ .start = 0x1E000000, -+ .end = 0x1E3FFFFF, -+ .name = "ROM1" -+ }, { -+ .start = 0x1FC00000, -+ .end = 0x1FFFFFFF, -+ .name = "ROM0" -+ }, { -+ .start = 0xFFFEF300, -+ .end = 0xFFFEF3FF, -+ .name = "SIO0" -+ }, { -+ .start = 0xFFFEF400, -+ .end = 0xFFFEF4FF, -+ .name = "SIO1" -+ }, - }; - - /* don't enable - see errata */ ---- gregkh-2.6.orig/arch/mips/pci/ops-it8172.c -+++ gregkh-2.6/arch/mips/pci/ops-it8172.c -@@ -50,30 +50,28 @@ - static struct resource pci_mem_resource_1; - - static struct resource pci_io_resource = { -- "io pci IO space", -- 0x14018000, -- 0x17FFFFFF, -- IORESOURCE_IO -+ .start = 0x14018000, -+ .end = 0x17FFFFFF, -+ .name = "io pci IO space", -+ .flags = IORESOURCE_IO - }; - - static struct resource pci_mem_resource_0 = { -- "ext pci memory space 0/1", -- 0x10101000, -- 0x13FFFFFF, -- IORESOURCE_MEM, -- &pci_mem_resource_0, -- NULL, -- &pci_mem_resource_1 -+ .start = 0x10101000, -+ .end = 0x13FFFFFF, -+ .name = "ext pci memory space 0/1", -+ .flags = IORESOURCE_MEM, -+ .parent = &pci_mem_resource_0, -+ .sibling = NULL, -+ .child = &pci_mem_resource_1 - }; - - static struct resource pci_mem_resource_1 = { -- "ext pci memory space 2/3", -- 0x1A000000, -- 0x1FBFFFFF, -- IORESOURCE_MEM, -- &pci_mem_resource_0, -- NULL, -- NULL -+ .start = 0x1A000000, -+ .end = 0x1FBFFFFF, -+ .name = "ext pci memory space 2/3", -+ .flags = IORESOURCE_MEM, -+ .parent = &pci_mem_resource_0 - }; - - extern struct pci_ops it8172_pci_ops; ---- gregkh-2.6.orig/arch/mips/pci/pci-ddb5074.c -+++ gregkh-2.6/arch/mips/pci/pci-ddb5074.c -@@ -8,17 +8,17 @@ - #include <asm/ddb5xxx/ddb5xxx.h> - - static struct resource extpci_io_resource = { -- "pci IO space", -- 0x1000, /* leave some room for ISA bus */ -- DDB_PCI_IO_SIZE - 1, -- IORESOURCE_IO -+ .start = 0x1000, /* leave some room for ISA bus */ -+ .end = DDB_PCI_IO_SIZE - 1, -+ .name = "pci IO space", -+ .flags = IORESOURCE_IO - }; - - static struct resource extpci_mem_resource = { -- "pci memory space", -- DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */ -- DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1, -- IORESOURCE_MEM -+ .start = DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */ -+ .end = DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1, -+ .name = "pci memory space", -+ .flags = IORESOURCE_MEM - }; - - extern struct pci_ops ddb5476_ext_pci_ops; ---- gregkh-2.6.orig/arch/mips/pci/pci-ddb5476.c -+++ gregkh-2.6/arch/mips/pci/pci-ddb5476.c -@@ -8,17 +8,17 @@ - #include <asm/ddb5xxx/ddb5xxx.h> - - static struct resource extpci_io_resource = { -- "pci IO space", -- 0x1000, /* leave some room for ISA bus */ -- DDB_PCI_IO_SIZE - 1, -- IORESOURCE_IO -+ .start = 0x1000, /* leave some room for ISA bus */ -+ .end = DDB_PCI_IO_SIZE - 1, -+ .name = "pci IO space", -+ .flags = IORESOURCE_IO - }; - - static struct resource extpci_mem_resource = { -- "pci memory space", -- DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */ -- DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1, -- IORESOURCE_MEM -+ .start = DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */ -+ .end = DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1, -+ .name = "pci memory space", -+ .flags = IORESOURCE_MEM - }; - - extern struct pci_ops ddb5476_ext_pci_ops; ---- gregkh-2.6.orig/arch/mips/pci/pci-ddb5477.c -+++ gregkh-2.6/arch/mips/pci/pci-ddb5477.c -@@ -22,31 +22,31 @@ - #include <asm/ddb5xxx/ddb5xxx.h> - - static struct resource extpci_io_resource = { -- "ext pci IO space", -- DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000, -- DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1, -- IORESOURCE_IO -+ .start = DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000, -+ .end = DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1, -+ .name = "ext pci IO space", -+ .flags = IORESOURCE_IO - }; - - static struct resource extpci_mem_resource = { -- "ext pci memory space", -- DDB_PCI0_MEM_BASE + 0x100000, -- DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1, -- IORESOURCE_MEM -+ .start = DDB_PCI0_MEM_BASE + 0x100000, -+ .end = DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1, -+ .name = "ext pci memory space", -+ .flags = IORESOURCE_MEM - }; - - static struct resource iopci_io_resource = { -- "io pci IO space", -- DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE, -- DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1, -- IORESOURCE_IO -+ .start = DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE, -+ .end = DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1, -+ .name = "io pci IO space", -+ .flags = IORESOURCE_IO - }; - - static struct resource iopci_mem_resource = { -- "ext pci memory space", -- DDB_PCI1_MEM_BASE, -- DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1, -- IORESOURCE_MEM -+ .start = DDB_PCI1_MEM_BASE, -+ .end = DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1, -+ .name = "ext pci memory space", -+ .flags = IORESOURCE_MEM - }; - - extern struct pci_ops ddb5477_ext_pci_ops; ---- gregkh-2.6.orig/arch/mips/pci/pci-jmr3927.c -+++ gregkh-2.6/arch/mips/pci/pci-jmr3927.c -@@ -35,17 +35,17 @@ - #include <asm/debug.h> - - struct resource pci_io_resource = { -- "IO MEM", -- 0x1000, /* reserve regacy I/O space */ -- 0x1000 + JMR3927_PCIIO_SIZE - 1, -- IORESOURCE_IO -+ .name = "IO MEM", -+ .start = 0x1000, /* reserve regacy I/O space */ -+ .end = 0x1000 + JMR3927_PCIIO_SIZE - 1, -+ .flags = IORESOURCE_IO - }; - - struct resource pci_mem_resource = { -- "PCI MEM", -- JMR3927_PCIMEM, -- JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1, -- IORESOURCE_MEM -+ .name = "PCI MEM", -+ .start = JMR3927_PCIMEM, -+ .end = JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1, -+ .flags = IORESOURCE_MEM - }; - - extern struct pci_ops jmr3927_pci_ops; ---- gregkh-2.6.orig/arch/mips/pci/pci-ocelot.c -+++ gregkh-2.6/arch/mips/pci/pci-ocelot.c -@@ -71,13 +71,13 @@ static inline void pci0WriteConfigReg(un - } - - static struct resource ocelot_mem_resource = { -- iomem_resource.start = GT_PCI_MEM_BASE; -- iomem_resource.end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1; -+ start = GT_PCI_MEM_BASE; -+ end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1; - }; - - static struct resource ocelot_io_resource = { -- ioport_resource.start = GT_PCI_IO_BASE; -- ioport_resource.end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1; -+ start = GT_PCI_IO_BASE; -+ end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1; - }; - - static struct pci_controller ocelot_pci_controller = { ---- gregkh-2.6.orig/arch/mips/pci/pci-yosemite.c -+++ gregkh-2.6/arch/mips/pci/pci-yosemite.c -@@ -14,7 +14,10 @@ - extern struct pci_ops titan_pci_ops; - - static struct resource py_mem_resource = { -- "Titan PCI MEM", 0xe0000000UL, 0xe3ffffffUL, IORESOURCE_MEM -+ .start = 0xe0000000UL, -+ .end = 0xe3ffffffUL, -+ .name = "Titan PCI MEM", -+ .flags = IORESOURCE_MEM - }; - - /* -@@ -26,7 +29,10 @@ static struct resource py_mem_resource = - #define TITAN_IO_BASE 0xe8000000UL - - static struct resource py_io_resource = { -- "Titan IO MEM", 0x00001000UL, TITAN_IO_SIZE - 1, IORESOURCE_IO, -+ .start = 0x00001000UL, -+ .end = TITAN_IO_SIZE - 1, -+ .name = "Titan IO MEM", -+ .flags = IORESOURCE_IO, - }; - - static struct pci_controller py_controller = { ---- gregkh-2.6.orig/arch/mips/philips/pnx8550/common/pci.c -+++ gregkh-2.6/arch/mips/philips/pnx8550/common/pci.c -@@ -27,17 +27,17 @@ - #include <nand.h> - - static struct resource pci_io_resource = { -- "pci IO space", -- (u32)(PNX8550_PCIIO + 0x1000), /* reserve regacy I/O space */ -- (u32)(PNX8550_PCIIO + PNX8550_PCIIO_SIZE), -- IORESOURCE_IO -+ .start = PNX8550_PCIIO + 0x1000, /* reserve regacy I/O space */ -+ .end = PNX8550_PCIIO + PNX8550_PCIIO_SIZE, -+ .name = "pci IO space", -+ .flags = IORESOURCE_IO - }; - - static struct resource pci_mem_resource = { -- "pci memory space", -- (u32)(PNX8550_PCIMEM), -- (u32)(PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1), -- IORESOURCE_MEM -+ .start = PNX8550_PCIMEM, -+ .end = PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1, -+ .name = "pci memory space", -+ .flags = IORESOURCE_MEM - }; - - extern struct pci_ops pnx8550_pci_ops; ---- gregkh-2.6.orig/arch/mips/philips/pnx8550/common/setup.c -+++ gregkh-2.6/arch/mips/philips/pnx8550/common/setup.c -@@ -58,10 +58,27 @@ extern void prom_printf(char *fmt, ...); - extern char *prom_getcmdline(void); - - struct resource standard_io_resources[] = { -- {"dma1", 0x00, 0x1f, IORESOURCE_BUSY}, -- {"timer", 0x40, 0x5f, IORESOURCE_BUSY}, -- {"dma page reg", 0x80, 0x8f, IORESOURCE_BUSY}, -- {"dma2", 0xc0, 0xdf, IORESOURCE_BUSY}, -+ { -+ .start = .0x00, -+ .end = 0x1f, -+ .name = "dma1", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x40, -+ .end = 0x5f, -+ .name = "timer", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x80, -+ .end = 0x8f, -+ .name = "dma page reg", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0xc0, -+ .end = 0xdf, -+ .name = "dma2", -+ .flags = IORESOURCE_BUSY -+ }, - }; - - #define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource)) ---- gregkh-2.6.orig/arch/mips/sni/setup.c -+++ gregkh-2.6/arch/mips/sni/setup.c -@@ -92,20 +92,51 @@ static void __init sni_display_setup(voi - } - - static struct resource sni_io_resource = { -- "PCIMT IO MEM", 0x00001000UL, 0x03bfffffUL, IORESOURCE_IO, -+ .start = 0x00001000UL, -+ .end = 0x03bfffffUL, -+ .name = "PCIMT IO MEM", -+ .flags = IORESOURCE_IO, - }; - - static struct resource pcimt_io_resources[] = { -- { "dma1", 0x00, 0x1f, IORESOURCE_BUSY }, -- { "timer", 0x40, 0x5f, IORESOURCE_BUSY }, -- { "keyboard", 0x60, 0x6f, IORESOURCE_BUSY }, -- { "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY }, -- { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY }, -- { "PCI config data", 0xcfc, 0xcff, IORESOURCE_BUSY } -+ { -+ .start = 0x00, -+ .end = 0x1f, -+ .name = "dma1", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x40, -+ .end = 0x5f, -+ .name = "timer", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x60, -+ .end = 0x6f, -+ .name = "keyboard", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x80, -+ .end = 0x8f, -+ .name = "dma page reg", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0xc0, -+ .end = 0xdf, -+ .name = "dma2", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0xcfc, -+ .end = 0xcff, -+ .name = "PCI config data", -+ .flags = IORESOURCE_BUSY -+ } - }; - - static struct resource sni_mem_resource = { -- "PCIMT PCI MEM", 0x10000000UL, 0xffffffffUL, IORESOURCE_MEM -+ .start = 0x10000000UL, -+ .end = 0xffffffffUL, -+ .name = "PCIMT PCI MEM", -+ .flags = IORESOURCE_MEM - }; - - /* -@@ -122,19 +153,72 @@ static struct resource sni_mem_resource - * 0xa0000000 - 0xffffffff (1.5GB) PCI/EISA Bus Memory - */ - static struct resource pcimt_mem_resources[] = { -- { "Video RAM area", 0x100a0000, 0x100bffff, IORESOURCE_BUSY }, -- { "ISA Reserved", 0x100c0000, 0x100fffff, IORESOURCE_BUSY }, -- { "PCI IO", 0x14000000, 0x17bfffff, IORESOURCE_BUSY }, -- { "Cache Replacement Area", 0x17c00000, 0x17ffffff, IORESOURCE_BUSY}, -- { "PCI INT Acknowledge", 0x1a000000, 0x1a000003, IORESOURCE_BUSY }, -- { "Boot PROM", 0x1fc00000, 0x1fc7ffff, IORESOURCE_BUSY}, -- { "Diag PROM", 0x1fc80000, 0x1fcfffff, IORESOURCE_BUSY}, -- { "X-Bus", 0x1fd00000, 0x1fdfffff, IORESOURCE_BUSY}, -- { "BIOS map", 0x1fe00000, 0x1fefffff, IORESOURCE_BUSY}, -- { "NVRAM / EEPROM", 0x1ff00000, 0x1ff7ffff, IORESOURCE_BUSY}, -- { "ASIC PCI", 0x1fff0000, 0x1fffefff, IORESOURCE_BUSY}, -- { "MP Agent", 0x1ffff000, 0x1fffffff, IORESOURCE_BUSY}, -- { "Main Memory", 0x20000000, 0x9fffffff, IORESOURCE_BUSY} -+ { -+ .start = 0x100a0000, -+ .end = 0x100bffff, -+ .name = "Video RAM area", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x100c0000, -+ .end = 0x100fffff, -+ .name = "ISA Reserved", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x14000000, -+ .end = 0x17bfffff, -+ .name = "PCI IO", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x17c00000, -+ .end = 0x17ffffff, -+ .name = "Cache Replacement Area", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x1a000000, -+ .end = 0x1a000003, -+ .name = "PCI INT Acknowledge", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x1fc00000, -+ .end = 0x1fc7ffff, -+ .name = "Boot PROM", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x1fc80000, -+ .end = 0x1fcfffff, -+ .name = "Diag PROM", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x1fd00000, -+ .end = 0x1fdfffff, -+ .name = "X-Bus", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x1fe00000, -+ .end = 0x1fefffff, -+ .name = "BIOS map", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x1ff00000, -+ .end = 0x1ff7ffff, -+ .name = "NVRAM / EEPROM", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x1fff0000, -+ .end = 0x1fffefff, -+ .name = "ASIC PCI", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x1ffff000, -+ .end = 0x1fffffff, -+ .name = "MP Agent", -+ .flags = IORESOURCE_BUSY -+ }, { -+ .start = 0x20000000, -+ .end = 0x9fffffff, -+ .name = "Main Memory", -+ .flags = IORESOURCE_BUSY -+ } - }; - - static void __init sni_resource_init(void) ---- gregkh-2.6.orig/arch/mips/tx4938/toshiba_rbtx4938/setup.c -+++ gregkh-2.6/arch/mips/tx4938/toshiba_rbtx4938/setup.c -@@ -664,7 +664,10 @@ static struct resource rbtx4938_fpga_res - - static char pcode_str[8]; - static struct resource tx4938_reg_resource = { -- pcode_str, TX4938_REG_BASE, TX4938_REG_BASE+TX4938_REG_SIZE, IORESOURCE_MEM -+ .start = TX4938_REG_BASE, -+ .end = TX4938_REG_BASE + TX4938_REG_SIZE, -+ .name = pcode_str, -+ .flags = IORESOURCE_MEM - }; - - void __init tx4938_board_setup(void) --- gregkh-2.6.orig/drivers/video/console/vgacon.c +++ gregkh-2.6/drivers/video/console/vgacon.c @@ -389,7 +389,7 @@ static const char __init *vgacon_startup diff --git a/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch b/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch index 620192f2a18bb..6645c0563e77b 100644 --- a/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch +++ b/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch @@ -380,7 +380,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/sparc64/kernel/pci.c +++ gregkh-2.6/arch/sparc64/kernel/pci.c -@@ -390,7 +390,7 @@ void pcibios_update_irq(struct pci_dev * +@@ -360,7 +360,7 @@ void pcibios_update_irq(struct pci_dev * } void pcibios_align_resource(void *data, struct resource *res, @@ -593,7 +593,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif /* __KERNEL__ */ --- gregkh-2.6.orig/include/linux/pci.h +++ gregkh-2.6/include/linux/pci.h -@@ -402,8 +402,8 @@ int pcibios_enable_device(struct pci_dev +@@ -401,8 +401,8 @@ int pcibios_enable_device(struct pci_dev char *pcibios_setup (char *str); /* Used only when drivers/pci/setup.c is used */ @@ -618,7 +618,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void *alignf_data); void pci_enable_bridges(struct pci_bus *bus); -@@ -725,7 +725,8 @@ static inline char *pci_name(struct pci_ +@@ -726,7 +726,8 @@ static inline char *pci_name(struct pci_ */ #ifndef HAVE_ARCH_PCI_RESOURCE_TO_USER static inline void pci_resource_to_user(const struct pci_dev *dev, int bar, diff --git a/pci/64bit-resource-convert-a-few-remaining-drivers-to-use-resource_size_t-where-needed.patch b/pci/64bit-resource-convert-a-few-remaining-drivers-to-use-resource_size_t-where-needed.patch index ea4832c8c77c4..df13605e3475a 100644 --- a/pci/64bit-resource-convert-a-few-remaining-drivers-to-use-resource_size_t-where-needed.patch +++ b/pci/64bit-resource-convert-a-few-remaining-drivers-to-use-resource_size_t-where-needed.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/ieee1394/ohci1394.c +++ gregkh-2.6/drivers/ieee1394/ohci1394.c -@@ -3210,7 +3210,7 @@ static int __devinit ohci1394_pci_probe( +@@ -3217,7 +3217,7 @@ static int __devinit ohci1394_pci_probe( { struct hpsb_host *host; struct ti_ohci *ohci; /* shortcut to currently handled device */ diff --git a/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch b/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch index d82154d7da790..c971afaa95331 100644 --- a/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch +++ b/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/arm/Kconfig +++ gregkh-2.6/arch/arm/Kconfig -@@ -518,6 +518,13 @@ config NODES_SHIFT +@@ -531,6 +531,13 @@ config NODES_SHIFT source "mm/Kconfig" @@ -164,7 +164,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> config ISA_DMA_API --- gregkh-2.6.orig/arch/mips/Kconfig +++ gregkh-2.6/arch/mips/Kconfig -@@ -1653,6 +1653,14 @@ config NR_CPUS +@@ -1784,6 +1784,14 @@ config HZ source "kernel/Kconfig.preempt" @@ -312,7 +312,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> menu "Platform options" --- gregkh-2.6.orig/include/linux/types.h +++ gregkh-2.6/include/linux/types.h -@@ -179,9 +179,14 @@ typedef __u64 __bitwise __be64; +@@ -178,9 +178,14 @@ typedef __u64 __bitwise __be64; #ifdef __KERNEL__ typedef unsigned __bitwise__ gfp_t; diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch index 1c638511c2914..bcad2506fcf41 100644 --- a/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch +++ b/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch @@ -108,9 +108,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> boardno = ac_register_board(dev->resource[0].start, RamIO,0); --- gregkh-2.6.orig/drivers/ieee1394/ohci1394.c +++ gregkh-2.6/drivers/ieee1394/ohci1394.c -@@ -592,11 +592,11 @@ static void ohci_initialize(struct ti_oh - sprintf (irq_buf, "%s", __irq_itoa(ohci->dev->irq)); - #endif +@@ -590,11 +590,11 @@ static void ohci_initialize(struct ti_oh + buf = reg_read(ohci, OHCI1394_Version); + sprintf (irq_buf, "%d", ohci->dev->irq); PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%s] " - "MMIO=[%lx-%lx] Max Packet=[%d] IR/IT contexts=[%d/%d]", + "MMIO=[%llx-%llx] Max Packet=[%d] IR/IT contexts=[%d/%d]", @@ -123,7 +123,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ohci->max_packet_size, ohci->nb_iso_rcv_ctx, ohci->nb_iso_xmit_ctx); -@@ -3263,15 +3263,16 @@ static int __devinit ohci1394_pci_probe( +@@ -3270,15 +3270,16 @@ static int __devinit ohci1394_pci_probe( * clearly says it's 2kb, so this shouldn't be a problem. */ ohci_base = pci_resource_start(dev, 0); if (pci_resource_len(dev, 0) < OHCI1394_REGISTER_SIZE) diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch index 9d2749ab81ab9..e0eb83b971abd 100644 --- a/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch +++ b/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/net/3c59x.c +++ gregkh-2.6/drivers/net/3c59x.c -@@ -1413,8 +1413,10 @@ static int __devinit vortex_probe1(struc +@@ -1408,8 +1408,10 @@ static int __devinit vortex_probe1(struc } if (print_info) { @@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/net/skge.c +++ gregkh-2.6/drivers/net/skge.c -@@ -3327,8 +3327,8 @@ static int __devinit skge_probe(struct p +@@ -3355,8 +3355,8 @@ static int __devinit skge_probe(struct p if (err) goto err_out_free_irq; diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-pci-core-and-hotplug-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-pci-core-and-hotplug-drivers.patch index 697ad3098f09d..8bec0603581c8 100644 --- a/pci/64bit-resource-fix-up-printks-for-resources-in-pci-core-and-hotplug-drivers.patch +++ b/pci/64bit-resource-fix-up-printks-for-resources-in-pci-core-and-hotplug-drivers.patch @@ -129,7 +129,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> out += sprintf(out, "Free resources: bus numbers\n"); --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c -@@ -680,10 +680,12 @@ int pci_request_region(struct pci_dev *p +@@ -679,10 +679,12 @@ int pci_request_region(struct pci_dev *p return 0; err_out: diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-sound-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-sound-drivers.patch index 8fe1dfeb98123..f49f5af461d1c 100644 --- a/pci/64bit-resource-fix-up-printks-for-resources-in-sound-drivers.patch +++ b/pci/64bit-resource-fix-up-printks-for-resources-in-sound-drivers.patch @@ -22,8 +22,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> sound/pci/sonicvibes.c | 4 ++-- sound/ppc/pmac.c | 14 ++++++++------ sound/sparc/cs4231.c | 4 ++-- - sound/sparc/dbri.c | 5 +++-- - 11 files changed, 35 insertions(+), 26 deletions(-) + sound/sparc/dbri.c | 4 ++-- + 11 files changed, 34 insertions(+), 26 deletions(-) --- gregkh-2.6.orig/sound/arm/aaci.c +++ gregkh-2.6/sound/arm/aaci.c @@ -169,31 +169,30 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- gregkh-2.6.orig/sound/sparc/cs4231.c +++ gregkh-2.6/sound/sparc/cs4231.c -@@ -2038,10 +2038,10 @@ static int __init cs4231_sbus_attach(str +@@ -2037,10 +2037,10 @@ static int __init cs4231_sbus_attach(str if (err) return err; -- sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %s", -+ sprintf(card->longname, "%s at 0x%02lx:0x%016llx, irq %s", +- sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d", ++ sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d", card->shortname, rp->flags & 0xffL, - rp->start, + (unsigned long long)rp->start, - __irq_itoa(sdev->irqs[0])); + sdev->irqs[0]); if ((err = snd_cs4231_sbus_create(card, sdev, dev, &cp)) < 0) { --- gregkh-2.6.orig/sound/sparc/dbri.c +++ gregkh-2.6/sound/sparc/dbri.c -@@ -2645,9 +2645,10 @@ static int __init dbri_attach(int prom_n +@@ -2645,9 +2645,9 @@ static int __init dbri_attach(int prom_n strcpy(card->driver, "DBRI"); strcpy(card->shortname, "Sun DBRI"); rp = &sdev->resource[0]; -- sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %s", -+ sprintf(card->longname, "%s at 0x%02lx:0x%016llx, irq %s", +- sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d", ++ sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d", card->shortname, -- rp->flags & 0xffL, rp->start, __irq_itoa(irq.pri)); -+ rp->flags & 0xffL, (unsigned long long)rp->start, -+ __irq_itoa(irq.pri)); +- rp->flags & 0xffL, rp->start, irq.pri); ++ rp->flags & 0xffL, (unsigned long long)rp->start, irq.pri); if ((err = snd_dbri_create(card, sdev, &irq, dev)) < 0) { snd_card_free(card); diff --git a/pci/64bit-resource-introduce-resource_size_t-for-the-start-and-end-of-struct-resource.patch b/pci/64bit-resource-introduce-resource_size_t-for-the-start-and-end-of-struct-resource.patch index 94f034270ff18..b4889bfbbf2e6 100644 --- a/pci/64bit-resource-introduce-resource_size_t-for-the-start-and-end-of-struct-resource.patch +++ b/pci/64bit-resource-introduce-resource_size_t-for-the-start-and-end-of-struct-resource.patch @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; --- gregkh-2.6.orig/include/linux/types.h +++ gregkh-2.6/include/linux/types.h -@@ -178,6 +178,8 @@ typedef __u64 __bitwise __be64; +@@ -177,6 +177,8 @@ typedef __u64 __bitwise __be64; #ifdef __KERNEL__ typedef unsigned __bitwise__ gfp_t; diff --git a/pci/pci-bus-parity-status-broken-hardware-attribute-edac-foundation.patch b/pci/pci-bus-parity-status-broken-hardware-attribute-edac-foundation.patch index 157e504375523..495ac263f591e 100644 --- a/pci/pci-bus-parity-status-broken-hardware-attribute-edac-foundation.patch +++ b/pci/pci-bus-parity-status-broken-hardware-attribute-edac-foundation.patch @@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __devinit quirk_passive_release(struct pci_dev *dev) --- gregkh-2.6.orig/include/linux/pci.h +++ gregkh-2.6/include/linux/pci.h -@@ -163,6 +163,7 @@ struct pci_dev { +@@ -162,6 +162,7 @@ struct pci_dev { unsigned int is_busmaster:1; /* device is busmaster */ unsigned int no_msi:1; /* device may not use msi */ unsigned int block_ucfg_access:1; /* userspace config space access is blocked */ @@ -74,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct hlist_head saved_cap_space; --- gregkh-2.6.orig/include/linux/pci_ids.h +++ gregkh-2.6/include/linux/pci_ids.h -@@ -1940,6 +1940,7 @@ +@@ -1951,6 +1951,7 @@ #define PCI_VENDOR_ID_MELLANOX 0x15b3 #define PCI_DEVICE_ID_MELLANOX_TAVOR 0x5a44 diff --git a/pci/pci-disable-msi-mode-in-pci_disable_device.patch b/pci/pci-disable-msi-mode-in-pci_disable_device.patch index c8139b83af2e9..bf220e431d684 100644 --- a/pci/pci-disable-msi-mode-in-pci_disable_device.patch +++ b/pci/pci-disable-msi-mode-in-pci_disable_device.patch @@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c -@@ -549,7 +549,14 @@ void +@@ -548,7 +548,14 @@ void pci_disable_device(struct pci_dev *dev) { u16 pci_command; @@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pci_command &= ~PCI_COMMAND_MASTER; --- gregkh-2.6.orig/include/linux/pci.h +++ gregkh-2.6/include/linux/pci.h -@@ -164,6 +164,8 @@ struct pci_dev { +@@ -163,6 +163,8 @@ struct pci_dev { unsigned int no_msi:1; /* device may not use msi */ unsigned int block_ucfg_access:1; /* userspace config space access is blocked */ unsigned int broken_parity_status:1; /* Device generates false positive parity */ diff --git a/pci/pci-don-t-enable-device-if-already-enabled.patch b/pci/pci-don-t-enable-device-if-already-enabled.patch index acd105be6ea7f..e572ee4c23ba8 100644 --- a/pci/pci-don-t-enable-device-if-already-enabled.patch +++ b/pci/pci-don-t-enable-device-if-already-enabled.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c -@@ -521,10 +521,11 @@ pci_enable_device_bars(struct pci_dev *d +@@ -520,10 +520,11 @@ pci_enable_device_bars(struct pci_dev *d int pci_enable_device(struct pci_dev *dev) { diff --git a/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch b/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch index 047f40039b9d2..f63d2ec11a42d 100644 --- a/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch +++ b/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pci_set_master(pci_dev); --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c -@@ -504,6 +504,9 @@ pci_enable_device_bars(struct pci_dev *d +@@ -503,6 +503,9 @@ pci_enable_device_bars(struct pci_dev *d err = pcibios_enable_device(dev, bars); if (err < 0) return err; @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -521,8 +524,6 @@ pci_enable_device(struct pci_dev *dev) +@@ -520,8 +523,6 @@ pci_enable_device(struct pci_dev *dev) int err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1); if (err) return err; @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -557,6 +558,7 @@ pci_disable_device(struct pci_dev *dev) +@@ -556,6 +557,7 @@ pci_disable_device(struct pci_dev *dev) pcibios_disable_device(dev); dev->is_enabled = 0; @@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -639,6 +641,12 @@ void pci_release_region(struct pci_dev * +@@ -638,6 +640,12 @@ void pci_release_region(struct pci_dev * { if (pci_resource_len(pdev, bar) == 0) return; @@ -92,7 +92,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) release_region(pci_resource_start(pdev, bar), pci_resource_len(pdev, bar)); -@@ -665,7 +673,12 @@ int pci_request_region(struct pci_dev *p +@@ -664,7 +672,12 @@ int pci_request_region(struct pci_dev *p { if (pci_resource_len(pdev, bar) == 0) return 0; @@ -106,7 +106,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) { if (!request_region(pci_resource_start(pdev, bar), pci_resource_len(pdev, bar), res_name)) -@@ -705,7 +718,8 @@ void pci_release_regions(struct pci_dev +@@ -704,7 +717,8 @@ void pci_release_regions(struct pci_dev int i; for (i = 0; i < 6; i++) @@ -116,7 +116,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -726,13 +740,15 @@ int pci_request_regions(struct pci_dev * +@@ -725,13 +739,15 @@ int pci_request_regions(struct pci_dev * int i; for (i = 0; i < 6; i++) @@ -135,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -EBUSY; } -@@ -907,6 +923,22 @@ pci_set_consistent_dma_mask(struct pci_d +@@ -906,6 +922,22 @@ pci_set_consistent_dma_mask(struct pci_d } #endif @@ -158,7 +158,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int __devinit pci_init(void) { struct pci_dev *dev = NULL; -@@ -964,6 +996,7 @@ EXPORT_SYMBOL(pci_set_dma_mask); +@@ -963,6 +995,7 @@ EXPORT_SYMBOL(pci_set_dma_mask); EXPORT_SYMBOL(pci_set_consistent_dma_mask); EXPORT_SYMBOL(pci_assign_resource); EXPORT_SYMBOL(pci_find_parent_resource); @@ -168,7 +168,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> EXPORT_SYMBOL(pci_save_state); --- gregkh-2.6.orig/include/linux/pci.h +++ gregkh-2.6/include/linux/pci.h -@@ -169,6 +169,7 @@ struct pci_dev { +@@ -168,6 +168,7 @@ struct pci_dev { struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */ int rom_attr_enabled; /* has display of the rom attribute been enabled? */ struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */ diff --git a/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch b/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch index 66e3255cfb8cc..9fcaaa21b6b12 100644 --- a/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch +++ b/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/net/e1000/e1000.h +++ gregkh-2.6/drivers/net/e1000/e1000.h -@@ -77,8 +77,9 @@ +@@ -78,8 +78,9 @@ #define BAR_1 1 #define BAR_5 5 @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct e1000_adapter; -@@ -338,6 +339,7 @@ struct e1000_adapter { +@@ -340,6 +341,7 @@ struct e1000_adapter { #ifdef NETIF_F_TSO boolean_t tso_force; #endif @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/net/e1000/e1000_main.c +++ gregkh-2.6/drivers/net/e1000/e1000_main.c -@@ -86,54 +86,54 @@ static char e1000_copyright[] = "Copyrig +@@ -48,54 +48,54 @@ static char e1000_copyright[] = "Copyrig * {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} */ static struct pci_device_id e1000_pci_tbl[] = { @@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* required last entry */ {0,} }; -@@ -621,7 +621,14 @@ e1000_probe(struct pci_dev *pdev, +@@ -596,7 +596,14 @@ e1000_probe(struct pci_dev *pdev, int i, err, pci_using_dac; uint16_t eeprom_data; uint16_t eeprom_apme_mask = E1000_EEPROM_APME; @@ -159,7 +159,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return err; if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) { -@@ -654,6 +661,7 @@ e1000_probe(struct pci_dev *pdev, +@@ -629,6 +636,7 @@ e1000_probe(struct pci_dev *pdev, adapter->pdev = pdev; adapter->hw.back = adapter; adapter->msg_enable = (1 << debug) - 1; @@ -167,7 +167,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> mmio_start = pci_resource_start(pdev, BAR_0); mmio_len = pci_resource_len(pdev, BAR_0); -@@ -664,12 +672,15 @@ e1000_probe(struct pci_dev *pdev, +@@ -639,12 +647,15 @@ e1000_probe(struct pci_dev *pdev, goto err_ioremap; } @@ -189,12 +189,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -4573,7 +4584,7 @@ e1000_resume(struct pci_dev *pdev) - if (retval) - DPRINTK(PROBE, ERR, "Error in setting power state\n"); +@@ -4553,7 +4564,7 @@ e1000_resume(struct pci_dev *pdev) + + pci_set_power_state(pdev, PCI_D0); e1000_pci_restore_state(adapter); - ret_val = pci_enable_device(pdev); + ret_val = pci_enable_device_bars(pdev, adapter->bars); pci_set_master(pdev); - retval = pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3hot, 0); diff --git a/pci/pci-move-various-pci-ids-to-header-file.patch b/pci/pci-move-various-pci-ids-to-header-file.patch index 31961bff06645..719f8bcaabd51 100644 --- a/pci/pci-move-various-pci-ids-to-header-file.patch +++ b/pci/pci-move-various-pci-ids-to-header-file.patch @@ -91,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100 #define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200 #define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300 -@@ -1964,6 +1969,9 @@ +@@ -1975,6 +1980,9 @@ #define PCI_VENDOR_ID_NETCELL 0x169c #define PCI_DEVICE_ID_REVOLUTION 0x0044 @@ -101,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI_VENDOR_ID_LINKSYS 0x1737 #define PCI_DEVICE_ID_LINKSYS_EG1064 0x1064 -@@ -2142,6 +2150,7 @@ +@@ -2154,6 +2162,7 @@ #define PCI_DEVICE_ID_INTEL_ICH8_4 0x2815 #define PCI_DEVICE_ID_INTEL_ICH8_5 0x283e #define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850 diff --git a/pci/pci-msi-abstractions-and-support-for-altix.patch b/pci/pci-msi-abstractions-and-support-for-altix.patch index 45ba637003ea3..5b08bc40cde51 100644 --- a/pci/pci-msi-abstractions-and-support-for-altix.patch +++ b/pci/pci-msi-abstractions-and-support-for-altix.patch @@ -727,7 +727,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif /* ASM_MSI_H */ --- gregkh-2.6.orig/include/asm-ia64/machvec.h +++ gregkh-2.6/include/asm-ia64/machvec.h -@@ -76,6 +76,7 @@ typedef unsigned char ia64_mv_readb_rela +@@ -75,6 +75,7 @@ typedef unsigned char ia64_mv_readb_rela typedef unsigned short ia64_mv_readw_relaxed_t (const volatile void __iomem *); typedef unsigned int ia64_mv_readl_relaxed_t (const volatile void __iomem *); typedef unsigned long ia64_mv_readq_relaxed_t (const volatile void __iomem *); @@ -735,7 +735,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static inline void machvec_noop (void) -@@ -154,6 +155,7 @@ extern void machvec_tlb_migrate_finish ( +@@ -153,6 +154,7 @@ extern void machvec_tlb_migrate_finish ( # define platform_readl_relaxed ia64_mv.readl_relaxed # define platform_readq_relaxed ia64_mv.readq_relaxed # define platform_migrate ia64_mv.migrate @@ -743,7 +743,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> # endif /* __attribute__((__aligned__(16))) is required to make size of the -@@ -203,6 +205,7 @@ struct ia64_machine_vector { +@@ -202,6 +204,7 @@ struct ia64_machine_vector { ia64_mv_readl_relaxed_t *readl_relaxed; ia64_mv_readq_relaxed_t *readq_relaxed; ia64_mv_migrate_t *migrate; @@ -751,7 +751,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } __attribute__((__aligned__(16))); /* align attrib? see above comment */ #define MACHVEC_INIT(name) \ -@@ -248,6 +251,7 @@ struct ia64_machine_vector { +@@ -247,6 +250,7 @@ struct ia64_machine_vector { platform_readl_relaxed, \ platform_readq_relaxed, \ platform_migrate, \ @@ -759,7 +759,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } extern struct ia64_machine_vector ia64_mv; -@@ -401,5 +405,8 @@ extern int ia64_pci_legacy_write(struct +@@ -400,5 +404,8 @@ extern int ia64_pci_legacy_write(struct #ifndef platform_migrate # define platform_migrate machvec_noop_task #endif diff --git a/pci/pci-nvidia-quirk-to-make-aer-pci-e-extended-capability-visible.patch b/pci/pci-nvidia-quirk-to-make-aer-pci-e-extended-capability-visible.patch index d749d57d0de59..b42fe1fb3ebb9 100644 --- a/pci/pci-nvidia-quirk-to-make-aer-pci-e-extended-capability-visible.patch +++ b/pci/pci-nvidia-quirk-to-make-aer-pci-e-extended-capability-visible.patch @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> EXPORT_SYMBOL(pci_fixup_device); --- gregkh-2.6.orig/include/linux/pci_ids.h +++ gregkh-2.6/include/linux/pci_ids.h -@@ -1025,6 +1025,7 @@ +@@ -1026,6 +1026,7 @@ #define PCI_DEVICE_ID_NVIDIA_NVENET_8 0x0056 #define PCI_DEVICE_ID_NVIDIA_NVENET_9 0x0057 #define PCI_DEVICE_ID_NVIDIA_CK804_AUDIO 0x0059 diff --git a/pci/pci-pci_ids-add-new-device-ids.patch b/pci/pci-pci_ids-add-new-device-ids.patch index 2047c53a2af39..999efbcb99263 100644 --- a/pci/pci-pci_ids-add-new-device-ids.patch +++ b/pci/pci-pci_ids-add-new-device-ids.patch @@ -15,27 +15,16 @@ Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - include/linux/pci_ids.h | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) + include/linux/pci_ids.h | 1 + + 1 file changed, 1 insertion(+) --- gregkh-2.6.orig/include/linux/pci_ids.h +++ gregkh-2.6/include/linux/pci_ids.h -@@ -1190,8 +1190,16 @@ - #define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_2 0x0348 - #define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO1000 0x034C - #define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100 0x034E --#define PCI_DEVICE_ID_NVIDIA_NVENET_14 0x0372 --#define PCI_DEVICE_ID_NVIDIA_NVENET_15 0x0373 -+#define PCI_DEVICE_ID_NVIDIA_NVENET_14 0x0372 -+#define PCI_DEVICE_ID_NVIDIA_NVENET_15 0x0373 -+#define PCI_DEVICE_ID_NVIDIA_NVENET_16 0x03E5 -+#define PCI_DEVICE_ID_NVIDIA_NVENET_17 0x03E6 -+#define PCI_DEVICE_ID_NVIDIA_NVENET_18 0x03EE -+#define PCI_DEVICE_ID_NVIDIA_NVENET_19 0x03EF -+#define PCI_DEVICE_ID_NVIDIA_NVENET_20 0x0450 -+#define PCI_DEVICE_ID_NVIDIA_NVENET_21 0x0451 -+#define PCI_DEVICE_ID_NVIDIA_NVENET_22 0x0452 -+#define PCI_DEVICE_ID_NVIDIA_NVENET_23 0x0453 +@@ -1202,6 +1202,7 @@ + #define PCI_DEVICE_ID_NVIDIA_NVENET_22 0x0452 + #define PCI_DEVICE_ID_NVIDIA_NVENET_23 0x0453 ++ #define PCI_VENDOR_ID_IMS 0x10e0 #define PCI_DEVICE_ID_IMS_TT128 0x9128 + #define PCI_DEVICE_ID_IMS_TT3D 0x9135 |