From: Greg Kroah-Hartman Date: Thu, 13 Jun 2013 17:48:31 +0000 (-0700) Subject: Linux 3.4.49 X-Git-Tag: v3.4.49^0 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99c1090d9398e951ce875f56c6bfe4210f8ddedb;p=thirdparty%2Fkernel%2Fstable-queue.git Linux 3.4.49 --- diff --git a/queue-3.9/powerpc-pseries-make-32-bit-msi-quirk-work-on-systems-lacking-firmware-support.patch b/queue-3.9/powerpc-pseries-make-32-bit-msi-quirk-work-on-systems-lacking-firmware-support.patch index ac128f65a8f..239facab076 100644 --- a/queue-3.9/powerpc-pseries-make-32-bit-msi-quirk-work-on-systems-lacking-firmware-support.patch +++ b/queue-3.9/powerpc-pseries-make-32-bit-msi-quirk-work-on-systems-lacking-firmware-support.patch @@ -21,19 +21,21 @@ Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Kleber Sacilotto de Souza Signed-off-by: Greg Kroah-Hartman + --- - arch/powerpc/platforms/pseries/msi.c | 40 ++++++++++++++++++++++++++++++++--- - 1 file changed, 37 insertions(+), 3 deletions(-) + arch/powerpc/platforms/pseries/msi.c | 42 ++++++++++++++++++++++++++++++++--- + 1 file changed, 39 insertions(+), 3 deletions(-) --- a/arch/powerpc/platforms/pseries/msi.c +++ b/arch/powerpc/platforms/pseries/msi.c -@@ -394,6 +394,23 @@ static int check_msix_entries(struct pci +@@ -394,6 +394,25 @@ static int check_msix_entries(struct pci return 0; } +static void rtas_hack_32bit_msi_gen2(struct pci_dev *pdev) +{ + u32 addr_hi, addr_lo; ++ int pos; + + /* + * We should only get in here for IODA1 configs. This is based on the @@ -42,16 +44,17 @@ Signed-off-by: Greg Kroah-Hartman + */ + dev_info(&pdev->dev, + "rtas_msi: No 32 bit MSI firmware support, forcing 32 bit MSI\n"); -+ pci_read_config_dword(pdev, pdev->msi_cap + PCI_MSI_ADDRESS_HI, &addr_hi); ++ pos = pci_find_capability(pdev, PCI_CAP_ID_MSI); ++ pci_read_config_dword(pdev, pos + PCI_MSI_ADDRESS_HI, &addr_hi); + addr_lo = 0xffff0000 | ((addr_hi >> (48 - 32)) << 4); -+ pci_write_config_dword(pdev, pdev->msi_cap + PCI_MSI_ADDRESS_LO, addr_lo); -+ pci_write_config_dword(pdev, pdev->msi_cap + PCI_MSI_ADDRESS_HI, 0); ++ pci_write_config_dword(pdev, pos + PCI_MSI_ADDRESS_LO, addr_lo); ++ pci_write_config_dword(pdev, pos + PCI_MSI_ADDRESS_HI, 0); +} + static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec_in, int type) { struct pci_dn *pdn; -@@ -401,6 +418,7 @@ static int rtas_setup_msi_irqs(struct pc +@@ -401,6 +420,7 @@ static int rtas_setup_msi_irqs(struct pc struct msi_desc *entry; struct msi_msg msg; int nvec = nvec_in; @@ -59,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman pdn = get_pdn(pdev); if (!pdn) -@@ -428,15 +446,31 @@ static int rtas_setup_msi_irqs(struct pc +@@ -428,15 +448,31 @@ static int rtas_setup_msi_irqs(struct pc */ again: if (type == PCI_CAP_ID_MSI) { diff --git a/queue-3.4/acpi-video-ignore-bios-initial-backlight-value-for-hp-m4.patch b/releases/3.4.49/acpi-video-ignore-bios-initial-backlight-value-for-hp-m4.patch similarity index 100% rename from queue-3.4/acpi-video-ignore-bios-initial-backlight-value-for-hp-m4.patch rename to releases/3.4.49/acpi-video-ignore-bios-initial-backlight-value-for-hp-m4.patch diff --git a/queue-3.4/acpi-video-ignore-bios-initial-backlight-value-for-hp-pavilion-g6.patch b/releases/3.4.49/acpi-video-ignore-bios-initial-backlight-value-for-hp-pavilion-g6.patch similarity index 100% rename from queue-3.4/acpi-video-ignore-bios-initial-backlight-value-for-hp-pavilion-g6.patch rename to releases/3.4.49/acpi-video-ignore-bios-initial-backlight-value-for-hp-pavilion-g6.patch diff --git a/queue-3.4/alsa-usb-audio-apply-logitech-quickcam-pro-9000-quirk-only-to-audio-iface.patch b/releases/3.4.49/alsa-usb-audio-apply-logitech-quickcam-pro-9000-quirk-only-to-audio-iface.patch similarity index 100% rename from queue-3.4/alsa-usb-audio-apply-logitech-quickcam-pro-9000-quirk-only-to-audio-iface.patch rename to releases/3.4.49/alsa-usb-audio-apply-logitech-quickcam-pro-9000-quirk-only-to-audio-iface.patch diff --git a/queue-3.4/alsa-usb-audio-fix-invalid-volume-resolution-on-logitech-hd-webcam-c270.patch b/releases/3.4.49/alsa-usb-audio-fix-invalid-volume-resolution-on-logitech-hd-webcam-c270.patch similarity index 100% rename from queue-3.4/alsa-usb-audio-fix-invalid-volume-resolution-on-logitech-hd-webcam-c270.patch rename to releases/3.4.49/alsa-usb-audio-fix-invalid-volume-resolution-on-logitech-hd-webcam-c270.patch diff --git a/queue-3.4/alsa-usb-audio-fix-roland-cakewalk-um-3g-support.patch b/releases/3.4.49/alsa-usb-audio-fix-roland-cakewalk-um-3g-support.patch similarity index 100% rename from queue-3.4/alsa-usb-audio-fix-roland-cakewalk-um-3g-support.patch rename to releases/3.4.49/alsa-usb-audio-fix-roland-cakewalk-um-3g-support.patch diff --git a/queue-3.4/drm-fix-a-use-after-free-when-gpu-acceleration-disabled.patch b/releases/3.4.49/drm-fix-a-use-after-free-when-gpu-acceleration-disabled.patch similarity index 100% rename from queue-3.4/drm-fix-a-use-after-free-when-gpu-acceleration-disabled.patch rename to releases/3.4.49/drm-fix-a-use-after-free-when-gpu-acceleration-disabled.patch diff --git a/queue-3.4/drm-gma500-increase-max-resolution-for-mode-setting.patch b/releases/3.4.49/drm-gma500-increase-max-resolution-for-mode-setting.patch similarity index 100% rename from queue-3.4/drm-gma500-increase-max-resolution-for-mode-setting.patch rename to releases/3.4.49/drm-gma500-increase-max-resolution-for-mode-setting.patch diff --git a/queue-3.4/drm-i915-no-lvds-quirk-for-hp-t5740.patch b/releases/3.4.49/drm-i915-no-lvds-quirk-for-hp-t5740.patch similarity index 100% rename from queue-3.4/drm-i915-no-lvds-quirk-for-hp-t5740.patch rename to releases/3.4.49/drm-i915-no-lvds-quirk-for-hp-t5740.patch diff --git a/queue-3.4/drm-i915-sdvo-use-intel_sdvo-ddc-instead-of-intel_sdvo-i2c-for-ddc.patch b/releases/3.4.49/drm-i915-sdvo-use-intel_sdvo-ddc-instead-of-intel_sdvo-i2c-for-ddc.patch similarity index 100% rename from queue-3.4/drm-i915-sdvo-use-intel_sdvo-ddc-instead-of-intel_sdvo-i2c-for-ddc.patch rename to releases/3.4.49/drm-i915-sdvo-use-intel_sdvo-ddc-instead-of-intel_sdvo-i2c-for-ddc.patch diff --git a/queue-3.4/drm-radeon-don-t-allow-audio-on-dce6.patch b/releases/3.4.49/drm-radeon-don-t-allow-audio-on-dce6.patch similarity index 100% rename from queue-3.4/drm-radeon-don-t-allow-audio-on-dce6.patch rename to releases/3.4.49/drm-radeon-don-t-allow-audio-on-dce6.patch diff --git a/queue-3.4/ftrace-move-ftrace_filter_lseek-out-of-config_dynamic_ftrace-section.patch b/releases/3.4.49/ftrace-move-ftrace_filter_lseek-out-of-config_dynamic_ftrace-section.patch similarity index 100% rename from queue-3.4/ftrace-move-ftrace_filter_lseek-out-of-config_dynamic_ftrace-section.patch rename to releases/3.4.49/ftrace-move-ftrace_filter_lseek-out-of-config_dynamic_ftrace-section.patch diff --git a/queue-3.4/hwmon-adm1021-strengthen-chip-detection-for-adm1021-lm84-and-max1617.patch b/releases/3.4.49/hwmon-adm1021-strengthen-chip-detection-for-adm1021-lm84-and-max1617.patch similarity index 100% rename from queue-3.4/hwmon-adm1021-strengthen-chip-detection-for-adm1021-lm84-and-max1617.patch rename to releases/3.4.49/hwmon-adm1021-strengthen-chip-detection-for-adm1021-lm84-and-max1617.patch diff --git a/queue-3.4/powerpc-eeh-don-t-check-rtas-token-to-get-pe-addr.patch b/releases/3.4.49/powerpc-eeh-don-t-check-rtas-token-to-get-pe-addr.patch similarity index 100% rename from queue-3.4/powerpc-eeh-don-t-check-rtas-token-to-get-pe-addr.patch rename to releases/3.4.49/powerpc-eeh-don-t-check-rtas-token-to-get-pe-addr.patch diff --git a/queue-3.4/radeon-fix-system-hang-issue-when-using-kms-with-older-cards.patch b/releases/3.4.49/radeon-fix-system-hang-issue-when-using-kms-with-older-cards.patch similarity index 100% rename from queue-3.4/radeon-fix-system-hang-issue-when-using-kms-with-older-cards.patch rename to releases/3.4.49/radeon-fix-system-hang-issue-when-using-kms-with-older-cards.patch diff --git a/queue-3.4/series b/releases/3.4.49/series similarity index 100% rename from queue-3.4/series rename to releases/3.4.49/series diff --git a/queue-3.4/tracing-fix-possible-null-pointer-dereferences.patch b/releases/3.4.49/tracing-fix-possible-null-pointer-dereferences.patch similarity index 100% rename from queue-3.4/tracing-fix-possible-null-pointer-dereferences.patch rename to releases/3.4.49/tracing-fix-possible-null-pointer-dereferences.patch diff --git a/queue-3.4/usb-ark3116-fix-control-message-timeout.patch b/releases/3.4.49/usb-ark3116-fix-control-message-timeout.patch similarity index 100% rename from queue-3.4/usb-ark3116-fix-control-message-timeout.patch rename to releases/3.4.49/usb-ark3116-fix-control-message-timeout.patch diff --git a/queue-3.4/usb-ftdi_sio-quiet-sparse-noise-about-using-plain-integer-was-null-pointer.patch b/releases/3.4.49/usb-ftdi_sio-quiet-sparse-noise-about-using-plain-integer-was-null-pointer.patch similarity index 100% rename from queue-3.4/usb-ftdi_sio-quiet-sparse-noise-about-using-plain-integer-was-null-pointer.patch rename to releases/3.4.49/usb-ftdi_sio-quiet-sparse-noise-about-using-plain-integer-was-null-pointer.patch diff --git a/queue-3.4/usb-iuu_phoenix-fix-bulk-message-timeout.patch b/releases/3.4.49/usb-iuu_phoenix-fix-bulk-message-timeout.patch similarity index 100% rename from queue-3.4/usb-iuu_phoenix-fix-bulk-message-timeout.patch rename to releases/3.4.49/usb-iuu_phoenix-fix-bulk-message-timeout.patch diff --git a/queue-3.4/usb-keyspan-fix-bogus-array-index.patch b/releases/3.4.49/usb-keyspan-fix-bogus-array-index.patch similarity index 100% rename from queue-3.4/usb-keyspan-fix-bogus-array-index.patch rename to releases/3.4.49/usb-keyspan-fix-bogus-array-index.patch diff --git a/queue-3.4/usb-mos7720-fix-dma-to-stack.patch b/releases/3.4.49/usb-mos7720-fix-dma-to-stack.patch similarity index 100% rename from queue-3.4/usb-mos7720-fix-dma-to-stack.patch rename to releases/3.4.49/usb-mos7720-fix-dma-to-stack.patch diff --git a/queue-3.4/usb-mos7720-fix-hardware-flow-control.patch b/releases/3.4.49/usb-mos7720-fix-hardware-flow-control.patch similarity index 100% rename from queue-3.4/usb-mos7720-fix-hardware-flow-control.patch rename to releases/3.4.49/usb-mos7720-fix-hardware-flow-control.patch diff --git a/queue-3.4/usb-mos7720-fix-message-timeouts.patch b/releases/3.4.49/usb-mos7720-fix-message-timeouts.patch similarity index 100% rename from queue-3.4/usb-mos7720-fix-message-timeouts.patch rename to releases/3.4.49/usb-mos7720-fix-message-timeouts.patch diff --git a/queue-3.4/usb-option-blacklist-network-interface-on-huawei-e1820.patch b/releases/3.4.49/usb-option-blacklist-network-interface-on-huawei-e1820.patch similarity index 100% rename from queue-3.4/usb-option-blacklist-network-interface-on-huawei-e1820.patch rename to releases/3.4.49/usb-option-blacklist-network-interface-on-huawei-e1820.patch diff --git a/queue-3.4/usb-revert-periodic-scheduling-bugfix.patch b/releases/3.4.49/usb-revert-periodic-scheduling-bugfix.patch similarity index 100% rename from queue-3.4/usb-revert-periodic-scheduling-bugfix.patch rename to releases/3.4.49/usb-revert-periodic-scheduling-bugfix.patch diff --git a/queue-3.4/usb-serial-cypress_m8-enable-frwd-dongle-hidcom-device.patch b/releases/3.4.49/usb-serial-cypress_m8-enable-frwd-dongle-hidcom-device.patch similarity index 100% rename from queue-3.4/usb-serial-cypress_m8-enable-frwd-dongle-hidcom-device.patch rename to releases/3.4.49/usb-serial-cypress_m8-enable-frwd-dongle-hidcom-device.patch diff --git a/queue-3.4/usb-serial-fix-treo-kyocera-interrrupt-in-urb-context.patch b/releases/3.4.49/usb-serial-fix-treo-kyocera-interrrupt-in-urb-context.patch similarity index 100% rename from queue-3.4/usb-serial-fix-treo-kyocera-interrrupt-in-urb-context.patch rename to releases/3.4.49/usb-serial-fix-treo-kyocera-interrrupt-in-urb-context.patch diff --git a/queue-3.4/usb-visor-fix-initialisation-of-treo-kyocera-devices.patch b/releases/3.4.49/usb-visor-fix-initialisation-of-treo-kyocera-devices.patch similarity index 100% rename from queue-3.4/usb-visor-fix-initialisation-of-treo-kyocera-devices.patch rename to releases/3.4.49/usb-visor-fix-initialisation-of-treo-kyocera-devices.patch diff --git a/queue-3.4/usb-whiteheat-fix-broken-port-configuration.patch b/releases/3.4.49/usb-whiteheat-fix-broken-port-configuration.patch similarity index 100% rename from queue-3.4/usb-whiteheat-fix-broken-port-configuration.patch rename to releases/3.4.49/usb-whiteheat-fix-broken-port-configuration.patch diff --git a/queue-3.4/xen-pciback-rate-limit-error-messages-from-xen_pcibk_enable_msi-x.patch b/releases/3.4.49/xen-pciback-rate-limit-error-messages-from-xen_pcibk_enable_msi-x.patch similarity index 100% rename from queue-3.4/xen-pciback-rate-limit-error-messages-from-xen_pcibk_enable_msi-x.patch rename to releases/3.4.49/xen-pciback-rate-limit-error-messages-from-xen_pcibk_enable_msi-x.patch diff --git a/queue-3.4/xhci-correct-comp_mode_recovery_timer-on-return-from-hibernate.patch b/releases/3.4.49/xhci-correct-comp_mode_recovery_timer-on-return-from-hibernate.patch similarity index 100% rename from queue-3.4/xhci-correct-comp_mode_recovery_timer-on-return-from-hibernate.patch rename to releases/3.4.49/xhci-correct-comp_mode_recovery_timer-on-return-from-hibernate.patch diff --git a/queue-3.4/xhci-fix-list-access-before-init.patch b/releases/3.4.49/xhci-fix-list-access-before-init.patch similarity index 100% rename from queue-3.4/xhci-fix-list-access-before-init.patch rename to releases/3.4.49/xhci-fix-list-access-before-init.patch diff --git a/queue-3.4/xhci-mem-init-list-heads-at-the-beginning-of-init.patch b/releases/3.4.49/xhci-mem-init-list-heads-at-the-beginning-of-init.patch similarity index 100% rename from queue-3.4/xhci-mem-init-list-heads-at-the-beginning-of-init.patch rename to releases/3.4.49/xhci-mem-init-list-heads-at-the-beginning-of-init.patch