From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabrizio Castro Subject: RE: [PATCH v5 12/26] watchdog: renesas_wdt: Add R-Car Gen2 support Date: Thu, 1 Mar 2018 15:34:02 +0000 Message-ID: References: <1518457475-4480-1-git-send-email-fabrizio.castro@bp.renesas.com> <1518457475-4480-13-git-send-email-fabrizio.castro@bp.renesas.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Geert Uytterhoeven Cc: Mark Rutland , Geert Uytterhoeven , Catalin Marinas , Michael Turquette , Will Deacon , Wolfram Sang , Wim Van Sebroeck , linux-clk , Magnus Damm , Russell King , Guenter Roeck , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Chris Paterson , Linux Watchdog Mailing List , Biju Das , Simon Horman , Linux ARM , Stephen Boyd , Linux-Renesas , Rob Herring List-Id: devicetree@vger.kernel.org Hi Geert, thank you for your feedback! > Subject: Re: [PATCH v5 12/26] watchdog: renesas_wdt: Add R-Car Gen2 support > > Hi Fabrizio, > > On Mon, Feb 12, 2018 at 6:44 PM, Fabrizio Castro > wrote: > > Due to commits: > > * "ARM: shmobile: Add watchdog support", > > * "ARM: shmobile: rcar-gen2: Add watchdog support", and > > * "soc: renesas: rcar-rst: Enable watchdog as reset trigger for Gen2", > > we now have everything we needed for the watchdog to work on Gen2 and > > RZ/G1. > > > > This commit adds "renesas,rcar-gen2-wdt" as compatible string for R-Car > > Gen2 and RZ/G1, and since on those platforms the rwdt clock needs to be > > always ON, when suspending to RAM we need to explicitly disable the > > counting by clearing TME from RWTCSRA. > > > > Signed-off-by: Fabrizio Castro > > Signed-off-by: Ramesh Shanmugasundaram > > Thanks for your patch! > > I verified this works on R-Car Gen2, so > Reviewed-and-Tested-by: Geert Uytterhoeven > > Still, more comments below... > > > --- a/drivers/watchdog/renesas_wdt.c > > +++ b/drivers/watchdog/renesas_wdt.c > > @@ -203,13 +203,29 @@ static int rwdt_remove(struct platform_device *pdev) > > return 0; > > } > > > > -/* > > - * This driver does also fit for R-Car Gen2 (r8a779[0-4]) WDT. However, for SMP > > - * to work there, one also needs a RESET (RST) driver which does not exist yet > > - * due to HW issues. This needs to be solved before adding compatibles here. > > - */ > > +static int __maybe_unused rwdt_suspend(struct device *dev) > > +{ > > + struct rwdt_priv *priv = dev_get_drvdata(dev); > > + > > + if (watchdog_active(&priv->wdev)) > > + rwdt_write(priv, priv->cks, RWTCSRA); > > + return 0; > > +} > > + > > +static int __maybe_unused rwdt_resume(struct device *dev) > > +{ > > + struct rwdt_priv *priv = dev_get_drvdata(dev); > > + > > + if (watchdog_active(&priv->wdev)) > > + rwdt_write(priv, priv->cks | RWTCSRA_TME, RWTCSRA); > > Writing to this register is not sufficient on R-Car Gen3, where PSCI > suspend powers down the whole SoC. Hence all WDT register content is lost, > causing the watchdog timeout never to trigger. > Note that this issue is pre-existing, and not caused by your patch. > > This can be fixed by replacing the RWTCSRA register writes in the > suspend/resume handlers by calls to rwdt_stop() resp. rwdt_start(), like is > done in the BSP in commit e406980763f18f38 ("watchdog: renesas-wdt: Support > the suspend/resume"). Note that this would cause a small change in behavior > on R-Car Gen2, where the timeout would be reset on resume, instead of > continuing where stopped before. I don't think that hurts, though. I see, well I believe we can make both of us happy by addressing Gen3 problems and preserving the original behaviour from Gen2. I am going to send a new series to address this shortly. > > Since I was always a bit uncomfortable with this patch doing two things at > once (1. suspend/resume, 2. "renesas,rcar-gen2-wdt" matching), I think it > would be better to take the patch from the BSP first, and add support for > "renesas,rcar-gen2-wdt" in a subsequent patch. I agree, I'll split the patch and submit suspend/resume first, Gen2 compatibility next. Thanks, Fab > > Does the above make sense? > Do you agree? > > Thanks! > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relmlor4.renesas.com ([210.160.252.174]:37042 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032403AbeCAPeK (ORCPT ); Thu, 1 Mar 2018 10:34:10 -0500 From: Fabrizio Castro To: Geert Uytterhoeven CC: Philipp Zabel , Rob Herring , Mark Rutland , Wim Van Sebroeck , Russell King , Catalin Marinas , Will Deacon , "Michael Turquette" , Stephen Boyd , Simon Horman , Magnus Damm , "Geert Uytterhoeven" , Wolfram Sang , Guenter Roeck , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Linux Watchdog Mailing List , Linux-Renesas , Linux ARM , linux-clk , Chris Paterson , Biju Das , Ramesh Shanmugasundaram Subject: RE: [PATCH v5 12/26] watchdog: renesas_wdt: Add R-Car Gen2 support Date: Thu, 1 Mar 2018 15:34:02 +0000 Message-ID: References: <1518457475-4480-1-git-send-email-fabrizio.castro@bp.renesas.com> <1518457475-4480-13-git-send-email-fabrizio.castro@bp.renesas.com> In-Reply-To: Content-Language: en-US Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 MIME-Version: 1.0 Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org SGkgR2VlcnQsDQoNCnRoYW5rIHlvdSBmb3IgeW91ciBmZWVkYmFjayENCg0KPiBTdWJqZWN0OiBS ZTogW1BBVENIIHY1IDEyLzI2XSB3YXRjaGRvZzogcmVuZXNhc193ZHQ6IEFkZCBSLUNhciBHZW4y IHN1cHBvcnQNCj4NCj4gSGkgRmFicml6aW8sDQo+DQo+IE9uIE1vbiwgRmViIDEyLCAyMDE4IGF0 IDY6NDQgUE0sIEZhYnJpemlvIENhc3Rybw0KPiA8ZmFicml6aW8uY2FzdHJvQGJwLnJlbmVzYXMu Y29tPiB3cm90ZToNCj4gPiBEdWUgdG8gY29tbWl0czoNCj4gPiAqICJBUk06IHNobW9iaWxlOiBB ZGQgd2F0Y2hkb2cgc3VwcG9ydCIsDQo+ID4gKiAiQVJNOiBzaG1vYmlsZTogcmNhci1nZW4yOiBB ZGQgd2F0Y2hkb2cgc3VwcG9ydCIsIGFuZA0KPiA+ICogInNvYzogcmVuZXNhczogcmNhci1yc3Q6 IEVuYWJsZSB3YXRjaGRvZyBhcyByZXNldCB0cmlnZ2VyIGZvciBHZW4yIiwNCj4gPiB3ZSBub3cg aGF2ZSBldmVyeXRoaW5nIHdlIG5lZWRlZCBmb3IgdGhlIHdhdGNoZG9nIHRvIHdvcmsgb24gR2Vu MiBhbmQNCj4gPiBSWi9HMS4NCj4gPg0KPiA+IFRoaXMgY29tbWl0IGFkZHMgInJlbmVzYXMscmNh ci1nZW4yLXdkdCIgYXMgY29tcGF0aWJsZSBzdHJpbmcgZm9yIFItQ2FyDQo+ID4gR2VuMiBhbmQg UlovRzEsIGFuZCBzaW5jZSBvbiB0aG9zZSBwbGF0Zm9ybXMgdGhlIHJ3ZHQgY2xvY2sgbmVlZHMg dG8gYmUNCj4gPiBhbHdheXMgT04sIHdoZW4gc3VzcGVuZGluZyB0byBSQU0gd2UgbmVlZCB0byBl eHBsaWNpdGx5IGRpc2FibGUgdGhlDQo+ID4gY291bnRpbmcgYnkgY2xlYXJpbmcgVE1FIGZyb20g UldUQ1NSQS4NCj4gPg0KPiA+IFNpZ25lZC1vZmYtYnk6IEZhYnJpemlvIENhc3RybyA8ZmFicml6 aW8uY2FzdHJvQGJwLnJlbmVzYXMuY29tPg0KPiA+IFNpZ25lZC1vZmYtYnk6IFJhbWVzaCBTaGFu bXVnYXN1bmRhcmFtIDxyYW1lc2guc2hhbm11Z2FzdW5kYXJhbUBicC5yZW5lc2FzLmNvbT4NCj4N Cj4gVGhhbmtzIGZvciB5b3VyIHBhdGNoIQ0KPg0KPiBJIHZlcmlmaWVkIHRoaXMgd29ya3Mgb24g Ui1DYXIgR2VuMiwgc28NCj4gUmV2aWV3ZWQtYW5kLVRlc3RlZC1ieTogR2VlcnQgVXl0dGVyaG9l dmVuIDxnZWVydCtyZW5lc2FzQGdsaWRlci5iZT4NCj4NCj4gU3RpbGwsIG1vcmUgY29tbWVudHMg YmVsb3cuLi4NCj4NCj4gPiAtLS0gYS9kcml2ZXJzL3dhdGNoZG9nL3JlbmVzYXNfd2R0LmMNCj4g PiArKysgYi9kcml2ZXJzL3dhdGNoZG9nL3JlbmVzYXNfd2R0LmMNCj4gPiBAQCAtMjAzLDEzICsy MDMsMjkgQEAgc3RhdGljIGludCByd2R0X3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw ZGV2KQ0KPiA+ICAgICAgICAgcmV0dXJuIDA7DQo+ID4gIH0NCj4gPg0KPiA+IC0vKg0KPiA+IC0g KiBUaGlzIGRyaXZlciBkb2VzIGFsc28gZml0IGZvciBSLUNhciBHZW4yIChyOGE3NzlbMC00XSkg V0RULiBIb3dldmVyLCBmb3IgU01QDQo+ID4gLSAqIHRvIHdvcmsgdGhlcmUsIG9uZSBhbHNvIG5l ZWRzIGEgUkVTRVQgKFJTVCkgZHJpdmVyIHdoaWNoIGRvZXMgbm90IGV4aXN0IHlldA0KPiA+IC0g KiBkdWUgdG8gSFcgaXNzdWVzLiBUaGlzIG5lZWRzIHRvIGJlIHNvbHZlZCBiZWZvcmUgYWRkaW5n IGNvbXBhdGlibGVzIGhlcmUuDQo+ID4gLSAqLw0KPiA+ICtzdGF0aWMgaW50IF9fbWF5YmVfdW51 c2VkIHJ3ZHRfc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICpkZXYpDQo+ID4gK3sNCj4gPiArICAgICAg IHN0cnVjdCByd2R0X3ByaXYgKnByaXYgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsNCj4gPiArDQo+ ID4gKyAgICAgICBpZiAod2F0Y2hkb2dfYWN0aXZlKCZwcml2LT53ZGV2KSkNCj4gPiArICAgICAg ICAgICAgICAgcndkdF93cml0ZShwcml2LCBwcml2LT5ja3MsIFJXVENTUkEpOw0KPiA+ICsgICAg ICAgcmV0dXJuIDA7DQo+ID4gK30NCj4gPiArDQo+ID4gK3N0YXRpYyBpbnQgX19tYXliZV91bnVz ZWQgcndkdF9yZXN1bWUoc3RydWN0IGRldmljZSAqZGV2KQ0KPiA+ICt7DQo+ID4gKyAgICAgICBz dHJ1Y3QgcndkdF9wcml2ICpwcml2ID0gZGV2X2dldF9kcnZkYXRhKGRldik7DQo+ID4gKw0KPiA+ ICsgICAgICAgaWYgKHdhdGNoZG9nX2FjdGl2ZSgmcHJpdi0+d2RldikpDQo+ID4gKyAgICAgICAg ICAgICAgIHJ3ZHRfd3JpdGUocHJpdiwgcHJpdi0+Y2tzIHwgUldUQ1NSQV9UTUUsIFJXVENTUkEp Ow0KPg0KPiBXcml0aW5nIHRvIHRoaXMgcmVnaXN0ZXIgaXMgbm90IHN1ZmZpY2llbnQgb24gUi1D YXIgR2VuMywgd2hlcmUgUFNDSQ0KPiBzdXNwZW5kIHBvd2VycyBkb3duIHRoZSB3aG9sZSBTb0Mu ICBIZW5jZSBhbGwgV0RUIHJlZ2lzdGVyIGNvbnRlbnQgaXMgbG9zdCwNCj4gY2F1c2luZyB0aGUg d2F0Y2hkb2cgdGltZW91dCBuZXZlciB0byB0cmlnZ2VyLg0KPiBOb3RlIHRoYXQgdGhpcyBpc3N1 ZSBpcyBwcmUtZXhpc3RpbmcsIGFuZCBub3QgY2F1c2VkIGJ5IHlvdXIgcGF0Y2guDQo+DQo+IFRo aXMgY2FuIGJlIGZpeGVkIGJ5IHJlcGxhY2luZyB0aGUgUldUQ1NSQSByZWdpc3RlciB3cml0ZXMg aW4gdGhlDQo+IHN1c3BlbmQvcmVzdW1lIGhhbmRsZXJzIGJ5IGNhbGxzIHRvIHJ3ZHRfc3RvcCgp IHJlc3AuIHJ3ZHRfc3RhcnQoKSwgbGlrZSBpcw0KPiBkb25lIGluIHRoZSBCU1AgaW4gY29tbWl0 IGU0MDY5ODA3NjNmMThmMzggKCJ3YXRjaGRvZzogcmVuZXNhcy13ZHQ6IFN1cHBvcnQNCj4gdGhl IHN1c3BlbmQvcmVzdW1lIikuIE5vdGUgdGhhdCB0aGlzIHdvdWxkIGNhdXNlIGEgc21hbGwgY2hh bmdlIGluIGJlaGF2aW9yDQo+IG9uIFItQ2FyIEdlbjIsIHdoZXJlIHRoZSB0aW1lb3V0IHdvdWxk IGJlIHJlc2V0IG9uIHJlc3VtZSwgaW5zdGVhZCBvZg0KPiBjb250aW51aW5nIHdoZXJlIHN0b3Bw ZWQgYmVmb3JlLiBJIGRvbid0IHRoaW5rIHRoYXQgaHVydHMsIHRob3VnaC4NCg0KSSBzZWUsIHdl bGwgSSBiZWxpZXZlIHdlIGNhbiBtYWtlIGJvdGggb2YgdXMgaGFwcHkgYnkgYWRkcmVzc2luZyBH ZW4zDQpwcm9ibGVtcyBhbmQgcHJlc2VydmluZyB0aGUgb3JpZ2luYWwgYmVoYXZpb3VyICBmcm9t IEdlbjIuDQoNCkkgYW0gZ29pbmcgdG8gc2VuZCBhIG5ldyBzZXJpZXMgdG8gYWRkcmVzcyB0aGlz IHNob3J0bHkuDQoNCj4NCj4gU2luY2UgSSB3YXMgYWx3YXlzIGEgYml0IHVuY29tZm9ydGFibGUg d2l0aCB0aGlzIHBhdGNoIGRvaW5nIHR3byB0aGluZ3MgYXQNCj4gb25jZSAoMS4gc3VzcGVuZC9y ZXN1bWUsIDIuICJyZW5lc2FzLHJjYXItZ2VuMi13ZHQiIG1hdGNoaW5nKSwgSSB0aGluayBpdA0K PiB3b3VsZCBiZSBiZXR0ZXIgdG8gdGFrZSB0aGUgcGF0Y2ggZnJvbSB0aGUgQlNQIGZpcnN0LCBh bmQgYWRkIHN1cHBvcnQgZm9yDQo+ICJyZW5lc2FzLHJjYXItZ2VuMi13ZHQiIGluIGEgc3Vic2Vx dWVudCBwYXRjaC4NCg0KSSBhZ3JlZSwgSSdsbCBzcGxpdCB0aGUgcGF0Y2ggYW5kIHN1Ym1pdCBz dXNwZW5kL3Jlc3VtZSBmaXJzdCwgR2VuMiBjb21wYXRpYmlsaXR5DQpuZXh0Lg0KDQpUaGFua3Ms DQpGYWINCg0KPg0KPiBEb2VzIHRoZSBhYm92ZSBtYWtlIHNlbnNlPw0KPiBEbyB5b3UgYWdyZWU/ DQo+DQo+IFRoYW5rcyENCj4NCj4gR3J7b2V0amUsZWV0aW5nfXMsDQo+DQo+ICAgICAgICAgICAg ICAgICAgICAgICAgIEdlZXJ0DQo+DQo+IC0tDQo+IEdlZXJ0IFV5dHRlcmhvZXZlbiAtLSBUaGVy ZSdzIGxvdHMgb2YgTGludXggYmV5b25kIGlhMzIgLS0gZ2VlcnRAbGludXgtbTY4ay5vcmcNCj4N Cj4gSW4gcGVyc29uYWwgY29udmVyc2F0aW9ucyB3aXRoIHRlY2huaWNhbCBwZW9wbGUsIEkgY2Fs bCBteXNlbGYgYSBoYWNrZXIuIEJ1dA0KPiB3aGVuIEknbSB0YWxraW5nIHRvIGpvdXJuYWxpc3Rz IEkganVzdCBzYXkgInByb2dyYW1tZXIiIG9yIHNvbWV0aGluZyBsaWtlIHRoYXQuDQo+ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgLS0gTGludXMgVG9ydmFsZHMNCg0KDQoNClJlbmVz YXMgRWxlY3Ryb25pY3MgRXVyb3BlIEx0ZCwgRHVrZXMgTWVhZG93LCBNaWxsYm9hcmQgUm9hZCwg Qm91cm5lIEVuZCwgQnVja2luZ2hhbXNoaXJlLCBTTDggNUZILCBVSy4gUmVnaXN0ZXJlZCBpbiBF bmdsYW5kICYgV2FsZXMgdW5kZXIgUmVnaXN0ZXJlZCBOby4gMDQ1ODY3MDkuDQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Fabrizio Castro To: Geert Uytterhoeven CC: Philipp Zabel , Rob Herring , Mark Rutland , Wim Van Sebroeck , Russell King , Catalin Marinas , Will Deacon , "Michael Turquette" , Stephen Boyd , Simon Horman , Magnus Damm , "Geert Uytterhoeven" , Wolfram Sang , Guenter Roeck , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Linux Watchdog Mailing List , Linux-Renesas , Linux ARM , linux-clk , Chris Paterson , Biju Das , Ramesh Shanmugasundaram Subject: RE: [PATCH v5 12/26] watchdog: renesas_wdt: Add R-Car Gen2 support Date: Thu, 1 Mar 2018 15:34:02 +0000 Message-ID: References: <1518457475-4480-1-git-send-email-fabrizio.castro@bp.renesas.com> <1518457475-4480-13-git-send-email-fabrizio.castro@bp.renesas.com> In-Reply-To: Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 List-ID: SGkgR2VlcnQsDQoNCnRoYW5rIHlvdSBmb3IgeW91ciBmZWVkYmFjayENCg0KPiBTdWJqZWN0OiBS ZTogW1BBVENIIHY1IDEyLzI2XSB3YXRjaGRvZzogcmVuZXNhc193ZHQ6IEFkZCBSLUNhciBHZW4y IHN1cHBvcnQNCj4NCj4gSGkgRmFicml6aW8sDQo+DQo+IE9uIE1vbiwgRmViIDEyLCAyMDE4IGF0 IDY6NDQgUE0sIEZhYnJpemlvIENhc3Rybw0KPiA8ZmFicml6aW8uY2FzdHJvQGJwLnJlbmVzYXMu Y29tPiB3cm90ZToNCj4gPiBEdWUgdG8gY29tbWl0czoNCj4gPiAqICJBUk06IHNobW9iaWxlOiBB ZGQgd2F0Y2hkb2cgc3VwcG9ydCIsDQo+ID4gKiAiQVJNOiBzaG1vYmlsZTogcmNhci1nZW4yOiBB ZGQgd2F0Y2hkb2cgc3VwcG9ydCIsIGFuZA0KPiA+ICogInNvYzogcmVuZXNhczogcmNhci1yc3Q6 IEVuYWJsZSB3YXRjaGRvZyBhcyByZXNldCB0cmlnZ2VyIGZvciBHZW4yIiwNCj4gPiB3ZSBub3cg aGF2ZSBldmVyeXRoaW5nIHdlIG5lZWRlZCBmb3IgdGhlIHdhdGNoZG9nIHRvIHdvcmsgb24gR2Vu MiBhbmQNCj4gPiBSWi9HMS4NCj4gPg0KPiA+IFRoaXMgY29tbWl0IGFkZHMgInJlbmVzYXMscmNh ci1nZW4yLXdkdCIgYXMgY29tcGF0aWJsZSBzdHJpbmcgZm9yIFItQ2FyDQo+ID4gR2VuMiBhbmQg UlovRzEsIGFuZCBzaW5jZSBvbiB0aG9zZSBwbGF0Zm9ybXMgdGhlIHJ3ZHQgY2xvY2sgbmVlZHMg dG8gYmUNCj4gPiBhbHdheXMgT04sIHdoZW4gc3VzcGVuZGluZyB0byBSQU0gd2UgbmVlZCB0byBl eHBsaWNpdGx5IGRpc2FibGUgdGhlDQo+ID4gY291bnRpbmcgYnkgY2xlYXJpbmcgVE1FIGZyb20g UldUQ1NSQS4NCj4gPg0KPiA+IFNpZ25lZC1vZmYtYnk6IEZhYnJpemlvIENhc3RybyA8ZmFicml6 aW8uY2FzdHJvQGJwLnJlbmVzYXMuY29tPg0KPiA+IFNpZ25lZC1vZmYtYnk6IFJhbWVzaCBTaGFu bXVnYXN1bmRhcmFtIDxyYW1lc2guc2hhbm11Z2FzdW5kYXJhbUBicC5yZW5lc2FzLmNvbT4NCj4N Cj4gVGhhbmtzIGZvciB5b3VyIHBhdGNoIQ0KPg0KPiBJIHZlcmlmaWVkIHRoaXMgd29ya3Mgb24g Ui1DYXIgR2VuMiwgc28NCj4gUmV2aWV3ZWQtYW5kLVRlc3RlZC1ieTogR2VlcnQgVXl0dGVyaG9l dmVuIDxnZWVydCtyZW5lc2FzQGdsaWRlci5iZT4NCj4NCj4gU3RpbGwsIG1vcmUgY29tbWVudHMg YmVsb3cuLi4NCj4NCj4gPiAtLS0gYS9kcml2ZXJzL3dhdGNoZG9nL3JlbmVzYXNfd2R0LmMNCj4g PiArKysgYi9kcml2ZXJzL3dhdGNoZG9nL3JlbmVzYXNfd2R0LmMNCj4gPiBAQCAtMjAzLDEzICsy MDMsMjkgQEAgc3RhdGljIGludCByd2R0X3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw ZGV2KQ0KPiA+ICAgICAgICAgcmV0dXJuIDA7DQo+ID4gIH0NCj4gPg0KPiA+IC0vKg0KPiA+IC0g KiBUaGlzIGRyaXZlciBkb2VzIGFsc28gZml0IGZvciBSLUNhciBHZW4yIChyOGE3NzlbMC00XSkg V0RULiBIb3dldmVyLCBmb3IgU01QDQo+ID4gLSAqIHRvIHdvcmsgdGhlcmUsIG9uZSBhbHNvIG5l ZWRzIGEgUkVTRVQgKFJTVCkgZHJpdmVyIHdoaWNoIGRvZXMgbm90IGV4aXN0IHlldA0KPiA+IC0g KiBkdWUgdG8gSFcgaXNzdWVzLiBUaGlzIG5lZWRzIHRvIGJlIHNvbHZlZCBiZWZvcmUgYWRkaW5n IGNvbXBhdGlibGVzIGhlcmUuDQo+ID4gLSAqLw0KPiA+ICtzdGF0aWMgaW50IF9fbWF5YmVfdW51 c2VkIHJ3ZHRfc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICpkZXYpDQo+ID4gK3sNCj4gPiArICAgICAg IHN0cnVjdCByd2R0X3ByaXYgKnByaXYgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsNCj4gPiArDQo+ ID4gKyAgICAgICBpZiAod2F0Y2hkb2dfYWN0aXZlKCZwcml2LT53ZGV2KSkNCj4gPiArICAgICAg ICAgICAgICAgcndkdF93cml0ZShwcml2LCBwcml2LT5ja3MsIFJXVENTUkEpOw0KPiA+ICsgICAg ICAgcmV0dXJuIDA7DQo+ID4gK30NCj4gPiArDQo+ID4gK3N0YXRpYyBpbnQgX19tYXliZV91bnVz ZWQgcndkdF9yZXN1bWUoc3RydWN0IGRldmljZSAqZGV2KQ0KPiA+ICt7DQo+ID4gKyAgICAgICBz dHJ1Y3QgcndkdF9wcml2ICpwcml2ID0gZGV2X2dldF9kcnZkYXRhKGRldik7DQo+ID4gKw0KPiA+ ICsgICAgICAgaWYgKHdhdGNoZG9nX2FjdGl2ZSgmcHJpdi0+d2RldikpDQo+ID4gKyAgICAgICAg ICAgICAgIHJ3ZHRfd3JpdGUocHJpdiwgcHJpdi0+Y2tzIHwgUldUQ1NSQV9UTUUsIFJXVENTUkEp Ow0KPg0KPiBXcml0aW5nIHRvIHRoaXMgcmVnaXN0ZXIgaXMgbm90IHN1ZmZpY2llbnQgb24gUi1D YXIgR2VuMywgd2hlcmUgUFNDSQ0KPiBzdXNwZW5kIHBvd2VycyBkb3duIHRoZSB3aG9sZSBTb0Mu ICBIZW5jZSBhbGwgV0RUIHJlZ2lzdGVyIGNvbnRlbnQgaXMgbG9zdCwNCj4gY2F1c2luZyB0aGUg d2F0Y2hkb2cgdGltZW91dCBuZXZlciB0byB0cmlnZ2VyLg0KPiBOb3RlIHRoYXQgdGhpcyBpc3N1 ZSBpcyBwcmUtZXhpc3RpbmcsIGFuZCBub3QgY2F1c2VkIGJ5IHlvdXIgcGF0Y2guDQo+DQo+IFRo aXMgY2FuIGJlIGZpeGVkIGJ5IHJlcGxhY2luZyB0aGUgUldUQ1NSQSByZWdpc3RlciB3cml0ZXMg aW4gdGhlDQo+IHN1c3BlbmQvcmVzdW1lIGhhbmRsZXJzIGJ5IGNhbGxzIHRvIHJ3ZHRfc3RvcCgp IHJlc3AuIHJ3ZHRfc3RhcnQoKSwgbGlrZSBpcw0KPiBkb25lIGluIHRoZSBCU1AgaW4gY29tbWl0 IGU0MDY5ODA3NjNmMThmMzggKCJ3YXRjaGRvZzogcmVuZXNhcy13ZHQ6IFN1cHBvcnQNCj4gdGhl IHN1c3BlbmQvcmVzdW1lIikuIE5vdGUgdGhhdCB0aGlzIHdvdWxkIGNhdXNlIGEgc21hbGwgY2hh bmdlIGluIGJlaGF2aW9yDQo+IG9uIFItQ2FyIEdlbjIsIHdoZXJlIHRoZSB0aW1lb3V0IHdvdWxk IGJlIHJlc2V0IG9uIHJlc3VtZSwgaW5zdGVhZCBvZg0KPiBjb250aW51aW5nIHdoZXJlIHN0b3Bw ZWQgYmVmb3JlLiBJIGRvbid0IHRoaW5rIHRoYXQgaHVydHMsIHRob3VnaC4NCg0KSSBzZWUsIHdl bGwgSSBiZWxpZXZlIHdlIGNhbiBtYWtlIGJvdGggb2YgdXMgaGFwcHkgYnkgYWRkcmVzc2luZyBH ZW4zDQpwcm9ibGVtcyBhbmQgcHJlc2VydmluZyB0aGUgb3JpZ2luYWwgYmVoYXZpb3VyICBmcm9t IEdlbjIuDQoNCkkgYW0gZ29pbmcgdG8gc2VuZCBhIG5ldyBzZXJpZXMgdG8gYWRkcmVzcyB0aGlz IHNob3J0bHkuDQoNCj4NCj4gU2luY2UgSSB3YXMgYWx3YXlzIGEgYml0IHVuY29tZm9ydGFibGUg d2l0aCB0aGlzIHBhdGNoIGRvaW5nIHR3byB0aGluZ3MgYXQNCj4gb25jZSAoMS4gc3VzcGVuZC9y ZXN1bWUsIDIuICJyZW5lc2FzLHJjYXItZ2VuMi13ZHQiIG1hdGNoaW5nKSwgSSB0aGluayBpdA0K PiB3b3VsZCBiZSBiZXR0ZXIgdG8gdGFrZSB0aGUgcGF0Y2ggZnJvbSB0aGUgQlNQIGZpcnN0LCBh bmQgYWRkIHN1cHBvcnQgZm9yDQo+ICJyZW5lc2FzLHJjYXItZ2VuMi13ZHQiIGluIGEgc3Vic2Vx dWVudCBwYXRjaC4NCg0KSSBhZ3JlZSwgSSdsbCBzcGxpdCB0aGUgcGF0Y2ggYW5kIHN1Ym1pdCBz dXNwZW5kL3Jlc3VtZSBmaXJzdCwgR2VuMiBjb21wYXRpYmlsaXR5DQpuZXh0Lg0KDQpUaGFua3Ms DQpGYWINCg0KPg0KPiBEb2VzIHRoZSBhYm92ZSBtYWtlIHNlbnNlPw0KPiBEbyB5b3UgYWdyZWU/ DQo+DQo+IFRoYW5rcyENCj4NCj4gR3J7b2V0amUsZWV0aW5nfXMsDQo+DQo+ICAgICAgICAgICAg ICAgICAgICAgICAgIEdlZXJ0DQo+DQo+IC0tDQo+IEdlZXJ0IFV5dHRlcmhvZXZlbiAtLSBUaGVy ZSdzIGxvdHMgb2YgTGludXggYmV5b25kIGlhMzIgLS0gZ2VlcnRAbGludXgtbTY4ay5vcmcNCj4N Cj4gSW4gcGVyc29uYWwgY29udmVyc2F0aW9ucyB3aXRoIHRlY2huaWNhbCBwZW9wbGUsIEkgY2Fs bCBteXNlbGYgYSBoYWNrZXIuIEJ1dA0KPiB3aGVuIEknbSB0YWxraW5nIHRvIGpvdXJuYWxpc3Rz IEkganVzdCBzYXkgInByb2dyYW1tZXIiIG9yIHNvbWV0aGluZyBsaWtlIHRoYXQuDQo+ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgLS0gTGludXMgVG9ydmFsZHMNCg0KDQoNClJlbmVz YXMgRWxlY3Ryb25pY3MgRXVyb3BlIEx0ZCwgRHVrZXMgTWVhZG93LCBNaWxsYm9hcmQgUm9hZCwg Qm91cm5lIEVuZCwgQnVja2luZ2hhbXNoaXJlLCBTTDggNUZILCBVSy4gUmVnaXN0ZXJlZCBpbiBF bmdsYW5kICYgV2FsZXMgdW5kZXIgUmVnaXN0ZXJlZCBOby4gMDQ1ODY3MDkuDQo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabrizio.castro@bp.renesas.com (Fabrizio Castro) Date: Thu, 1 Mar 2018 15:34:02 +0000 Subject: [PATCH v5 12/26] watchdog: renesas_wdt: Add R-Car Gen2 support In-Reply-To: References: <1518457475-4480-1-git-send-email-fabrizio.castro@bp.renesas.com> <1518457475-4480-13-git-send-email-fabrizio.castro@bp.renesas.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Geert, thank you for your feedback! > Subject: Re: [PATCH v5 12/26] watchdog: renesas_wdt: Add R-Car Gen2 support > > Hi Fabrizio, > > On Mon, Feb 12, 2018 at 6:44 PM, Fabrizio Castro > wrote: > > Due to commits: > > * "ARM: shmobile: Add watchdog support", > > * "ARM: shmobile: rcar-gen2: Add watchdog support", and > > * "soc: renesas: rcar-rst: Enable watchdog as reset trigger for Gen2", > > we now have everything we needed for the watchdog to work on Gen2 and > > RZ/G1. > > > > This commit adds "renesas,rcar-gen2-wdt" as compatible string for R-Car > > Gen2 and RZ/G1, and since on those platforms the rwdt clock needs to be > > always ON, when suspending to RAM we need to explicitly disable the > > counting by clearing TME from RWTCSRA. > > > > Signed-off-by: Fabrizio Castro > > Signed-off-by: Ramesh Shanmugasundaram > > Thanks for your patch! > > I verified this works on R-Car Gen2, so > Reviewed-and-Tested-by: Geert Uytterhoeven > > Still, more comments below... > > > --- a/drivers/watchdog/renesas_wdt.c > > +++ b/drivers/watchdog/renesas_wdt.c > > @@ -203,13 +203,29 @@ static int rwdt_remove(struct platform_device *pdev) > > return 0; > > } > > > > -/* > > - * This driver does also fit for R-Car Gen2 (r8a779[0-4]) WDT. However, for SMP > > - * to work there, one also needs a RESET (RST) driver which does not exist yet > > - * due to HW issues. This needs to be solved before adding compatibles here. > > - */ > > +static int __maybe_unused rwdt_suspend(struct device *dev) > > +{ > > + struct rwdt_priv *priv = dev_get_drvdata(dev); > > + > > + if (watchdog_active(&priv->wdev)) > > + rwdt_write(priv, priv->cks, RWTCSRA); > > + return 0; > > +} > > + > > +static int __maybe_unused rwdt_resume(struct device *dev) > > +{ > > + struct rwdt_priv *priv = dev_get_drvdata(dev); > > + > > + if (watchdog_active(&priv->wdev)) > > + rwdt_write(priv, priv->cks | RWTCSRA_TME, RWTCSRA); > > Writing to this register is not sufficient on R-Car Gen3, where PSCI > suspend powers down the whole SoC. Hence all WDT register content is lost, > causing the watchdog timeout never to trigger. > Note that this issue is pre-existing, and not caused by your patch. > > This can be fixed by replacing the RWTCSRA register writes in the > suspend/resume handlers by calls to rwdt_stop() resp. rwdt_start(), like is > done in the BSP in commit e406980763f18f38 ("watchdog: renesas-wdt: Support > the suspend/resume"). Note that this would cause a small change in behavior > on R-Car Gen2, where the timeout would be reset on resume, instead of > continuing where stopped before. I don't think that hurts, though. I see, well I believe we can make both of us happy by addressing Gen3 problems and preserving the original behaviour from Gen2. I am going to send a new series to address this shortly. > > Since I was always a bit uncomfortable with this patch doing two things at > once (1. suspend/resume, 2. "renesas,rcar-gen2-wdt" matching), I think it > would be better to take the patch from the BSP first, and add support for > "renesas,rcar-gen2-wdt" in a subsequent patch. I agree, I'll split the patch and submit suspend/resume first, Gen2 compatibility next. Thanks, Fab > > Does the above make sense? > Do you agree? > > Thanks! > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.