From 9bcb2d9815f3822b17f423a4eb94cab88ff8c631 Mon Sep 17 00:00:00 2001 From: Samuel Angebault Date: Sun, 9 Jun 2019 10:08:11 -0700 Subject: [PATCH] Backport dmi fix from linux-4.16 (#85) This is just a cosmetic fix for platforms that doesn't provide any DMI information. Without this patch this raise an error kernel message which should actually just be a debug one. This patch does just that. --- ...i-handle-missing-DMI-data-gracefully.patch | 63 +++++++++++++++++++ patch/series | 1 + 2 files changed, 64 insertions(+) create mode 100644 patch/linux-4.16-firmware-dmi-handle-missing-DMI-data-gracefully.patch diff --git a/patch/linux-4.16-firmware-dmi-handle-missing-DMI-data-gracefully.patch b/patch/linux-4.16-firmware-dmi-handle-missing-DMI-data-gracefully.patch new file mode 100644 index 000000000000..bc49bf1f42ae --- /dev/null +++ b/patch/linux-4.16-firmware-dmi-handle-missing-DMI-data-gracefully.patch @@ -0,0 +1,63 @@ +From a81114d03e4a529c4b68293249f75438b3c1783f Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Sat, 3 Feb 2018 11:25:20 +0100 +Subject: [PATCH] firmware: dmi: handle missing DMI data gracefully +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Currently, when booting a kernel with DMI support on a platform that has +no DMI tables, the following output is emitted into the kernel log: + + [ 0.128818] DMI not present or invalid. + ... + [ 1.306659] dmi: Firmware registration failed. + ... + [ 2.908681] dmi-sysfs: dmi entry is absent. + +The first one is a pr_info(), but the subsequent ones are pr_err()s that +complain about a condition that is not really an error to begin with. + +So let's clean this up, and give up silently if dma_available is not set. + +Signed-off-by: Ard Biesheuvel +Acked-by: Martin Hundebøll +Signed-off-by: Jean Delvare +--- + drivers/firmware/dmi-sysfs.c | 2 +- + drivers/firmware/dmi_scan.c | 6 ++---- + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/drivers/firmware/dmi-sysfs.c b/drivers/firmware/dmi-sysfs.c +index ef76e5eecf0b..d401d69ee2a7 100644 +--- a/drivers/firmware/dmi-sysfs.c ++++ b/drivers/firmware/dmi-sysfs.c +@@ -651,7 +651,7 @@ static int __init dmi_sysfs_init(void) + int val; + + if (!dmi_kobj) { +- pr_err("dmi-sysfs: dmi entry is absent.\n"); ++ pr_debug("dmi-sysfs: dmi entry is absent.\n"); + error = -ENODATA; + goto err; + } +diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c +index 42844c318445..74a6a3c5185c 100644 +--- a/drivers/firmware/dmi_scan.c ++++ b/drivers/firmware/dmi_scan.c +@@ -686,10 +686,8 @@ static int __init dmi_init(void) + u8 *dmi_table; + int ret = -ENOMEM; + +- if (!dmi_available) { +- ret = -ENODATA; +- goto err; +- } ++ if (!dmi_available) ++ return 0; + + /* + * Set up dmi directory at /sys/firmware/dmi. This entry should stay +-- +2.21.0 + diff --git a/patch/series b/patch/series index ad72f2762049..2d23efea2d71 100755 --- a/patch/series +++ b/patch/series @@ -75,6 +75,7 @@ linux-4.13-thermal-intel_pch_thermal-Fix-enable-check-on.patch 0037-mlxsw-Align-code-with-kernel-v-5.1.patch 0038-mlxsw-core-Add-check-for-split-port-during-thermal-z.patch 0039-mlxsw-core-Prevent-reading-unsupported-slave-address.patch +linux-4.16-firmware-dmi-handle-missing-DMI-data-gracefully.patch # # This series applies on GIT commit 1451b36b2b0d62178e42f648d8a18131af18f7d8 # Tkernel-sched-core-fix-cgroup-fork-race.patch