From: Sasha Levin Date: Sat, 29 Feb 2020 03:59:13 +0000 (-0500) Subject: fixes for 5.5 X-Git-Tag: v4.19.108~91 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36a47f8684547d8d0adfe3d0a8d1d02bcf0d9822;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 5.5 Signed-off-by: Sasha Levin --- diff --git a/queue-5.5/edac-skx_common-downgrade-message-importance-on-miss.patch b/queue-5.5/edac-skx_common-downgrade-message-importance-on-miss.patch new file mode 100644 index 00000000000..b138065c1ad --- /dev/null +++ b/queue-5.5/edac-skx_common-downgrade-message-importance-on-miss.patch @@ -0,0 +1,42 @@ +From 1c554c62d2a073042787d4539db1bfe047d28917 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Dec 2019 16:23:25 -0500 +Subject: EDAC: skx_common: downgrade message importance on missing PCI device + +From: Aristeu Rozanski + +[ Upstream commit 854bb48018d5da261d438b2232fa683bdb553979 ] + +Both skx_edac and i10nm_edac drivers are loaded based on the matching CPU being +available which leads the module to be automatically loaded in virtual machines +as well. That will fail due the missing PCI devices. In both drivers the first +function to make use of the PCI devices is skx_get_hi_lo() will simply print + + EDAC skx: Can't get tolm/tohm + +for each CPU core, which is noisy. This patch makes it a debug message. + +Signed-off-by: Aristeu Rozanski +Signed-off-by: Tony Luck +Link: https://lore.kernel.org/r/20191204212325.c4k47p5hrnn3vpb5@redhat.com +Signed-off-by: Sasha Levin +--- + drivers/edac/skx_common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/edac/skx_common.c b/drivers/edac/skx_common.c +index 95662a4ff4c4f..99bbaf629b8d9 100644 +--- a/drivers/edac/skx_common.c ++++ b/drivers/edac/skx_common.c +@@ -256,7 +256,7 @@ int skx_get_hi_lo(unsigned int did, int off[], u64 *tolm, u64 *tohm) + + pdev = pci_get_device(PCI_VENDOR_ID_INTEL, did, NULL); + if (!pdev) { +- skx_printk(KERN_ERR, "Can't get tolm/tohm\n"); ++ edac_dbg(2, "Can't get tolm/tohm\n"); + return -ENODEV; + } + +-- +2.20.1 + diff --git a/queue-5.5/series b/queue-5.5/series new file mode 100644 index 00000000000..84e80a7fc4f --- /dev/null +++ b/queue-5.5/series @@ -0,0 +1 @@ +edac-skx_common-downgrade-message-importance-on-miss.patch