From nobody Tue May 7 05:37:10 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3180C7EE2A for ; Fri, 2 Jun 2023 16:30:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236585AbjFBQa4 (ORCPT ); Fri, 2 Jun 2023 12:30:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235994AbjFBQay (ORCPT ); Fri, 2 Jun 2023 12:30:54 -0400 Received: from mail-yw1-x1133.google.com (mail-yw1-x1133.google.com [IPv6:2607:f8b0:4864:20::1133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 360BA99; Fri, 2 Jun 2023 09:30:51 -0700 (PDT) Received: by mail-yw1-x1133.google.com with SMTP id 00721157ae682-565a3cdba71so24954277b3.0; Fri, 02 Jun 2023 09:30:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685723450; x=1688315450; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7b2oNC/3bHcc79P4winLK0zibvtQ3oqsR0R2xylkI38=; b=SHzuAvh7YjfFs0GRQEUm9+owTE6cIAajLmun8OoYKszwHy5NKXxQbdOB7a4Hs9yQMw pS85FkooufHVk2SxSFcSKab1v8HtNCMhy3JUmGeeV8ygosXDb8hPWE6RUaESLmEo1bnF AnNqdzwE8HFHGwfqHFbnYZ7B/7slxyKnNIKDECfekNDcCu4ecu3vU2MXWJjS0K2ej+g9 Z2LsgT3tFkehgh+g2DgFO9W61GJ8npKRvuCNu3mPLucpOo2UpqKF5tyDt61I9oXYRbgg X40eAWNm6IcRw84KnYzG3PV+zhQaaXhJ2Rv3Nyrb58Yko3IsUfne+QA6tvt+HX2TNaJw 5JOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685723450; x=1688315450; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7b2oNC/3bHcc79P4winLK0zibvtQ3oqsR0R2xylkI38=; b=TykMQyooClhbCfGzVYyLamuHmQjdw5gxudxMrNPRXhF6OnAxhJRS30WOW7zEV8kMCM wimYP7w71xG/i2k+rpeKpkb8SPwgRvpPzOg3jH8yYOSusiaISs2pyD8wKjKGvYp6yHSX G4qamyzxmyku9kPpkjD5uSrnQBS6vnknK5Pt02YiF0Mc4Hg3jTo65O3wAlZ1+hQpZunu B3cSL+vIPCdUn0DptnEaJtvRZCO9QKKuVAtU1lSQCnYwZCvj0+r82nghOjRtW3OgkwwB Afp0JQIFaAEAtie2m5jEMmIZkyJmYKbxP5fZv57QeVJ1FupkGh1OTAaGs88xuvxuQ5zM FvKQ== X-Gm-Message-State: AC+VfDzDJYLkSTUAYFEwXOmtJbbBk4DDMdRmb6j99w1PucAqfo0GC4vN X3ZOP9WY9UdatkswkT9bCrA= X-Google-Smtp-Source: ACHHUZ5ctCh0WTYjXWQMK+RQ64OL7nr6snLJ48kjJrkemkttTb9o+3qE1kckkn/Hl9wjqcM1hEM51A== X-Received: by 2002:a81:a115:0:b0:561:e2dc:fc60 with SMTP id y21-20020a81a115000000b00561e2dcfc60mr537553ywg.25.1685723450117; Fri, 02 Jun 2023 09:30:50 -0700 (PDT) Received: from z-Lenovo-Product.lan ([2605:59c8:60b6:b110::4f6]) by smtp.gmail.com with ESMTPSA id p203-20020a0de6d4000000b005688f7596ccsm609110ywe.78.2023.06.02.09.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jun 2023 09:30:49 -0700 (PDT) From: David Ober To: wim@linux-watchdog.org Cc: linux@roeck-us.net, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, mpearson@lenovo.com, dober@lenovo.com, David Ober Subject: [PATCH] New module to add NCT6692D watchdog funtionality Date: Fri, 2 Jun 2023 12:30:45 -0400 Message-Id: <20230602163045.605774-1-dober6023@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The new module adds in the basic functionality of the NCT6692D watchdog driver. This functionality is added to support the Lenovo SE30 device Signed-off-by: David Ober --- drivers/watchdog/Kconfig | 12 + drivers/watchdog/Makefile | 1 + drivers/watchdog/nct6692_wdt.c | 690 +++++++++++++++++++++++++++++++++ 3 files changed, 703 insertions(+) create mode 100644 drivers/watchdog/nct6692_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f22138709bf5..e5b9a25c5b45 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1672,6 +1672,18 @@ config SIEMENS_SIMATIC_IPC_WDT To compile this driver as a module, choose M here: the module will be called simatic-ipc-wdt. =20 +config NCT6692_WDT + tristate "Nuvoton NCT6692D Watchdog" + depends on !PPC + depends on ACPI + select WATCHDOG_CORE + help + If you say yes here you get support for the hardware watchdog + functionality of the Nuvoton NCT6692D eSIO chip. + + This driver can also be built as a module. If so, the module + will be called nct6692_wdt. + # M68K Architecture =20 config M54xx_WATCHDOG diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index b4c4ccf2d703..2ec1e703faae 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -151,6 +151,7 @@ obj-$(CONFIG_NIC7018_WDT) +=3D nic7018_wdt.o obj-$(CONFIG_MLX_WDT) +=3D mlx_wdt.o obj-$(CONFIG_KEEMBAY_WATCHDOG) +=3D keembay_wdt.o obj-$(CONFIG_SIEMENS_SIMATIC_IPC_WDT) +=3D simatic-ipc-wdt.o +obj-$(CONFIG_NCT6692D_WDT) +=3D nct6692_wdt.o =20 # M68K Architecture obj-$(CONFIG_M54xx_WATCHDOG) +=3D m54xx_wdt.o diff --git a/drivers/watchdog/nct6692_wdt.c b/drivers/watchdog/nct6692_wdt.c new file mode 100644 index 000000000000..4a2e9a249e6d --- /dev/null +++ b/drivers/watchdog/nct6692_wdt.c @@ -0,0 +1,690 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * ThinkEdge Watchdog Driver + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +/* + * ISA constants + */ + +#define IOREGION_ALIGNMENT (~7) +#define IOREGION_OFFSET 4 /* Use EC port 1 */ +#define IOREGION_LENGTH 4 + +#define WATCHDOG_TIMEOUT 60 /* 60 sec default timeout */ +#define WATCHDOG_WDT_SEL 1 + +/*The timeout range is 1-255 seconds*/ +#define MIN_TIMEOUT 1 +#define MAX_TIMEOUT 255 + +#define THINKEDGE_MAX_PARAM_STRING_LEN 16 + +static int timeout; /* in seconds */ +module_param(timeout, int, 0); +MODULE_PARM_DESC(timeout, + "Watchdog timeout in seconds. 1 <=3D timeout <=3D 255, default=3D" + __MODULE_STRING(WATCHDOG_TIMEOUT) "."); + +static bool nowayout =3D WATCHDOG_NOWAYOUT; +module_param(nowayout, bool, 0); +MODULE_PARM_DESC(nowayout, + "Watchdog cannot be stopped once started (default=3D" + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + +static int early_disable; +module_param(early_disable, int, 0); +MODULE_PARM_DESC(early_disable, "Disable watchdog at boot time (default=3D= 0)"); + +#define DRVNAME "nct6692" + +#define NCT6692 "nct6692" +#define NCT6692_ID 0x0110 + +#define WDT_EFER(X) (X + 0) /* Extended Function Enable Registers */ +#define WDT_EFIR(X) (X + 0) /* Extended Function Index Register(same as E= FER) */ +#define WDT_EFDR(X) (WDT_EFIR(X) + 1) /* Extended Function Data Register */ +#define CHIPID_MASK 0xFFF0 + +#define NCT6692_MAX_IO_RETRY_NUM 0x300 + +#define NCT6692_EC_NAME "nct6692_ec" +#define NCT6692_EC_REPORT_NAME "nct6692_ec_rep" +#define NCT6692_HWM_CFG 0x180 + +#define NCT6692_SIO_UNLOCK_KEY 0x87 +#define NCT6692_SIO_LOCK_KEY 0xAA + +#define NCT6692_LD_NUM_SHM 0x0F +#define NCT6692_LD_WIN2_BASE_ADDR 0xF8 +#define NCT6692_LD_REPORT_BASE_ADDR 0xE4 + +// Host Interface WIN2 offset definition +#define SHM_WIN_MOD_OFFSET 0x01 +#define SHM_WIN_CMD_OFFSET 0x02 +#define SHM_WIN_SEL_OFFSET 0x03 +#define SHM_WIN_CTL_OFFSET 0x04 +#define VAL_SHM_WIN_CTRL_WR 0x40 +#define VAL_SHM_WIN_CTRL_RD 0x80 +#define SHM_WIN_ID_OFFSET 0x08 +#define SHM_WIN_DAT_OFFSET 0x10 + +struct nct6692_shm_t { + u_char *base_addr; + u_long base_phys; + u_char offset_mod; + u_char offset_cmd; + u_char offset_sel; + u_char offset_ctl; + u_char offset_id; + u_char offset_dat; + u_char *report_addr; + u_long report_phys; +}; + +/* REGs definitions */ +enum nct6692_channel_type { + NCT6692_CHANNEL_DEFAULT, + NCT6692_CHANNEL_REPORT, /* Not used in this driver. */ +}; + +struct nct6692_sio_data { + u_long base_phys; + u_long report_phys; + int sioreg; +}; + +struct nct6692_reg_t { + u_char channel; /* nct6692_channel_type */ + u_char mod; + u_char cmd; + u_char sel; + u_int idx; +}; + +struct nct6692_data_t { + struct nct6692_shm_t shm; + struct nct6692_reg_t cfg; + struct nct6692_reg_t cnt; + u_char timeout; + struct watchdog_device wdt; +}; + +static inline void superio_outb(int ioreg, int reg, int val) +{ + outb(reg, WDT_EFER(ioreg)); + outb(val, WDT_EFDR(ioreg)); +} + +static inline int superio_inb(int ioreg, int reg) +{ + outb(reg, WDT_EFER(ioreg)); + return inb(WDT_EFDR(ioreg)); +} + +static inline int superio_enter(int key, int addr, const char *name) +{ + if (!request_muxed_region(addr, 2, name)) { + pr_err("I/O address 0x%04x already in use\n", addr); + return -EBUSY; + } + outb_p(key, WDT_EFER(addr)); /* Enter extended function mode */ + outb_p(key, WDT_EFER(addr)); /* Again according to manual */ + + return 0; +} + +static inline void superio_select(int ioreg, int ld) +{ + superio_outb(ioreg, 0x07, ld); +} + +static inline void superio_exit(int key, int addr) +{ + outb_p(key, WDT_EFER(addr)); /* Leave extended function mode */ + release_region(addr, 2); +} + +/* + * The following several functions are used to access host interface accor= ding + * to the definition of memory region, reg (as a base addr) and an index o= ffset + * It uses (shm.base_addr + shm.offset) format to locate the data area of = the + * host interface channel. Then access the address "reg.idx + idx_offset" = that + * are suitable for a loop accessing. Where the idx_offset is an extra off= set + * based on the definition of reg for accessing the address based on the r= eg. + * + * Functions with suffix of 'report' are used to access report channel. + */ + +int read_shm_win(const struct nct6692_shm_t *shm, + const struct nct6692_reg_t *reg, + u_char idx_offset) +{ + int retval; + u_char pre_id; + u_char new_id; + u_int count =3D 0; + + if (!request_mem_region(shm->base_phys, 256, NCT6692_EC_NAME)) { + pr_err("nuv:request channel mutex fail (base_addr=3D%lX)\n", + shm->base_phys); + retval =3D -EBUSY; + goto exit; + } + + iowrite8(reg->mod, shm->base_addr + shm->offset_mod); + iowrite8(reg->cmd, shm->base_addr + shm->offset_cmd); + iowrite8(reg->sel, shm->base_addr + shm->offset_sel); + pre_id =3D ioread8(shm->base_addr + shm->offset_id); + iowrite8(VAL_SHM_WIN_CTRL_RD, shm->base_addr + shm->offset_ctl); + do { + new_id =3D ioread8(shm->base_addr + shm->offset_id); + if (count =3D=3D NCT6692_MAX_IO_RETRY_NUM) { + pr_warn("nuv:Wait ID count timeout in %s!\n", __func__); + retval =3D 0; + goto exit_release; + } + count++; + } while (pre_id =3D=3D new_id); + retval =3D ioread8(shm->base_addr + shm->offset_dat + reg->idx + idx_offs= et); + +exit_release: + release_mem_region(shm->base_phys, 256); +exit: + return retval; +} + +int write_shm_win(const struct nct6692_shm_t *shm, + const struct nct6692_reg_t *reg, + u_char idx_offset, + u_char val) +{ + int err =3D 0; + u_char pre_id; + u_char new_id; + u_int count =3D 0; + + if (!request_mem_region(shm->base_phys, 256, NCT6692_EC_NAME)) { + pr_err("nuv:request channel mutex fail (base_addr=3D%lX)\n", + shm->base_phys); + err =3D -EBUSY; + goto err_exit; + } + + iowrite8(reg->mod, shm->base_addr + shm->offset_mod); + iowrite8(reg->cmd, shm->base_addr + shm->offset_cmd); + iowrite8(reg->sel, shm->base_addr + shm->offset_sel); + + pre_id =3D ioread8(shm->base_addr + shm->offset_id); + iowrite8(VAL_SHM_WIN_CTRL_RD, shm->base_addr + shm->offset_ctl); + do { + new_id =3D ioread8(shm->base_addr + shm->offset_id); + if (count =3D=3D NCT6692_MAX_IO_RETRY_NUM) { + pr_warn("nuv:Wait ID count timeout in %s!\n", __func__); + err =3D -EINVAL; + goto err_exit_release; + } + count++; + } while (pre_id =3D=3D new_id); + + iowrite8(val, shm->base_addr + shm->offset_dat + reg->idx + idx_offset); + + pre_id =3D new_id; + + iowrite8(VAL_SHM_WIN_CTRL_WR, shm->base_addr + shm->offset_ctl); + do { + new_id =3D ioread8(shm->base_addr + shm->offset_id); + if (count =3D=3D NCT6692_MAX_IO_RETRY_NUM) { + pr_warn("nuv:Wait ID count timeout in %s!\n", __func__); + err =3D -EINVAL; + goto err_exit_release; + } + count++; + } while (pre_id =3D=3D new_id); + +err_exit_release: + release_mem_region(shm->base_phys, 256); + +err_exit: + return err; +} + +int read_shm_report(const struct nct6692_shm_t *shm, + const struct nct6692_reg_t *reg, + u_char idx_offset) +{ + int val; + + if (!request_mem_region(shm->report_phys, 256, + NCT6692_EC_REPORT_NAME)) { + pr_err("nuv:request channel mutex fail (base_addr=3D%lX)\n", + shm->report_phys); + return -EBUSY; + } + + val =3D ioread8(shm->report_addr + reg->idx + idx_offset); + + release_mem_region(shm->report_phys, 256); + + return val; +} + +int read_shm(const struct nct6692_shm_t *shm, + const struct nct6692_reg_t *reg) +{ + if (reg->channel =3D=3D NCT6692_CHANNEL_DEFAULT) + return read_shm_win(shm, reg, 0); + + return read_shm_report(shm, reg, 0); +} + +int write_shm(const struct nct6692_shm_t *shm, + const struct nct6692_reg_t *reg, + u_char val) +{ + if (reg->channel =3D=3D NCT6692_CHANNEL_DEFAULT) + return write_shm_win(shm, reg, 0, val); + + pr_warn("Report channel CAN NOT be written!\n"); + return -EINVAL; +} + +int read_shm_with_offset(const struct nct6692_shm_t *shm, + const struct nct6692_reg_t *reg, + u_char idx_offset) +{ + if (reg->channel =3D=3D NCT6692_CHANNEL_DEFAULT) + return read_shm_win(shm, reg, idx_offset); + + return read_shm_report(shm, reg, idx_offset); +} + +int write_shm_with_offset(const struct nct6692_shm_t *shm, + const struct nct6692_reg_t *reg, + u_char idx_offset, + u_char val) +{ + if (reg->channel =3D=3D NCT6692_CHANNEL_DEFAULT) + return write_shm_win(shm, reg, idx_offset, val); + + pr_warn("Report channel CAN NOT be written!\n"); + return -EINVAL; +} + +static int nct6692_wdt_init(struct watchdog_device *wdog) +{ + int err =3D 0; + u_char timeout, cfg; + struct nct6692_data_t *data =3D watchdog_get_drvdata(wdog); + + timeout =3D read_shm(&data->shm, &data->cnt); + cfg =3D read_shm(&data->shm, &data->cfg); + + if (timeout < 0) + return timeout; + if (timeout =3D=3D 0) + return 0; + + if (early_disable) { + pr_warn("Stopping previously enabled watchdog until userland kicks in\n"= ); + // Disable WDT and clear timeout count + data->timeout =3D 0; + err =3D write_shm(&data->shm, &data->cnt, data->timeout); + } else { + pr_info("Watchdog already running. Resetting timeout to %d sec\n", + wdog->timeout); + data->timeout =3D wdog->timeout; + err =3D write_shm(&data->shm, &data->cnt, data->timeout); + } + + return err; +} + +static int nct6692_wdt_enable(bool enable, u_int timeout, + struct nct6692_data_t *data) +{ + u_char reg; + + reg =3D read_shm(&data->shm, &data->cfg); + + if (enable) { + write_shm(&data->shm, &data->cfg, 0x02); + /* ^^^^ 0x00 to disable reboot */ + data->timeout =3D timeout; + write_shm(&data->shm, &data->cnt, data->timeout); + reg =3D read_shm(&data->shm, &data->cfg); + } else { + data->timeout =3D 0; + write_shm(&data->shm, &data->cnt, data->timeout); + } + reg =3D read_shm(&data->shm, &data->cfg); + reg =3D read_shm(&data->shm, &data->cnt); + return 0; +} + +static int nct6692_wdt_set_time(struct watchdog_device *wdog, u_int timeou= t) +{ + struct nct6692_data_t *data =3D watchdog_get_drvdata(wdog); + + if (timeout !=3D 0) + nct6692_wdt_enable(true, timeout, data); + else + nct6692_wdt_enable(false, timeout, data); + + return 0; +} + +static int nct6692_wdt_setup(struct watchdog_device *wdt) +{ + int err =3D 0; + + watchdog_stop_on_reboot(wdt); + + err =3D nct6692_wdt_init(wdt); + if (err) { + pr_err("failed to initialize watchdog (err=3D%d)\n", err); + return err; + } + return err; +} + +static int nct6692_wdt_start(struct watchdog_device *wdog) +{ + struct nct6692_data_t *data =3D watchdog_get_drvdata(wdog); + + nct6692_wdt_setup(wdog); + nct6692_wdt_set_time(wdog, data->timeout); + return 0; +} + +static int nct6692_wdt_stop(struct watchdog_device *wdog) +{ + return nct6692_wdt_set_time(wdog, 0); +} + +static int nct6692_wdt_set_timeout(struct watchdog_device *wdog, + u_int timeout) +{ + wdog->timeout =3D timeout; + return 0; +} + +static u_int nct6692_wdt_get_timeleft(struct watchdog_device *wdog) +{ + struct nct6692_data_t *data =3D watchdog_get_drvdata(wdog); + u_int timeleft; + + timeleft =3D read_shm(&data->shm, &data->cnt); + return timeleft; +} + +static int nct6692_wdt_ping(struct watchdog_device *wdt) +{ + struct nct6692_data_t *data =3D watchdog_get_drvdata(wdt); + int timeout; + + /* + * Note: + * NCT6692 does not support refreshing WDT_TIMER_REG register when + * the watchdog is active. Please disable watchdog before feeding + * the watchdog and enable it again. + */ + /* Disable soft watchdog timer */ + timeout =3D 0; + nct6692_wdt_enable(false, timeout, data); + + /* feed watchdog */ + timeout =3D wdt->timeout; + write_shm(&data->shm, &data->cnt, data->timeout); + + /* Enable soft watchdog timer */ + nct6692_wdt_enable(true, timeout, data); + return 0; + +} + +static const struct watchdog_info nct6692_wdt_info =3D { + .options =3D WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | + WDIOF_MAGICCLOSE, + .identity =3D "nct6692 watchdog", +}; + +static const struct watchdog_ops nct6692_wdt_ops =3D { + .owner =3D THIS_MODULE, + .start =3D nct6692_wdt_start, + .stop =3D nct6692_wdt_stop, + .ping =3D nct6692_wdt_ping, + .set_timeout =3D nct6692_wdt_set_timeout, + .get_timeleft =3D nct6692_wdt_get_timeleft, +}; + +static int nct6692_probe(struct platform_device *pdev) +{ + struct device *dev =3D &pdev->dev; + struct nct6692_data_t *data =3D NULL; + struct nct6692_sio_data *sio_data =3D dev->platform_data; + struct resource *res; + + pr_info("Probe NCT6692 called\n"); + res =3D platform_get_resource(pdev, IORESOURCE_IO, 0); + + data =3D kzalloc(sizeof(struct nct6692_data_t), GFP_KERNEL); + if (!data) + return -ENOMEM; + + // init value + data->shm.base_addr =3D 0; + data->shm.report_addr =3D 0; + + data->shm.base_phys =3D sio_data->base_phys; + data->shm.base_addr =3D (u_char *)ioremap_cache(data->shm.base_phys, 256); + + data->shm.offset_mod =3D SHM_WIN_MOD_OFFSET; + data->shm.offset_cmd =3D SHM_WIN_CMD_OFFSET; + data->shm.offset_sel =3D SHM_WIN_SEL_OFFSET; + data->shm.offset_ctl =3D SHM_WIN_CTL_OFFSET; + data->shm.offset_id =3D SHM_WIN_ID_OFFSET; + data->shm.offset_dat =3D SHM_WIN_DAT_OFFSET; + + // Base for REPORT Channel + data->shm.report_phys =3D sio_data->report_phys; + data->shm.report_addr =3D (u_char *)ioremap_cache(data->shm.report_phys, = 256); + + data->cfg.channel =3D NCT6692_CHANNEL_DEFAULT; + data->cfg.mod =3D 0x10; + data->cfg.cmd =3D 0; + data->cfg.sel =3D 0; + data->cfg.idx =3D 0x15; + data->cnt.channel =3D NCT6692_CHANNEL_DEFAULT; + data->cnt.mod =3D 0x10; + data->cnt.cmd =3D 0; + data->cnt.sel =3D 0; + data->cnt.idx =3D 0x16; + + data->wdt.ops =3D &nct6692_wdt_ops; + data->wdt.info =3D &nct6692_wdt_info; + + data->wdt.timeout =3D WATCHDOG_TIMEOUT; /* Set default timeout */ + data->wdt.min_timeout =3D MIN_TIMEOUT; + data->wdt.max_timeout =3D MAX_TIMEOUT; + data->wdt.parent =3D &pdev->dev; + + watchdog_init_timeout(&data->wdt, timeout, &pdev->dev); + watchdog_set_nowayout(&data->wdt, nowayout); + watchdog_set_drvdata(&data->wdt, data); + + watchdog_stop_on_unregister(&data->wdt); + + return devm_watchdog_register_device(dev, &data->wdt); +} + +static struct platform_driver nct6692_driver =3D { + .driver =3D { + .name =3D DRVNAME, + /*.pm =3D NCT6692_DEV_PM_OPS,*/ + }, + .probe =3D nct6692_probe, +}; + +static int __init nct6692_find(int addr, u_long *base_phys, + u_long *report_phys) +{ + u16 val; + int err =3D 0; + u_long tmp_base_phys; + u_long tmp_report_phys; + + err =3D superio_enter(NCT6692_SIO_UNLOCK_KEY, addr, NCT6692); + if (err) + return err; + + val =3D superio_inb(addr, 0x20); + val =3D ((val << 8) | (superio_inb(addr, 0x21) & 0xFF)) & CHIPID_MASK; + + if (val !=3D NCT6692_ID) { + err =3D -ENODEV; + goto fail; + } + + superio_select(addr, NCT6692_LD_NUM_SHM); + tmp_base_phys =3D ((superio_inb(addr, NCT6692_LD_WIN2_BASE_ADDR) & 0xFF) | + ((superio_inb(addr, NCT6692_LD_WIN2_BASE_ADDR + 1) & 0xFF) << 8) | + ((superio_inb(addr, NCT6692_LD_WIN2_BASE_ADDR + 2) & 0xFF) << 16) | + ((superio_inb(addr, NCT6692_LD_WIN2_BASE_ADDR + 3) & 0xFF) << 24)) & + 0xFFFFFFFF; + + if ((tmp_base_phys =3D=3D 0xFFFFFFFF) || (tmp_base_phys =3D=3D 0)) { + err =3D -ENODEV; + goto fail; + } + + tmp_report_phys =3D ((superio_inb(addr, NCT6692_LD_REPORT_BASE_ADDR) & 0x= FF) | + ((superio_inb(addr, NCT6692_LD_REPORT_BASE_ADDR + 1) & 0xFF) << 8) | + ((superio_inb(addr, NCT6692_LD_REPORT_BASE_ADDR + 2) & 0xFF) << 16) | + ((superio_inb(addr, NCT6692_LD_REPORT_BASE_ADDR + 3) & 0xFF) << 24))= & + 0xFFFFFFFF; + + if ((tmp_report_phys =3D=3D 0xFFFFFFFF) || (tmp_report_phys =3D=3D 0)) { + err =3D -ENODEV; + goto fail; + } + +fail: + superio_exit(NCT6692_SIO_LOCK_KEY, addr); + if (!err) { + if (base_phys !=3D NULL) + *base_phys =3D tmp_base_phys; + if (report_phys !=3D NULL) + *report_phys =3D tmp_report_phys; + } + return err; +} + +static struct platform_device *pdev; + +static int __init nct6692_init(void) +{ + struct nct6692_sio_data sio_data; + int sioaddr[2] =3D { 0x2e, 0x4e }; + struct resource res; + int err; + int address; + bool found =3D false; + u_long base_phys =3D 0; + u_long report_phys =3D 0; + + platform_driver_register(&nct6692_driver); + + /* + * initialize sio_data->kind and sio_data->sioreg. + * + * when Super-I/O functions move to a separate file, the Super-I/O + * driver will probe 0x2e and 0x4e and auto-detect the presence of a + * nct6692 hardware monitor, and call probe() + */ + err =3D nct6692_find(sioaddr[0], &base_phys, &report_phys); + if (err) { + err =3D nct6692_find(sioaddr[1], &base_phys, &report_phys); + if (err) + return -ENODEV; + } + found =3D true; + sio_data.base_phys =3D base_phys; + sio_data.report_phys =3D report_phys; + + pr_info("NCT6692 device found\n"); + pdev =3D platform_device_alloc(DRVNAME, base_phys); + if (!pdev) { + err =3D -ENOMEM; + goto exit_device_unregister; + } + err =3D platform_device_add_data(pdev, &sio_data, + sizeof(struct nct6692_sio_data)); + if (err) + goto exit_device_put; + + memset(&res, 0, sizeof(res)); + res.name =3D DRVNAME; + res.start =3D address + IOREGION_OFFSET; + res.end =3D address + IOREGION_OFFSET + IOREGION_LENGTH - 1; + res.flags =3D IORESOURCE_IO; + + err =3D acpi_check_resource_conflict(&res); + if (err) { + platform_device_put(pdev); + pdev =3D NULL; + } + + err =3D platform_device_add_resources(pdev, &res, 1); + if (err) + goto exit_device_put; + + /* platform_device_add calls probe() */ + err =3D platform_device_add(pdev); + if (err) + goto exit_device_put; + + if (!found) { + err =3D -ENODEV; + goto exit_unregister; + } + + return 0; +exit_device_put: + platform_device_put(pdev); +exit_device_unregister: + if (pdev) + platform_device_unregister(pdev); +exit_unregister: + platform_driver_unregister(&nct6692_driver); + return err; +} + +static void __exit nct6692_exit(void) +{ + platform_device_unregister(pdev); + platform_driver_unregister(&nct6692_driver); +} + +MODULE_AUTHOR("David Ober "); +MODULE_DESCRIPTION("NCT6692D driver"); +MODULE_LICENSE("GPL"); + +module_init(nct6692_init); +module_exit(nct6692_exit); + --=20 2.34.1