Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1242743 > unrolled thread

[PATCH 0/6] watchdog: sama5d4 and at91sam9: trivial rework

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/6] watchdog: sama5d4 and at91sam9: trivial rework Sylvain Rochet <sylvain.rochet@finsecur.com> - 2015-10-08 23:40 +0200
    [PATCH 5/6] watchdog: at91sam9: remove unused pdata support Sylvain Rochet <sylvain.rochet@finsecur.com> - 2015-10-08 23:40 +0200
    [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first Sylvain Rochet <sylvain.rochet@finsecur.com> - 2015-10-08 23:40 +0200
      Re: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device  tree first Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-10-12 10:00 +0200
        RE: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device  tree first "Yang, Wenyou" <Wenyou.Yang@atmel.com> - 2015-10-12 10:20 +0200
          Re: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device  tree first Sylvain Rochet <sylvain.rochet@finsecur.com> - 2015-10-12 16:00 +0200
        Re: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device  tree first Sylvain Rochet <sylvain.rochet@finsecur.com> - 2015-10-12 11:10 +0200
    [PATCH 2/6] watchdog: at91sam9: use watchdog_get_drvdata instead of container_of Sylvain Rochet <sylvain.rochet@finsecur.com> - 2015-10-08 23:40 +0200
    [PATCH 4/6] watchdog: at91sam9: remove nowayout useless copy Sylvain Rochet <sylvain.rochet@finsecur.com> - 2015-10-08 23:40 +0200

#1242743 — [PATCH 0/6] watchdog: sama5d4 and at91sam9: trivial rework

A little bit of trivial rework for both sama5d4 and at91sam9 drivers.

Sylvain Rochet (6):
  watchdog: at91sam9: use devm_request_irq instead of request_irq
  watchdog: at91sam9: use watchdog_get_drvdata instead of container_of
  watchdog: at91sam9: rename heartbeats into timeout where necessary
  watchdog: at91sam9: remove nowayout useless copy
  watchdog: at91sam9: remove unused pdata support
  watchdog: sama5d4: try to set timeout from device tree first

 drivers/watchdog/at91sam9_wdt.c | 48 +++++++++++++----------------------------
 drivers/watchdog/sama5d4_wdt.c  |  7 ++++--
 2 files changed, 20 insertions(+), 35 deletions(-)

-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1242744 — [PATCH 5/6] watchdog: at91sam9: remove unused pdata support

All SoC using this driver were converted to device tree. Remove pdata
support and initialization steps which are only used for pdata.

Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
---
 drivers/watchdog/at91sam9_wdt.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 8629f48..5d3e8c0 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -62,9 +62,6 @@
 /* Watchdog max delta/value in secs */
 #define WDT_COUNTER_MAX_SECS	ticks_to_secs(WDT_COUNTER_MAX_TICKS)
 
-/* Hardware timeout in seconds */
-#define WDT_HW_TIMEOUT 16
-
 /* User land default timeout */
 #define WDT_DEFAULT_TIMEOUT 15
 
@@ -261,7 +258,6 @@ static const struct watchdog_ops at91_wdt_ops = {
 	.set_timeout =	at91_wdt_set_timeout,
 };
 
-#if defined(CONFIG_OF)
 static int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt)
 {
 	u32 min = 0;
@@ -317,12 +313,6 @@ static int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt)
 
 	return 0;
 }
-#else
-static inline int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt)
-{
-	return 0;
-}
-#endif
 
 static int __init at91wdt_probe(struct platform_device *pdev)
 {
@@ -334,9 +324,6 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 	if (!wdt)
 		return -ENOMEM;
 
-	wdt->mr = (WDT_HW_TIMEOUT * 256) | AT91_WDT_WDRSTEN | AT91_WDT_WDD |
-		  AT91_WDT_WDDBGHLT;
-	wdt->mr_mask = 0x3FFFFFFF;
 	wdt->wdd.parent = &pdev->dev;
 	wdt->wdd.info = &at91_wdt_info;
 	wdt->wdd.ops = &at91_wdt_ops;
@@ -396,14 +383,12 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#if defined(CONFIG_OF)
 static const struct of_device_id at91_wdt_dt_ids[] = {
 	{ .compatible = "atmel,at91sam9260-wdt" },
 	{ /* sentinel */ }
 };
 
 MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids);
-#endif
 
 static struct platform_driver at91wdt_driver = {
 	.remove		= __exit_p(at91wdt_remove),
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1242745 — [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first

watchdog_init_timeout function doesn't try to get the "timeout-sec" DT
property if timeout_parm is not zero. This change makes this DT property
working for the sama5d4 watchdog driver.

Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
---
 drivers/watchdog/sama5d4_wdt.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index a49634c..2e2049b 100644
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -222,7 +222,10 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
 		}
 	}
 
-	ret = watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);
+	/* Try to set timeout from device tree first */
+	ret = watchdog_init_timeout(wdd, 0, &pdev->dev);
+	if (ret)
+		ret = watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);
 	if (ret) {
 		dev_err(&pdev->dev, "unable to set timeout value\n");
 		return ret;
@@ -243,7 +246,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, wdt);
 
 	dev_info(&pdev->dev, "initialized (timeout = %d sec, nowayout = %d)\n",
-		 wdt_timeout, nowayout);
+		 wdd->timeout, nowayout);
 
 	return 0;
 }
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1244462 — Re: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first

Hi Sylvain,

The rest of the series looks good to me, one comment below:

On 08/10/2015 at 23:34:34 +0200, Sylvain Rochet wrote :
> watchdog_init_timeout function doesn't try to get the "timeout-sec" DT
> property if timeout_parm is not zero. This change makes this DT property
> working for the sama5d4 watchdog driver.
> 

While I'm not sure of the feasibility, I think that the module parameter
should override the DT property.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1244472 — RE: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first

DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogQWxleGFuZHJlIEJlbGxv
bmkgW21haWx0bzphbGV4YW5kcmUuYmVsbG9uaUBmcmVlLWVsZWN0cm9ucy5jb21dDQo+IFNlbnQ6
IDIwMTXE6jEw1MIxMsjVIDE1OjUwDQo+IFRvOiBTeWx2YWluIFJvY2hldA0KPiBDYzogR3VlbnRl
ciBSb2VjazsgQm9yaXMgQlJFWklMTE9OOyBsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnOyBG
ZXJyZSwNCj4gTmljb2xhczsgRGVzcm9jaGVzLCBMdWRvdmljOyBsaW51eC1hcm0ta2VybmVsQGxp
c3RzLmluZnJhZGVhZC5vcmc7IFlhbmcsDQo+IFdlbnlvdTsgV2ltIFZhbiBTZWJyb2Vjaw0KPiBT
dWJqZWN0OiBSZTogW1BBVENIIDYvNl0gd2F0Y2hkb2c6IHNhbWE1ZDQ6IHRyeSB0byBzZXQgdGlt
ZW91dCBmcm9tIGRldmljZSB0cmVlDQo+IGZpcnN0DQo+IA0KPiBIaSBTeWx2YWluLA0KPiANCj4g
VGhlIHJlc3Qgb2YgdGhlIHNlcmllcyBsb29rcyBnb29kIHRvIG1lLCBvbmUgY29tbWVudCBiZWxv
dzoNCj4gDQo+IE9uIDA4LzEwLzIwMTUgYXQgMjM6MzQ6MzQgKzAyMDAsIFN5bHZhaW4gUm9jaGV0
IHdyb3RlIDoNCj4gPiB3YXRjaGRvZ19pbml0X3RpbWVvdXQgZnVuY3Rpb24gZG9lc24ndCB0cnkg
dG8gZ2V0IHRoZSAidGltZW91dC1zZWMiIERUDQo+ID4gcHJvcGVydHkgaWYgdGltZW91dF9wYXJt
IGlzIG5vdCB6ZXJvLiBUaGlzIGNoYW5nZSBtYWtlcyB0aGlzIERUDQo+ID4gcHJvcGVydHkgd29y
a2luZyBmb3IgdGhlIHNhbWE1ZDQgd2F0Y2hkb2cgZHJpdmVyLg0KPiA+DQo+IA0KPiBXaGlsZSBJ
J20gbm90IHN1cmUgb2YgdGhlIGZlYXNpYmlsaXR5LCBJIHRoaW5rIHRoYXQgdGhlIG1vZHVsZSBw
YXJhbWV0ZXIgc2hvdWxkDQo+IG92ZXJyaWRlIHRoZSBEVCBwcm9wZXJ0eS4NCg0KVGhlIHBhdGNo
IHNob3VsZCBiZSByaWdodCwgdGhlIERUIHByb3BlcnR5IG92ZXJyaWRlcyB0aGUgbW9kdWxlIHBh
cmFtZXRlci4NCg0KSWYgdGhlIERUIHByb3BlcnR5IGlzIG5vdCBhIHZhbGlkIHZhbHVlLCBpdCB1
c2VzIHRoZSBkZWZhdWx0IHZhbHVlLCAgaW5pdGlhbGl6ZWQgd2l0aCB0aGUgbW9kdWxlIHBhcmFt
ZXRlciBhdCB0aGUgYmVnaW5uaW5nIG9mIHByb2JlLg0KDQo+IA0KPiAtLQ0KPiBBbGV4YW5kcmUg
QmVsbG9uaSwgRnJlZSBFbGVjdHJvbnMNCj4gRW1iZWRkZWQgTGludXgsIEtlcm5lbCBhbmQgQW5k
cm9pZCBlbmdpbmVlcmluZyBodHRwOi8vZnJlZS1lbGVjdHJvbnMuY29tDQoNCkJlc3QgUmVnYXJk
cywNCldlbnlvdSBZYW5nDQo=
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1244720 — Re: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first

Hi Wenyou,

On Mon, Oct 12, 2015 at 08:12:42AM +0000, Yang, Wenyou wrote:
> > -----Original Message-----
> > From: Alexandre Belloni [mailto:alexandre.belloni@free-electrons.com]
> > Sent: 2015年10月12日 15:50
> > To: Sylvain Rochet
> > Cc: Guenter Roeck; Boris BREZILLON; linux-kernel@vger.kernel.org; Ferre,
> > Nicolas; Desroches, Ludovic; linux-arm-kernel@lists.infradead.org; Yang,
> > Wenyou; Wim Van Sebroeck
> > Subject: Re: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree
> > first
> > 
> > Hi Sylvain,
> > 
> > The rest of the series looks good to me, one comment below:
> > 
> > On 08/10/2015 at 23:34:34 +0200, Sylvain Rochet wrote :
> > > watchdog_init_timeout function doesn't try to get the "timeout-sec" DT
> > > property if timeout_parm is not zero. This change makes this DT
> > > property working for the sama5d4 watchdog driver.
> > >
> > 
> > While I'm not sure of the feasibility, I think that the module parameter should
> > override the DT property.
> 
> The patch should be right, the DT property overrides the module 
> parameter.
> 
> If the DT property is not a valid value, it uses the default value, 
> initialized with the module parameter at the beginning of probe.

Well, the principle of least surprise applied here means if you load the 
module with a timeout argument, you expect the timeout argument to be 
used and not the dt one. As such, it makes more sense to have the 
parameter value takes precedence over the dt value.

Sylvain
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1244504 — Re: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first

Hi Alexandre,

On Mon, Oct 12, 2015 at 09:50:01AM +0200, Alexandre Belloni wrote:
> Hi Sylvain,
> 
> The rest of the series looks good to me, one comment below:
> 
> On 08/10/2015 at 23:34:34 +0200, Sylvain Rochet wrote :
> > watchdog_init_timeout function doesn't try to get the "timeout-sec" DT
> > property if timeout_parm is not zero. This change makes this DT property
> > working for the sama5d4 watchdog driver.
> 
> While I'm not sure of the feasibility, I think that the module parameter
> should override the DT property.

That's not that hard, we can remove the initialisation of wdt_timeout to 
WDT_DEFAULT_TIMEOUT and use the 0 magic value, which is not an 
acceptable timeout value, to tell whether the variable was set with a 
module parameter or not.

I followed what was done in the at91sam9_wdt driver but I agree the 
module parameter should override the DT property, if we all agree on 
that, I will also change this behavior in at91sam9_wdt in v2, at least 
for the sake of coherency between drivers.

Sylvain
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1242746 — [PATCH 2/6] watchdog: at91sam9: use watchdog_get_drvdata instead of container_of

Use watchdog_get_drvdata instead of container_of.

Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
---
 drivers/watchdog/at91sam9_wdt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 88f56b5..8c1c9de 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -80,7 +80,6 @@ module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
 	"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
-#define to_wdt(wdd) container_of(wdd, struct at91wdt, wdd)
 struct at91wdt {
 	struct watchdog_device wdd;
 	void __iomem *base;
@@ -134,7 +133,7 @@ static void at91_ping(unsigned long data)
 
 static int at91_wdt_start(struct watchdog_device *wdd)
 {
-	struct at91wdt *wdt = to_wdt(wdd);
+	struct at91wdt *wdt = watchdog_get_drvdata(wdd);
 	/* calculate when the next userspace timeout will be */
 	wdt->next_heartbeat = jiffies + wdd->timeout * HZ;
 	return 0;
@@ -349,6 +348,8 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 	wdt->wdd.min_timeout = 1;
 	wdt->wdd.max_timeout = 0xFFFF;
 
+	watchdog_set_drvdata(&wdt->wdd, wdt);
+
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	wdt->base = devm_ioremap_resource(&pdev->dev, r);
 	if (IS_ERR(wdt->base))
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1242747 — [PATCH 4/6] watchdog: at91sam9: remove nowayout useless copy

nowayout is a global variable set by module parameter, remove the
nowayout useless copy.

Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
---
 drivers/watchdog/at91sam9_wdt.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 2c506e0..8629f48 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -86,7 +86,6 @@ struct at91wdt {
 	u32 mr;
 	u32 mr_mask;
 	unsigned long heartbeat;	/* WDT heartbeat in jiffies */
-	bool nowayout;
 	unsigned int irq;
 	struct clk *sclk;
 };
@@ -233,7 +232,7 @@ static int at91_wdt_init(struct platform_device *pdev, struct at91wdt *wdt)
 	/* Try to set timeout from device tree first */
 	if (watchdog_init_timeout(&wdt->wdd, 0, dev))
 		watchdog_init_timeout(&wdt->wdd, wdt_timeout, dev);
-	watchdog_set_nowayout(&wdt->wdd, wdt->nowayout);
+	watchdog_set_nowayout(&wdt->wdd, nowayout);
 	err = watchdog_register_device(&wdt->wdd);
 	if (err)
 		goto out_stop_timer;
@@ -338,7 +337,6 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 	wdt->mr = (WDT_HW_TIMEOUT * 256) | AT91_WDT_WDRSTEN | AT91_WDT_WDD |
 		  AT91_WDT_WDDBGHLT;
 	wdt->mr_mask = 0x3FFFFFFF;
-	wdt->nowayout = nowayout;
 	wdt->wdd.parent = &pdev->dev;
 	wdt->wdd.info = &at91_wdt_info;
 	wdt->wdd.ops = &at91_wdt_ops;
@@ -376,7 +374,7 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, wdt);
 
 	pr_info("initialized (timeout=%d sec, nowayout=%d)\n",
-		wdt->wdd.timeout, wdt->nowayout);
+		wdt->wdd.timeout, nowayout);
 
 	return 0;
 
-- 
2.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web