From: Ivan Mikhaylov <i.mikhaylov@yadro.com> To: Wim Van Sebroeck <wim@linux-watchdog.org>, Guenter Roeck <linux@roeck-us.net> Cc: Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>, <linux-watchdog@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-aspeed@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>, "Alexander Amelkin" <a.amelkin@yadro.com> Subject: [PATCH 3/3] watchdog/aspeed: add support for dual boot Date: Wed, 21 Aug 2019 18:57:43 +0300 [thread overview] Message-ID: <1f2cd155057e5ab0cdb20a9a11614bbb09bb49ad.camel@yadro.com> (raw) Set WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION into WDT_CLEAR_TIMEOUT_STATUS to clear out boot code source and re-enable access to the primary SPI flash chip while booted via wdt2 from the alternate chip. AST2400 datasheet says: "In the 2nd flash booting mode, all the address mapping to CS0# would be re-directed to CS1#. And CS0# is not accessable under this mode. To access CS0#, firmware should clear the 2nd boot mode register in the WDT2 status register WDT30.bit[1]." Signed-off-by: Ivan Mikhaylov <i.mikhaylov@yadro.com> --- drivers/watchdog/aspeed_wdt.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c index cc71861e033a..858e62f1c7ba 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -53,6 +53,8 @@ MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table); #define WDT_CTRL_ENABLE BIT(0) #define WDT_TIMEOUT_STATUS 0x10 #define WDT_TIMEOUT_STATUS_BOOT_SECONDARY BIT(1) +#define WDT_CLEAR_TIMEOUT_STATUS 0x14 +#define WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION BIT(0) /* * WDT_RESET_WIDTH controls the characteristics of the external pulse (if @@ -165,6 +167,29 @@ static int aspeed_wdt_restart(struct watchdog_device *wdd, return 0; } +static ssize_t access_cs0_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size) +{ + struct aspeed_wdt *wdt = dev_get_drvdata(dev); + + if (unlikely(!wdt)) + return -ENODEV; + + writel(WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION, + wdt->base + WDT_CLEAR_TIMEOUT_STATUS); + wdt->wdd.bootstatus |= WDIOF_EXTERN1; + + return size; +} +static DEVICE_ATTR_WO(access_cs0); + +static struct attribute *bswitch_attrs[] = { + &dev_attr_access_cs0.attr, + NULL +}; +ATTRIBUTE_GROUPS(bswitch); + static const struct watchdog_ops aspeed_wdt_ops = { .start = aspeed_wdt_start, .stop = aspeed_wdt_stop, @@ -223,6 +248,9 @@ static int aspeed_wdt_probe(struct platform_device *pdev) wdt->ctrl = WDT_CTRL_1MHZ_CLK; + if (of_property_read_bool(np, "aspeed,alt-boot")) + wdt->wdd.groups = bswitch_groups; + /* * Control reset on a per-device basis to ensure the * host is not affected by a BMC reboot @@ -309,6 +337,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev) if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY) wdt->wdd.bootstatus = WDIOF_CARDRESET; + dev_set_drvdata(dev, wdt); + return devm_watchdog_register_device(dev, &wdt->wdd); } -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Ivan Mikhaylov <i.mikhaylov@yadro.com> To: Wim Van Sebroeck <wim@linux-watchdog.org>, Guenter Roeck <linux@roeck-us.net> Cc: linux-watchdog@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Andrew Jeffery <andrew@aj.id.au>, Alexander Amelkin <a.amelkin@yadro.com>, linux-kernel@vger.kernel.org, Joel Stanley <joel@jms.id.au>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] watchdog/aspeed: add support for dual boot Date: Wed, 21 Aug 2019 18:57:43 +0300 [thread overview] Message-ID: <1f2cd155057e5ab0cdb20a9a11614bbb09bb49ad.camel@yadro.com> (raw) Set WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION into WDT_CLEAR_TIMEOUT_STATUS to clear out boot code source and re-enable access to the primary SPI flash chip while booted via wdt2 from the alternate chip. AST2400 datasheet says: "In the 2nd flash booting mode, all the address mapping to CS0# would be re-directed to CS1#. And CS0# is not accessable under this mode. To access CS0#, firmware should clear the 2nd boot mode register in the WDT2 status register WDT30.bit[1]." Signed-off-by: Ivan Mikhaylov <i.mikhaylov@yadro.com> --- drivers/watchdog/aspeed_wdt.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c index cc71861e033a..858e62f1c7ba 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -53,6 +53,8 @@ MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table); #define WDT_CTRL_ENABLE BIT(0) #define WDT_TIMEOUT_STATUS 0x10 #define WDT_TIMEOUT_STATUS_BOOT_SECONDARY BIT(1) +#define WDT_CLEAR_TIMEOUT_STATUS 0x14 +#define WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION BIT(0) /* * WDT_RESET_WIDTH controls the characteristics of the external pulse (if @@ -165,6 +167,29 @@ static int aspeed_wdt_restart(struct watchdog_device *wdd, return 0; } +static ssize_t access_cs0_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size) +{ + struct aspeed_wdt *wdt = dev_get_drvdata(dev); + + if (unlikely(!wdt)) + return -ENODEV; + + writel(WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION, + wdt->base + WDT_CLEAR_TIMEOUT_STATUS); + wdt->wdd.bootstatus |= WDIOF_EXTERN1; + + return size; +} +static DEVICE_ATTR_WO(access_cs0); + +static struct attribute *bswitch_attrs[] = { + &dev_attr_access_cs0.attr, + NULL +}; +ATTRIBUTE_GROUPS(bswitch); + static const struct watchdog_ops aspeed_wdt_ops = { .start = aspeed_wdt_start, .stop = aspeed_wdt_stop, @@ -223,6 +248,9 @@ static int aspeed_wdt_probe(struct platform_device *pdev) wdt->ctrl = WDT_CTRL_1MHZ_CLK; + if (of_property_read_bool(np, "aspeed,alt-boot")) + wdt->wdd.groups = bswitch_groups; + /* * Control reset on a per-device basis to ensure the * host is not affected by a BMC reboot @@ -309,6 +337,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev) if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY) wdt->wdd.bootstatus = WDIOF_CARDRESET; + dev_set_drvdata(dev, wdt); + return devm_watchdog_register_device(dev, &wdt->wdd); } -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2019-08-21 15:57 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-21 15:57 Ivan Mikhaylov [this message] 2019-08-21 15:57 ` [PATCH 3/3] watchdog/aspeed: add support for dual boot Ivan Mikhaylov 2019-08-21 16:32 ` Guenter Roeck 2019-08-21 16:32 ` Guenter Roeck 2019-08-21 17:42 ` Alexander Amelkin 2019-08-21 17:42 ` Alexander Amelkin 2019-08-21 18:10 ` Guenter Roeck 2019-08-21 18:10 ` Guenter Roeck 2019-08-22 14:36 ` Alexander Amelkin 2019-08-22 14:36 ` Alexander Amelkin 2019-08-22 16:01 ` Guenter Roeck 2019-08-22 16:01 ` Guenter Roeck 2019-08-22 16:45 ` Alexander Amelkin 2019-08-22 16:45 ` Alexander Amelkin 2019-08-22 9:15 ` Ivan Mikhaylov 2019-08-22 9:15 ` Ivan Mikhaylov 2019-08-22 13:55 ` Guenter Roeck 2019-08-22 13:55 ` Guenter Roeck 2019-08-22 14:24 ` Ivan Mikhaylov 2019-08-22 14:24 ` Ivan Mikhaylov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1f2cd155057e5ab0cdb20a9a11614bbb09bb49ad.camel@yadro.com \ --to=i.mikhaylov@yadro.com \ --cc=a.amelkin@yadro.com \ --cc=andrew@aj.id.au \ --cc=joel@jms.id.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=wim@linux-watchdog.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.