Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://www.linux-watchdog.org/linux-watchdog
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing (part 2)
watchdog: hpwdt: Changes to handle NX secure bit in 32bit path
watchdog: sp805: Fix section mismatch in ID table.
watchdog: move coh901327 state holders
+12
-7
+4
-2
drivers/watchdog/coh901327_wdt.c
+4
-2
drivers/watchdog/coh901327_wdt.c
···
76
76
static void __iomem *virtbase;
77
77
static unsigned long coh901327_users;
78
78
static unsigned long boot_status;
79
-
static u16 wdogenablestore;
80
-
static u16 irqmaskstore;
81
79
static struct device *parent;
82
80
83
81
/*
···
459
461
}
460
462
461
463
#ifdef CONFIG_PM
464
+
465
+
static u16 wdogenablestore;
466
+
static u16 irqmaskstore;
467
+
462
468
static int coh901327_suspend(struct platform_device *pdev, pm_message_t state)
463
469
{
464
470
irqmaskstore = readw(virtbase + U300_WDOG_IMR) & 0x0001U;
+4
-1
drivers/watchdog/hpwdt.c
+4
-1
drivers/watchdog/hpwdt.c
···
231
231
232
232
cmn_regs.u1.reax = CRU_BIOS_SIGNATURE_VALUE;
233
233
234
+
set_memory_x((unsigned long)bios32_entrypoint, (2 * PAGE_SIZE));
234
235
asminline_call(&cmn_regs, bios32_entrypoint);
235
236
236
237
if (cmn_regs.u1.ral != 0) {
···
249
248
if ((physical_bios_base + physical_bios_offset)) {
250
249
cru_rom_addr =
251
250
ioremap(cru_physical_address, cru_length);
252
-
if (cru_rom_addr)
251
+
if (cru_rom_addr) {
252
+
set_memory_x((unsigned long)cru_rom_addr, cru_length);
253
253
retval = 0;
254
+
}
254
255
}
255
256
256
257
printk(KERN_DEBUG "hpwdt: CRU Base Address: 0x%lx\n",
+3
-3
drivers/watchdog/iTCO_wdt.c
+3
-3
drivers/watchdog/iTCO_wdt.c
···
384
384
"Watchdog cannot be stopped once started (default="
385
385
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
386
386
387
-
static int turn_SMI_watchdog_clear_off = 0;
387
+
static int turn_SMI_watchdog_clear_off = 1;
388
388
module_param(turn_SMI_watchdog_clear_off, int, 0);
389
389
MODULE_PARM_DESC(turn_SMI_watchdog_clear_off,
390
-
"Turn off SMI clearing watchdog (default=0)");
390
+
"Turn off SMI clearing watchdog (depends on TCO-version)(default=1)");
391
391
392
392
/*
393
393
* Some TCO specific functions
···
813
813
ret = -EIO;
814
814
goto out_unmap;
815
815
}
816
-
if (turn_SMI_watchdog_clear_off) {
816
+
if (turn_SMI_watchdog_clear_off >= iTCO_wdt_private.iTCO_version) {
817
817
/* Bit 13: TCO_EN -> 0 = Disables TCO logic generating an SMI# */
818
818
val32 = inl(SMI_EN);
819
819
val32 &= 0xffffdfff; /* Turn off SMI clearing watchdog */