From patchwork Mon Jan 31 09:37:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12730494 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 60163C433FE for ; Mon, 31 Jan 2022 09:38:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238817AbiAaJiX (ORCPT ); Mon, 31 Jan 2022 04:38:23 -0500 Received: from mout.gmx.net ([212.227.17.21]:41735 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238447AbiAaJiW (ORCPT ); Mon, 31 Jan 2022 04:38:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1643621886; bh=JpB5EeGsjEKA7C7A6LOk7832eX0tDl/y70K+UIb+d8I=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=dyeSFNU+KVIJNeAFmpyPXwWOloE/m37epaKLjroHwmjExm2lZf4Ba8FwDlu+OqHOR 88ByGkmFVRcFburtLAJmXBRjIGaEYrx3l6KvqqBGv/p6V6VnqUzd0St/bzG7PbbPxi ylF5IJU50qDE1pI9pLeYIQhXUmqhIDJWP0knV3DM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([91.137.126.34]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MORAU-1mt5xQ0WFy-00Pwk5; Mon, 31 Jan 2022 10:38:06 +0100 From: Armin Wolf To: hdegoede@redhat.com Cc: jdelvare@suse.com, linux@roeck-us.net, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND 1/4] hwmon: (sch56xx) Autoload modules on platform device creation Date: Mon, 31 Jan 2022 10:37:53 +0100 Message-Id: <20220131093756.8075-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220131093756.8075-1-W_Armin@gmx.de> References: <20220131093756.8075-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:2GV2X4NCRXiLexg2jyxgvm910cTocEb1CPSrzJMGpzhxol2tLru LX0yE8aKsatZRuYZHciEQ9IVkob97SuBUGw05fGa7UHRhGBEdwVnLejtd5eReac5VJtdVJc YA+ylpshPQZnmZGdYqf1t31VBOcij4KLJ2PxzPAjE4xu6/5ih5Q/uxS4oZwo+h+7kFAZCJw l9qxfxdgF+sPYv7Ra0npQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:85dxoojQqZg=:B9CFx7KUZ+Jret0awhOQuk e6CdTIRNkWcKwbVid3iaouJtBAon/Wnjm16Lx0+ksjPe6qWkscFCHr5i7vR2Fa/wBnU61V9BS WtB+PuE3HsHpZMg20J72df1xKUPC2Seu0oUO4vNHRUd9MUSW8tT2GXFyeIWYVVs3cy9AGCIuZ m9w43bgo2sy4FlydpQG6shqkszAtsSsvmixt6ka2WgQFHSkpi+KtvA7602Pv6GsgS7pKj5dHz 8g5rY/V0gCiuYD7pTWIyOhVXgVnwvhcaYP1CP6rC+N2gDFmqjh8mdSczZv7NtyUZFOsFq8wJ7 yCoDVnDZC0But3Wu04pcg+mSiamBZHGf2k4Ww0s9nKfX4LJfrCplfXHPhAdt2sOY3Eb+Sy3UM 5JuOUeXNHsaxROL8IAPpN0Qj0wjqFc3m6FbwK+G9yXicL8yQANsectrjFsXwa6LmHSprlcyPv SIvmDSKSvjrgdEdVhoPXrSsnr/crUVcX1B69WXFyWw0hykDlcAkSmZHpYLn7gi9qlYYHJeGg1 hzXRZx56UabeSxt63IUB4O3rFlDEsXZRpkWICxcKse6SYpfLYT3wtlvUJbkYFX7+cPKuJvU+5 OtWdggTODEZCQ5Fm9w2ls4tpPZzGtwvO7BC9K6Wiw1Vqa+Y9G38j7QqtHQUifOXBH3vPBhTeM jKulV3beByDXfos+omhyedMXwIfqsTytm7VmrTFiDbFuGTe9iuPfZzucKz1qB3cfa+VoX397s r/oxzeloiTNy0b3VlFMzqM1Jo347CP1nmIyWveXPh4uIkSbTuOOUWscupUaXGWN/jRCKiBKM/ kKvF+p3x2OXGv0S6c3PJNKtFHNu+5njCM1rlbmBy1rCeOFgIXg6S2fWOoMrSFUrKUMIsDj1if eR7gljV3uym5qYDWpntHlHsYaO99jbaevgnxDHUJcS5tSheQqmJj3fRjCS42UVm3itpAm8fSK XmbGwypg1+OEsYe8+SsB32g6j9d0OiscYnlG0GSFpgXa+4zqN5z8kriCOSMLy9aHAYp8q+x3l QRABRl5Jo1k2zGHYoFCwz1ZQtjd+9o35eTW0B5BPxx0nk63K+nRx7SDbfySAMReK3H1MLvRNU XpVbon4pGDG4mA= Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org Right now, when sch56xx-common has detected a SCH5627/SCH5636 superio chip, the corresponding module is not automatically loaded. Fix that by adding the necessary device tables to both modules. Tested on a Fujitsu Esprimo P720. Signed-off-by: Armin Wolf --- drivers/hwmon/sch5627.c | 9 +++++++++ drivers/hwmon/sch5636.c | 9 +++++++++ 2 files changed, 18 insertions(+) -- 2.30.2 diff --git a/drivers/hwmon/sch5627.c b/drivers/hwmon/sch5627.c index 8f1b569c69e7..bfff27d6c736 100644 --- a/drivers/hwmon/sch5627.c +++ b/drivers/hwmon/sch5627.c @@ -7,6 +7,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include +#include #include #include #include @@ -456,6 +457,14 @@ static int sch5627_probe(struct platform_device *pdev) return 0; } +static const struct platform_device_id sch5627_device_ids[] __initconst = { + { + .name = "sch5627", + }, + { } +}; +MODULE_DEVICE_TABLE(platform, sch5627_device_ids); + static struct platform_driver sch5627_driver = { .driver = { .name = DRVNAME, diff --git a/drivers/hwmon/sch5636.c b/drivers/hwmon/sch5636.c index 39ff1c9b1df5..9ef43cbfc830 100644 --- a/drivers/hwmon/sch5636.c +++ b/drivers/hwmon/sch5636.c @@ -7,6 +7,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include +#include #include #include #include @@ -501,6 +502,14 @@ static int sch5636_probe(struct platform_device *pdev) return err; } +static const struct platform_device_id sch5636_device_ids[] __initconst = { + { + .name = "sch5636", + }, + { } +}; +MODULE_DEVICE_TABLE(platform, sch5636_device_ids); + static struct platform_driver sch5636_driver = { .driver = { .name = DRVNAME, From patchwork Mon Jan 31 09:37:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12730495 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 C046AC433FE for ; Mon, 31 Jan 2022 09:38:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238447AbiAaJi0 (ORCPT ); Mon, 31 Jan 2022 04:38:26 -0500 Received: from mout.gmx.net ([212.227.17.22]:50055 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238819AbiAaJiY (ORCPT ); Mon, 31 Jan 2022 04:38:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1643621888; bh=q1ugW5vj4OYyvuTgfzR5w8vCHi9Ca6RP1hz9efhCLfY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=GRSolaKoj6JFJmn5IRm6k6EC3/2uKfoe25QVA0FacfB6LWBH+B7bvEsAKDJ3CuYQf ArEtgvM7rR2I3aMSsrDQ9k/5ElRtwFVORJhizfyDaMRAIDk+fUIR2cbJ2IduJqWToL iG/msOWVMw2Mpy1pwBT1Mxr9Pu8hvoNN1BCCYhZI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([91.137.126.34]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MAfYm-1n7pJA0kA4-00B4AN; Mon, 31 Jan 2022 10:38:08 +0100 From: Armin Wolf To: hdegoede@redhat.com Cc: jdelvare@suse.com, linux@roeck-us.net, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND 2/4] hwmon: (sch56xx-common) Add automatic module loading on supported devices Date: Mon, 31 Jan 2022 10:37:54 +0100 Message-Id: <20220131093756.8075-3-W_Armin@gmx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220131093756.8075-1-W_Armin@gmx.de> References: <20220131093756.8075-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:3e5EiL9EGTf6S2faKx/hZPtaZ/r3OwWmc73OVgGE1RfyLkUgWGH 0XoABBRHSbHmYV/XxcIkqBfQYzjWwlhv3s7ZSS8HLRATzKVK3gIM+Nw6Laf2iCPJGwSvVzx hecVFOpeLcPbI6sb2uTh9O6PgYsSMZ87svgzW9uUgMjZvmjYKPgs4EDzlR7CDj2SdjCLHJr id2XTYowH6btdw7YW8+IQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:1aR8S5uN9nk=:68kuFq2kxuXzVWmlTwTx1f Q50Yrsb+WI1OWVAGOVXipqybfZ6rqiyYsHtpQNKi1vw0wEv4EmWYgWvB5NV76K5OIBhXUS774 Hs0merK2ILPrj9CxLV/fSYAC0QbJH0ga0Hup48dPqOkgVcT+ggEyurPdydKdr0x1cSsoCZbGI NENbZJjjxkbsyLxRvGr6Q4FcUkrCIzvUeh4BbgN7jSRJhwgkyGtqLI522MPapPMLRD6AsEpcf zEPnH9ItI69AL/JKJcj5sETvpCoC5uxppjG/FLe4u6miHQgCHZU/nudFzhfFSlRvZvc5xvw97 zLRB29uV9KWdiU4BvSAfd54t8qsuYbOOKNyyv14zCAyadeC6VxKiz6ThbGsHBmdhrI/olAwAD uqv5iVqTQSdwvsAWHot4M3ulNt/togpijpZm0RfB06h+5AaSYxNttDI/+CD+Rp4TxrQD8Y8dO sR6oSwUA+xWFesDPzI0xMlnv+L7FDbS4Q6Rc5W210lsmpBrl4z2qsbjS81/eAafRHZHJK1dYo 6P67Ui3VM4es6Sc9L8em9wT2WW5D2WCnf0A51FfCz0oAITOkGZyvCcXvhfUmMz/vcT7BGlnTA PBXW6oi+ApKwapPfpWIdDH5i+mXqi6Zp+HnAxtJTuVhqq1sG+ISq8BA8ACetKWWJo4F2p3UEG 85yI6vfiCS77vjT2mp+XgUlX1I2Ewsz1ejj1YapAxbxTTEl/jNGoRwT7xaDcGdiV/zI/ApG3Y x31EMC1ycyh73CLltodBsTQym+R9yz/DeruyS+sFx7hwVlDNaG69hspo3SgsAp9k9OQ/snQWY rMiwxiRNs+yg6HAng1KmzxNq2TwCyvsdTwAH1ESOQY+/Ati9JJsXNTR9vhJQ+87r2yVOmvS/0 kctBZJmqPWAy+fhh42N2+B5Z3EaUGzfSyXxGXsJHxudvQ23XWNEKPqIG6UexFL3GtWKjxN1uW rNbEK5a/Jzh/zlkfHwfLtVwhQlT0YNxnJWyD8bV9VQFjjc0kXm1uqEBm5Ti+VabRXYw3AEP92 UbkXUreTZ7D10kVMA1HApre7v5Av0wLzFbKDVYjVueATPheIXEx8DJz6GQ84I1zBLIcrN5Q4B NCv1DEL9MlDjbg= Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org This patch enables the sch56xx-common module to get automatically loaded on supported machines. If a machine supports Fujitsu's SCH56XX-based hardware monitoring solutions, it contains a "Antiope"/" Antiope" dmi onboard device in case of the sch5627 or a "Theseus"/" Theseus" dmi onboard device in case of the sch5636. Since some machines like the Esprimo C700 have a seemingly faulty DMI table containing both onboard devices, the driver still needs to probe for the individual superio chip, which in presence of at least one DMI onboard device however can be considered safe. Also add a module parameter allowing for bypassing the DMI check. Tested on a Fujitsu Esprimo P720. Signed-off-by: Armin Wolf --- drivers/hwmon/sch56xx-common.c | 40 ++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c index 40cdadad35e5..0172aa16dc0c 100644 --- a/drivers/hwmon/sch56xx-common.c +++ b/drivers/hwmon/sch56xx-common.c @@ -7,8 +7,10 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include +#include #include #include +#include #include #include #include @@ -19,7 +21,10 @@ #include #include "sch56xx-common.h" -/* Insmod parameters */ +static bool ignore_dmi; +module_param(ignore_dmi, bool, 0); +MODULE_PARM_DESC(ignore_dmi, "Omit DMI check for supported devices (default=0)"); + static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" @@ -518,11 +523,42 @@ static int __init sch56xx_device_add(int address, const char *name) return PTR_ERR_OR_ZERO(sch56xx_pdev); } +/* For autoloading only */ +static const struct dmi_system_id sch56xx_dmi_table[] __initconst = { + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + }, + }, + { } +}; +MODULE_DEVICE_TABLE(dmi, sch56xx_dmi_table); + static int __init sch56xx_init(void) { - int address; const char *name = NULL; + int address; + if (!ignore_dmi) { + if (!dmi_check_system(sch56xx_dmi_table)) + return -ENODEV; + + /* + * Some machines like the Esprimo P720 and Esprimo C700 have + * onboard devices named " Antiope"/" Theseus" instead of + * "Antiope"/"Theseus", so we need to check for both. + */ + if (!dmi_find_device(DMI_DEV_TYPE_OTHER, "Antiope", NULL) && + !dmi_find_device(DMI_DEV_TYPE_OTHER, " Antiope", NULL) && + !dmi_find_device(DMI_DEV_TYPE_OTHER, "Theseus", NULL) && + !dmi_find_device(DMI_DEV_TYPE_OTHER, " Theseus", NULL)) + return -ENODEV; + } + + /* + * Some devices like the Esprimo C700 have both onboard devices, + * so we still have to check manually + */ address = sch56xx_find(0x4e, &name); if (address < 0) address = sch56xx_find(0x2e, &name); From patchwork Mon Jan 31 09:37:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12730496 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 2EB66C433F5 for ; Mon, 31 Jan 2022 09:38:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240764AbiAaJia (ORCPT ); Mon, 31 Jan 2022 04:38:30 -0500 Received: from mout.gmx.net ([212.227.17.21]:38679 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239035AbiAaJi1 (ORCPT ); Mon, 31 Jan 2022 04:38:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1643621891; bh=mJxsPYb64pkiiR8ddTh3vIBADHaclB5tW+tmgCYuZ4E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=DjOqOjcKf6PsYr0gC2i8mR+mWvxunldjDiHfbBx/VrJHDZmeA/eaKxARhyfw8lFQf lfEwBRVfhY9qik4RFo4B3CNp78maZ07It4QbunrVNh4SbZ6hYHdSFbJIS/nMKSRwvT 7Y8yYKtLRG15POTjIVVbfoBNEFGjZ4TiISABr33Y= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([91.137.126.34]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MtfJX-1mNrie0hXb-00v9Xk; Mon, 31 Jan 2022 10:38:11 +0100 From: Armin Wolf To: hdegoede@redhat.com Cc: jdelvare@suse.com, linux@roeck-us.net, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND 3/4] hwmon: (sch56xx-common) Replace msleep() with usleep_range() Date: Mon, 31 Jan 2022 10:37:55 +0100 Message-Id: <20220131093756.8075-4-W_Armin@gmx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220131093756.8075-1-W_Armin@gmx.de> References: <20220131093756.8075-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:631rragYDHePZtnqpgl3BQnNodwzxhbldTFzOnV4v7m4bHM3v5p ZufQ9k9OiQITAnQMafQ8bq6HJkZqt8u7WV8BkswfZLu5EjZCkBXbcJv48B3TN0ls8oDpbQd +6AgyWzRaKaqpwJGXjmgVjGO0L5/3zfKy8klJ7ZOZ369tMSuOhxrxaRANPBV42HgoYUEiwc zDhkYM75m+rKjmGQyrTVQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:4zPAX+ETwoU=:L1KV9YzhpboZ+tTm0lbg3F rAWp9+mzAsxl8fpRuQ1C16J10VzeK/lzcGIaDdc/Acquvn+nXuRQwul8uYM2m6bLiYAdJkiKu mgOLXnT3P66POAz0eivLpWUsfE4HVTVI850WKVHMJdpUJprVICr3/PX5Nyg9V03MOGdibDNp2 VvfqpjpNohZ2akk0gOKeq4Kj3+gahcjl9AgD1DJS0V03D7TSTJpiwIb09ujsd7mZJUwEXANbU 1SHi6sg7YcqH0PJV5c3KEWM0+8WrBFV6dNzNLLPOVnLQsFHcpqEV8DL9Y4/M4hCTkI2SRZO9o MKkWtGP9e0dOudC/pwYoYqypO7/cidE5xUQDNnBp7FqyXVsx+rwXQ9XdeZueIPMa3lX6ybPyD qZmgZWUbT9LblpjQZlN5s1zUTRSBGmzX4pFtqAlzqIVHN10YUiBLjXByOgZ9b/1ybdAkTsT3H quEYmvkoU3Z6Y3egOB9jbb3I2m+W2vAIB6QaSeZ+I81CWm6kKs/dNnhoI9W7mG0699tMctaYs 1roB72WtG1hTsLzpNOUgkhTa1apIHE0z1ZBUJh4B+ET4/WwTJ9OsOn02zHqbsq6qnKindQSL4 y8/+Z2ynQxxImQEdU3dRVKxpEoZyxAREBJdO1RtZR4+6s6RYbwR2q+B7rfjANfy0yoZbZrIFX G5i/pHRQseESLtdxYus2Wa2+CG/khDrRGPvEzIR1YmTWRFz/eZFLUOOI2yRPri/JUAuv75aEH rfxfg9FUN4y5ATh1xQpyt+tMBWrIs0uE4XUHG6oTwqTV+Z44+CCcos59ZSSHT0R2Uqz+B1Bfn P1pwN41L1/BJXCXnxtxc7ey4gCZ75OAPph6ziasuJYqJtQR+IiyQqyI2Hi+XWIRClNBHHfCcM Xa/sZulTCbwU4xzOIC/S69c/POoKtXt8/SKxDm9Pj7Iyoii8BAClTwZp7gykWUDghHzQE+85q OUtN9gScLjKIBFZ+dQKcFBoOJ4PrGz1PsLWlaYd6sFIiFpbie0tlE3zwCwZe1Zg/giVkYyGeE Yk2+zmWfw2WrUZjocBlY1hkp/uezFqzJkThoq6FLhnesorEapTqOp/7VZNWzewl3gYcCaG9Xn HX35ijh0kM8lIk= Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org msleep(1) will often sleep more than 20ms, slowing down sensor and watchdog reads/writes. Use usleep_range() as recommended in timers-howto.rst to fix that. Tested on a Fujitsu Esprimo P720. Signed-off-by: Armin Wolf --- drivers/hwmon/sch56xx-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c index 0172aa16dc0c..f66e1ed4b1aa 100644 --- a/drivers/hwmon/sch56xx-common.c +++ b/drivers/hwmon/sch56xx-common.c @@ -139,7 +139,7 @@ static int sch56xx_send_cmd(u16 addr, u8 cmd, u16 reg, u8 v) /* EM Interface Polling "Algorithm" */ for (i = 0; i < max_busy_polls + max_lazy_polls; i++) { if (i >= max_busy_polls) - msleep(1); + usleep_range(1, 2); /* Read Interrupt source Register */ val = inb(addr + 8); /* Write Clear the interrupt source bits */ From patchwork Mon Jan 31 09:37:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12730497 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 55E33C433FE for ; Mon, 31 Jan 2022 09:38:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240738AbiAaJib (ORCPT ); Mon, 31 Jan 2022 04:38:31 -0500 Received: from mout.gmx.net ([212.227.17.21]:44793 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240686AbiAaJia (ORCPT ); Mon, 31 Jan 2022 04:38:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1643621893; bh=M8VxZrM69T8fzVT7HtYVnghJWaulQqQeYn5dd1DXrAA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=CwMBW/ysfcJWiL+ER3SYZ17Eknj9kDFRU98lseUJd7akCMQZq9t6t3gSNYS+azKp+ sKZHexUhCMyV6QUZMdgtGGoCtcEd6StwA7hikEwNNB5ILAyrz9Jqfrlo5KeJhucyXh KWE3sl7RitsxNtc1te/R+eS6RsCIsZmizzBF530Q= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([91.137.126.34]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N4hzj-1mCqAc24vP-011gXw; Mon, 31 Jan 2022 10:38:13 +0100 From: Armin Wolf To: hdegoede@redhat.com Cc: jdelvare@suse.com, linux@roeck-us.net, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND 4/4] hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING Date: Mon, 31 Jan 2022 10:37:56 +0100 Message-Id: <20220131093756.8075-5-W_Armin@gmx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220131093756.8075-1-W_Armin@gmx.de> References: <20220131093756.8075-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:9QBdxLpwQraj2RF0DjGnbPUr64KV/UJiV0ngLb/rPcGIGhUtmZY aOgreswTTk/TemZzQEUZPuN6ImKxtTkRFQf1G+/iBzdb/iL8dfUbrmN6VA67l+hutHAcCl4 htrWaSDwRm102+DqcHVdqBTsjVL4E7v08tDrXFJ/uelCqGXAUPu8JfDBSsdPmsoKeHP2CPW 2NZNlBoP+QBJdGHZymrxw== X-UI-Out-Filterresults: notjunk:1;V03:K0:wruDPY0hL/E=:FSYCl1tY/CCeoaGaTWlljW d6efG0vEpOG5Carnk4rXdjqAvWslHAi7FiqN9cL4EvaQhzxVvXz32aJmmW8GikZurQP4OjS0f Bul/BaDtHFojGcLrW5/MdFEIw0Dv3HsgXAadLRkU1gN1jlKKDwTryfipmNo4b3GoC1lOz3UZ9 lwnVNfNAHL6HRN4pbyVmuUWYl+5b655jOl0xhTFDx5MoIMaIx0KsL0xmqnBdi7LIc99yCviDN 4OX7lLzRlfNOUeIMCo3NGiv3G7pZcn050o2GW7DhDidfyNzfj49rtq/c3n5QQOGgDCG+4glj7 iXaDLFzPuANANK2Gbg8XgyJqNOZxyo9G67yMWmU1Lgf5ygbMGI1xeWwQ3+11wXwipEeV6NFEq H2som6psHeh7GZhW99V9+ex+NG3DCFUFC29wJ5E/KjRVVRqECbel1bH9yijKcO+tNeZ+UMWFJ ai/77bgFbxyL86vK9FDre8xAVfn4RPvNAncirWoo7xMyL9eZvCUpdx5YTj0/9Uvay5fkqqaMD sfge8efI+JbfAhoQiKxiotd8XmGrBsw2bE+NYQxuyZ1sUKseFK1OZT8PG/0/c+2EW5JOX3Wag b0jYkC8fH9LDenmNkJD9TLUigRoOxf4chUQEWINqgOTInT06Y9p0kPluYzPUekRnJknQZ45if sYP+jYdGgnjEGAUdUhLu5GsgkTDC1vi5j8nW9+1jwnFvVAWF1VHTGQ1uoDC8hyF3rfo00TilH xxk876pKFRIjnWfXlp2Vu0W5EODwqBifXKkRDYhzKcMIG9RC6JUHO/aKDvb7ZSi78n/abuCWw P/n5Lm4bZrGVZNW/EpE1yF/wWTbVDMhkI/O1yhYYZ6ZivAGKWZBJ9OY31GZ7z8DZ8qvXYDHPS z6E2b9bbBQILHFY48hsKlpCistgTQaE9k3P/yho8UiSPK/Hx1wIOsf9v4bReJ36cXFddRNV3w hxlQfBzHZvN1qPZ/C4PlTqNwVD6SH9/ovTymnk6GYBOix+JXqUfvXV0CDCTaeu/YnwOdylvHa 42TbVG8VWHnGS6Zwle9LCciMTc6ix9QoUkbbwOjWjaeBdd9nAhXZqJgS4a7R6kIB80wCIBk3s v3VSX5/b3DLaNY= Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org If the watchdog was already enabled by the BIOS after booting, the watchdog infrastructure needs to regularly send keepalives to prevent a unexpected reset. WDOG_ACTIVE only serves as an status indicator for userspace, we want to use WDOG_HW_RUNNING instead. Since my Fujitsu Esprimo P720 does not support the watchdog, this change is compile-tested only. Suggested-by: Guenter Roeck Fixes: fb551405c0f8 (watchdog: sch56xx: Use watchdog core) Signed-off-by: Armin Wolf --- drivers/hwmon/sch56xx-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c index f66e1ed4b1aa..2cd146fd0562 100644 --- a/drivers/hwmon/sch56xx-common.c +++ b/drivers/hwmon/sch56xx-common.c @@ -427,7 +427,7 @@ void sch56xx_watchdog_register(struct device *parent, u16 addr, u32 revision, data->wddev.max_timeout = 255 * 60; watchdog_set_nowayout(&data->wddev, nowayout); if (output_enable & SCH56XX_WDOG_OUTPUT_ENABLE) - set_bit(WDOG_ACTIVE, &data->wddev.status); + set_bit(WDOG_HW_RUNNING, &data->wddev.status); /* Since the watchdog uses a downcounter there is no register to read the BIOS set timeout from (if any was set at all) ->