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

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

[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.

Fixes: 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
Reported-and-tested-by: Semyon Verchenko <semverchenko@factor-ts.ru>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/platform/x86/pmc_atom.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c
index 3a635ea09b8a..2910845b7cdd 100644
--- a/drivers/platform/x86/pmc_atom.c
+++ b/drivers/platform/x86/pmc_atom.c
@@ -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

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

[Andy Shevchenko]

On Mon, Apr 29, 2019 at 6:01 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> 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.
>

Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
supposedly to go via CLK tree.

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

> Fixes: 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
> Reported-and-tested-by: Semyon Verchenko <semverchenko@factor-ts.ru>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  drivers/platform/x86/pmc_atom.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c
> index 3a635ea09b8a..2910845b7cdd 100644
> --- a/drivers/platform/x86/pmc_atom.c
> +++ b/drivers/platform/x86/pmc_atom.c
> @@ -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
>


-- 
With Best Regards,
Andy Shevchenko

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

[Hans de Goede]

Hi,

On 06-05-19 14:38, Andy Shevchenko wrote:
> On Mon, Apr 29, 2019 at 6:01 PM Hans de Goede <hdegoede@redhat.com> wrote:
>>
>> 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.
>>
> 
> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> 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


> 
>> Fixes: 648e921888ad ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
>> Reported-and-tested-by: Semyon Verchenko <semverchenko@factor-ts.ru>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> ---
>>   drivers/platform/x86/pmc_atom.c | 9 +++++++++
>>   1 file changed, 9 insertions(+)
>>
>> diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c
>> index 3a635ea09b8a..2910845b7cdd 100644
>> --- a/drivers/platform/x86/pmc_atom.c
>> +++ b/drivers/platform/x86/pmc_atom.c
>> @@ -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
>>
> 
> 

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

[Andy Shevchenko]

On Mon, May 6, 2019 at 5:47 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Hi,
>
> On 06-05-19 14:38, Andy Shevchenko wrote:
> > On Mon, Apr 29, 2019 at 6:01 PM Hans de Goede <hdegoede@redhat.com> wrote:
> >>
> >> 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.
> >>
> >
> > Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> > 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.

-- 
With Best Regards,
Andy Shevchenko

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

[Hans de Goede]

Hi,

On 06-05-19 16:59, Andy Shevchenko wrote:
> On Mon, May 6, 2019 at 5:47 PM Hans de Goede <hdegoede@redhat.com> wrote:
>>
>> Hi,
>>
>> On 06-05-19 14:38, Andy Shevchenko wrote:
>>> On Mon, Apr 29, 2019 at 6:01 PM Hans de Goede <hdegoede@redhat.com> wrote:
>>>>
>>>> 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.
>>>>
>>>
>>> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
>>> 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.

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

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

[Stephen Boyd]

Quoting Hans de Goede (2019-05-06 08:05:42)
> Hi,
> 
> On 06-05-19 16:59, Andy Shevchenko wrote:
> > On Mon, May 6, 2019 at 5:47 PM Hans de Goede <hdegoede@redhat.com> wrote:
> >>
> >> Hi,
> >>
> >> On 06-05-19 14:38, Andy Shevchenko wrote:
> >>> On Mon, Apr 29, 2019 at 6:01 PM Hans de Goede <hdegoede@redhat.com> wrote:
> >>>>
> >>>> 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.
> >>>>
> >>>
> >>> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> >>> 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.
> 
> 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.

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

[Hans de Goede]

Hi,

On 07-05-19 22:17, Stephen Boyd wrote:
> Quoting Hans de Goede (2019-05-06 08:05:42)
>> Hi,
>>
>> On 06-05-19 16:59, Andy Shevchenko wrote:
>>> On Mon, May 6, 2019 at 5:47 PM Hans de Goede <hdegoede@redhat.com> wrote:
>>>>
>>>> Hi,
>>>>
>>>> On 06-05-19 14:38, Andy Shevchenko wrote:
>>>>> On Mon, Apr 29, 2019 at 6:01 PM Hans de Goede <hdegoede@redhat.com> wrote:
>>>>>>
>>>>>> 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.
>>>>>>
>>>>>
>>>>> Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>
>>>>> 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.
>>
>> 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

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

[Andy Shevchenko]

On Wed, May 8, 2019 at 10:48 AM Hans de Goede <hdegoede@redhat.com> wrote:
> On 07-05-19 22:17, Stephen Boyd wrote:
> > 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.

-- 
With Best Regards,
Andy Shevchenko

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

[Hans de Goede]

Hi,

On 08-05-19 10:42, Andy Shevchenko wrote:
> On Wed, May 8, 2019 at 10:48 AM Hans de Goede <hdegoede@redhat.com> wrote:
>> On 07-05-19 22:17, Stephen Boyd wrote:
>>> 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

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

[Darren Hart]

On Wed, May 08, 2019 at 11:20:52AM +0200, Hans de Goede wrote:
> Hi,
> 
> On 08-05-19 10:42, Andy Shevchenko wrote:
> > On Wed, May 8, 2019 at 10:48 AM Hans de Goede <hdegoede@redhat.com> wrote:
> > > On 07-05-19 22:17, Stephen Boyd wrote:
> > > > 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.

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.

-- 
Darren Hart
VMware Open Source Technology Center

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

[Darren Hart]

On Wed, May 08, 2019 at 03:55:22PM -0700, Darren Hart wrote:
> On Wed, May 08, 2019 at 11:20:52AM +0200, Hans de Goede wrote:
> > Hi,
> > 
> > On 08-05-19 10:42, Andy Shevchenko wrote:
> > > On Wed, May 8, 2019 at 10:48 AM Hans de Goede <hdegoede@redhat.com> wrote:
> > > > On 07-05-19 22:17, Stephen Boyd wrote:
> > > > > 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.
> 
> 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?

-- 
Darren Hart
VMware Open Source Technology Center

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

[Hans de Goede]

Hi

On 08-05-19 10:42, Andy Shevchenko wrote:
> On Wed, May 8, 2019 at 10:48 AM Hans de Goede <hdegoede@redhat.com> wrote:
>> On 07-05-19 22:17, Stephen Boyd wrote:
>>> 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

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

[Andy Shevchenko]

On Wed, May 22, 2019 at 3:32 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Hi
>
> On 08-05-19 10:42, Andy Shevchenko wrote:
> > On Wed, May 8, 2019 at 10:48 AM Hans de Goede <hdegoede@redhat.com> wrote:
> >> On 07-05-19 22:17, Stephen Boyd wrote:
> >>> 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 ?

PR had been sent couple of hours ago, thanks!

-- 
With Best Regards,
Andy Shevchenko