Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Watchdog: sp5100_tco: Add initialization using EFCH MMIO

cd6h/cd7h port I/O can be disabled on recent AMD hardware. Read
accesses to disabled cd6h/cd7h port I/O will return F's and written
data is dropped. It is recommended to replace the cd6h/cd7h
port I/O with MMIO.

Co-developed-by: Robert Richter <rrichter@amd.com>
Signed-off-by: Robert Richter <rrichter@amd.com>
Signed-off-by: Terry Bowman <terry.bowman@amd.com>
Tested-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220202153525.1693378-4-terry.bowman@amd.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

authored by

Terry Bowman and committed by
Wim Van Sebroeck
0578fff4 1f182aca

+104 -1
+99 -1
drivers/watchdog/sp5100_tco.c
··· 49 49 /* internal variables */ 50 50 51 51 enum tco_reg_layout { 52 - sp5100, sb800, efch 52 + sp5100, sb800, efch, efch_mmio 53 53 }; 54 54 55 55 struct sp5100_tco { ··· 209 209 ~EFCH_PM_WATCHDOG_DISABLE, 210 210 EFCH_PM_DECODEEN_SECOND_RES); 211 211 break; 212 + default: 213 + break; 212 214 } 213 215 } 214 216 ··· 309 307 return 0; 310 308 } 311 309 310 + static u8 efch_read_pm_reg8(void __iomem *addr, u8 index) 311 + { 312 + return readb(addr + index); 313 + } 314 + 315 + static void efch_update_pm_reg8(void __iomem *addr, u8 index, u8 reset, u8 set) 316 + { 317 + u8 val; 318 + 319 + val = readb(addr + index); 320 + val &= reset; 321 + val |= set; 322 + writeb(val, addr + index); 323 + } 324 + 325 + static void tco_timer_enable_mmio(void __iomem *addr) 326 + { 327 + efch_update_pm_reg8(addr, EFCH_PM_DECODEEN3, 328 + ~EFCH_PM_WATCHDOG_DISABLE, 329 + EFCH_PM_DECODEEN_SECOND_RES); 330 + } 331 + 332 + static int sp5100_tco_setupdevice_mmio(struct device *dev, 333 + struct watchdog_device *wdd) 334 + { 335 + struct sp5100_tco *tco = watchdog_get_drvdata(wdd); 336 + const char *dev_name = SB800_DEVNAME; 337 + u32 mmio_addr = 0, alt_mmio_addr = 0; 338 + struct resource *res; 339 + void __iomem *addr; 340 + int ret; 341 + u32 val; 342 + 343 + res = request_mem_region_muxed(EFCH_PM_ACPI_MMIO_PM_ADDR, 344 + EFCH_PM_ACPI_MMIO_PM_SIZE, 345 + "sp5100_tco"); 346 + 347 + if (!res) { 348 + dev_err(dev, 349 + "Memory region 0x%08x already in use\n", 350 + EFCH_PM_ACPI_MMIO_PM_ADDR); 351 + return -EBUSY; 352 + } 353 + 354 + addr = ioremap(EFCH_PM_ACPI_MMIO_PM_ADDR, EFCH_PM_ACPI_MMIO_PM_SIZE); 355 + if (!addr) { 356 + dev_err(dev, "Address mapping failed\n"); 357 + ret = -ENOMEM; 358 + goto out; 359 + } 360 + 361 + /* 362 + * EFCH_PM_DECODEEN_WDT_TMREN is dual purpose. This bitfield 363 + * enables sp5100_tco register MMIO space decoding. The bitfield 364 + * also starts the timer operation. Enable if not already enabled. 365 + */ 366 + val = efch_read_pm_reg8(addr, EFCH_PM_DECODEEN); 367 + if (!(val & EFCH_PM_DECODEEN_WDT_TMREN)) { 368 + efch_update_pm_reg8(addr, EFCH_PM_DECODEEN, 0xff, 369 + EFCH_PM_DECODEEN_WDT_TMREN); 370 + } 371 + 372 + /* Error if the timer could not be enabled */ 373 + val = efch_read_pm_reg8(addr, EFCH_PM_DECODEEN); 374 + if (!(val & EFCH_PM_DECODEEN_WDT_TMREN)) { 375 + dev_err(dev, "Failed to enable the timer\n"); 376 + ret = -EFAULT; 377 + goto out; 378 + } 379 + 380 + mmio_addr = EFCH_PM_WDT_ADDR; 381 + 382 + /* Determine alternate MMIO base address */ 383 + val = efch_read_pm_reg8(addr, EFCH_PM_ISACONTROL); 384 + if (val & EFCH_PM_ISACONTROL_MMIOEN) 385 + alt_mmio_addr = EFCH_PM_ACPI_MMIO_ADDR + 386 + EFCH_PM_ACPI_MMIO_WDT_OFFSET; 387 + 388 + ret = sp5100_tco_prepare_base(tco, mmio_addr, alt_mmio_addr, dev_name); 389 + if (!ret) { 390 + tco_timer_enable_mmio(addr); 391 + ret = sp5100_tco_timer_init(tco); 392 + } 393 + 394 + out: 395 + if (addr) 396 + iounmap(addr); 397 + 398 + release_resource(res); 399 + 400 + return ret; 401 + } 402 + 312 403 static int sp5100_tco_setupdevice(struct device *dev, 313 404 struct watchdog_device *wdd) 314 405 { ··· 410 315 u32 mmio_addr = 0, val; 411 316 u32 alt_mmio_addr = 0; 412 317 int ret; 318 + 319 + if (tco->tco_reg_layout == efch_mmio) 320 + return sp5100_tco_setupdevice_mmio(dev, wdd); 413 321 414 322 /* Request the IO ports used by this driver */ 415 323 if (!request_muxed_region(SP5100_IO_PM_INDEX_REG,
+5
drivers/watchdog/sp5100_tco.h
··· 83 83 #define EFCH_PM_ISACONTROL_MMIOEN BIT(1) 84 84 85 85 #define EFCH_PM_ACPI_MMIO_ADDR 0xfed80000 86 + #define EFCH_PM_ACPI_MMIO_PM_OFFSET 0x00000300 86 87 #define EFCH_PM_ACPI_MMIO_WDT_OFFSET 0x00000b00 88 + 89 + #define EFCH_PM_ACPI_MMIO_PM_ADDR (EFCH_PM_ACPI_MMIO_ADDR + \ 90 + EFCH_PM_ACPI_MMIO_PM_OFFSET) 91 + #define EFCH_PM_ACPI_MMIO_PM_SIZE 8