From 1a05970831bfaaf96e7ad6186c6233aabf014bde Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 16 Dec 2019 14:07:50 +0100 Subject: [PATCH] drop mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch --- ...el-lpss-use-devm_ioremap_uc-for-mmio.patch | 49 ------------------- queue-4.19/series | 1 - ...el-lpss-use-devm_ioremap_uc-for-mmio.patch | 49 ------------------- queue-5.3/series | 1 - ...el-lpss-use-devm_ioremap_uc-for-mmio.patch | 49 ------------------- queue-5.4/series | 1 - 6 files changed, 150 deletions(-) delete mode 100644 queue-4.19/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch delete mode 100644 queue-5.3/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch delete mode 100644 queue-5.4/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 deleted file mode 100644 index bef2f098401..00000000000 --- a/queue-4.19/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a8ff78f7f773142eb8a8befe5a95dd6858ebd635 Mon Sep 17 00:00:00 2001 -From: Tuowen Zhao -Date: Wed, 16 Oct 2019 15:06:29 -0600 -Subject: mfd: intel-lpss: Use devm_ioremap_uc for MMIO - -From: Tuowen Zhao - -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: # v4.19+ -Tested-by: AceLan Kao -Signed-off-by: Tuowen Zhao -Acked-by: Mika Westerberg -Acked-by: Andy Shevchenko -Tested-by: Roman Gilg -Signed-off-by: Lee Jones -Signed-off-by: Greg Kroah-Hartman - ---- - 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 a848c2d47fc..90e9aa1dfc1 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -129,4 +129,3 @@ 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 diff --git a/queue-5.3/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch b/queue-5.3/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch deleted file mode 100644 index 50a3d3bf9ae..00000000000 --- a/queue-5.3/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a8ff78f7f773142eb8a8befe5a95dd6858ebd635 Mon Sep 17 00:00:00 2001 -From: Tuowen Zhao -Date: Wed, 16 Oct 2019 15:06:29 -0600 -Subject: mfd: intel-lpss: Use devm_ioremap_uc for MMIO - -From: Tuowen Zhao - -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: # v4.19+ -Tested-by: AceLan Kao -Signed-off-by: Tuowen Zhao -Acked-by: Mika Westerberg -Acked-by: Andy Shevchenko -Tested-by: Roman Gilg -Signed-off-by: Lee Jones -Signed-off-by: Greg Kroah-Hartman - ---- - 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 -@@ -395,7 +395,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-5.3/series b/queue-5.3/series index 309e3a62125..d2d548d8236 100644 --- a/queue-5.3/series +++ b/queue-5.3/series @@ -169,7 +169,6 @@ omap-pdata-quirks-remove-openpandora-quirks-for-mmc3.patch powerpc-avoid-clang-warnings-around-setjmp-and-longj.patch powerpc-fix-vdso-clock_getres.patch mm-memfd-fix-cow-issue-on-map_private-and-f_seal_future_write-mappings.patch -mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch mfd-rk808-fix-rk818-id-template.patch mm-memory.c-fix-a-huge-pud-insertion-race-during-faulting.patch mm-memcg-slab-wait-for-root-kmem_cache-refcnt-killing-on-root-kmem_cache-destruction.patch diff --git a/queue-5.4/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch b/queue-5.4/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch deleted file mode 100644 index ed03a5afa6d..00000000000 --- a/queue-5.4/mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a8ff78f7f773142eb8a8befe5a95dd6858ebd635 Mon Sep 17 00:00:00 2001 -From: Tuowen Zhao -Date: Wed, 16 Oct 2019 15:06:29 -0600 -Subject: mfd: intel-lpss: Use devm_ioremap_uc for MMIO - -From: Tuowen Zhao - -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: # v4.19+ -Tested-by: AceLan Kao -Signed-off-by: Tuowen Zhao -Acked-by: Mika Westerberg -Acked-by: Andy Shevchenko -Tested-by: Roman Gilg -Signed-off-by: Lee Jones -Signed-off-by: Greg Kroah-Hartman - ---- - 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 -@@ -384,7 +384,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-5.4/series b/queue-5.4/series index 7bdadafcf90..c59fd7ca737 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -162,7 +162,6 @@ omap-pdata-quirks-remove-openpandora-quirks-for-mmc3.patch powerpc-avoid-clang-warnings-around-setjmp-and-longj.patch powerpc-fix-vdso-clock_getres.patch mm-memfd-fix-cow-issue-on-map_private-and-f_seal_future_write-mappings.patch -mfd-intel-lpss-use-devm_ioremap_uc-for-mmio.patch mfd-rk808-fix-rk818-id-template.patch mm-memory.c-fix-a-huge-pud-insertion-race-during-faulting.patch mm-memcg-slab-wait-for-root-kmem_cache-refcnt-killing-on-root-kmem_cache-destruction.patch -- 2.47.3