From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 16 Dec 2019 12:01:16 +0000 (+0100)
Subject: 4.19-stable patches
X-Git-Tag: v5.4.4~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6b5413b39d29848f03f23d3ebbbe43ceaf8b651;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch
---

diff --git a/queue-4.19/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch b/queue-4.19/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch
new file mode 100644
index 00000000000..bef2f098401
--- /dev/null
+++ b/queue-4.19/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch
@@ -0,0 +1,49 @@
+From a8ff78f7f773142eb8a8befe5a95dd6858ebd635 Mon Sep 17 00:00:00 2001
+From: Tuowen Zhao <ztuowen@gmail.com>
+Date: Wed, 16 Oct 2019 15:06:29 -0600
+Subject: mfd: intel-lpss: Use devm_ioremap_uc for MMIO
+
+From: Tuowen Zhao <ztuowen@gmail.com>
+
+commit a8ff78f7f773142eb8a8befe5a95dd6858ebd635 upstream.
+
+Some BIOS erroneously specifies write-combining BAR for intel-lpss-pci
+in MTRR. This will cause the system to hang during boot. If possible,
+this bug could be corrected with a firmware update.
+
+This patch use devm_ioremap_uc to overwrite/ignore the MTRR settings
+by forcing the use of strongly uncachable pages for intel-lpss.
+
+The BIOS bug is present on Dell XPS 13 7390 2-in-1:
+
+[    0.001734]   5 base 4000000000 mask 6000000000 write-combining
+
+4000000000-7fffffffff : PCI Bus 0000:00
+  4000000000-400fffffff : 0000:00:02.0 (i915)
+  4010000000-4010000fff : 0000:00:15.0 (intel-lpss-pci)
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=203485
+Cc: <stable@vger.kernel.org> # v4.19+
+Tested-by: AceLan Kao <acelan.kao@canonical.com>
+Signed-off-by: Tuowen Zhao <ztuowen@gmail.com>
+Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Tested-by: Roman Gilg <subdiff@gmail.com>
+Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mfd/intel-lpss.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mfd/intel-lpss.c
++++ b/drivers/mfd/intel-lpss.c
+@@ -397,7 +397,7 @@ int intel_lpss_probe(struct device *dev,
+ 	if (!lpss)
+ 		return -ENOMEM;
+ 
+-	lpss->priv = devm_ioremap(dev, info->mem->start + LPSS_PRIV_OFFSET,
++	lpss->priv = devm_ioremap_uc(dev, info->mem->start + LPSS_PRIV_OFFSET,
+ 				  LPSS_PRIV_SIZE);
+ 	if (!lpss->priv)
+ 		return -ENOMEM;
diff --git a/queue-4.19/series b/queue-4.19/series
index 90e9aa1dfc1..a848c2d47fc 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -129,3 +129,4 @@ ath10k-fix-fw-crash-by-moving-chip-reset-after-napi-.patch
 regulator-88pm800-fix-warning-same-module-names.patch
 powerpc-avoid-clang-warnings-around-setjmp-and-longj.patch
 powerpc-fix-vdso-clock_getres.patch
+mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch