]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Nov 2019 14:09:01 +0000 (15:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Nov 2019 14:09:01 +0000 (15:09 +0100)
added patches:
platform-x86-pmc_atom-add-siemens-simatic-ipc227e-to-critclk_systems-dmi-table.patch

queue-4.19/platform-x86-pmc_atom-add-siemens-simatic-ipc227e-to-critclk_systems-dmi-table.patch [new file with mode: 0644]
queue-4.19/series

diff --git a/queue-4.19/platform-x86-pmc_atom-add-siemens-simatic-ipc227e-to-critclk_systems-dmi-table.patch b/queue-4.19/platform-x86-pmc_atom-add-siemens-simatic-ipc227e-to-critclk_systems-dmi-table.patch
new file mode 100644 (file)
index 0000000..849f0c6
--- /dev/null
@@ -0,0 +1,38 @@
+From ad0d315b4d4e7138f43acf03308192ec00e9614d Mon Sep 17 00:00:00 2001
+From: Jan Kiszka <jan.kiszka@siemens.com>
+Date: Wed, 4 Sep 2019 08:42:30 +0200
+Subject: platform/x86: pmc_atom: Add Siemens SIMATIC IPC227E to critclk_systems DMI table
+
+From: Jan Kiszka <jan.kiszka@siemens.com>
+
+commit ad0d315b4d4e7138f43acf03308192ec00e9614d upstream.
+
+The SIMATIC IPC227E uses the PMC clock for on-board components and gets
+stuck during boot if the clock is disabled. Therefore, add this device
+to the critical systems list.
+
+Fixes: 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
+Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/platform/x86/pmc_atom.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/platform/x86/pmc_atom.c
++++ b/drivers/platform/x86/pmc_atom.c
+@@ -445,6 +445,13 @@ static const struct dmi_system_id critcl
+                       DMI_MATCH(DMI_BOARD_NAME, "CB6363"),
+               },
+       },
++      {
++              .ident = "SIMATIC IPC227E",
++              .matches = {
++                      DMI_MATCH(DMI_SYS_VENDOR, "SIEMENS AG"),
++                      DMI_MATCH(DMI_PRODUCT_VERSION, "6ES7647-8B"),
++              },
++      },
+       { /*sentinel*/ }
+ };
index 13f791ee670766d3af7162b79d66a216a43481a6..01b804695e41832e90d05fc4039e66fef591c256 100644 (file)
@@ -70,3 +70,4 @@ net-dsa-fix-switch-tree-list.patch
 r8152-add-device-id-for-lenovo-thinkpad-usb-c-dock-gen-2.patch
 net-flow_dissector-switch-to-siphash.patch
 wireless-skip-directory-when-generating-certificates.patch
+platform-x86-pmc_atom-add-siemens-simatic-ipc227e-to-critclk_systems-dmi-table.patch