Skip to contentSkip to conversation

Add several Beckhoff Automation boards to critclk_systems DMI table

PATCH In review [email protected] 3 participants 4 messages May 2, 2019 – May 6, 2019 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

cover Add several Beckhoff Automation boards to critclk_systems DMI table

From: Steffen Dirkwinkel <[email protected]>

There are several Beckhoff Automation industrial PC boards which use pmc_plt_clk* clocks for ethernet controllers. The patch adds affected boards to critclk_systems DMI table so the clocks are marked as CLK_CRITICAL and not turned off.
This should be applied on top of another patch as both change
the same table:
[PATCH] platform/x86: pmc_atom: Add Lex 3I380D industrial PC to critclk_systems DMI table

Steffen Dirkwinkel (1):
platform/x86: pmc_atom: Add several Beckhoff Automation boards to
critclk_systems DMI table

 drivers/platform/x86/pmc_atom.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/1 platform/x86: pmc_atom: Add several Beckhoff Automation boards to critclk_systems DMI table

From: Steffen Dirkwinkel <[email protected]>

There are several Beckhoff Automation industrial PC boards which use pmc_plt_clk* clocks for ethernet controllers. This adds affected boards to critclk_systems DMI table so the clocks are marked as CLK_CRITICAL and not turned off.

Fixes 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
---
 drivers/platform/x86/pmc_atom.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
drivers/platform/x86/pmc_atom.c +24 -0
index a311f48ce7c9..b1d804376237 100644
@@ -413,6 +413,30 @@ static const struct dmi_system_id critclk_systems[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "3I380D"),
 		},
 	},
+	{
+		/* pmc_plt_clk* - are used for ethernet controllers */
+		.ident = "Beckhoff CB3163",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff Automation"),
+			DMI_MATCH(DMI_BOARD_NAME, "CB3163"),
+		},
+	},
+	{
+		/* pmc_plt_clk* - are used for ethernet controllers */
+		.ident = "Beckhoff CB6263",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff Automation"),
+			DMI_MATCH(DMI_BOARD_NAME, "CB6263"),
+		},
+	},
+	{
+		/* pmc_plt_clk* - are used for ethernet controllers */
+		.ident = "Beckhoff CB6363",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Beckhoff Automation"),
+			DMI_MATCH(DMI_BOARD_NAME, "CB6363"),
+		},
+	},
 	{ /*sentinel*/ }
 };
 
Signature · 1 line
2.21.0
Acked-by on the v1 series
#2 lore raw
In reply to [email protected]
Quoted 10 lines · On Thu, May 2, 2019 at 4:04 PM <[email protected]> wrote:

From: Steffen Dirkwinkel <[email protected]>

There are several Beckhoff Automation industrial PC boards which use pmc_plt_clk* clocks for ethernet controllers. The patch adds affected boards to critclk_systems DMI table so the clocks are marked as CLK_CRITICAL and not turned off.
This should be applied on top of another patch as both change
the same table:
[PATCH] platform/x86: pmc_atom: Add Lex 3I380D industrial PC to critclk_systems DMI table

Yes, that's why it either should go via CLK tree, or I need an immutable tag or branch from them.

Quoted 10 lines

Steffen Dirkwinkel (1):
platform/x86: pmc_atom: Add several Beckhoff Automation boards to
critclk_systems DMI table

 drivers/platform/x86/pmc_atom.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

--
2.21.0

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw

Hi,

Quoted 12 lines · Andy Shevchenko
Quoted 10 lines · On Thu, May 2, 2019 at 4:04 PM <[email protected]> wrote:

From: Steffen Dirkwinkel <[email protected]>

There are several Beckhoff Automation industrial PC boards which use pmc_plt_clk* clocks for ethernet controllers. The patch adds affected boards to critclk_systems DMI table so the clocks are marked as CLK_CRITICAL and not turned off.
This should be applied on top of another patch as both change
the same table:
[PATCH] platform/x86: pmc_atom: Add Lex 3I380D industrial PC to critclk_systems DMI table

Quoted 3 lines

Yes, that's why it either should go via CLK tree, or I need an immutable tag or branch from them.

As I just mentioned in your reply to the "[PATCH] platform/x86: pmc_atom:
Add Lex 3I380D industrial PC to critclk_systems DMI table":

"Stephen added the patches this depends on to his fixes branch, so they are in the 5.1 / Torvald's master branch, since we are now in the 5.2 merge window, you should be able to cleanly apply this directly."

So both that patch and this patch should be able to go through the d-p-x86 tree unless I'm missing something?

Regards,

Hans

Quoted 14 lines
Quoted 11 lines

Steffen Dirkwinkel (1):
platform/x86: pmc_atom: Add several Beckhoff Automation boards to
critclk_systems DMI table

  drivers/platform/x86/pmc_atom.c | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)

--
2.21.0