From patchwork Wed Nov 5 20:53:56 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fuchs X-Patchwork-Id: 7411 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id BB1C4DDF13 for ; Thu, 6 Nov 2008 07:54:42 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from mail-in-04.arcor-online.net (mail-in-04.arcor-online.net [151.189.21.44]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.arcor.de", Issuer "Thawte Premium Server CA" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id AC7BDDDE1A for ; Thu, 6 Nov 2008 07:54:05 +1100 (EST) Received: from mail-in-10-z2.arcor-online.net (mail-in-10-z2.arcor-online.net [151.189.8.27]) by mail-in-04.arcor-online.net (Postfix) with ESMTP id 21E6817F514; Wed, 5 Nov 2008 21:54:00 +0100 (CET) Received: from mail-in-05.arcor-online.net (mail-in-05.arcor-online.net [151.189.21.45]) by mail-in-10-z2.arcor-online.net (Postfix) with ESMTP id 0E01C23D2EB; Wed, 5 Nov 2008 21:54:00 +0100 (CET) Received: from bunny.home (dslb-088-070-057-200.pools.arcor-ip.net [88.70.57.200]) by mail-in-05.arcor-online.net (Postfix) with ESMTP id C7A9C1C36B6; Wed, 5 Nov 2008 21:53:58 +0100 (CET) Received: from fox.home (fox.home [192.168.2.13]) by bunny.home (Postfix) with ESMTPS id 5E92B251057C; Wed, 5 Nov 2008 21:53:58 +0100 (CET) From: Matthias Fuchs To: linuxppc-dev@ozlabs.org Subject: [PATCH V3] powerpc: Fix Book-E watchdog timer interval setting Date: Wed, 5 Nov 2008 21:53:56 +0100 User-Agent: KMail/1.9.10 Organization: esd gmbh MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200811052153.57292.matthias.fuchs@esd-electronics.com> X-Virus-Scanned: ClamAV 0.93.3/8576/Wed Nov 5 19:28:48 2008 on mail-in-05.arcor-online.net X-Virus-Status: Clean Cc: Timur Tabi X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org This patch fixes the setting of the Book-E watchdog timer interval setup on initialization and by ioctl(). On initialization the period bits have to be masked before setting a new period. In WDIOC_SETTIMEOUT ioctl we have to use the correct mask. Signed-off-by: Matthias Fuchs Acked-by: Timur Tabi --- drivers/watchdog/booke_wdt.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index c3b78a7..225398f 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c @@ -42,8 +42,10 @@ u32 booke_wdt_period = WDT_PERIOD_DEFAULT; #ifdef CONFIG_FSL_BOOKE #define WDTP(x) ((((63-x)&0x3)<<30)|(((63-x)&0x3c)<<15)) +#define WDTP_MASK (WDTP(0)) #else #define WDTP(x) (TCR_WP(x)) +#define WDTP_MASK (TCR_WP_MASK) #endif static DEFINE_SPINLOCK(booke_wdt_lock); @@ -65,6 +67,7 @@ static void __booke_wdt_enable(void *data) /* clear status before enabling watchdog */ __booke_wdt_ping(NULL); val = mfspr(SPRN_TCR); + val &= ~WDTP_MASK; val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period)); mtspr(SPRN_TCR, val); @@ -114,7 +117,7 @@ static long booke_wdt_ioctl(struct file *file, case WDIOC_SETTIMEOUT: if (get_user(booke_wdt_period, p)) return -EFAULT; - mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WDTP(0)) | + mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WDTP_MASK) | WDTP(booke_wdt_period)); return 0; case WDIOC_GETTIMEOUT: