Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933560AbbG1KNX (ORCPT ); Tue, 28 Jul 2015 06:13:23 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:34674 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933098AbbG1KNS (ORCPT ); Tue, 28 Jul 2015 06:13:18 -0400 Date: Tue, 28 Jul 2015 11:13:14 +0100 From: Matt Fleming To: Guenter Roeck Cc: Wim Van Sebroeck , linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Mika Westerberg , Andy Shevchenko , Jean Delvare , Wolfram Sang , Matt Fleming Subject: Re: [PATCH 3/5] iTCO_wdt: Add support for TCO on Intel Sunrisepoint Message-ID: <20150728101314.GG2492@codeblueprint.co.uk> References: <1438004292-16382-1-git-send-email-matt@codeblueprint.co.uk> <1438004292-16382-4-git-send-email-matt@codeblueprint.co.uk> <55B63EBB.7030306@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55B63EBB.7030306@roeck-us.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1791 Lines: 49 On Mon, 27 Jul, at 07:22:51AM, Guenter Roeck wrote: > On 07/27/2015 06:38 AM, Matt Fleming wrote: > >From: Matt Fleming > > > >The revision of the watchdog hardware in Sunrisepoint necessitates a new > >"version" inside the TCO watchdog driver because some of the register > >layouts have changed. > > > >Cc: Wim Van Sebroeck > >Signed-off-by: Matt Fleming > >--- > > drivers/watchdog/iTCO_wdt.c | 58 ++++++++++++++++++++++++++------------------- > > 1 file changed, 34 insertions(+), 24 deletions(-) > > > >diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c > >index 9a6e70976f64..17dfbc51b85a 100644 > >--- a/drivers/watchdog/iTCO_wdt.c > >+++ b/drivers/watchdog/iTCO_wdt.c > >@@ -145,58 +145,65 @@ static inline unsigned int ticks_to_seconds(int ticks) > > return iTCO_wdt_private.iTCO_version == 3 ? ticks : (ticks * 6) / 10; > > } > > > >+static inline u32 no_reboot_bit(void) > >+{ > >+ u32 enable_bit; > >+ > >+ switch (iTCO_wdt_private.iTCO_version) { > >+ case 3: > >+ enable_bit = 0x00000010; > >+ break; > >+ case 2: > >+ enable_bit = 0x00000020; > >+ break; > >+ default: > >+ enable_bit = 0x00000002; > > I think it would be better to explicitly list versions 1 and 4 here, > for clarification. We don't know what Intel will come up with for version 5, > and by then no one will remember that bit 2 applies for version 1 and 4 only. Sure, that makes sense. I'll update the patch. -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/