mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
Merge tag 'watchdog-fixes-for-v7.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull watchdog fixes from Guenter Roeck: - gunyah_wdt: Re-enable the watchdog on resume - mediatek: Register reset controller before watchdog device - meson_gxbb_wdt: fix suspend/resume handling of HW_RUNNING watchdog - mtk_wdt: Stop a running watchdog over system sleep even if not opened - npcm: fix clock prepare leak when setting timeout on a running watchdog - omap: Fix early_enable handling in omap_wdt_probe() - orion_wdt: load the pretimeout counter on Armada 370/XP start - rzv2h: Drop runtime PM handling from WDTDCR init, and use pm_runtime_put_sync() - sbsa_gwdt: Limit the MediaTek WS0 race workaround to revision 0 - sc1200wdt: add missing MODULE_DEVICE_TABLE() - sp5100_tco: Use release_mem_region() for EFCH MMIO resource * tag 'watchdog-fixes-for-v7.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: watchdog: rzv2h: Drop runtime PM handling from WDTDCR init watchdog: rzv2h: Use pm_runtime_put_sync() watchdog: omap: Fix early_enable handling in omap_wdt_probe() watchdog: npcm: fix clock prepare leak when setting timeout on a running watchdog watchdog: gunyah_wdt: Re-enable the watchdog on resume watchdog: mediatek: Register reset controller before watchdog device watchdog: sp5100_tco: Use release_mem_region() for EFCH MMIO resource watchdog: sbsa_gwdt: Limit the MediaTek WS0 race workaround to revision 0 watchdog: meson_gxbb_wdt: fix suspend/resume handling of HW_RUNNING watchdog watchdog: mtk_wdt: Stop a running watchdog over system sleep even if not opened watchdog: orion_wdt: load the pretimeout counter on Armada 370/XP start watchdog: sc1200wdt: add missing MODULE_DEVICE_TABLE()
This commit is contained in:
@@ -62,19 +62,12 @@ static int gunyah_wdt_call(unsigned long func_id, unsigned long arg1,
|
||||
return gunyah_error_remap(res.a0);
|
||||
}
|
||||
|
||||
static int gunyah_wdt_start(struct watchdog_device *wdd)
|
||||
static int gunyah_wdt_enable(struct watchdog_device *wdd)
|
||||
{
|
||||
unsigned int timeout_ms;
|
||||
unsigned int timeout_ms = wdd->timeout * 1000;
|
||||
struct device *dev = wdd->parent;
|
||||
int ret;
|
||||
|
||||
ret = gunyah_wdt_call(GUNYAH_WDT_CONTROL, WDT_CTRL_DISABLE, 0);
|
||||
if (ret && watchdog_active(wdd)) {
|
||||
dev_err(dev, "%s: Failed to stop gunyah wdt %d\n", __func__, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
timeout_ms = wdd->timeout * 1000;
|
||||
ret = gunyah_wdt_call(GUNYAH_WDT_SET_TIME, timeout_ms, timeout_ms);
|
||||
if (ret) {
|
||||
dev_err(dev, "%s: Failed to set timeout for gunyah wdt %d\n",
|
||||
@@ -89,6 +82,20 @@ static int gunyah_wdt_start(struct watchdog_device *wdd)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int gunyah_wdt_start(struct watchdog_device *wdd)
|
||||
{
|
||||
struct device *dev = wdd->parent;
|
||||
int ret;
|
||||
|
||||
ret = gunyah_wdt_call(GUNYAH_WDT_CONTROL, WDT_CTRL_DISABLE, 0);
|
||||
if (ret && watchdog_active(wdd)) {
|
||||
dev_err(dev, "%s: Failed to stop gunyah wdt %d\n", __func__, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return gunyah_wdt_enable(wdd);
|
||||
}
|
||||
|
||||
static int gunyah_wdt_stop(struct watchdog_device *wdd)
|
||||
{
|
||||
return gunyah_wdt_call(GUNYAH_WDT_CONTROL, WDT_CTRL_DISABLE, 0);
|
||||
@@ -224,7 +231,7 @@ static int gunyah_wdt_resume(struct device *dev)
|
||||
struct watchdog_device *wdd = dev_get_drvdata(dev);
|
||||
|
||||
if (watchdog_active(wdd))
|
||||
gunyah_wdt_start(wdd);
|
||||
gunyah_wdt_enable(wdd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -124,7 +124,8 @@ static int __maybe_unused meson_gxbb_wdt_resume(struct device *dev)
|
||||
{
|
||||
struct meson_gxbb_wdt *data = dev_get_drvdata(dev);
|
||||
|
||||
if (watchdog_active(&data->wdt_dev))
|
||||
if (watchdog_active(&data->wdt_dev) ||
|
||||
watchdog_hw_running(&data->wdt_dev))
|
||||
meson_gxbb_wdt_start(&data->wdt_dev);
|
||||
|
||||
return 0;
|
||||
@@ -134,7 +135,8 @@ static int __maybe_unused meson_gxbb_wdt_suspend(struct device *dev)
|
||||
{
|
||||
struct meson_gxbb_wdt *data = dev_get_drvdata(dev);
|
||||
|
||||
if (watchdog_active(&data->wdt_dev))
|
||||
if (watchdog_active(&data->wdt_dev) ||
|
||||
watchdog_hw_running(&data->wdt_dev))
|
||||
meson_gxbb_wdt_stop(&data->wdt_dev);
|
||||
|
||||
return 0;
|
||||
|
||||
+16
-14
@@ -540,6 +540,18 @@ static int mtk_wdt_probe(struct platform_device *pdev)
|
||||
mtk_wdt->reset_by_toprgu =
|
||||
of_property_read_bool(dev->of_node, "mediatek,reset-by-toprgu");
|
||||
|
||||
wdt_data = of_device_get_match_data(dev);
|
||||
if (wdt_data) {
|
||||
mtk_wdt->toprgu_sw_rst_num = wdt_data->toprgu_sw_rst_num;
|
||||
mtk_wdt->toprgu_sw_rst_tb = wdt_data->toprgu_sw_rst_tb;
|
||||
mtk_wdt->has_swsysrst_en = wdt_data->has_swsysrst_en;
|
||||
|
||||
err = toprgu_register_reset_controller(pdev,
|
||||
wdt_data->toprgu_sw_rst_num);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
mtk_wdt_init(&mtk_wdt->wdt_dev);
|
||||
|
||||
watchdog_stop_on_reboot(&mtk_wdt->wdt_dev);
|
||||
@@ -553,18 +565,6 @@ static int mtk_wdt_probe(struct platform_device *pdev)
|
||||
dev_info(dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)\n",
|
||||
mtk_wdt->wdt_dev.timeout, nowayout);
|
||||
|
||||
wdt_data = of_device_get_match_data(dev);
|
||||
if (wdt_data) {
|
||||
mtk_wdt->toprgu_sw_rst_num = wdt_data->toprgu_sw_rst_num;
|
||||
mtk_wdt->toprgu_sw_rst_tb = wdt_data->toprgu_sw_rst_tb;
|
||||
mtk_wdt->has_swsysrst_en = wdt_data->has_swsysrst_en;
|
||||
|
||||
err = toprgu_register_reset_controller(pdev,
|
||||
wdt_data->toprgu_sw_rst_num);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -572,7 +572,8 @@ static int mtk_wdt_suspend(struct device *dev)
|
||||
{
|
||||
struct mtk_wdt_dev *mtk_wdt = dev_get_drvdata(dev);
|
||||
|
||||
if (watchdog_active(&mtk_wdt->wdt_dev))
|
||||
if (watchdog_active(&mtk_wdt->wdt_dev) ||
|
||||
watchdog_hw_running(&mtk_wdt->wdt_dev))
|
||||
mtk_wdt_stop(&mtk_wdt->wdt_dev);
|
||||
|
||||
return 0;
|
||||
@@ -582,7 +583,8 @@ static int mtk_wdt_resume(struct device *dev)
|
||||
{
|
||||
struct mtk_wdt_dev *mtk_wdt = dev_get_drvdata(dev);
|
||||
|
||||
if (watchdog_active(&mtk_wdt->wdt_dev)) {
|
||||
if (watchdog_active(&mtk_wdt->wdt_dev) ||
|
||||
watchdog_hw_running(&mtk_wdt->wdt_dev)) {
|
||||
mtk_wdt_start(&mtk_wdt->wdt_dev);
|
||||
mtk_wdt_ping(&mtk_wdt->wdt_dev);
|
||||
}
|
||||
|
||||
@@ -145,13 +145,11 @@ static int npcm_wdt_ping(struct watchdog_device *wdd)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int npcm_wdt_start(struct watchdog_device *wdd)
|
||||
static void __npcm_wdt_start(struct watchdog_device *wdd)
|
||||
{
|
||||
struct npcm_wdt *wdt = to_npcm_wdt(wdd);
|
||||
u32 val;
|
||||
|
||||
clk_prepare_enable(wdt->clk);
|
||||
|
||||
if (wdd->timeout < 2)
|
||||
val = 0x800;
|
||||
else if (wdd->timeout < 3)
|
||||
@@ -176,6 +174,15 @@ static int npcm_wdt_start(struct watchdog_device *wdd)
|
||||
val |= NPCM_WTRE | NPCM_WTE | NPCM_WTR | NPCM_WTIE;
|
||||
|
||||
writel(val, wdt->reg);
|
||||
}
|
||||
|
||||
static int npcm_wdt_start(struct watchdog_device *wdd)
|
||||
{
|
||||
struct npcm_wdt *wdt = to_npcm_wdt(wdd);
|
||||
|
||||
clk_prepare_enable(wdt->clk);
|
||||
|
||||
__npcm_wdt_start(wdd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -216,7 +223,7 @@ static int npcm_wdt_set_timeout(struct watchdog_device *wdd,
|
||||
wdd->timeout = 2750;
|
||||
|
||||
if (watchdog_active(wdd))
|
||||
npcm_wdt_start(wdd);
|
||||
__npcm_wdt_start(wdd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -277,6 +277,8 @@ static int omap_wdt_probe(struct platform_device *pdev)
|
||||
|
||||
ret = watchdog_register_device(&wdev->wdog);
|
||||
if (ret) {
|
||||
if (wdev->omap_wdt_users)
|
||||
omap_wdt_stop(&wdev->wdog);
|
||||
pm_runtime_put(wdev->dev);
|
||||
pm_runtime_disable(wdev->dev);
|
||||
return ret;
|
||||
@@ -286,9 +288,6 @@ static int omap_wdt_probe(struct platform_device *pdev)
|
||||
readl_relaxed(wdev->base + OMAP_WATCHDOG_REV) & 0xFF,
|
||||
wdev->wdog.timeout);
|
||||
|
||||
if (early_enable)
|
||||
omap_wdt_start(&wdev->wdog);
|
||||
|
||||
pm_runtime_put(wdev->dev);
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -232,6 +232,9 @@ static int armada370_start(struct watchdog_device *wdt_dev)
|
||||
/* Set watchdog duration */
|
||||
writel(dev->clk_rate * wdt_dev->timeout,
|
||||
dev->reg + dev->data->wdt_counter_offset);
|
||||
if (dev->wdt.info->options & WDIOF_PRETIMEOUT)
|
||||
writel(dev->clk_rate * (wdt_dev->timeout - wdt_dev->pretimeout),
|
||||
dev->reg + TIMER1_VAL_OFF);
|
||||
|
||||
/* Clear the watchdog expiration bit */
|
||||
atomic_io_modify(dev->reg + TIMER_A370_STATUS, WDT_A370_EXPIRED, 0);
|
||||
|
||||
@@ -175,7 +175,7 @@ static int rzv2h_wdt_stop(struct watchdog_device *wdev)
|
||||
if (priv->of_data->wdtdcr)
|
||||
rzt2h_wdt_wdtdcr_count_stop(priv);
|
||||
|
||||
pm_runtime_put(wdev->parent);
|
||||
pm_runtime_put_sync(wdev->parent);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -257,20 +257,12 @@ static const struct watchdog_ops rzv2h_wdt_ops = {
|
||||
static int rzt2h_wdt_wdtdcr_init(struct platform_device *pdev,
|
||||
struct rzv2h_wdt_priv *priv)
|
||||
{
|
||||
int ret;
|
||||
|
||||
priv->wdtdcr = devm_platform_ioremap_resource(pdev, 1);
|
||||
if (IS_ERR(priv->wdtdcr))
|
||||
return PTR_ERR(priv->wdtdcr);
|
||||
|
||||
ret = pm_runtime_resume_and_get(&pdev->dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
rzt2h_wdt_wdtdcr_count_stop(priv);
|
||||
|
||||
pm_runtime_put(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -72,12 +72,16 @@
|
||||
#define SBSA_GWDT_WCS_WS0 BIT(1)
|
||||
#define SBSA_GWDT_WCS_WS1 BIT(2)
|
||||
|
||||
#define SBSA_GWDT_VERSION_MASK GENMASK(3, 0)
|
||||
#define SBSA_GWDT_VERSION_SHIFT 16
|
||||
#define SBSA_GWDT_VERSION_MASK GENMASK(3, 0)
|
||||
#define SBSA_GWDT_VERSION_SHIFT 16
|
||||
|
||||
#define SBSA_GWDT_IMPL_MASK GENMASK(11, 0)
|
||||
#define SBSA_GWDT_IMPL_SHIFT 0
|
||||
#define SBSA_GWDT_IMPL_MEDIATEK 0x426
|
||||
#define SBSA_GWDT_REVISION_MASK GENMASK(3, 0)
|
||||
#define SBSA_GWDT_REVISION_SHIFT 12
|
||||
#define SBSA_GWDT_REV_RACE_WA 0x0
|
||||
|
||||
#define SBSA_GWDT_IMPL_MASK GENMASK(11, 0)
|
||||
#define SBSA_GWDT_IMPL_SHIFT 0
|
||||
#define SBSA_GWDT_IMPL_MEDIATEK 0x426
|
||||
|
||||
/**
|
||||
* struct sbsa_gwdt - Internal representation of the SBSA GWDT
|
||||
@@ -239,15 +243,17 @@ static int sbsa_gwdt_keepalive(struct watchdog_device *wdd)
|
||||
static void sbsa_gwdt_get_version(struct watchdog_device *wdd)
|
||||
{
|
||||
struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd);
|
||||
int iidr, ver, impl;
|
||||
int iidr, ver, rev, impl;
|
||||
|
||||
iidr = readl(gwdt->control_base + SBSA_GWDT_W_IIDR);
|
||||
ver = (iidr >> SBSA_GWDT_VERSION_SHIFT) & SBSA_GWDT_VERSION_MASK;
|
||||
rev = (iidr >> SBSA_GWDT_REVISION_SHIFT) & SBSA_GWDT_REVISION_MASK;
|
||||
impl = (iidr >> SBSA_GWDT_IMPL_SHIFT) & SBSA_GWDT_IMPL_MASK;
|
||||
|
||||
gwdt->version = ver;
|
||||
gwdt->need_ws0_race_workaround =
|
||||
!action && (impl == SBSA_GWDT_IMPL_MEDIATEK);
|
||||
!action && (impl == SBSA_GWDT_IMPL_MEDIATEK) &&
|
||||
(rev == SBSA_GWDT_REV_RACE_WA);
|
||||
}
|
||||
|
||||
static int sbsa_gwdt_start(struct watchdog_device *wdd)
|
||||
|
||||
@@ -343,6 +343,7 @@ static const struct pnp_device_id scl200wdt_pnp_devices[] = {
|
||||
{ .id = "NSC0800" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pnp, scl200wdt_pnp_devices);
|
||||
|
||||
static int scl200wdt_pnp_probe(struct pnp_dev *dev,
|
||||
const struct pnp_device_id *dev_id)
|
||||
|
||||
@@ -407,16 +407,13 @@ static int sp5100_tco_setupdevice_mmio(struct device *dev,
|
||||
struct sp5100_tco *tco = watchdog_get_drvdata(wdd);
|
||||
const char *dev_name = SB800_DEVNAME;
|
||||
u32 mmio_addr = 0, alt_mmio_addr = 0;
|
||||
struct resource *res;
|
||||
void __iomem *addr;
|
||||
int ret;
|
||||
u32 val;
|
||||
|
||||
res = request_mem_region_muxed(EFCH_PM_ACPI_MMIO_PM_ADDR,
|
||||
EFCH_PM_ACPI_MMIO_PM_SIZE,
|
||||
"sp5100_tco");
|
||||
|
||||
if (!res) {
|
||||
if (!request_mem_region_muxed(EFCH_PM_ACPI_MMIO_PM_ADDR,
|
||||
EFCH_PM_ACPI_MMIO_PM_SIZE,
|
||||
"sp5100_tco")) {
|
||||
dev_err(dev,
|
||||
"Memory region 0x%08x already in use\n",
|
||||
EFCH_PM_ACPI_MMIO_PM_ADDR);
|
||||
@@ -467,8 +464,8 @@ out:
|
||||
if (addr)
|
||||
iounmap(addr);
|
||||
|
||||
release_resource(res);
|
||||
kfree(res);
|
||||
release_mem_region(EFCH_PM_ACPI_MMIO_PM_ADDR,
|
||||
EFCH_PM_ACPI_MMIO_PM_SIZE);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user