From patchwork Tue Mar 5 15:52:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu TUDOR X-Patchwork-Id: 225059 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id DF5B52C0362 for ; Wed, 6 Mar 2013 02:53:28 +1100 (EST) Received: from db8outboundpool.messaging.microsoft.com (mail-db8lp0186.outbound.messaging.microsoft.com [213.199.154.186]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Microsoft Secure Server Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 4552E2C032B for ; Wed, 6 Mar 2013 02:53:02 +1100 (EST) Received: from mail96-db8-R.bigfish.com (10.174.8.240) by DB8EHSOBE018.bigfish.com (10.174.4.81) with Microsoft SMTP Server id 14.1.225.23; Tue, 5 Mar 2013 15:52:56 +0000 Received: from mail96-db8 (localhost [127.0.0.1]) by mail96-db8-R.bigfish.com (Postfix) with ESMTP id 3C580CC00B4 for ; Tue, 5 Mar 2013 15:52:56 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839he5bhf0ah107ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) Received: from mail96-db8 (localhost.localdomain [127.0.0.1]) by mail96-db8 (MessageSwitch) id 1362498773181388_11800; Tue, 5 Mar 2013 15:52:53 +0000 (UTC) Received: from DB8EHSMHS002.bigfish.com (unknown [10.174.8.252]) by mail96-db8.bigfish.com (Postfix) with ESMTP id 2A183B80240 for ; Tue, 5 Mar 2013 15:52:53 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB8EHSMHS002.bigfish.com (10.174.4.12) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 5 Mar 2013 15:52:53 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.2.328.11; Tue, 5 Mar 2013 15:52:51 +0000 Received: from zro03-ws408.ea.freescale.net (zro04-ws641.ea.freescale.net [10.171.73.87]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r25Fqo2p032261; Tue, 5 Mar 2013 08:52:50 -0700 Received: (from b10716@localhost) by zro03-ws408.ea.freescale.net (8.14.4/8.14.4/Submit) id r25FqnIV000466; Tue, 5 Mar 2013 17:52:49 +0200 From: Laurentiu Tudor To: Subject: [PATCH] powerpc/watchdog: Don't enable interrupt on PPC64 BookE Date: Tue, 5 Mar 2013 17:52:49 +0200 Message-ID: <1362498769-438-1-git-send-email-Laurentiu.Tudor@freescale.com> X-Mailer: git-send-email 1.5.6.5 MIME-Version: 1.0 X-OriginatorOrg: freescale.net Cc: Laurentiu Tudor X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Tudor Laurentiu Critical interrupts are not handled on PPC64 BookE machines, so when the first watchdog interrupt fires the machine will freeze without a warning until it's rebooted by the second watchdog trigger. Plus, the interrupt isn't used anyway since the driver expects a usermode app to ping the watchdog periodically. Signed-off-by: Laurentiu Tudor --- drivers/watchdog/booke_wdt.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index c0bc92d..5eb2040 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c @@ -122,6 +122,14 @@ static void __booke_wdt_enable(void *data) val &= ~WDTP_MASK; val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period)); +#ifdef CONFIG_PPC_BOOK3E_64 + /* + * Crit ints are currently broken on PPC64 Book-E, so + * just disable them for now. + */ + val &= ~TCR_WIE; +#endif + mtspr(SPRN_TCR, val); }