diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-03 11:09:09 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-03 11:09:09 -0700 |
commit | edebd83392a7b67e4b4aa1a3d387f0593d07f053 (patch) | |
tree | 15ba4110301eff54b33437e6dad58d2d71e632f6 /pci | |
parent | 4f380d9c1d1c3e77a996c2dfaa09daebdce6b257 (diff) | |
download | patches-edebd83392a7b67e4b4aa1a3d387f0593d07f053.tar.gz |
2.6.17-git21 refresh
Diffstat (limited to 'pci')
8 files changed, 15 insertions, 15 deletions
diff --git a/pci/msi-blacklist-pci-e-chipsets-depending-on-hypertransport-msi-capabality.patch b/pci/msi-blacklist-pci-e-chipsets-depending-on-hypertransport-msi-capabality.patch index 5096955870a80..7d22bbf0e4dd0 100644 --- a/pci/msi-blacklist-pci-e-chipsets-depending-on-hypertransport-msi-capabality.patch +++ b/pci/msi-blacklist-pci-e-chipsets-depending-on-hypertransport-msi-capabality.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/quirks.c +++ gregkh-2.6/drivers/pci/quirks.c -@@ -1546,6 +1546,64 @@ static void __devinit quirk_disable_msi( +@@ -1545,6 +1545,64 @@ static void __devinit quirk_disable_msi( DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE, quirk_disable_msi); @@ -92,7 +92,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> EXPORT_SYMBOL(pcie_mch_quirk); --- gregkh-2.6.orig/include/linux/pci_ids.h +++ gregkh-2.6/include/linux/pci_ids.h -@@ -1406,6 +1406,7 @@ +@@ -1408,6 +1408,7 @@ #define PCI_DEVICE_ID_SERVERWORKS_LE 0x0009 #define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017 #define PCI_DEVICE_ID_SERVERWORKS_EPB 0x0103 diff --git a/pci/msi-drop-pci_msi_quirk.patch b/pci/msi-drop-pci_msi_quirk.patch index 6e982cf2bee80..32029379497cb 100644 --- a/pci/msi-drop-pci_msi_quirk.patch +++ b/pci/msi-drop-pci_msi_quirk.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/msi.c +++ gregkh-2.6/drivers/pci/msi.c -@@ -352,13 +352,6 @@ static int msi_init(void) +@@ -351,13 +351,6 @@ static int msi_init(void) if (!status) return status; @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void pci_no_msi(void); --- gregkh-2.6.orig/drivers/pci/quirks.c +++ gregkh-2.6/drivers/pci/quirks.c -@@ -576,8 +576,6 @@ static void __init quirk_ioapic_rmw(stru +@@ -575,8 +575,6 @@ static void __init quirk_ioapic_rmw(stru } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI, PCI_ANY_ID, quirk_ioapic_rmw ); diff --git a/pci/msi-factorize-common-msi-detection-code-from-pci_enable_msi-and-msix.patch b/pci/msi-factorize-common-msi-detection-code-from-pci_enable_msi-and-msix.patch index 60c7e79a63d53..6fd32b53aa17e 100644 --- a/pci/msi-factorize-common-msi-detection-code-from-pci_enable_msi-and-msix.patch +++ b/pci/msi-factorize-common-msi-detection-code-from-pci_enable_msi-and-msix.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/msi.c +++ gregkh-2.6/drivers/pci/msi.c -@@ -902,6 +902,28 @@ static int msix_capability_init(struct p +@@ -901,6 +901,28 @@ static int msix_capability_init(struct p } /** @@ -49,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * pci_enable_msi - configure device's MSI capability structure * @dev: pointer to the pci_dev data structure of MSI device function * -@@ -913,19 +935,11 @@ static int msix_capability_init(struct p +@@ -912,19 +934,11 @@ static int msix_capability_init(struct p **/ int pci_enable_msi(struct pci_dev* dev) { @@ -72,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> temp = dev->irq; -@@ -1135,22 +1149,14 @@ static int reroute_msix_table(int head, +@@ -1134,22 +1148,14 @@ static int reroute_msix_table(int head, **/ int pci_enable_msix(struct pci_dev* dev, struct msix_entry *entries, int nvec) { diff --git a/pci/msi-merge-existing-msi-disabling-quirks.patch b/pci/msi-merge-existing-msi-disabling-quirks.patch index d4a90ddce7007..ce9871d3948a0 100644 --- a/pci/msi-merge-existing-msi-disabling-quirks.patch +++ b/pci/msi-merge-existing-msi-disabling-quirks.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/quirks.c +++ gregkh-2.6/drivers/pci/quirks.c -@@ -586,12 +586,6 @@ static void __init quirk_amd_8131_ioapic +@@ -585,12 +585,6 @@ static void __init quirk_amd_8131_ioapic { unsigned char revid, tmp; @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (nr_ioapics == 0) return; -@@ -604,13 +598,6 @@ static void __init quirk_amd_8131_ioapic +@@ -603,13 +597,6 @@ static void __init quirk_amd_8131_ioapic } } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic); @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif /* CONFIG_X86_IO_APIC */ -@@ -1545,6 +1532,22 @@ static void __devinit quirk_nvidia_ck804 +@@ -1544,6 +1531,22 @@ static void __devinit quirk_nvidia_ck804 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE, quirk_nvidia_ck804_pcie_aer_ext_cap); diff --git a/pci/msi-rename-pci_cap_id_ht_irqconf-into-pci_cap_id_ht.patch b/pci/msi-rename-pci_cap_id_ht_irqconf-into-pci_cap_id_ht.patch index 5aecf55611855..f44511d3858e3 100644 --- a/pci/msi-rename-pci_cap_id_ht_irqconf-into-pci_cap_id_ht.patch +++ b/pci/msi-rename-pci_cap_id_ht_irqconf-into-pci_cap_id_ht.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/powerpc/sysdev/mpic.c +++ gregkh-2.6/arch/powerpc/sysdev/mpic.c -@@ -250,7 +250,7 @@ static void __init mpic_scan_ht_pic(stru +@@ -249,7 +249,7 @@ static void __init mpic_scan_ht_pic(stru for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0; pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) { u8 id = readb(devbase + pos + PCI_CAP_LIST_ID); diff --git a/pci/msi-stop-inheriting-bus-flags-and-check-root-chipset-bus-flags-instead.patch b/pci/msi-stop-inheriting-bus-flags-and-check-root-chipset-bus-flags-instead.patch index 1af95eb459797..f0c07210e2c97 100644 --- a/pci/msi-stop-inheriting-bus-flags-and-check-root-chipset-bus-flags-instead.patch +++ b/pci/msi-stop-inheriting-bus-flags-and-check-root-chipset-bus-flags-instead.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/msi.c +++ gregkh-2.6/drivers/pci/msi.c -@@ -911,14 +911,19 @@ static int msix_capability_init(struct p +@@ -910,14 +910,19 @@ static int msix_capability_init(struct p static int pci_msi_supported(struct pci_dev * dev) { diff --git a/pci/pci-clear-abnormal-poweroff-flag-on-via-southbridges-fix-resume.patch b/pci/pci-clear-abnormal-poweroff-flag-on-via-southbridges-fix-resume.patch index f11b25479b865..491629b557eea 100644 --- a/pci/pci-clear-abnormal-poweroff-flag-on-via-southbridges-fix-resume.patch +++ b/pci/pci-clear-abnormal-poweroff-flag-on-via-southbridges-fix-resume.patch @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/quirks.c +++ gregkh-2.6/drivers/pci/quirks.c -@@ -683,6 +683,33 @@ static void __devinit quirk_vt82c598_id( +@@ -682,6 +682,33 @@ static void __devinit quirk_vt82c598_id( } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_vt82c598_id ); diff --git a/pci/resources-insert-identical-resources-above-existing-resources.patch b/pci/resources-insert-identical-resources-above-existing-resources.patch index 05c2541741919..058d6202f2818 100644 --- a/pci/resources-insert-identical-resources-above-existing-resources.patch +++ b/pci/resources-insert-identical-resources-above-existing-resources.patch @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/kernel/resource.c +++ gregkh-2.6/kernel/resource.c -@@ -342,12 +342,11 @@ EXPORT_SYMBOL(allocate_resource); +@@ -341,12 +341,11 @@ EXPORT_SYMBOL(allocate_resource); * * Returns 0 on success, -EBUSY if the resource can't be inserted. * @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> */ int insert_resource(struct resource *parent, struct resource *new) { -@@ -355,20 +354,21 @@ int insert_resource(struct resource *par +@@ -354,20 +353,21 @@ int insert_resource(struct resource *par struct resource *first, *next; write_lock(&resource_lock); |