Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
To:     Stefan Riedmueller <s.riedmueller@phytec.de>,
        Wim Van Sebroeck <wim@linux-watchdog.org>,
        Guenter Roeck <linux@roeck-us.net>,
        Support Opensource <Support.Opensource@diasemi.com>
CC:     "linux-watchdog@vger.kernel.org" <linux-watchdog@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v2 1/3] watchdog: da9062: Initialize timeout during probe
Thread-Topic: [PATCH v2 1/3] watchdog: da9062: Initialize timeout during probe
Thread-Index: AQHWCbjYHXW9BZB8v0eH8SxcAWnXX6hu8wZg
Date:   Wed, 8 Apr 2020 08:54:47 +0000
Message-ID: <AM6PR10MB22633FAA4A5E067DE777339880C00@AM6PR10MB2263.EURPRD10.PROD.OUTLOOK.COM>
References: <20200403130728.39260-1-s.riedmueller@phytec.de>
In-Reply-To: <20200403130728.39260-1-s.riedmueller@phytec.de>
Accept-Language: en-GB, en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [146.200.27.209]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 161cba08-4f69-468c-7b7f-08d7db9a7da2
x-ms-traffictypediagnostic: AM6PR10MB2391:
x-ms-exchange-sharedmailbox-routingagent-processed: True
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <AM6PR10MB2391601CBB6E7BDE605DFC84A7C00@AM6PR10MB2391.EURPRD10.PROD.OUTLOOK.COM>
x-ms-oob-tlc-oobclassifiers: OLM:8273;
x-forefront-prvs: 0367A50BB1
x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR10MB2263.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFTY:;SFS:(10009020)(4636009)(376002)(366004)(39850400004)(396003)(136003)(346002)(55016002)(33656002)(110136005)(26005)(478600001)(54906003)(4326008)(7696005)(9686003)(316002)(66946007)(186003)(76116006)(2906002)(71200400001)(52536014)(5660300002)(66476007)(6636002)(66556008)(81166007)(64756008)(55236004)(8936002)(53546011)(6506007)(81156014)(8676002)(66446008)(86362001);DIR:OUT;SFP:1101;
received-spf: None (protection.outlook.com: diasemi.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam: BCL:0;
x-microsoft-antispam-message-info: GHvV0rCgJIHNUvHzO8Y3qJpOMrHCOxPvPi0uso26jXsaiFNusIGVdcRf7mpPjoxJndRtRr7ZMx/rcCAW+FZWs2MOzcVI0GyodFIn6oWXr18KTDhOXcy+rp2nE8TrUqw8Pi2u4+7PKcebV6gItQhEm0Ar4kWgZftygdVzjFQD3OWiN4596TnGxUgevqJ3eDOjKYhTzfTzc7Pr3p58cFVuoV/+HBgzjxyr3fXAxgCYTThmYUu1oqZVJHu7JA9/xywfaPJaXSggtztrEcHaAXDKSrIVrc4fTi4JT8M3leG3QjNCMeZ0OGWotCer5JHiEmIjTrgMO3ZGStPVliSApe9erNHHSBanmZY6hJyVAtGq3O7poQ4JPohUl7lZrDrwxgbVjSF6Ki6iQZ4Vtid34qG16T/nXSNLIDYSAg56akKVGGdsqhOvWjFQqg4zwX7A2iAn
x-ms-exchange-antispam-messagedata: 7cs3FeGG9Pg1CYXmX4E9JMYw2Tbj74d3+gLpPPkkV/XMghDFxSKRcKjV8t5Yn2rwSc/N+RXZp2ORSZJ9+L9iyi/3T19tsJESwcPoOwxozawiujcgUAI4W/MJAq1RFSgv+48JSTYLYaMNZIq8pRsKtA==
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: diasemi.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 161cba08-4f69-468c-7b7f-08d7db9a7da2
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Apr 2020 08:54:47.4222
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 511e3c0e-ee96-486e-a2ec-e272ffa37b7c
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: WrfN0WBJ2hE7Ers7lp/xfs1c/9qLvP2qQwdgJAsu8ACHzENVUUId2rYAjrdG+wNHBp+e8t8r7SduWywRnoiFhS8Bsl9kugnNKhY0GmuIZX0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR10MB2391
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 03 April 2020 14:07, Stefan Riedmueller wrote:

> During probe try to set the timeout from device tree and fall back to
> either the pre-configured timeout set by e.g. the bootloader in case the
> watchdog is already running or the default value.
>=20
> If the watchdog is already running make sure to update the timeout and
> tell the framework about the running state to make sure the watchdog is
> handled correctly until user space takes over. Updating the timeout also
> removes the need for an additional manual ping so we can remove that as
> well.
>=20
> Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>

Reviewed-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>

> ---
> Changes in v2:
>  - Reworked the patch to use the pre-configured timeout instead of the de=
fault
>    value as a fallback in case no DT value is present.
>  - To achieve the previous point watchdog_init_timeout was added to get t=
he
>    DT value if present.
>  - Added a timeout update if the watchdog is running to set the desired
>    timeout and in this instance removed the manual ping at the end.
>  - Removed info message.
> ---
>  drivers/watchdog/da9062_wdt.c | 27 ++++++++++++++++++++++-----
>  1 file changed, 22 insertions(+), 5 deletions(-)
>=20
> diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.=
c
> index 0ad15d55071c..10b37dd65bed 100644
> --- a/drivers/watchdog/da9062_wdt.c
> +++ b/drivers/watchdog/da9062_wdt.c
> @@ -35,6 +35,15 @@ struct da9062_watchdog {
>  	bool use_sw_pm;
>  };
>=20
> +static unsigned int da9062_wdt_read_timeout(struct da9062_watchdog *wdt)
> +{
> +	unsigned int val;
> +
> +	regmap_read(wdt->hw->regmap, DA9062AA_CONTROL_D, &val);
> +
> +	return wdt_timeout[val & DA9062AA_TWDSCALE_MASK];
> +}
> +
>  static unsigned int da9062_wdt_timeout_to_sel(unsigned int secs)
>  {
>  	unsigned int i;
> @@ -183,7 +192,7 @@ MODULE_DEVICE_TABLE(of,
> da9062_compatible_id_table);
>  static int da9062_wdt_probe(struct platform_device *pdev)
>  {
>  	struct device *dev =3D &pdev->dev;
> -	int ret;
> +	unsigned int timeout;
>  	struct da9062 *chip;
>  	struct da9062_watchdog *wdt;
>=20
> @@ -213,11 +222,19 @@ static int da9062_wdt_probe(struct platform_device
> *pdev)
>  	watchdog_set_drvdata(&wdt->wdtdev, wdt);
>  	dev_set_drvdata(dev, &wdt->wdtdev);
>=20
> -	ret =3D devm_watchdog_register_device(dev, &wdt->wdtdev);
> -	if (ret < 0)
> -		return ret;
> +	timeout =3D da9062_wdt_read_timeout(wdt);
> +	if (timeout)
> +		wdt->wdtdev.timeout =3D timeout;
> +
> +	/* Set timeout from DT value if available */
> +	watchdog_init_timeout(&wdt->wdtdev, 0, dev);
> +
> +	if (timeout) {
> +		da9062_wdt_set_timeout(&wdt->wdtdev, wdt-
> >wdtdev.timeout);
> +		set_bit(WDOG_HW_RUNNING, &wdt->wdtdev.status);
> +	}
>=20
> -	return da9062_wdt_ping(&wdt->wdtdev);
> +	return devm_watchdog_register_device(dev, &wdt->wdtdev);
>  }
>=20
>  static int __maybe_unused da9062_wdt_suspend(struct device *dev)
> --
> 2.23.0