3.0-stable patches

added patches:
	x86-pci-do-not-tie-msi-ms-7253-use_crs-quirk-to-bios-version.patch
	x86-pci-use-host-bridge-_crs-info-on-msi-ms-7253.patch

diff --git a/queue-3.0/series b/queue-3.0/series
index 99231da1688578098286e0c9dcd17db7c7a2258f..ab97f4e5caf45e3ae7196c46724c689ce0a61e0c 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -28,3 +28,5 @@ mmc-atmel-mci-correct-data-timeout-computation.patch
 sysctl-fix-write-access-to-dmesg_restrict-kptr_restrict.patch
 modpost-fix-modpost-s-license-checking-v3.patch
 modpost-fix-modpost-license-checking-of-vmlinux.o.patch
+x86-pci-use-host-bridge-_crs-info-on-msi-ms-7253.patch
+x86-pci-do-not-tie-msi-ms-7253-use_crs-quirk-to-bios-version.patch

diff --git a/queue-3.0/x86-pci-do-not-tie-msi-ms-7253-use_crs-quirk-to-bios-version.patch b/queue-3.0/x86-pci-do-not-tie-msi-ms-7253-use_crs-quirk-to-bios-version.patch
new file mode 100644 (file)
index 0000000..07626ae
--- /dev/null
+++ b/queue-3.0/x86-pci-do-not-tie-msi-ms-7253-use_crs-quirk-to-bios-version.patch
@@ -0,0 +1,47 @@
+From a97f4f5e524bcd09a85ef0b8821a14d35e69335f Mon Sep 17 00:00:00 2001
+From: Jonathan Nieder <jrnieder@gmail.com>
+Date: Tue, 28 Feb 2012 15:31:35 -0600
+Subject: x86/PCI: do not tie MSI MS-7253 use_crs quirk to BIOS version
+
+From: Jonathan Nieder <jrnieder@gmail.com>
+
+commit a97f4f5e524bcd09a85ef0b8821a14d35e69335f upstream.
+
+Carlos was getting
+
+       WARNING: at drivers/pci/pci.c:118 pci_ioremap_bar+0x24/0x52()
+
+when probing his sound card, and sound did not work.  After adding
+pci=use_crs to the kernel command line, no more trouble.
+
+Ok, we can add a quirk.  dmidecode output reveals that this is an MSI
+MS-7253, for which we already have a quirk, but the short-sighted
+author tied the quirk to a single BIOS version, making it not kick in
+on Carlos's machine with BIOS V1.2.  If a later BIOS update makes it
+no longer necessary to look at the _CRS info it will still be
+harmless, so let's stop trying to guess which versions have and don't
+have accurate _CRS tables.
+
+Addresses https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5533
+Also see <https://bugzilla.kernel.org/show_bug.cgi?id=42619>.
+
+Reported-by: Carlos Luna <caralu74@gmail.com>
+Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/pci/acpi.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/arch/x86/pci/acpi.c
++++ b/arch/x86/pci/acpi.c
+@@ -62,7 +62,6 @@ static const struct dmi_system_id pci_us
+                       DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
+                       DMI_MATCH(DMI_BOARD_NAME, "MS-7253"),
+                       DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"),
+-                      DMI_MATCH(DMI_BIOS_VERSION, "V1.6"),
+               },
+       },
+       {}

diff --git a/queue-3.0/x86-pci-use-host-bridge-_crs-info-on-msi-ms-7253.patch b/queue-3.0/x86-pci-use-host-bridge-_crs-info-on-msi-ms-7253.patch
new file mode 100644 (file)
index 0000000..48d3590
--- /dev/null
+++ b/queue-3.0/x86-pci-use-host-bridge-_crs-info-on-msi-ms-7253.patch
@@ -0,0 +1,60 @@
+From 8411371709610c826bf65684f886bfdfb5780ca1 Mon Sep 17 00:00:00 2001
+From: Jonathan Nieder <jrnieder@gmail.com>
+Date: Tue, 28 Feb 2012 11:51:10 -0700
+Subject: x86/PCI: use host bridge _CRS info on MSI MS-7253
+
+From: Jonathan Nieder <jrnieder@gmail.com>
+
+commit 8411371709610c826bf65684f886bfdfb5780ca1 upstream.
+
+In the spirit of commit 29cf7a30f8a0 ("x86/PCI: use host bridge _CRS
+info on ASUS M2V-MX SE"), this DMI quirk turns on "pci_use_crs" by
+default on a board that needs it.
+
+This fixes boot failures and oopses introduced in 3e3da00c01d0
+("x86/pci: AMD one chain system to use pci read out res").  The quirk
+is quite targetted (to a specific board and BIOS version) for two
+reasons:
+
+ (1) to emphasize that this method of tackling the problem one quirk
+     at a time is a little insane
+
+ (2) to give BIOS vendors an opportunity to use simpler tables and
+     allow us to return to generic behavior (whatever that happens to
+     be) with a later BIOS update
+
+In other words, I am not at all happy with having quirks like this.
+But it is even worse for the kernel not to work out of the box on
+these machines, so...
+
+Reference: https://bugzilla.kernel.org/show_bug.cgi?id=42619
+Reported-by: Svante Signell <svante.signell@telia.com>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/pci/acpi.c |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/arch/x86/pci/acpi.c
++++ b/arch/x86/pci/acpi.c
+@@ -54,6 +54,17 @@ static const struct dmi_system_id pci_us
+                       DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
+               },
+       },
++      /* https://bugzilla.kernel.org/show_bug.cgi?id=42619 */
++      {
++              .callback = set_use_crs,
++              .ident = "MSI MS-7253",
++              .matches = {
++                      DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
++                      DMI_MATCH(DMI_BOARD_NAME, "MS-7253"),
++                      DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"),
++                      DMI_MATCH(DMI_BIOS_VERSION, "V1.6"),
++              },
++      },
+       {}
+ };
+