Fix backtrace from PNP conflict on Haswell-ULT (rhbz 1300955)

2 files changed, 125 insertions, 0 deletions

diff --git a/PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch b/PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch
new file mode 100644
index 000000000..c2082a3b4
--- /dev/null
+++ b/PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch
@@ -0,0 +1,119 @@
+From afa5b65015ff2a7f0b4ec8cab6f58fa47025259a Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Fri, 22 Jan 2016 08:11:46 -0500
+Subject: [PATCH] PNP: Add Haswell-ULT to Intel MCH size workaround
+
+Add device ID 0x0a04 for Haswell-ULT to the list of devices with MCH
+problems.
+
+From a Lenovo ThinkPad T440S:
+[    0.188604] pnp: PnP ACPI init
+[    0.189044] system 00:00: [mem 0x00000000-0x0009ffff] could not be reserved
+[    0.189048] system 00:00: [mem 0x000c0000-0x000c3fff] could not be reserved
+[    0.189050] system 00:00: [mem 0x000c4000-0x000c7fff] could not be reserved
+[    0.189052] system 00:00: [mem 0x000c8000-0x000cbfff] could not be reserved
+[    0.189054] system 00:00: [mem 0x000cc000-0x000cffff] could not be reserved
+[    0.189056] system 00:00: [mem 0x000d0000-0x000d3fff] has been reserved
+[    0.189058] system 00:00: [mem 0x000d4000-0x000d7fff] has been reserved
+[    0.189060] system 00:00: [mem 0x000d8000-0x000dbfff] has been reserved
+[    0.189061] system 00:00: [mem 0x000dc000-0x000dffff] has been reserved
+[    0.189063] system 00:00: [mem 0x000e0000-0x000e3fff] could not be reserved
+[    0.189065] system 00:00: [mem 0x000e4000-0x000e7fff] could not be reserved
+[    0.189067] system 00:00: [mem 0x000e8000-0x000ebfff] could not be reserved
+[    0.189069] system 00:00: [mem 0x000ec000-0x000effff] could not be reserved
+[    0.189071] system 00:00: [mem 0x000f0000-0x000fffff] could not be reserved
+[    0.189073] system 00:00: [mem 0x00100000-0xdf9fffff] could not be reserved
+[    0.189075] system 00:00: [mem 0xfec00000-0xfed3ffff] could not be reserved
+[    0.189078] system 00:00: [mem 0xfed4c000-0xffffffff] could not be reserved
+[    0.189082] system 00:00: Plug and Play ACPI device, IDs PNP0c01 (active)
+[    0.189216] system 00:01: [io  0x1800-0x189f] could not be reserved
+[    0.189220] system 00:01: [io  0x0800-0x087f] has been reserved
+[    0.189222] system 00:01: [io  0x0880-0x08ff] has been reserved
+[    0.189224] system 00:01: [io  0x0900-0x097f] has been reserved
+[    0.189226] system 00:01: [io  0x0980-0x09ff] has been reserved
+[    0.189229] system 00:01: [io  0x0a00-0x0a7f] has been reserved
+[    0.189231] system 00:01: [io  0x0a80-0x0aff] has been reserved
+[    0.189233] system 00:01: [io  0x0b00-0x0b7f] has been reserved
+[    0.189235] system 00:01: [io  0x0b80-0x0bff] has been reserved
+[    0.189238] system 00:01: [io  0x15e0-0x15ef] has been reserved
+[    0.189240] system 00:01: [io  0x1600-0x167f] has been reserved
+[    0.189242] system 00:01: [io  0x1640-0x165f] has been reserved
+[    0.189246] system 00:01: [mem 0xf8000000-0xfbffffff] could not be reserved
+[    0.189249] system 00:01: [mem 0x00000000-0x00000fff] could not be reserved
+[    0.189251] system 00:01: [mem 0xfed1c000-0xfed1ffff] has been reserved
+[    0.189254] system 00:01: [mem 0xfed10000-0xfed13fff] has been reserved
+[    0.189256] system 00:01: [mem 0xfed18000-0xfed18fff] has been reserved
+[    0.189258] system 00:01: [mem 0xfed19000-0xfed19fff] has been reserved
+[    0.189261] system 00:01: [mem 0xfed45000-0xfed4bfff] has been reserved
+[    0.189264] system 00:01: Plug and Play ACPI device, IDs PNP0c02 (active)
+[....]
+[    0.583653] resource sanity check: requesting [mem 0xfed10000-0xfed15fff], which spans more than pnp 00:01 [mem 0xfed10000-0xfed13fff]
+[    0.583654] ------------[ cut here ]------------
+[    0.583660] WARNING: CPU: 0 PID: 1 at arch/x86/mm/ioremap.c:198 __ioremap_caller+0x2c5/0x380()
+[    0.583661] Info: mapping multiple BARs. Your kernel is fine.
+[    0.583662] Modules linked in:
+
+[    0.583666] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.3.3-303.fc23.x86_64 #1
+[    0.583668] Hardware name: LENOVO 20AR001GXS/20AR001GXS, BIOS GJET86WW (2.36 ) 12/04/2015
+[    0.583670]  0000000000000000 0000000014cf7e59 ffff880214a1baf8 ffffffff813a625f
+[    0.583673]  ffff880214a1bb40 ffff880214a1bb30 ffffffff810a07c2 00000000fed10000
+[    0.583675]  ffffc90000cb8000 0000000000006000 0000000000000000 ffff8800d6381040
+[    0.583678] Call Trace:
+[    0.583683]  [<ffffffff813a625f>] dump_stack+0x44/0x55
+[    0.583686]  [<ffffffff810a07c2>] warn_slowpath_common+0x82/0xc0
+[    0.583688]  [<ffffffff810a085c>] warn_slowpath_fmt+0x5c/0x80
+[    0.583692]  [<ffffffff810a6fba>] ? iomem_map_sanity_check+0xba/0xd0
+[    0.583695]  [<ffffffff81065835>] __ioremap_caller+0x2c5/0x380
+[    0.583698]  [<ffffffff81065907>] ioremap_nocache+0x17/0x20
+[    0.583701]  [<ffffffff8103a119>] snb_uncore_imc_init_box+0x79/0xb0
+[    0.583705]  [<ffffffff81038900>] uncore_pci_probe+0xd0/0x1b0
+[    0.583707]  [<ffffffff813efda5>] local_pci_probe+0x45/0xa0
+[    0.583710]  [<ffffffff813f118d>] pci_device_probe+0xfd/0x140
+[    0.583713]  [<ffffffff814d9b52>] driver_probe_device+0x222/0x480
+[    0.583715]  [<ffffffff814d9e34>] __driver_attach+0x84/0x90
+[    0.583717]  [<ffffffff814d9db0>] ? driver_probe_device+0x480/0x480
+[    0.583720]  [<ffffffff814d762c>] bus_for_each_dev+0x6c/0xc0
+[    0.583722]  [<ffffffff814d930e>] driver_attach+0x1e/0x20
+[    0.583724]  [<ffffffff814d8e4b>] bus_add_driver+0x1eb/0x280
+[    0.583727]  [<ffffffff81d6af1a>] ? uncore_cpu_setup+0x12/0x12
+[    0.583729]  [<ffffffff814da680>] driver_register+0x60/0xe0
+[    0.583733]  [<ffffffff813ef78c>] __pci_register_driver+0x4c/0x50
+[    0.583736]  [<ffffffff81d6affc>] intel_uncore_init+0xe2/0x2e6
+[    0.583738]  [<ffffffff81d6af1a>] ? uncore_cpu_setup+0x12/0x12
+[    0.583741]  [<ffffffff81002123>] do_one_initcall+0xb3/0x200
+[    0.583745]  [<ffffffff810be500>] ? parse_args+0x1a0/0x4a0
+[    0.583749]  [<ffffffff81d5c1c8>] kernel_init_freeable+0x189/0x223
+[    0.583752]  [<ffffffff81775c40>] ? rest_init+0x80/0x80
+[    0.583754]  [<ffffffff81775c4e>] kernel_init+0xe/0xe0
+[    0.583758]  [<ffffffff81781adf>] ret_from_fork+0x3f/0x70
+[    0.583760]  [<ffffffff81775c40>] ? rest_init+0x80/0x80
+[    0.583765] ---[ end trace 077c426a39e018aa ]---
+
+00:00.0 Host bridge [0600]: Intel Corporation Haswell-ULT DRAM Controller [8086:0a04] (rev 0b)
+	Subsystem: Lenovo Device [17aa:220c]
+	Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
+	Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort+ >SERR- <PERR- INTx-
+	Latency: 0
+	Capabilities: <access denied>
+	Kernel driver in use: hsw_uncore
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ drivers/pnp/quirks.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
+index f700723ca5d6..d28e3ab9479c 100644
+--- a/drivers/pnp/quirks.c
++++ b/drivers/pnp/quirks.c
+@@ -342,6 +342,7 @@ static void quirk_amd_mmconfig_area(struct pnp_dev *dev)
+ /* Device IDs of parts that have 32KB MCH space */
+ static const unsigned int mch_quirk_devices[] = {
+ 	0x0154,	/* Ivy Bridge */
++	0x0a04, /* Haswell-ULT */
+ 	0x0c00,	/* Haswell */
+ 	0x1604, /* Broadwell */
+ };
+-- 
+2.5.0
+
diff --git a/kernel.spec b/kernel.spec
index 90ac28b95..7cf8f9f5d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -602,6 +602,9 @@ Patch637: tty-Fix-unsafe-ldisc-reference-via-ioctl-TIOCGETD.patch
 #rhbz 1279653
 Patch638: rtlwifi-rtl8821ae-Fix-5G-failure-when-EEPROM-is-inco.patch
 
+#rhbz 1300955
+Patch640: PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2047,6 +2050,9 @@ fi
 #
 # 
 %changelog
+* Fri Jan 22 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix backtrace from PNP conflict on Haswell-ULT (rhbz 1300955)
+
 * Thu Jan 21 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git8.1
 - Linux v4.4-10062-g30f0530