diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-10 12:01:10 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-10 12:01:10 -0800 |
commit | 3871c527fe1cef5a8a6a5cd4613e0f583307a4dc (patch) | |
tree | 6a78e052b29a2029ed37c9418a2e4c575687137e /pci | |
parent | 9ea31ab14e75cd05e8377979768d95eb036c8aaa (diff) | |
download | patches-3871c527fe1cef5a8a6a5cd4613e0f583307a4dc.tar.gz |
lots of new patches all over the place
Diffstat (limited to 'pci')
-rw-r--r-- | pci/pci-drivers-pci-pci.c-if-0-pci_find_ext_capability.patch | 55 | ||||
-rw-r--r-- | pci/pci-hotplug-fix-up-coding-style-issues.patch | 88 | ||||
-rw-r--r-- | pci/pci-hotplug-fix-up-kconfig-help-text.patch | 28 | ||||
-rw-r--r-- | pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch | 49 | ||||
-rw-r--r-- | pci/pci-make-it-easier-to-see-that-set_msi_affinity-is-used.patch | 81 | ||||
-rw-r--r-- | pci/pci-schedule-pci_legacy_proc-for-removal.patch | 31 | ||||
-rw-r--r-- | pci/pci-schedule-removal-of-pci_module_init.patch | 12 | ||||
-rw-r--r-- | pci/shot-accross-the-bow.patch | 6 |
8 files changed, 341 insertions, 9 deletions
diff --git a/pci/pci-drivers-pci-pci.c-if-0-pci_find_ext_capability.patch b/pci/pci-drivers-pci-pci.c-if-0-pci_find_ext_capability.patch new file mode 100644 index 0000000000000..fb9edeaa319c9 --- /dev/null +++ b/pci/pci-drivers-pci-pci.c-if-0-pci_find_ext_capability.patch @@ -0,0 +1,55 @@ +From owner-linux-pci@atrey.karlin.mff.cuni.cz Thu Jan 5 19:15:54 2006 +Date: Fri, 6 Jan 2006 03:25:37 +0100 +From: Adrian Bunk <bunk@stusta.de> +To: gregkh@suse.de +Subject: PCI: drivers/pci/pci.c: #if 0 pci_find_ext_capability() +Message-ID: <20060106022537.GU12313@stusta.de> +Content-Disposition: inline + +This patch #if 0's the unused global function pci_find_ext_capability(). + + +Signed-off-by: Adrian Bunk <bunk@stusta.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/pci/pci.c | 2 ++ + include/linux/pci.h | 2 -- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- gregkh-2.6.orig/include/linux/pci.h ++++ gregkh-2.6/include/linux/pci.h +@@ -400,7 +400,6 @@ struct pci_dev *pci_find_device_reverse + struct pci_dev *pci_find_slot (unsigned int bus, unsigned int devfn); + int pci_find_capability (struct pci_dev *dev, int cap); + int pci_find_next_capability (struct pci_dev *dev, u8 pos, int cap); +-int pci_find_ext_capability (struct pci_dev *dev, int cap); + struct pci_bus * pci_find_next_bus(const struct pci_bus *from); + + struct pci_dev *pci_get_device (unsigned int vendor, unsigned int device, struct pci_dev *from); +@@ -625,7 +624,6 @@ static inline int pci_register_driver(st + static inline void pci_unregister_driver(struct pci_driver *drv) { } + static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; } + static inline int pci_find_next_capability (struct pci_dev *dev, u8 post, int cap) { return 0; } +-static inline int pci_find_ext_capability (struct pci_dev *dev, int cap) {return 0; } + static inline const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev) { return NULL; } + + /* Power management related routines */ +--- gregkh-2.6.orig/drivers/pci/pci.c ++++ gregkh-2.6/drivers/pci/pci.c +@@ -163,6 +163,7 @@ int pci_bus_find_capability(struct pci_b + return __pci_bus_find_cap(bus, devfn, hdr_type & 0x7f, cap); + } + ++#if 0 + /** + * pci_find_ext_capability - Find an extended capability + * @dev: PCI device to query +@@ -210,6 +211,7 @@ int pci_find_ext_capability(struct pci_d + + return 0; + } ++#endif /* 0 */ + + /** + * pci_find_parent_resource - return resource region of parent bus of given region diff --git a/pci/pci-hotplug-fix-up-coding-style-issues.patch b/pci/pci-hotplug-fix-up-coding-style-issues.patch new file mode 100644 index 0000000000000..f220855be9018 --- /dev/null +++ b/pci/pci-hotplug-fix-up-coding-style-issues.patch @@ -0,0 +1,88 @@ +From pavel@ucw.cz Sun Jan 8 11:14:18 2006 +Date: Sun, 8 Jan 2006 20:11:59 +0100 +From: Pavel Machek <pavel@ucw.cz> +Subject: PCI Hotplug: fix up coding style issues +Message-ID: <20060108191159.GA1880@elf.ucw.cz> +Content-Disposition: inline + +Signed-off-by: Pavel Machek <pavel@suse.cz> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/pci/hotplug/acpiphp_ibm.c | 21 +++++++++------------ + drivers/pci/hotplug/ibmphp_core.c | 4 ++-- + 2 files changed, 11 insertions(+), 14 deletions(-) + +--- gregkh-2.6.orig/drivers/pci/hotplug/acpiphp_ibm.c ++++ gregkh-2.6/drivers/pci/hotplug/acpiphp_ibm.c +@@ -302,7 +302,7 @@ static int ibm_get_table_from_acpi(char + } + + package = (union acpi_object *) buffer.pointer; +- if(!(package) || ++ if (!(package) || + (package->type != ACPI_TYPE_PACKAGE) || + !(package->package.elements)) { + err("%s: Invalid APCI object\n", __FUNCTION__); +@@ -405,7 +405,7 @@ static acpi_status __init ibm_find_acpi_ + } + info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0'; + +- if(info.current_status && (info.valid & ACPI_VALID_HID) && ++ if (info.current_status && (info.valid & ACPI_VALID_HID) && + (!strcmp(info.hardware_id.value, IBM_HARDWARE_ID1) || + !strcmp(info.hardware_id.value, IBM_HARDWARE_ID2))) { + dbg("found hardware: %s, handle: %p\n", info.hardware_id.value, +@@ -449,13 +449,11 @@ static int __init ibm_acpiphp_init(void) + } + + ibm_note.device = device; +- status = acpi_install_notify_handler( +- ibm_acpi_handle, +- ACPI_DEVICE_NOTIFY, +- ibm_handle_events, ++ status = acpi_install_notify_handler(ibm_acpi_handle, ++ ACPI_DEVICE_NOTIFY, ibm_handle_events, + &ibm_note); + if (ACPI_FAILURE(status)) { +- err("%s: Failed to register notification handler\n", ++ err("%s: Failed to register notification handler\n", + __FUNCTION__); + retval = -EBUSY; + goto init_cleanup; +@@ -482,14 +480,13 @@ static void __exit ibm_acpiphp_exit(void + if (acpiphp_unregister_attention(&ibm_attention_info)) + err("%s: attention info deregistration failed", __FUNCTION__); + +- status = acpi_remove_notify_handler( ++ status = acpi_remove_notify_handler( + ibm_acpi_handle, + ACPI_DEVICE_NOTIFY, + ibm_handle_events); +- if (ACPI_FAILURE(status)) +- err("%s: Notification handler removal failed\n", +- __FUNCTION__); +- // remove the /sys entries ++ if (ACPI_FAILURE(status)) ++ err("%s: Notification handler removal failed\n", __FUNCTION__); ++ /* remove the /sys entries */ + if (sysfs_remove_bin_file(sysdir, &ibm_apci_table_attr)) + err("%s: removal of sysfs file apci_table failed\n", + __FUNCTION__); +--- gregkh-2.6.orig/drivers/pci/hotplug/ibmphp_core.c ++++ gregkh-2.6/drivers/pci/hotplug/ibmphp_core.c +@@ -235,12 +235,12 @@ static int set_attention_status(struct h + { + int rc = 0; + struct slot *pslot; +- u8 cmd; ++ u8 cmd = 0x00; /* avoid compiler warning */ + + debug("set_attention_status - Entry hotplug_slot[%lx] value[%x]\n", + (ulong) hotplug_slot, value); + ibmphp_lock_operations(); +- cmd = 0x00; // avoid compiler warning ++ + + if (hotplug_slot) { + switch (value) { diff --git a/pci/pci-hotplug-fix-up-kconfig-help-text.patch b/pci/pci-hotplug-fix-up-kconfig-help-text.patch new file mode 100644 index 0000000000000..34e4b14a83503 --- /dev/null +++ b/pci/pci-hotplug-fix-up-kconfig-help-text.patch @@ -0,0 +1,28 @@ +From pavel@atrey.karlin.mff.cuni.cz Mon Jan 9 07:20:30 2006 +Date: Mon, 9 Jan 2006 16:16:00 +0100 +From: Pavel Machek <pavel@ucw.cz> +To: Greg KH <greg@kroah.com> +Subject: PCI Hotplug: fix up Kconfig help text +Message-ID: <20060109151600.GE717@atrey.karlin.mff.cuni.cz> +Content-Disposition: inline + +Remove reference to pcihpfs that no longer exists. + +Signed-off-by: Pavel Machek <pavel@suse.cz> + +--- + drivers/pci/hotplug/Kconfig | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- gregkh-2.6.orig/drivers/pci/hotplug/Kconfig ++++ gregkh-2.6/drivers/pci/hotplug/Kconfig +@@ -11,8 +11,7 @@ config HOTPLUG_PCI + ---help--- + Say Y here if you have a motherboard with a PCI Hotplug controller. + This allows you to add and remove PCI cards while the machine is +- powered up and running. The file system pcihpfs must be mounted +- in order to interact with any PCI Hotplug controllers. ++ powered up and running. + + To compile this driver as a module, choose M here: the + module will be called pci_hotplug. diff --git a/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch b/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch new file mode 100644 index 0000000000000..d3a19d5f82b07 --- /dev/null +++ b/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch @@ -0,0 +1,49 @@ +From linux-kernel-owner+greg=40kroah.com-S1750792AbWAIWG3@vger.kernel.org Mon Jan 9 14:10:41 2006 +From: Jason Gaston <jason.d.gaston@intel.com> +To: <mj@ucw.cz>, <akpm@osdl.org> +Subject: PCI: irq and pci_ids: patch for Intel ICH8 +Date: Mon, 9 Jan 2006 10:53:45 -0800 +Cc: <jason.d.gaston@intel.com> +Content-Disposition: inline +Message-Id: <200601091053.46191.jason.d.gaston@intel.com> + +This patch adds the Intel ICH8 DID's to the irq.c and pci_ids.h files. + +Signed-off-by: Jason Gaston <Jason.d.gaston@intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + arch/i386/pci/irq.c | 5 +++++ + include/linux/pci_ids.h | 7 +++++++ + 2 files changed, 12 insertions(+) + +--- gregkh-2.6.orig/arch/i386/pci/irq.c ++++ gregkh-2.6/arch/i386/pci/irq.c +@@ -539,6 +539,11 @@ static __init int intel_router_probe(str + case PCI_DEVICE_ID_INTEL_ICH7_30: + case PCI_DEVICE_ID_INTEL_ICH7_31: + case PCI_DEVICE_ID_INTEL_ESB2_0: ++ case PCI_DEVICE_ID_INTEL_ICH8_0: ++ case PCI_DEVICE_ID_INTEL_ICH8_1: ++ case PCI_DEVICE_ID_INTEL_ICH8_2: ++ case PCI_DEVICE_ID_INTEL_ICH8_3: ++ case PCI_DEVICE_ID_INTEL_ICH8_4: + r->name = "PIIX/ICH"; + r->get = pirq_piix_get; + r->set = pirq_piix_set; +--- gregkh-2.6.orig/include/linux/pci_ids.h ++++ gregkh-2.6/include/linux/pci_ids.h +@@ -2088,6 +2088,13 @@ + #define PCI_DEVICE_ID_INTEL_ICH7_19 0x27dd + #define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de + #define PCI_DEVICE_ID_INTEL_ICH7_21 0x27df ++#define PCI_DEVICE_ID_INTEL_ICH8_0 0x2810 ++#define PCI_DEVICE_ID_INTEL_ICH8_1 0x2811 ++#define PCI_DEVICE_ID_INTEL_ICH8_2 0x2812 ++#define PCI_DEVICE_ID_INTEL_ICH8_3 0x2814 ++#define PCI_DEVICE_ID_INTEL_ICH8_4 0x2815 ++#define PCI_DEVICE_ID_INTEL_ICH8_5 0x283e ++#define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850 + #define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340 + #define PCI_DEVICE_ID_INTEL_82830_HB 0x3575 + #define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577 diff --git a/pci/pci-make-it-easier-to-see-that-set_msi_affinity-is-used.patch b/pci/pci-make-it-easier-to-see-that-set_msi_affinity-is-used.patch new file mode 100644 index 0000000000000..4fe97d58cd546 --- /dev/null +++ b/pci/pci-make-it-easier-to-see-that-set_msi_affinity-is-used.patch @@ -0,0 +1,81 @@ +From owner-linux-pci@atrey.karlin.mff.cuni.cz Tue Jan 3 18:55:39 2006 +Date: Tue, 3 Jan 2006 18:51:46 -0800 +From: Grant Grundler <iod00d@hp.com> +To: Rajesh Shah <rajesh.shah@intel.com> +Cc: Grant Grundler <iod00d@hp.com>, Greg KH <gregkh@suse.de> +Subject: PCI: make it easier to see that set_msi_affinity() is used +Message-ID: <20060104025146.GG13841@esmail.cup.hp.com> +Content-Disposition: inline + +I missed this usage in drivers/pci/msi.h: + +#ifdef CONFIG_SMP +#define set_msi_irq_affinity set_msi_affinity +#else +#define set_msi_irq_affinity NULL +#endif + +set_msi_affinity() is declared and exclusively used in msi.c. +Here's a better way so (hopefully) history doesn't repeat itself. + +Signed-off-by: Grant Grundler <iod00d@hp.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/pci/msi.c | 8 +++++--- + drivers/pci/msi.h | 6 ------ + 2 files changed, 5 insertions(+), 9 deletions(-) + +--- gregkh-2.6.orig/drivers/pci/msi.c ++++ gregkh-2.6/drivers/pci/msi.c +@@ -137,6 +137,8 @@ static void set_msi_affinity(unsigned in + break; + } + } ++#else ++#define set_msi_affinity NULL + #endif /* CONFIG_SMP */ + + static void mask_MSI_irq(unsigned int vector) +@@ -214,7 +216,7 @@ static struct hw_interrupt_type msix_irq + .disable = mask_MSI_irq, + .ack = mask_MSI_irq, + .end = end_msi_irq_w_maskbit, +- .set_affinity = set_msi_irq_affinity ++ .set_affinity = set_msi_affinity + }; + + /* +@@ -230,7 +232,7 @@ static struct hw_interrupt_type msi_irq_ + .disable = mask_MSI_irq, + .ack = mask_MSI_irq, + .end = end_msi_irq_w_maskbit, +- .set_affinity = set_msi_irq_affinity ++ .set_affinity = set_msi_affinity + }; + + /* +@@ -246,7 +248,7 @@ static struct hw_interrupt_type msi_irq_ + .disable = do_nothing, + .ack = do_nothing, + .end = end_msi_irq_wo_maskbit, +- .set_affinity = set_msi_irq_affinity ++ .set_affinity = set_msi_affinity + }; + + static void msi_data_init(struct msg_data *msi_data, +--- gregkh-2.6.orig/drivers/pci/msi.h ++++ gregkh-2.6/drivers/pci/msi.h +@@ -22,12 +22,6 @@ extern int vector_irq[NR_VECTORS]; + extern void (*interrupt[NR_IRQS])(void); + extern int pci_vector_resources(int last, int nr_released); + +-#ifdef CONFIG_SMP +-#define set_msi_irq_affinity set_msi_affinity +-#else +-#define set_msi_irq_affinity NULL +-#endif +- + /* + * MSI-X Address Register + */ diff --git a/pci/pci-schedule-pci_legacy_proc-for-removal.patch b/pci/pci-schedule-pci_legacy_proc-for-removal.patch new file mode 100644 index 0000000000000..0ee984f5957f6 --- /dev/null +++ b/pci/pci-schedule-pci_legacy_proc-for-removal.patch @@ -0,0 +1,31 @@ +From bunk@stusta.de Thu Dec 29 11:07:28 2005 +Date: Thu, 29 Dec 2005 20:07:25 +0100 +From: Adrian Bunk <bunk@stusta.de> +To: gregkh@suse.de +Subject: PCI: schedule PCI_LEGACY_PROC for removal +Message-ID: <20051229190725.GO3811@stusta.de> +Content-Disposition: inline + +PCI_LEGACY_PROC is deprecated since 2.5.53 in favor of lspci(8). + + +Signed-off-by: Adrian Bunk <bunk@stusta.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + Documentation/feature-removal-schedule.txt | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- gregkh-2.6.orig/Documentation/feature-removal-schedule.txt ++++ gregkh-2.6/Documentation/feature-removal-schedule.txt +@@ -139,3 +139,10 @@ Why: The 8250 serial driver now has the + brother on Alchemy SOCs. The loss of features is not considered an + issue. + Who: Ralf Baechle <ralf@linux-mips.org> ++ ++--------------------------- ++ ++What: Legacy /proc/pci interface (PCI_LEGACY_PROC) ++When: March 2006 ++Why: deprecated since 2.5.53 in favor of lspci(8) ++Who: Adrian Bunk <bunk@stusta.de> diff --git a/pci/pci-schedule-removal-of-pci_module_init.patch b/pci/pci-schedule-removal-of-pci_module_init.patch index 7a10cc152feba..4cd3a225672e6 100644 --- a/pci/pci-schedule-removal-of-pci_module_init.patch +++ b/pci/pci-schedule-removal-of-pci_module_init.patch @@ -20,10 +20,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/Documentation/feature-removal-schedule.txt +++ gregkh-2.6/Documentation/feature-removal-schedule.txt -@@ -139,3 +139,10 @@ Why: The 8250 serial driver now has the - brother on Alchemy SOCs. The loss of features is not considered an - issue. - Who: Ralf Baechle <ralf@linux-mips.org> +@@ -146,3 +146,10 @@ What: Legacy /proc/pci interface (PCI_LE + When: March 2006 + Why: deprecated since 2.5.53 in favor of lspci(8) + Who: Adrian Bunk <bunk@stusta.de> + +--------------------------- + @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* these external functions are only available when PCI support is enabled */ #ifdef CONFIG_PCI -@@ -502,6 +496,10 @@ void pci_enable_bridges(struct pci_bus * +@@ -501,6 +495,10 @@ void pci_enable_bridges(struct pci_bus * /* Proper probing supporting hot-pluggable devices */ int __pci_register_driver(struct pci_driver *, struct module *); @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static inline int pci_register_driver(struct pci_driver *driver) { return __pci_register_driver(driver, THIS_MODULE); -@@ -622,6 +620,7 @@ static inline void pci_disable_device(st +@@ -621,6 +619,7 @@ static inline void pci_disable_device(st static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; } static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;} static inline int __pci_register_driver(struct pci_driver *drv, struct module *owner) { return 0;} diff --git a/pci/shot-accross-the-bow.patch b/pci/shot-accross-the-bow.patch index a8a11339e0796..d655dfcdf0185 100644 --- a/pci/shot-accross-the-bow.patch +++ b/pci/shot-accross-the-bow.patch @@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> +EXPORT_SYMBOL_GPL(pci_enable_bridges); --- gregkh-2.6.orig/drivers/pci/msi.c +++ gregkh-2.6/drivers/pci/msi.c -@@ -1119,7 +1119,7 @@ void msi_remove_pci_irq_vectors(struct p +@@ -1121,7 +1121,7 @@ void msi_remove_pci_irq_vectors(struct p } } @@ -142,7 +142,7 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> +EXPORT_SYMBOL_GPL(pci_dev_put); --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c -@@ -428,7 +428,7 @@ pci_power_t pci_choose_state(struct pci_ +@@ -430,7 +430,7 @@ pci_power_t pci_choose_state(struct pci_ return PCI_D0; } @@ -151,7 +151,7 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> /** * pci_save_state - save the PCI configuration space of a device before suspending -@@ -913,34 +913,34 @@ __setup("pci=", pci_setup); +@@ -915,34 +915,34 @@ __setup("pci=", pci_setup); #if defined(CONFIG_ISA) || defined(CONFIG_EISA) /* FIXME: Some boxes have multiple ISA bridges! */ struct pci_dev *isa_bridge; |