From: Jan Kiszka jan.kiszka@siemens.com
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") Cc: stable@vger.kernel.org Signed-off-by: Jan Kiszka jan.kiszka@siemens.com Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com ---
- resend for stable inclusion
drivers/platform/x86/pmc_atom.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c index aa53648a2214..9aca5e7ce6d0 100644 --- a/drivers/platform/x86/pmc_atom.c +++ b/drivers/platform/x86/pmc_atom.c @@ -415,6 +415,13 @@ static const struct dmi_system_id critclk_systems[] = { 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*/ } };
Hi,
2019年11月8日(金) 2:05 Andy Shevchenko andriy.shevchenko@linux.intel.com:
From: Jan Kiszka jan.kiszka@siemens.com
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.
You forgot to add original commit ID.
Best regards, Nobuhiro
Fixes: 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL") Cc: stable@vger.kernel.org Signed-off-by: Jan Kiszka jan.kiszka@siemens.com Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
- resend for stable inclusion
drivers/platform/x86/pmc_atom.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c index aa53648a2214..9aca5e7ce6d0 100644 --- a/drivers/platform/x86/pmc_atom.c +++ b/drivers/platform/x86/pmc_atom.c @@ -415,6 +415,13 @@ static const struct dmi_system_id critclk_systems[] = { 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*/ }
};
-- 2.24.0
-- Nobuhiro Iwamatsu iwamatsu at {nigauri.org / debian.org} GPG ID: 40AD1FA6
On Thu, Nov 07, 2019 at 07:05:30PM +0200, Andy Shevchenko wrote:
From: Jan Kiszka jan.kiszka@siemens.com
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") Cc: stable@vger.kernel.org Signed-off-by: Jan Kiszka jan.kiszka@siemens.com Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
- resend for stable inclusion
What git id is this in Linus's tree, and what tree(s) is this backport for?
thanks,
greg k-h
On 08.11.19 14:18, Greg Kroah-Hartman wrote:
On Thu, Nov 07, 2019 at 07:05:30PM +0200, Andy Shevchenko wrote:
From: Jan Kiszka jan.kiszka@siemens.com
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") Cc: stable@vger.kernel.org Signed-off-by: Jan Kiszka jan.kiszka@siemens.com Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
- resend for stable inclusion
What git id is this in Linus's tree, and what tree(s) is this backport for?
Upstream ID ad0d315b4d4e7138f43acf03308192ec00e9614d.
We should target down to 4.14, the last stable kernel that got bothered by 648e921888ad as far as I can see.
Jan
linux-stable-mirror@lists.linaro.org