Skip to contentSkip to conversation

platform/x86: pmc_atom: Add Lex 3I380D industrial PC to critclk_systems DMI table

PATCH In review Hans de Goede 4 participants 13 messages Apr 29, 2019 – May 24, 2019 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: pmc_atom: Add Lex 3I380D industrial PC to critclk_systems DMI table

The Lex 3I380D industrial PC has 4 ethernet controllers on board which need pmc_plt_clk0 - 3 to function, add it to the critclk_systems DMI table, so that drivers/clk/x86/clk-pmc-atom.c will mark the clocks as CLK_CRITICAL and they will not get turned off.

Fixes 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
---
 drivers/platform/x86/pmc_atom.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/platform/x86/pmc_atom.c +9 -0
index 3a635ea09b8a..2910845b7cdd 100644
@@ -407,12 +407,21 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc)
  */
 static const struct dmi_system_id critclk_systems[] = {
 	{
+		/* pmc_plt_clk0 is used for an external HSIC USB HUB */
 		.ident = "MPL CEC1x",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "MPL AG"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "CEC10 Family"),
 		},
 	},
+	{
+		/* pmc_plt_clk0 - 3 are used for the 4 ethernet controllers */
+		.ident = "Lex 3I380D",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Lex BayTrail"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "3I380D"),
+		},
+	},
 	{ /*sentinel*/ }
 };
 
Signature · 1 line
2.21.0
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Hans de Goede

The Lex 3I380D industrial PC has 4 ethernet controllers on board which need pmc_plt_clk0 - 3 to function, add it to the critclk_systems DMI table, so that drivers/clk/x86/clk-pmc-atom.c will mark the clocks as CLK_CRITICAL and they will not get turned off.

supposedly to go via CLK tree.

P.S. If you want it through PDx86, I need immutable branch / tag from CLK.

Quoted 36 lines
Fixes 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
---
 drivers/platform/x86/pmc_atom.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/platform/x86/pmc_atom.c +9 -1
index 3a635ea09b8a..2910845b7cdd 100644
@@ -407,12 +407,21 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc)
  */
 static const struct dmi_system_id critclk_systems[] = {
        {
+               /* pmc_plt_clk0 is used for an external HSIC USB HUB */
                .ident = "MPL CEC1x",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "MPL AG"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "CEC10 Family"),
                },
        },
+       {
+               /* pmc_plt_clk0 - 3 are used for the 4 ethernet controllers */
+               .ident = "Lex 3I380D",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Lex BayTrail"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "3I380D"),
+               },
+       },
        { /*sentinel*/ }
 };
 
--

2.21.0

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

Hi,

Quoted 8 lines · Andy Shevchenko
Quoted 6 lines · Hans de Goede

The Lex 3I380D industrial PC has 4 ethernet controllers on board which need pmc_plt_clk0 - 3 to function, add it to the critclk_systems DMI table, so that drivers/clk/x86/clk-pmc-atom.c will mark the clocks as CLK_CRITICAL and they will not get turned off.

Quoted 4 lines

supposedly to go via CLK tree.

P.S. If you want it through PDx86, I need immutable branch / tag from CLK.

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.

Regards,

Hans

Quoted 39 lines
Quoted 37 lines
Fixes 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
---
  drivers/platform/x86/pmc_atom.c | 9 +++++++++
  1 file changed, 9 insertions(+)
drivers/platform/x86/pmc_atom.c +9 -1
index 3a635ea09b8a..2910845b7cdd 100644
@@ -407,12 +407,21 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc)
   */
  static const struct dmi_system_id critclk_systems[] = {
         {
+               /* pmc_plt_clk0 is used for an external HSIC USB HUB */
                 .ident = "MPL CEC1x",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "MPL AG"),
                         DMI_MATCH(DMI_PRODUCT_NAME, "CEC10 Family"),
                 },
         },
+       {
+               /* pmc_plt_clk0 - 3 are used for the 4 ethernet controllers */
+               .ident = "Lex 3I380D",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Lex BayTrail"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "3I380D"),
+               },
+       },
         { /*sentinel*/ }
  };
 
--

2.21.0

#3 lore raw
Quoted 12 lines · Hans de Goede

Hi,

Quoted 8 lines · Andy Shevchenko
Quoted 6 lines · Hans de Goede

The Lex 3I380D industrial PC has 4 ethernet controllers on board which need pmc_plt_clk0 - 3 to function, add it to the critclk_systems DMI table, so that drivers/clk/x86/clk-pmc-atom.c will mark the clocks as CLK_CRITICAL and they will not get turned off.

Quoted 8 lines
Quoted 4 lines

supposedly to go via CLK tree.

P.S. If you want it through PDx86, I need immutable branch / tag from CLK.

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.

We don't do back merges, so, our base is v5.1-rc1. Does it mean the commit in question is in v5.1-rc1?
AFAICS it was appeared in v5.1-rc5.

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

Hi,

Quoted 18 lines · Andy Shevchenko
Quoted 17 lines · Hans de Goede

Hi,

Quoted 12 lines · Andy Shevchenko
Quoted 6 lines · Hans de Goede

The Lex 3I380D industrial PC has 4 ethernet controllers on board which need pmc_plt_clk0 - 3 to function, add it to the critclk_systems DMI table, so that drivers/clk/x86/clk-pmc-atom.c will mark the clocks as CLK_CRITICAL and they will not get turned off.

supposedly to go via CLK tree.

P.S. If you want it through PDx86, I need immutable branch / tag from CLK.

Quoted 7 lines
Quoted 3 lines

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.

We don't do back merges, so, our base is v5.1-rc1. Does it mean the commit in question is in v5.1-rc1?
AFAICS it was appeared in v5.1-rc5.

Ah, I see, my bad.

Stephen can you pick up this patch and the
"[PATCH 1/1] Add several Beckhoff Automation boards to critclk_systems DMI table" patch then?

Regards,

Hans

#5 lore raw

Quoting Hans de Goede (2019-05-06 08:05:42)

Quoted 29 lines

Hi,

Quoted 18 lines · Andy Shevchenko
Quoted 17 lines · Hans de Goede

Hi,

Quoted 12 lines · Andy Shevchenko
Quoted 6 lines · Hans de Goede

The Lex 3I380D industrial PC has 4 ethernet controllers on board which need pmc_plt_clk0 - 3 to function, add it to the critclk_systems DMI table, so that drivers/clk/x86/clk-pmc-atom.c will mark the clocks as CLK_CRITICAL and they will not get turned off.

supposedly to go via CLK tree.

P.S. If you want it through PDx86, I need immutable branch / tag from CLK.

Quoted 7 lines
Quoted 3 lines

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.

We don't do back merges, so, our base is v5.1-rc1. Does it mean the commit in question is in v5.1-rc1?
AFAICS it was appeared in v5.1-rc5.

Quoted 6 lines

Ah, I see, my bad.

Stephen can you pick up this patch and the
"[PATCH 1/1] Add several Beckhoff Automation boards to critclk_systems DMI table" patch then?

I guess this is urgent? I'm lost why Andy can't apply the patch and merge it up to Linus. I don't maintain this driver here, and even if there's a cross tree dependency I don't understand why a base of v5.1-rc1 is limiting abilities to apply patches.

I'd think that if an "immutable branch" was all that was required you could 'git checkout 7c2e07130090ae001a97a6b65597830d6815e93e' and then apply the patch there and merge it all up into the PDx86 tree. In the end, when sending the PR to Linus the already merged changes won't show up in the diff because it's all been merged already on the other side.

Either way, I'm going to send off the clk PR real soon so this may need to wait until after the merge window, or if it's really urgent I could send a fixes branch before the merge window closes next week.

#6 lore raw

Hi,

Quoted 30 lines · Stephen Boyd

Quoting Hans de Goede (2019-05-06 08:05:42)

Quoted 29 lines

Hi,

Quoted 25 lines · Andy Shevchenko
Quoted 12 lines · Hans de Goede

Hi,

Quoted 8 lines · Andy Shevchenko
Quoted 6 lines · Hans de Goede

The Lex 3I380D industrial PC has 4 ethernet controllers on board which need pmc_plt_clk0 - 3 to function, add it to the critclk_systems DMI table, so that drivers/clk/x86/clk-pmc-atom.c will mark the clocks as CLK_CRITICAL and they will not get turned off.

Quoted 8 lines
Quoted 4 lines

supposedly to go via CLK tree.

P.S. If you want it through PDx86, I need immutable branch / tag from CLK.

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.

We don't do back merges, so, our base is v5.1-rc1. Does it mean the commit in question is in v5.1-rc1?
AFAICS it was appeared in v5.1-rc5.

Quoted 8 lines
Quoted 6 lines

Ah, I see, my bad.

Stephen can you pick up this patch and the
"[PATCH 1/1] Add several Beckhoff Automation boards to critclk_systems DMI table" patch then?

I guess this is urgent?

Somewhat, getting this into e.g. rc2 would be fine too, waiting till 5.3 would be bad.

Regards,

Hans

#7 lore raw
Quoted 7 lines · Hans de Goede
Quoted 3 lines · Stephen Boyd

Quoting Hans de Goede (2019-05-06 08:05:42)

I guess this is urgent?

Somewhat, getting this into e.g. rc2 would be fine too, waiting till 5.3 would be bad.

So, I can do it as a fixes for rc2, just ping me after merge window.

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

Hi,

Quoted 10 lines · Andy Shevchenko
Quoted 7 lines · Hans de Goede
Quoted 3 lines · Stephen Boyd

Quoting Hans de Goede (2019-05-06 08:05:42)

I guess this is urgent?

Somewhat, getting this into e.g. rc2 would be fine too, waiting till 5.3 would be bad.

So, I can do it as a fixes for rc2, just ping me after merge window.

Ok, will do.

Regards,

Hans

#9 lore raw
Quoted 7 lines · Hans de Goede

Hi,

Quoted 4 lines · Andy Shevchenko
Quoted 2 lines · Hans de Goede
Quoted 1 line · Stephen Boyd

Quoting Hans de Goede (2019-05-06 08:05:42)

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 1 line

I guess this is urgent?

Somewhat, getting this into e.g. rc2 would be fine too, waiting till 5.3 would be bad.

So, I can do it as a fixes for rc2, just ping me after merge window.

Ok, will do.

Andy, what is the issue here? If the dependency is in v5.1 we can do a "merge --ff-only v5.1" in our for-next branch in order to pull it in, that would be the same as an immutable branch basically.

Signature · 2 lines
Darren Hart
VMware Open Source Technology Center
#10 lore raw
Quoted 13 lines · Darren Hart
Quoted 12 lines · Hans de Goede

Hi,

Quoted 9 lines · Andy Shevchenko
Quoted 7 lines · Hans de Goede
Quoted 3 lines · Stephen Boyd

Quoting Hans de Goede (2019-05-06 08:05:42)

I guess this is urgent?

Somewhat, getting this into e.g. rc2 would be fine too, waiting till 5.3 would be bad.

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

So, I can do it as a fixes for rc2, just ping me after merge window.

Ok, will do.

Andy, what is the issue here? If the dependency is in v5.1 we can do a "merge --ff-only v5.1" in our for-next branch in order to pull it in, that would be the same as an immutable branch basically.

A simpler solution for this case would be to issue two PRs to Linus from two different branches. Other subsystems send topic branches, so this isn't out of the ordinary.

I have merged the two patches in question from Hans and Steffen to for-next-2.

We could send two PRs back to back, with a note to Linus why this is a bit different than usual, and then come back together in our for-next and fixes branches once both are merged and continue as usual.

Any concerns with this approach?

Signature · 2 lines
Darren Hart
VMware Open Source Technology Center
#11 lore raw
In reply to Andy Shevchenko

Hi

Quoted 10 lines · Andy Shevchenko
Quoted 7 lines · Hans de Goede
Quoted 3 lines · Stephen Boyd

Quoting Hans de Goede (2019-05-06 08:05:42)

I guess this is urgent?

Somewhat, getting this into e.g. rc2 would be fine too, waiting till 5.3 would be bad.

So, I can do it as a fixes for rc2, just ping me after merge window.

The merge window is done now, can you please get the patch from this
thread and the
"PATCH 1/1] platform/x86: pmc_atom: Add several Beckhoff Automation boards to critclk_systems DMI table" patch queued up as fixes for 5.2 now ?

Regards,

Hans

#12 lore raw
Quoted 13 lines · Hans de Goede

Hi

Quoted 9 lines · Andy Shevchenko
Quoted 7 lines · Hans de Goede
Quoted 3 lines · Stephen Boyd

Quoting Hans de Goede (2019-05-06 08:05:42)

I guess this is urgent?

Somewhat, getting this into e.g. rc2 would be fine too, waiting till 5.3 would be bad.

Quoted 6 lines
Quoted 1 line

So, I can do it as a fixes for rc2, just ping me after merge window.

The merge window is done now, can you please get the patch from this
thread and the
"PATCH 1/1] platform/x86: pmc_atom: Add several Beckhoff Automation boards to critclk_systems DMI table" patch queued up as fixes for 5.2 now ?

PR had been sent couple of hours ago, thanks!

Signature · 2 lines
With Best Regards,
Andy Shevchenko