Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1424560 > unrolled thread

[PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake "Yong, Jonathan" <jonathan.yong@intel.com> - 2016-06-17 02:40 +0200
    [PATCH v2 1/2] watchdog: iTCO-wdt handle 5th variation for Apollo Lake "Yong, Jonathan" <jonathan.yong@intel.com> - 2016-06-17 02:40 +0200
    Re: [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake "Yong, Jonathan" <jonathan.yong@intel.com> - 2016-06-22 07:00 +0200
      Re: [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake Guenter Roeck <linux@roeck-us.net> - 2016-06-22 08:10 +0200
        Re: [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake Darren Hart <dvhart@infradead.org> - 2016-06-23 07:10 +0200
          Re: [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake Guenter Roeck <linux@roeck-us.net> - 2016-06-23 15:40 +0200

#1424560 — [PATCH v2 0/2] Correct iTCO Watchdog for Apollo Lake

These patches fix the iTCO watchdog for Apollo Lake.
I changed the watchdog memory io to only use 4 bytes rather
the whole region, I'm not sure if that is the correct way.

The previous 0x30h offset in intel_pmc_ipc.c was for based
on the earlier BXT-M platform. Apollo Lake has it at 0x40h.

Let me know if the patches need changes.
Please CC me as I am not subscribed, thanks.

* Resent, typo in linux-kernel email address

Changes since v1:
	* Watchdog NO_REBOOT bit off-by-one corrected.

Yong, Jonathan (2):
  watchdog: iTCO-wdt handle 5th variation for Apollo Lake
  x86: Fix Apollo Lake Watchdog address in PMC driver

 drivers/platform/x86/intel_pmc_ipc.c | 10 ++++++----
 drivers/watchdog/iTCO_wdt.c          |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

-- 
2.7.3

[toc] | [next] | [standalone]

#1424566 — [PATCH v2 1/2] watchdog: iTCO-wdt handle 5th variation for Apollo Lake

The Apollo Lake Watchdog has the no_reboot flag in the 4th bit.

Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com>
---
 drivers/watchdog/iTCO_wdt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 0acc6c5..54cab18 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -150,6 +150,7 @@ static inline u32 no_reboot_bit(void)
 	u32 enable_bit;
 
 	switch (iTCO_wdt_private.iTCO_version) {
+	case 5:
 	case 3:
 		enable_bit = 0x00000010;
 		break;
@@ -512,6 +513,7 @@ static int iTCO_wdt_probe(struct platform_device *dev)
 
 	/* Clear out the (probably old) status */
 	switch (iTCO_wdt_private.iTCO_version) {
+	case 5:
 	case 4:
 		outw(0x0008, TCO1_STS);	/* Clear the Time Out Status bit */
 		outw(0x0002, TCO2_STS);	/* Clear SECOND_TO_STS bit */
-- 
2.7.3

[toc] | [prev] | [next] | [standalone]

#1428410

On 06/17/2016 08:36, Yong, Jonathan wrote:
> These patches fix the iTCO watchdog for Apollo Lake.
> I changed the watchdog memory io to only use 4 bytes rather
> the whole region, I'm not sure if that is the correct way.
>
> The previous 0x30h offset in intel_pmc_ipc.c was for based
> on the earlier BXT-M platform. Apollo Lake has it at 0x40h.
>
> Let me know if the patches need changes.
> Please CC me as I am not subscribed, thanks.
>
> * Resent, typo in linux-kernel email address
>
> Changes since v1:
> 	* Watchdog NO_REBOOT bit off-by-one corrected.
>
> Yong, Jonathan (2):
>    watchdog: iTCO-wdt handle 5th variation for Apollo Lake
>    x86: Fix Apollo Lake Watchdog address in PMC driver
>
>   drivers/platform/x86/intel_pmc_ipc.c | 10 ++++++----
>   drivers/watchdog/iTCO_wdt.c          |  2 ++
>   2 files changed, 8 insertions(+), 4 deletions(-)
>

Ping.

[toc] | [prev] | [next] | [standalone]

#1428439

On 06/21/2016 09:53 PM, Yong, Jonathan wrote:
> On 06/17/2016 08:36, Yong, Jonathan wrote:
>> These patches fix the iTCO watchdog for Apollo Lake.
>> I changed the watchdog memory io to only use 4 bytes rather
>> the whole region, I'm not sure if that is the correct way.
>>
>> The previous 0x30h offset in intel_pmc_ipc.c was for based
>> on the earlier BXT-M platform. Apollo Lake has it at 0x40h.
>>
>> Let me know if the patches need changes.
>> Please CC me as I am not subscribed, thanks.
>>
>> * Resent, typo in linux-kernel email address
>>
>> Changes since v1:
>>     * Watchdog NO_REBOOT bit off-by-one corrected.
>>
>> Yong, Jonathan (2):
>>    watchdog: iTCO-wdt handle 5th variation for Apollo Lake
>>    x86: Fix Apollo Lake Watchdog address in PMC driver
>>
>>   drivers/platform/x86/intel_pmc_ipc.c | 10 ++++++----
>>   drivers/watchdog/iTCO_wdt.c          |  2 ++
>>   2 files changed, 8 insertions(+), 4 deletions(-)
>>
>
> Ping.
>
>
Waiting for an Ack from Darren.

Guenter

[toc] | [prev] | [next] | [standalone]

#1429447

On Tue, Jun 21, 2016 at 11:01:01PM -0700, Guenter Roeck wrote:
> On 06/21/2016 09:53 PM, Yong, Jonathan wrote:
> > On 06/17/2016 08:36, Yong, Jonathan wrote:
> > > These patches fix the iTCO watchdog for Apollo Lake.
> > > I changed the watchdog memory io to only use 4 bytes rather
> > > the whole region, I'm not sure if that is the correct way.
> > > 
> > > The previous 0x30h offset in intel_pmc_ipc.c was for based
> > > on the earlier BXT-M platform. Apollo Lake has it at 0x40h.
> > > 
> > > Let me know if the patches need changes.
> > > Please CC me as I am not subscribed, thanks.
> > > 
> > > * Resent, typo in linux-kernel email address
> > > 
> > > Changes since v1:
> > >     * Watchdog NO_REBOOT bit off-by-one corrected.
> > > 
> > > Yong, Jonathan (2):
> > >    watchdog: iTCO-wdt handle 5th variation for Apollo Lake
> > >    x86: Fix Apollo Lake Watchdog address in PMC driver
> > > 
> > >   drivers/platform/x86/intel_pmc_ipc.c | 10 ++++++----
> > >   drivers/watchdog/iTCO_wdt.c          |  2 ++
> > >   2 files changed, 8 insertions(+), 4 deletions(-)
> > > 
> > 
> > Ping.
> > 
> > 
> Waiting for an Ack from Darren.

Jonathan verified that the change will not break existing external platforms.
I'm happy with it from that perspective.

Guenter, will you take both patches together?

Reviewed-by: Darren Hart <dvhart@linux.intel.com>


-- 
Darren Hart
Intel Open Source Technology Center

[toc] | [prev] | [next] | [standalone]

#1429833

On 06/22/2016 10:02 PM, Darren Hart wrote:
> On Tue, Jun 21, 2016 at 11:01:01PM -0700, Guenter Roeck wrote:
>> On 06/21/2016 09:53 PM, Yong, Jonathan wrote:
>>> On 06/17/2016 08:36, Yong, Jonathan wrote:
>>>> These patches fix the iTCO watchdog for Apollo Lake.
>>>> I changed the watchdog memory io to only use 4 bytes rather
>>>> the whole region, I'm not sure if that is the correct way.
>>>>
>>>> The previous 0x30h offset in intel_pmc_ipc.c was for based
>>>> on the earlier BXT-M platform. Apollo Lake has it at 0x40h.
>>>>
>>>> Let me know if the patches need changes.
>>>> Please CC me as I am not subscribed, thanks.
>>>>
>>>> * Resent, typo in linux-kernel email address
>>>>
>>>> Changes since v1:
>>>>      * Watchdog NO_REBOOT bit off-by-one corrected.
>>>>
>>>> Yong, Jonathan (2):
>>>>     watchdog: iTCO-wdt handle 5th variation for Apollo Lake
>>>>     x86: Fix Apollo Lake Watchdog address in PMC driver
>>>>
>>>>    drivers/platform/x86/intel_pmc_ipc.c | 10 ++++++----
>>>>    drivers/watchdog/iTCO_wdt.c          |  2 ++
>>>>    2 files changed, 8 insertions(+), 4 deletions(-)
>>>>
>>>
>>> Ping.
>>>
>>>
>> Waiting for an Ack from Darren.
>
> Jonathan verified that the change will not break existing external platforms.
> I'm happy with it from that perspective.
>
> Guenter, will you take both patches together?
>

Yes, I'll add them to my queue of patches to send to Wim.

Thanks,
Guenter

> Reviewed-by: Darren Hart <dvhart@linux.intel.com>
>
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web