* [PATCH 1/2] spi: sprd: adi: Add missing lock protection when rebooting @ 2019-10-28 10:10 Baolin Wang 2019-10-28 10:10 ` [PATCH 2/2] spi: sprd: adi: Set BIT_WDG_NEW bit " Baolin Wang 2019-10-28 14:56 ` Applied "spi: sprd: adi: Add missing lock protection " Mark Brown 0 siblings, 2 replies; 4+ messages in thread From: Baolin Wang @ 2019-10-28 10:10 UTC (permalink / raw) To: broonie Cc: orsonzhai, zhang.lyra, baolin.wang, baolin.wang7, ling_ling.xu, linux-spi, linux-kernel From: Lingling Xu <ling_ling.xu@unisoc.com> When rebooting the system, we should lock the watchdog after configuration to make sure the watchdog can reboot the system successfully. Signed-off-by: Lingling Xu <ling_ling.xu@unisoc.com> Signed-off-by: Baolin Wang <baolin.wang@linaro.org> --- drivers/spi/spi-sprd-adi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c index 9a05128..9613cfe 100644 --- a/drivers/spi/spi-sprd-adi.c +++ b/drivers/spi/spi-sprd-adi.c @@ -393,6 +393,9 @@ static int sprd_adi_restart_handler(struct notifier_block *this, val |= BIT_WDG_RUN | BIT_WDG_RST; sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_CTRL, val); + /* Lock the watchdog */ + sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOCK, ~WDG_UNLOCK_KEY); + mdelay(1000); dev_emerg(sadi->dev, "Unable to restart system\n"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] spi: sprd: adi: Set BIT_WDG_NEW bit when rebooting 2019-10-28 10:10 [PATCH 1/2] spi: sprd: adi: Add missing lock protection when rebooting Baolin Wang @ 2019-10-28 10:10 ` Baolin Wang 2019-10-28 14:56 ` Applied "spi: sprd: adi: Set BIT_WDG_NEW bit when rebooting" to the spi tree Mark Brown 2019-10-28 14:56 ` Applied "spi: sprd: adi: Add missing lock protection " Mark Brown 1 sibling, 1 reply; 4+ messages in thread From: Baolin Wang @ 2019-10-28 10:10 UTC (permalink / raw) To: broonie Cc: orsonzhai, zhang.lyra, baolin.wang, baolin.wang7, ling_ling.xu, linux-spi, linux-kernel From: Lingling Xu <ling_ling.xu@unisoc.com> When rebooting system, the PMIC watchdog time loading may not be loaded correctly when another system is feeding the PMIC watchdog, since we did not check the watchdog busy status before loading time values. Thus we should set the BIT_WDG_NEW bit before loading time values, that can support multiple loads without checking busy status to make sure the time values can be loaded successfully to avoid this potential issue. Signed-off-by: Lingling Xu <ling_ling.xu@unisoc.com> Signed-off-by: Baolin Wang <baolin.wang@linaro.org> --- drivers/spi/spi-sprd-adi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c index 9613cfe..87dadb6 100644 --- a/drivers/spi/spi-sprd-adi.c +++ b/drivers/spi/spi-sprd-adi.c @@ -77,6 +77,7 @@ /* Bits definitions for register REG_WDG_CTRL */ #define BIT_WDG_RUN BIT(1) +#define BIT_WDG_NEW BIT(2) #define BIT_WDG_RST BIT(3) /* Registers definitions for PMIC */ @@ -383,6 +384,10 @@ static int sprd_adi_restart_handler(struct notifier_block *this, /* Unlock the watchdog */ sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOCK, WDG_UNLOCK_KEY); + sprd_adi_read(sadi, sadi->slave_pbase + REG_WDG_CTRL, &val); + val |= BIT_WDG_NEW; + sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_CTRL, val); + /* Load the watchdog timeout value, 50ms is always enough. */ sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_LOW, WDG_LOAD_VAL & WDG_LOAD_MASK); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Applied "spi: sprd: adi: Set BIT_WDG_NEW bit when rebooting" to the spi tree 2019-10-28 10:10 ` [PATCH 2/2] spi: sprd: adi: Set BIT_WDG_NEW bit " Baolin Wang @ 2019-10-28 14:56 ` Mark Brown 0 siblings, 0 replies; 4+ messages in thread From: Mark Brown @ 2019-10-28 14:56 UTC (permalink / raw) To: Lingling Xu Cc: baolin.wang7, Baolin Wang, baolin.wang, broonie, ling_ling.xu, linux-kernel, linux-spi, Mark Brown, orsonzhai, zhang.lyra The patch spi: sprd: adi: Set BIT_WDG_NEW bit when rebooting has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 1d00a67c2da2d8d82e6dcc5b398d9f6db656d9be Mon Sep 17 00:00:00 2001 From: Lingling Xu <ling_ling.xu@unisoc.com> Date: Mon, 28 Oct 2019 18:10:31 +0800 Subject: [PATCH] spi: sprd: adi: Set BIT_WDG_NEW bit when rebooting When rebooting system, the PMIC watchdog time loading may not be loaded correctly when another system is feeding the PMIC watchdog, since we did not check the watchdog busy status before loading time values. Thus we should set the BIT_WDG_NEW bit before loading time values, that can support multiple loads without checking busy status to make sure the time values can be loaded successfully to avoid this potential issue. Signed-off-by: Lingling Xu <ling_ling.xu@unisoc.com> Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Link: https://lore.kernel.org/r/5655318a7252c9ea518c2f7950a61228ab8f42bf.1572257085.git.baolin.wang@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-sprd-adi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c index 9613cfe3c0a2..87dadb6b8ebf 100644 --- a/drivers/spi/spi-sprd-adi.c +++ b/drivers/spi/spi-sprd-adi.c @@ -77,6 +77,7 @@ /* Bits definitions for register REG_WDG_CTRL */ #define BIT_WDG_RUN BIT(1) +#define BIT_WDG_NEW BIT(2) #define BIT_WDG_RST BIT(3) /* Registers definitions for PMIC */ @@ -383,6 +384,10 @@ static int sprd_adi_restart_handler(struct notifier_block *this, /* Unlock the watchdog */ sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOCK, WDG_UNLOCK_KEY); + sprd_adi_read(sadi, sadi->slave_pbase + REG_WDG_CTRL, &val); + val |= BIT_WDG_NEW; + sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_CTRL, val); + /* Load the watchdog timeout value, 50ms is always enough. */ sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_LOW, WDG_LOAD_VAL & WDG_LOAD_MASK); -- 2.20.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Applied "spi: sprd: adi: Add missing lock protection when rebooting" to the spi tree 2019-10-28 10:10 [PATCH 1/2] spi: sprd: adi: Add missing lock protection when rebooting Baolin Wang 2019-10-28 10:10 ` [PATCH 2/2] spi: sprd: adi: Set BIT_WDG_NEW bit " Baolin Wang @ 2019-10-28 14:56 ` Mark Brown 1 sibling, 0 replies; 4+ messages in thread From: Mark Brown @ 2019-10-28 14:56 UTC (permalink / raw) To: Lingling Xu Cc: baolin.wang7, Baolin Wang, baolin.wang, broonie, ling_ling.xu, linux-kernel, linux-spi, Mark Brown, orsonzhai, zhang.lyra The patch spi: sprd: adi: Add missing lock protection when rebooting has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-5.5 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 91ea1d70607e374b014b4b9bea771ce661f9f64b Mon Sep 17 00:00:00 2001 From: Lingling Xu <ling_ling.xu@unisoc.com> Date: Mon, 28 Oct 2019 18:10:30 +0800 Subject: [PATCH] spi: sprd: adi: Add missing lock protection when rebooting When rebooting the system, we should lock the watchdog after configuration to make sure the watchdog can reboot the system successfully. Signed-off-by: Lingling Xu <ling_ling.xu@unisoc.com> Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Link: https://lore.kernel.org/r/7b04711127434555e3a1a86bc6be99860cd86668.1572257085.git.baolin.wang@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-sprd-adi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c index 9a051286f120..9613cfe3c0a2 100644 --- a/drivers/spi/spi-sprd-adi.c +++ b/drivers/spi/spi-sprd-adi.c @@ -393,6 +393,9 @@ static int sprd_adi_restart_handler(struct notifier_block *this, val |= BIT_WDG_RUN | BIT_WDG_RST; sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_CTRL, val); + /* Lock the watchdog */ + sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOCK, ~WDG_UNLOCK_KEY); + mdelay(1000); dev_emerg(sadi->dev, "Unable to restart system\n"); -- 2.20.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-28 14:57 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-10-28 10:10 [PATCH 1/2] spi: sprd: adi: Add missing lock protection when rebooting Baolin Wang 2019-10-28 10:10 ` [PATCH 2/2] spi: sprd: adi: Set BIT_WDG_NEW bit " Baolin Wang 2019-10-28 14:56 ` Applied "spi: sprd: adi: Set BIT_WDG_NEW bit when rebooting" to the spi tree Mark Brown 2019-10-28 14:56 ` Applied "spi: sprd: adi: Add missing lock protection " Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).