add pci quirks for MSI MS-7253 board

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 108 insertions, 0 deletions

diff --git a/queue/series b/queue/series
index 4ae50d8..28ea0b8 100644
--- a/queue/series
+++ b/queue/series
@@ -175,3 +175,5 @@ tty-icount-changeover-for-other-main-devices.patch
 nozomi-Fix-warning-from-the-previous-TIOCGCOUNT-chan.patch
 tty-fix-warning-in-synclink-driver.patch
 score-fix-off-by-one-index-into-syscall-table.patch
+x86-PCI-do-not-tie-MSI-MS-7253-use_crs-quirk-to-BIOS.patch
+x86-PCI-use-host-bridge-_CRS-info-on-MSI-MS-7253.patch
diff --git a/queue/x86-PCI-do-not-tie-MSI-MS-7253-use_crs-quirk-to-BIOS.patch b/queue/x86-PCI-do-not-tie-MSI-MS-7253-use_crs-quirk-to-BIOS.patch
new file mode 100644
index 0000000..1ddbd64
--- /dev/null
+++ b/queue/x86-PCI-do-not-tie-MSI-MS-7253-use_crs-quirk-to-BIOS.patch
@@ -0,0 +1,47 @@
+From d730608c0f23256d72a4bff3a433680740b880d8 Mon Sep 17 00:00:00 2001
+From: Jonathan Nieder <jrnieder@gmail.com>
+Date: Tue, 28 Feb 2012 15:31:35 -0600
+Subject: [PATCH] x86/PCI: do not tie MSI MS-7253 use_crs quirk to BIOS
+ version
+
+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: Paul Gortmaker <paul.gortmaker@windriver.com>
+
+diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
+index 9b55642..15245cf 100644
+--- a/arch/x86/pci/acpi.c
++++ b/arch/x86/pci/acpi.c
+@@ -51,7 +51,6 @@ static const struct dmi_system_id pci_use_crs_table[] __initconst = {
+ 			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"),
+ 		},
+ 	},
+ 	{}
+-- 
+1.7.9.6
+
diff --git a/queue/x86-PCI-use-host-bridge-_CRS-info-on-MSI-MS-7253.patch b/queue/x86-PCI-use-host-bridge-_CRS-info-on-MSI-MS-7253.patch
new file mode 100644
index 0000000..61aef4f
--- /dev/null
+++ b/queue/x86-PCI-use-host-bridge-_CRS-info-on-MSI-MS-7253.patch
@@ -0,0 +1,59 @@
+From 73e69dd9a684f55205881521026d27c03f9308c4 Mon Sep 17 00:00:00 2001
+From: Jonathan Nieder <jrnieder@gmail.com>
+Date: Tue, 28 Feb 2012 11:51:10 -0700
+Subject: [PATCH] x86/PCI: use host bridge _CRS info on MSI MS-7253
+
+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: Paul Gortmaker <paul.gortmaker@windriver.com>
+
+diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
+index 7743fb1..9b55642 100644
+--- a/arch/x86/pci/acpi.c
++++ b/arch/x86/pci/acpi.c
+@@ -43,6 +43,17 @@ static const struct dmi_system_id pci_use_crs_table[] __initconst = {
+ 			DMI_MATCH(DMI_PRODUCT_NAME, "ALiveSATA2-GLAN"),
+                 },
+         },
++	/* 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"),
++		},
++	},
+ 	{}
+ };
+ 
+-- 
+1.7.9.6
+