From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7400FC38145 for ; Thu, 8 Sep 2022 17:50:17 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4MNmqX07lJz3dqw for ; Fri, 9 Sep 2022 03:50:16 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=N9miSMEM; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::52a; helo=mail-pg1-x52a.google.com; envelope-from=groeck7@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=N9miSMEM; dkim-atps=neutral Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4MNmpr4ybtz2xJM for ; Fri, 9 Sep 2022 03:49:39 +1000 (AEST) Received: by mail-pg1-x52a.google.com with SMTP id c24so17432583pgg.11 for ; Thu, 08 Sep 2022 10:49:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date; bh=6tvs4ayRExWvRUyu07Fc3dE/Ryea2CBbaJjmdbcY3zQ=; b=N9miSMEMgSmCGbHiQdE2LfUCX1ihj9UQdDXy4wUwvgQqAgT6c89By9B32Yr7ks4QW/ kQ3r/GzhvTa+Qg8BbYzGl6AyHpJC846e6qN6kwPlHLifQDD2x4FUCdTpgvksa6uWVXcD hqNSr6yBzrXOpZ+L4PDO2vHgKyP9tpNtRpC0Hz/Q72HoumSKIVl0V1wYsTwRdY9xI42q VodiYMH0Gr7pg5pHaGd77fxN8sKYs6l3AOENeIXSIhU/uMbUuw829uxlnSnNtndJsT7b Aozkj+v0mARSnpsxipaFS3n/8JN/9DFfgycFsbUcAFTWHvb2qlaGj3EGU36VsVJcMwSm J6UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date; bh=6tvs4ayRExWvRUyu07Fc3dE/Ryea2CBbaJjmdbcY3zQ=; b=J5ItGUGgk6Hsp9aZVe2cghSKqUXusG3x0l3SKY8ykc1GnzZMs89A8TssbZuAj2GZPQ HH/riOFDRd+D0PSvNaJgKztqP8MI3koxv4M0ar/PWRxwgVNDOvzJfgu8ovFlzcO/vdqt TPFyHEpxtB056dn4cz3rTHucopsy2SUr3YhmK9TEnCG3gnOBADHIvACddFq4kvhv5oUG TnRzKWv/x9uXmv+1AwrChjA1AHPDSoLT83ZbW5GvHT7wpNkOWkMSKMqAbkmexwxqW2/U hTJrKzVmUW9Z0unkgEu9IritH1CVIK7tWubKiy1rKzazzxi06WA0JwMo321S7QtLCnI1 /hMA== X-Gm-Message-State: ACgBeo0cm5KPzK1sRQfEbt36QJzqh/W80UQ7NSxDhvRjPpfteo1ItkFk BlzB80YnlF/1tVWK1TtK3sk= X-Google-Smtp-Source: AA6agR4rP0sq0eTqJnNeFCoLicuac5FawsgASHi+dty/arH6J/GnQ6Y3EXP1Dq4hyzo0M3jlr3GItQ== X-Received: by 2002:a63:4519:0:b0:434:ae87:ca5b with SMTP id s25-20020a634519000000b00434ae87ca5bmr8796465pga.194.1662659375463; Thu, 08 Sep 2022 10:49:35 -0700 (PDT) Received: from ?IPV6:2600:1700:e321:62f0:329c:23ff:fee3:9d7c? ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id g11-20020a17090a300b00b002005c3d4d4fsm2032943pjb.19.2022.09.08.10.49.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Sep 2022 10:49:33 -0700 (PDT) Message-ID: <35ed4d8c-21c3-fd1f-bbab-fa826c33adab@roeck-us.net> Date: Thu, 8 Sep 2022 10:49:31 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH v1 13/19] watchdog: booke_wdt: Replace PPC_FSL_BOOK3E by PPC_E500 Content-Language: en-US To: Christophe Leroy , Michael Ellerman , Nicholas Piggin References: <4e7e6259e5af0e0e171f19ee1f85ab5b2553723f.1662658653.git.christophe.leroy@csgroup.eu> <015ac5217fd0f061e98df9cf98bce515855f2bc3.1662658653.git.christophe.leroy@csgroup.eu> From: Guenter Roeck In-Reply-To: <015ac5217fd0f061e98df9cf98bce515855f2bc3.1662658653.git.christophe.leroy@csgroup.eu> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wim Van Sebroeck , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 9/8/22 10:37, Christophe Leroy wrote: > CONFIG_PPC_FSL_BOOK3E is redundant with CONFIG_PPC_E500. > > Replace it so that CONFIG_PPC_FSL_BOOK3E can be removed later. > > Signed-off-by: Christophe Leroy > Cc: Wim Van Sebroeck > Cc: Guenter Roeck > Cc: linux-watchdog@vger.kernel.org Acked-by: Guenter Roeck > --- > drivers/watchdog/Kconfig | 8 ++++---- > drivers/watchdog/booke_wdt.c | 8 ++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 9295492d24f7..b7c03c600567 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -1935,10 +1935,10 @@ config BOOKE_WDT > config BOOKE_WDT_DEFAULT_TIMEOUT > int "PowerPC Book-E Watchdog Timer Default Timeout" > depends on BOOKE_WDT > - default 38 if PPC_FSL_BOOK3E > - range 0 63 if PPC_FSL_BOOK3E > - default 3 if !PPC_FSL_BOOK3E > - range 0 3 if !PPC_FSL_BOOK3E > + default 38 if PPC_E500 > + range 0 63 if PPC_E500 > + default 3 if !PPC_E500 > + range 0 3 if !PPC_E500 > help > Select the default watchdog timer period to be used by the PowerPC > Book-E watchdog driver. A watchdog "event" occurs when the bit > diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c > index 75da5cd02615..932a03f4436a 100644 > --- a/drivers/watchdog/booke_wdt.c > +++ b/drivers/watchdog/booke_wdt.c > @@ -27,7 +27,7 @@ > */ > > > -#ifdef CONFIG_PPC_FSL_BOOK3E > +#ifdef CONFIG_PPC_E500 > #define WDTP(x) ((((x)&0x3)<<30)|(((x)&0x3c)<<15)) > #define WDTP_MASK (WDTP(0x3f)) > #else > @@ -45,7 +45,7 @@ MODULE_PARM_DESC(nowayout, > "Watchdog cannot be stopped once started (default=" > __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); > > -#ifdef CONFIG_PPC_FSL_BOOK3E > +#ifdef CONFIG_PPC_E500 > > /* For the specified period, determine the number of seconds > * corresponding to the reset time. There will be a watchdog > @@ -88,7 +88,7 @@ static unsigned int sec_to_period(unsigned int secs) > > #define MAX_WDT_TIMEOUT period_to_sec(1) > > -#else /* CONFIG_PPC_FSL_BOOK3E */ > +#else /* CONFIG_PPC_E500 */ > > static unsigned long long period_to_sec(unsigned int period) > { > @@ -102,7 +102,7 @@ static unsigned int sec_to_period(unsigned int secs) > > #define MAX_WDT_TIMEOUT 3 /* from Kconfig */ > > -#endif /* !CONFIG_PPC_FSL_BOOK3E */ > +#endif /* !CONFIG_PPC_E500 */ > > static void __booke_wdt_set(void *data) > {