From patchwork Wed Jul 28 20:51:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12406693 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E9EDC4338F for ; Wed, 28 Jul 2021 20:52:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 14AAE6101C for ; Wed, 28 Jul 2021 20:52:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231697AbhG1UwI (ORCPT ); Wed, 28 Jul 2021 16:52:08 -0400 Received: from mout.gmx.net ([212.227.17.22]:52201 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231574AbhG1UwI (ORCPT ); Wed, 28 Jul 2021 16:52:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627505509; bh=DhSFe+P3rPaWUNqUAqEdNMpsMXOakE4UTWSA3BpWl8A=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ew8J4CKVptNsJbr/TtFwZKjNG5Bso/taGU41eJsaS9aumLKTb/aAomWhPHP8jZJjZ IpzD5TxgyjojSMsc5oiiu9UMi0DpAt8ErtJdjRGdcDiiCyu40ey4GMpxnGQPfAc7H1 jUTIL9ocJxhtUpj0a5O0xKaKTrbXOL88KVo3Kghs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.190.212]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mqb1c-1mv9q11UTw-00mZNh; Wed, 28 Jul 2021 22:51:49 +0200 From: W_Armin@gmx.de To: pali@kernel.org Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [PATCH v6 1/6] hwmon: (dell-smm-hwmon) Use platform device Date: Wed, 28 Jul 2021 22:51:37 +0200 Message-Id: <20210728205142.8959-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210728205142.8959-1-W_Armin@gmx.de> References: <20210728205142.8959-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:i9RP8SbF9BMbp0NQHIHsAzCYQ6fek7NtS9S8nVrM1zVAk58Lw/7 HMTdWBMGMFIRRv7mC6COC4T8qICfbHxmuldKs9aZumUxWGXffAbRoP4D0HKcTFopAJTfYsm a9Ux0OFEo/F/ZE0/ZJsqG8x1greI5u3yhPjmQ58SmdPU/oCZgDX7P0A+Po4TzeeiSRgllmz ggg2PK8oKgQZlziWrhJoQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:sV5Za5XzprU=:7RRBaGOGd2oYF7XlsMspuQ 91kvIEejlc0EzIBIRnlKZHliLuvLBN75nNSGWB9n4KHy6aJ5ToZBj3bLSCF3GiEVNO8q1lt5R 5XcQck2tQNYQ0MD3+bDEK+TVb2T0tXuTeyYtGUU4KzW/AzWsvY2zTdvluQaaH7VTh79wo169m j+pJcPFnDP8dzAkQ5RUbacTF8mDaEzV04eV1oM46p8OgbKJ6NRftb1ZbCjWQdSr0GIBfUm4i8 OjWn8xjWNfBcR/GzSOiz9nSDs2ISdMtkTT9yAGshKLF78aGN2lwsvti172ZblAqsDs8ScupoW jeKdW8GaENbLVIyPK9VmjN5V21sdLvNDFWtDc1luIxbGnKaFanmkpx3N0SFdl2DkVB+skK6oZ qptjRuHoSnEbIE7LdzqLhyYEIC0kMjcOBBbG1c9eeo38snXKY/GhhaRG5JJrOBlrI0yGr3x5m 3PJA3hrHFcj3boL9GnNtXvysFGWMIloJQzcxRv3zd9wCND/e3Zk3XgdKUPy2XLtuQzlbIuYZg xMu1ylr0F1R1TO/868Pv/tpdNRdMuXmm9VHhK9aZVxg+IlqR0PSNVBREFQ9KvRYuoAXZTSM8J v/z6uJqExdGhUtVpLVkYzYrb1H7JiAc/bu1W1BznBlCT553ZwSu/1clzNFi6v6jsgvPy5gdwz Jc2MvLaC37CHmXby2RsAW9VPdRAgv/bc38tiVWN0bYXVDSpfzwRL9s6etImgNNMWxxuLCUsCl 8U5foPPlWytqqw0NNwGV5YWIK8WhV+OYlR+YLKoRmHTXF8UtHCh8VLYMa6vE48PHfqj2kiwh5 J1l48qRQi+Jw6CbMDC+/miU9DUOLhmG/A+zZzlJwlOqMzZko7i+Vh72AZ7o+g4vNJhR3dCAaJ PSKtGtfz/OBalP9oD7+FgPb56HA/M3LQrZ83AWR5CgVgLjCmDdk91AbBDSz41j8gqUthuzvyS VNKT6DR9V7FI+zN5cciFJb574vTLxOFQ3fbKadeaPz2v76TZCuFebJs1E3L72cP/tgwKnz5UT vkgv5wDEE2sP+ZLzM5mZDH8rqvyIrrO8a4SGjZzmfL5qG6XTdSjml7mdAKscmRZlQ4MAX89+l zSMq+84VfZG/Twq+klr4V7jIO/XsxDwcgdy Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Armin Wolf Register a platform device for usage with devm_hwmon_device_register_with_groups since the platform device is necessary for future changes. Also fix some checkpatch warnings. Signed-off-by: Armin Wolf --- drivers/hwmon/dell-smm-hwmon.c | 113 ++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 51 deletions(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index f2221ca0aa7b..f06873413aea 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -14,7 +14,9 @@ #include #include +#include #include +#include #include #include #include @@ -896,7 +898,7 @@ static const struct attribute_group i8k_group = { }; __ATTRIBUTE_GROUPS(i8k); -static int __init i8k_init_hwmon(void) +static int __init dell_smm_init_hwmon(struct device *dev) { int err; @@ -956,15 +958,9 @@ static int __init i8k_init_hwmon(void) if (err >= 0) i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN3; - i8k_hwmon_dev = hwmon_device_register_with_groups(NULL, "dell_smm", - NULL, i8k_groups); - if (IS_ERR(i8k_hwmon_dev)) { - err = PTR_ERR(i8k_hwmon_dev); - i8k_hwmon_dev = NULL; - pr_err("hwmon registration failed (%d)\n", err); - return err; - } - return 0; + i8k_hwmon_dev = devm_hwmon_device_register_with_groups(dev, "dell_smm", NULL, i8k_groups); + + return PTR_ERR_OR_ZERO(i8k_hwmon_dev); } struct i8k_config_data { @@ -1221,28 +1217,11 @@ static struct dmi_system_id i8k_whitelist_fan_control[] __initdata = { { } }; -/* - * Probe for the presence of a supported laptop. - */ -static int __init i8k_probe(void) +static int __init dell_smm_probe(struct platform_device *pdev) { const struct dmi_system_id *id, *fan_control; int fan, ret; - /* - * Get DMI information - */ - if (!dmi_check_system(i8k_dmi_table)) { - if (!ignore_dmi && !force) - return -ENODEV; - - pr_info("not running on a supported Dell system.\n"); - pr_info("vendor=%s, model=%s, version=%s\n", - i8k_get_dmi_data(DMI_SYS_VENDOR), - i8k_get_dmi_data(DMI_PRODUCT_NAME), - i8k_get_dmi_data(DMI_BIOS_VERSION)); - } - if (dmi_check_system(i8k_blacklist_fan_support_dmi_table)) { pr_warn("broken Dell BIOS detected, disallow fan support\n"); if (!force) @@ -1255,21 +1234,11 @@ static int __init i8k_probe(void) disallow_fan_type_call = true; } - strlcpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), + strscpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), sizeof(bios_version)); - strlcpy(bios_machineid, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), + strscpy(bios_machineid, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), sizeof(bios_machineid)); - /* - * Get SMM Dell signature - */ - if (i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG1) && - i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG2)) { - pr_err("unable to get SMM Dell signature\n"); - if (!force) - return -ENODEV; - } - /* * Set fan multiplier and maximal fan speed from dmi config * Values specified in module parameters override values from dmi @@ -1277,6 +1246,7 @@ static int __init i8k_probe(void) id = dmi_first_match(i8k_dmi_table); if (id && id->driver_data) { const struct i8k_config_data *conf = id->driver_data; + if (!fan_mult && conf->fan_mult) fan_mult = conf->fan_mult; if (!fan_max && conf->fan_max) @@ -1313,29 +1283,70 @@ static int __init i8k_probe(void) i8k_fan_mult = fan_mult; } + ret = dell_smm_init_hwmon(&pdev->dev); + if (ret) + return ret; + + i8k_init_procfs(); + return 0; } +static int dell_smm_remove(struct platform_device *pdev) +{ + i8k_exit_procfs(); + + return 0; +} + +static struct platform_driver dell_smm_driver = { + .driver = { + .name = KBUILD_MODNAME, + }, + .remove = dell_smm_remove, +}; + +static struct platform_device *dell_smm_device; + +/* + * Probe for the presence of a supported laptop. + */ static int __init i8k_init(void) { - int err; + /* + * Get DMI information + */ + if (!dmi_check_system(i8k_dmi_table)) { + if (!ignore_dmi && !force) + return -ENODEV; - /* Are we running on an supported laptop? */ - if (i8k_probe()) - return -ENODEV; + pr_info("not running on a supported Dell system.\n"); + pr_info("vendor=%s, model=%s, version=%s\n", + i8k_get_dmi_data(DMI_SYS_VENDOR), + i8k_get_dmi_data(DMI_PRODUCT_NAME), + i8k_get_dmi_data(DMI_BIOS_VERSION)); + } - err = i8k_init_hwmon(); - if (err) - return err; + /* + * Get SMM Dell signature + */ + if (i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG1) && + i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG2)) { + pr_err("unable to get SMM Dell signature\n"); + if (!force) + return -ENODEV; + } - i8k_init_procfs(); - return 0; + dell_smm_device = platform_create_bundle(&dell_smm_driver, dell_smm_probe, NULL, 0, NULL, + 0); + + return PTR_ERR_OR_ZERO(dell_smm_device); } static void __exit i8k_exit(void) { - hwmon_device_unregister(i8k_hwmon_dev); - i8k_exit_procfs(); + platform_device_unregister(dell_smm_device); + platform_driver_unregister(&dell_smm_driver); } module_init(i8k_init); From patchwork Wed Jul 28 20:51:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12406695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0400FC4338F for ; Wed, 28 Jul 2021 20:52:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DDC8460FD7 for ; Wed, 28 Jul 2021 20:52:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231829AbhG1UwY (ORCPT ); Wed, 28 Jul 2021 16:52:24 -0400 Received: from mout.gmx.net ([212.227.17.21]:41677 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231574AbhG1UwK (ORCPT ); Wed, 28 Jul 2021 16:52:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627505511; bh=Er6k5tLiUJPuW1WNmYTS1PUHAIWkMV1+c3yIe+8Tf8E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Vw+ZGn82lSzD0WFgvpD0HY7OVNJnZ5gOM4w2jX3Q5HsucuCYVrZqvLSlRKbiVA5Z6 LvD6YL3S8Za6coAbCw1WqxekzoQdzQsbEimpYssWimHKDEIChnL/jWDOx4/6dYgAFG osn7LDmM9JLrsTWyujDgTSMRBvGr7dSbhatjrlCo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.190.212]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mgeo8-1mpdXP0Hca-00h9ug; Wed, 28 Jul 2021 22:51:51 +0200 From: W_Armin@gmx.de To: pali@kernel.org Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [PATCH v6 2/6] hwmon: (dell-smm-hwmon) Mark functions as __init Date: Wed, 28 Jul 2021 22:51:38 +0200 Message-Id: <20210728205142.8959-3-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210728205142.8959-1-W_Armin@gmx.de> References: <20210728205142.8959-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:M+WNHN0ZUk9eA2hiVHUJmejTehceMyGCpH1ZkQgX7bC2GL89zTM qsN8nJ6o5Othex4bI5tO9U9Dggr8FDlgLsaWIhZsc0oYj/6MYu7W4z5e54dPgzlymb0lCzO ER+924uIknGJ86mdU9nomvH5NiiIrCeJ3Rr8wkTNWWTbiaBrJ003BJiDMCCqrXPOGQymQNn /BBhv4vzRxdQYRIJizfPA== X-UI-Out-Filterresults: notjunk:1;V03:K0:9qCUt0yl1OM=:rQL32SIYYGZ7RgNm89UBcr cfRkthVIvs8ZgKhykeQdy78JaJ8vxKAMayUMiovYMPYzc5mKhei1U7NEKdSlGNeBsawobjErP tk8bQFHex6i3UmYrbKlQ4ByK/AlY0F+EtKs570+t6p9LoL8W8g4mZSp+rgj1uRO79W+vHj1Fs Nhatpiw6oDKjWiSHBfegDF47Vzc8bC+Znxsw+/EkyeKcO6pNVDVYVm25vlQfbHXqqRd6c9yVs N3yLYlQCeIXc/NXz84MPr7861umZ5R/5BsuBaoJMlpS4E93+vTYXsOimgtc+rB8YEDfrQ8GPG fWzvQ8Jp3InHvtHieUDfoBe8fnKcvorKqe/uu3NxvRE5D/TZ+kFcKqQ8f7b1SDKY+8V+R2K0v 9Tr2jDL8r9QQhqVqbH6FWLengOeyjWuvO81jXrucG04wgP+yPuLQU90ECT6qpxd2/J56UQwQr mwiqAbNcHdHDvWgVUGNXm7zSEuLVLn02j3avIHYMORXhTUjaLo7dJ8WPo6zzvwJNS+YwLtGFZ n0Yv7nUzMgDIKv5ufnPsGrkpDHfxSXEhUJHvNxK6VWf00qgxyCy2cfE5PqgS6bq4XMuh+8lTi qzslO0v3b3QU2/OPULevXyPYk2bY7tlS3t+Slh0tZJLNsXWMfJrOHYCtf7D6MA4ruQoU8of4D g788gMe64G+Jk9yAEP0gWJOL1Z684NmUQ67hHEiIfkWUxHyVnOM4IYY/4oyrhxKeKTekTo6tA TOTplMytciPvqLOkJ6Nvf430I78fq+Dh57adHe5bzN8gg7kWIavIrrL/xvaXVu4OpJlzEG2ZK KmnYw9jB/607p2Tv0BGyJNn1p1RjUxOwuOgVJaBT7alfquQzI74iFQS7cCOo9STv/pExi5BVv Jvk9xaURXEr8PXWV589+xqu8FKbOm1ZLJqMYTUPFUSrt8W+7wdpJKjWA6SLkuWSTb21slt3Xr dmFaONq6FF2bFSSX1nJeKDRYu1GU4ZMZp0lbjTdCaT1iFzQAFEahd6QaOgPiFe9C5C5sNa2tG XUAIYMmOREiSky0NjdmSswjBH0Yfl2ZpP605BM2CZDmcfjp1E650xC3dxSPcBtAHEUQ0vOh/L LVvaeYo5eUrd6mb5bX61db+l5lNvd8HUesg Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Armin Wolf i8k_get_dmi_data() and i8k_get_dell_signature() are only called during module init and probe, which both are marked as __init. Also mark these function as __init to lower the runtime memory footprint. Signed-off-by: Armin Wolf Reviewed-by: Pali Rohár Tested-by: Pali Rohár --- drivers/hwmon/dell-smm-hwmon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index f06873413aea..c898d6bd6a18 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -128,7 +128,7 @@ struct smm_regs { unsigned int edi __packed; }; -static inline const char *i8k_get_dmi_data(int field) +static inline const char __init *i8k_get_dmi_data(int field) { const char *dmi_data = dmi_get_system_info(field); @@ -384,7 +384,7 @@ static int i8k_get_temp(int sensor) return temp; } -static int i8k_get_dell_signature(int req_fn) +static int __init i8k_get_dell_signature(int req_fn) { struct smm_regs regs = { .eax = req_fn, }; int rc; From patchwork Wed Jul 28 20:51:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12406697 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1320BC4320A for ; Wed, 28 Jul 2021 20:52:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE55A61019 for ; Wed, 28 Jul 2021 20:52:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231519AbhG1UwZ (ORCPT ); Wed, 28 Jul 2021 16:52:25 -0400 Received: from mout.gmx.net ([212.227.17.21]:42247 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231760AbhG1UwM (ORCPT ); Wed, 28 Jul 2021 16:52:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627505513; bh=fno1fA+0keQwzzK9v/Ru4/C9g+Om8P+dCHByA/X0ohM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=jM4NwtxYVSvzPJGvEnJeu61QBQoNh5RiETBJYbZwYnyqfSGbsWWTolkceUzkj55sa QC0zM7uFAa0CMNQuqE0e6MBbCWYgBZbkMVsJ1yE/mPvTrSc5Po9FRAqT3tr65qhbgw QLBoVx9yJr65Dy8FnTbLkK6lhj0aJbvli06XHLxM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.190.212]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mj8mb-1mn9Uy0GYP-00f8Ql; Wed, 28 Jul 2021 22:51:53 +0200 From: W_Armin@gmx.de To: pali@kernel.org Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [PATCH v6 3/6] hwmon: (dell-smm-hwmon) Use devm_add_action_or_reset() Date: Wed, 28 Jul 2021 22:51:39 +0200 Message-Id: <20210728205142.8959-4-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210728205142.8959-1-W_Armin@gmx.de> References: <20210728205142.8959-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:H47yGfgAR+PR/XAz+c2beax0eX0kseNj7phbrX2w/S5VufMstI5 PVm/HFb7usNsCDRInNHTuFnpdvcz+unqQbJTr2EKby7IXv8fAiZ65EVRtsAGxkLTAdCL4Zm wEhLA6GUC1Fsr8eHraWCwACygeydBr9fGLDmCpynuKq+8Su9yubl6q3J493OkIrCNOvklyl lcBMzwRnWMtpZKq6Jk3lg== X-UI-Out-Filterresults: notjunk:1;V03:K0:6kO1dmOYEcg=:cbConAfSnQdUgT4hACCfKe +PkN8zqpQidZB0LgifgqGFBZS/OCzBzyHozlAgGxOGEzoYIA7cEirHkaHNaSsoN5I/VeEt51i IjL6+XLm//Ta9ZcsTplw3fKX5E+eiq4VIAiXF6VXU1EEJaXdGw3ElgLH2uK+x88dFehjef3tD N0uceBpzFZQNkBTDaXhfwy65qbasWQ6CWRgreQW4a2xMUrgogLL0uhZBAOvPOPEhWMgLc2JOC EFui9hFo7tTOT4TItWnTxRW3uv+THV08oNiF14mzBJsdjR011DdwAIgggY0/u0EnUj6qxTVzQ QvJLerM1WaQwGvlrusoggTz2OoZT8AINghc1CcCVcvfQe7wsOhOS8zzvtHYYLFC7gjiBu+rMa lq9IiJ4c3tlxfCXIepMyoPdQGxox4Cs2noakc1C4FFKHvfAzhEfkd0oSfT/ogrI9T+oV8UX3o 4cHeDWVXTY5C7D2byLui2UZEY/twNgrPUe4ha4Xmg/OW6mjPzm2fQOKwA2Zso6mkdK0aWKDO+ 1H7Tm/bN45WQL/BBbnm7eAiTs3oib1REJI1J7tMRTpvfr6eGfspVDWSG4KnkE4HyKO4oSwLYC W23o7Ug36d8AI8IaleE+AqYhl7TOwHGzOx4pnb9ME5SFa8xIMxEDB3Z8f5URcL/rDwzAej/6F 8jp8KIfs5jN6d+9nAk76e7NKU5FPmJVvvj6Y6/gmwfz60PEhlxX18k1Q4+SRx3uHB5spbjPb8 CYjv+NFtPVSPMpWzYd3xFNNVrB+5IBu6MxJPl+Ty+Q6Z61ZXQ+w5VBSRPSwNYBusxNepem1f2 5NyIn7FODMZkFlE2T9cDvGbHnQIVPcNEjXgNONpIO0KHpH5AQlcYqLxpYyYspJe/5ISLYWBfX TZBRUcyADJvsiWUPMOQlzG7DaeBnCKaH848d0cksZSiZJm7bJ2ieP6ksO9b5G0/5xTelP1D6o XMHmGtTInv//KfnR1cZIcMqAigVLd+ms/yzAA07ledTAwMtaC/jSY8eYwR3cUnDxn0aBHRL4O FF5+WjdonGe5UA7XJPpD2mhxTlS+tw+QsmDmwMN+PFcyeRLIAj8A86F2j9lb0nUAGS4K4PLgX bKaLVwx5LmmoRUB/o5uLWD5KXJMr4VE/mJQ Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Armin Wolf Use devm_add_action_or_reset() for calling i8k_exit_procfs() so the remove() function in dell_smm_driver can be omitted. Signed-off-by: Armin Wolf Reviewed-by: Pali Rohár Tested-by: Pali Rohár --- drivers/hwmon/dell-smm-hwmon.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index c898d6bd6a18..da7040f2442e 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -605,24 +605,22 @@ static const struct proc_ops i8k_proc_ops = { .proc_ioctl = i8k_ioctl, }; -static void __init i8k_init_procfs(void) +static void i8k_exit_procfs(void *param) { - /* Register the proc entry */ - proc_create("i8k", 0, NULL, &i8k_proc_ops); + remove_proc_entry("i8k", NULL); } -static void __exit i8k_exit_procfs(void) +static void __init i8k_init_procfs(struct device *dev) { - remove_proc_entry("i8k", NULL); + /* Register the proc entry */ + proc_create("i8k", 0, NULL, &i8k_proc_ops); + + devm_add_action_or_reset(dev, i8k_exit_procfs, NULL); } #else -static inline void __init i8k_init_procfs(void) -{ -} - -static inline void __exit i8k_exit_procfs(void) +static void __init i8k_init_procfs(struct device *dev) { } @@ -1287,14 +1285,7 @@ static int __init dell_smm_probe(struct platform_device *pdev) if (ret) return ret; - i8k_init_procfs(); - - return 0; -} - -static int dell_smm_remove(struct platform_device *pdev) -{ - i8k_exit_procfs(); + i8k_init_procfs(&pdev->dev); return 0; } @@ -1303,7 +1294,6 @@ static struct platform_driver dell_smm_driver = { .driver = { .name = KBUILD_MODNAME, }, - .remove = dell_smm_remove, }; static struct platform_device *dell_smm_device; From patchwork Wed Jul 28 20:51:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12406703 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 669F7C43214 for ; Wed, 28 Jul 2021 20:52:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E1A160FD7 for ; Wed, 28 Jul 2021 20:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231126AbhG1Uw0 (ORCPT ); Wed, 28 Jul 2021 16:52:26 -0400 Received: from mout.gmx.net ([212.227.17.20]:45879 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231764AbhG1UwN (ORCPT ); Wed, 28 Jul 2021 16:52:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627505515; bh=oixciV1xo5MoHy9eeElEMgU+g7Dm3FkM0+yVGfMkbB4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Zs6DFydTsrVihixivbqMGjjmRN6vGnykO6VsCkGigllFxTowNHyW/tK63co3YGfoS CatvvPFa9dXzoGAl1gi8S2jlDGQMaRAS9I0LIDQ/qeYj5UcFuVc8IdKEShVxTFnAK0 QikMLJ6AJuSe5I7PXJBu01w3M1IrwCxiBKrLe+KI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.190.212]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MYeR1-1mdtlp2mBP-00VeF9; Wed, 28 Jul 2021 22:51:54 +0200 From: W_Armin@gmx.de To: pali@kernel.org Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [PATCH v6 4/6] hwmon: (dell-smm-hwmon) Move variables into a driver private data structure Date: Wed, 28 Jul 2021 22:51:40 +0200 Message-Id: <20210728205142.8959-5-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210728205142.8959-1-W_Armin@gmx.de> References: <20210728205142.8959-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:YEkPi1fcfwoKscgNEro/reIdw1qZltPG6e40P0k478aiux10pXm iMUhJEyL5CqebhsMDmwEofJyZwdIMbJfRt63FGO4jFh8Q0vK4AFRNdI1eyondSM8EPNMbLd alcBZiLQCoLyciy1Gkuayn9g4EUoXs0+qHZUzL0IJIEiycmGNnaEEP2XPRVEIafipbelPO0 +QniwKUNnPNyzv7nye/hA== X-UI-Out-Filterresults: notjunk:1;V03:K0:ipUO/xDdv28=:GzjoJbcnRSN3zfcMXNZ+NI PveYWtuMxNK/BOG2Xf7gBLDu6Fl67/Oirt/Ift6kwh+iLI4DCg7mFJJ2LX96REaMpya9izl5I fWNr9JqkKBLDHmQc5lRgzd252QUUXZJHzHui7CaL/PWLUO1Z5JA1xqUOKBKbCbC8jrdOojEEW ntJ4MVSvAFttHJOjTlA7IKrf4nu0Ms6s9Zkzb2vF4gAIOra7e4NsAhBTFA5orz4lBceq/vz0a pb5olgU1E+1Th+0MVTAhY2VaamLd8zXjIwsudbqtnw9l6LZF60d00ImlunngBkhRxFiloQ8f3 6DCsgr0ciXVNoOhdqQVmFDRegdr2iqKU8F6/XxU9IBVdSNSBBsBjbBVQM+6WI8fz1py5jPw/+ ZdJS3w4gIgp28OYMgsK7GUgd3klLNmLAjwl7fGrIMt4AX8BESyuoB7+8PAY9O8xd+MJU341a5 P4vEbupsSp2NIgzJ/sOFV2Z8VqIVF8RsMv0iY+vwCIX+EOrG7BouN3d1Pr2MSuHuWL2tvW5xG m2ATnoqUZhcn9GOdZ6yzxJhN6fd0iDwnGmo7azyXq2wEiQ0AJl6rW+u+QpkEoUPwZlz4vWGjT rCgUnno/lBNV9d4/EhlviunnZBOA88tF9sHN6VddSToLExMTgU3m5jN2qIHD07PwyRTFTERK3 K/hd7Ibei7dOfr+0tKGPVsyktFYHutrrpb3jSjZ0HWLcLYR7DHd4n3OL19xols/F3Z6KqQSML O4UgzX0O23f6E5CLrunZGjk4SwooxUZChcub9v+3q3MVpoqHIGiIyYWcg99tCN4eGDvJIbq7h f9HjtMG2MALMSvQBItATt3M3LHbx0RsR/L/VQqWsh0kbk2nzRK667sH/ll6u+aISD/OnZlbfC rSb895ltwcqNJ3IRRZYMjx3D1kC5muvTsOviGUJc7w97I1EBXVEj5uZZdshK7roCx4RAAwhlJ MuTwo4XzphLe/aYUmeu+pM5xpO2unwNB3xCDNHdUeDgmB2GzAqddc1WwC4DXzsLigrlnnDZMl 3I08H8sAKf/vOujlzNXAmJyGRgod5G9Q9bZY+118iRKZ9mUgHyuymIwhogL/UGzTcZ71y1sVb 9nnJoGO0fl6P50iUCyK0E81Ylhtg5lqMblT Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Armin Wolf Move Variables into a driver private data structure. Signed-off-by: Armin Wolf --- drivers/hwmon/dell-smm-hwmon.c | 277 ++++++++++++++++++--------------- 1 file changed, 152 insertions(+), 125 deletions(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index da7040f2442e..8841fc1e5872 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -60,18 +60,20 @@ #define I8K_POWER_AC 0x05 #define I8K_POWER_BATTERY 0x01 -static DEFINE_MUTEX(i8k_mutex); -static char bios_version[4]; -static char bios_machineid[16]; -static struct device *i8k_hwmon_dev; -static u32 i8k_hwmon_flags; -static uint i8k_fan_mult = I8K_FAN_MULT; -static uint i8k_pwm_mult; -static uint i8k_fan_max = I8K_FAN_HIGH; -static bool disallow_fan_type_call; -static bool disallow_fan_support; -static unsigned int manual_fan; -static unsigned int auto_fan; +struct dell_smm_data { + struct mutex i8k_mutex; /* lock for sensors writes */ + char bios_version[4]; + char bios_machineid[16]; + u32 i8k_hwmon_flags; + uint i8k_fan_mult; + uint i8k_pwm_mult; + uint i8k_fan_max; + bool disallow_fan_type_call; + bool disallow_fan_support; + unsigned int manual_fan; + unsigned int auto_fan; + int types[3]; +}; #define I8K_HWMON_HAVE_TEMP1 (1 << 0) #define I8K_HWMON_HAVE_TEMP2 (1 << 1) @@ -240,11 +242,11 @@ static int i8k_smm(struct smm_regs *regs) /* * Read the fan status. */ -static int i8k_get_fan_status(int fan) +static int i8k_get_fan_status(const struct dell_smm_data *data, int fan) { struct smm_regs regs = { .eax = I8K_SMM_GET_FAN, }; - if (disallow_fan_support) + if (data->disallow_fan_support) return -EINVAL; regs.ebx = fan & 0xff; @@ -254,84 +256,82 @@ static int i8k_get_fan_status(int fan) /* * Read the fan speed in RPM. */ -static int i8k_get_fan_speed(int fan) +static int i8k_get_fan_speed(const struct dell_smm_data *data, int fan) { struct smm_regs regs = { .eax = I8K_SMM_GET_SPEED, }; - if (disallow_fan_support) + if (data->disallow_fan_support) return -EINVAL; regs.ebx = fan & 0xff; - return i8k_smm(®s) ? : (regs.eax & 0xffff) * i8k_fan_mult; + return i8k_smm(®s) ? : (regs.eax & 0xffff) * data->i8k_fan_mult; } /* * Read the fan type. */ -static int _i8k_get_fan_type(int fan) +static int _i8k_get_fan_type(const struct dell_smm_data *data, int fan) { struct smm_regs regs = { .eax = I8K_SMM_GET_FAN_TYPE, }; - if (disallow_fan_support || disallow_fan_type_call) + if (data->disallow_fan_support || data->disallow_fan_type_call) return -EINVAL; regs.ebx = fan & 0xff; return i8k_smm(®s) ? : regs.eax & 0xff; } -static int i8k_get_fan_type(int fan) +static int i8k_get_fan_type(struct dell_smm_data *data, int fan) { /* I8K_SMM_GET_FAN_TYPE SMM call is expensive, so cache values */ - static int types[3] = { INT_MIN, INT_MIN, INT_MIN }; + if (data->types[fan] == INT_MIN) + data->types[fan] = _i8k_get_fan_type(data, fan); - if (types[fan] == INT_MIN) - types[fan] = _i8k_get_fan_type(fan); - - return types[fan]; + return data->types[fan]; } /* * Read the fan nominal rpm for specific fan speed. */ -static int i8k_get_fan_nominal_speed(int fan, int speed) +static int i8k_get_fan_nominal_speed(const struct dell_smm_data *data, int fan, int speed) { struct smm_regs regs = { .eax = I8K_SMM_GET_NOM_SPEED, }; - if (disallow_fan_support) + if (data->disallow_fan_support) return -EINVAL; regs.ebx = (fan & 0xff) | (speed << 8); - return i8k_smm(®s) ? : (regs.eax & 0xffff) * i8k_fan_mult; + return i8k_smm(®s) ? : (regs.eax & 0xffff) * data->i8k_fan_mult; } /* * Enable or disable automatic BIOS fan control support */ -static int i8k_enable_fan_auto_mode(bool enable) +static int i8k_enable_fan_auto_mode(const struct dell_smm_data *data, bool enable) { struct smm_regs regs = { }; - if (disallow_fan_support) + if (data->disallow_fan_support) return -EINVAL; - regs.eax = enable ? auto_fan : manual_fan; + regs.eax = enable ? data->auto_fan : data->manual_fan; return i8k_smm(®s); } /* * Set the fan speed (off, low, high). Returns the new fan status. */ -static int i8k_set_fan(int fan, int speed) +static int i8k_set_fan(const struct dell_smm_data *data, int fan, int speed) { struct smm_regs regs = { .eax = I8K_SMM_SET_FAN, }; - if (disallow_fan_support) + if (data->disallow_fan_support) return -EINVAL; - speed = (speed < 0) ? 0 : ((speed > i8k_fan_max) ? i8k_fan_max : speed); + speed = (speed < 0) ? 0 : ((speed > data->i8k_fan_max) ? data->i8k_fan_max : speed); regs.ebx = (fan & 0xff) | (speed << 8); - return i8k_smm(®s) ? : i8k_get_fan_status(fan); + return i8k_smm(®s) ? : i8k_get_fan_status(data, fan); } static int i8k_get_temp_type(int sensor) @@ -442,7 +442,7 @@ static int i8k_get_power_status(void) */ static int -i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) +i8k_ioctl_unlocked(struct file *fp, struct dell_smm_data *data, unsigned int cmd, unsigned long arg) { int val = 0; int speed; @@ -454,12 +454,12 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) switch (cmd) { case I8K_BIOS_VERSION: - if (!isdigit(bios_version[0]) || !isdigit(bios_version[1]) || - !isdigit(bios_version[2])) + if (!isdigit(data->bios_version[0]) || !isdigit(data->bios_version[1]) || + !isdigit(data->bios_version[2])) return -EINVAL; - val = (bios_version[0] << 16) | - (bios_version[1] << 8) | bios_version[2]; + val = (data->bios_version[0] << 16) | + (data->bios_version[1] << 8) | data->bios_version[2]; break; case I8K_MACHINE_ID: @@ -467,7 +467,7 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) return -EPERM; memset(buff, 0, sizeof(buff)); - strlcpy(buff, bios_machineid, sizeof(buff)); + strscpy(buff, data->bios_machineid, sizeof(buff)); break; case I8K_FN_STATUS: @@ -486,14 +486,14 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) if (copy_from_user(&val, argp, sizeof(int))) return -EFAULT; - val = i8k_get_fan_speed(val); + val = i8k_get_fan_speed(data, val); break; case I8K_GET_FAN: if (copy_from_user(&val, argp, sizeof(int))) return -EFAULT; - val = i8k_get_fan_status(val); + val = i8k_get_fan_status(data, val); break; case I8K_SET_FAN: @@ -506,7 +506,7 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) if (copy_from_user(&speed, argp + 1, sizeof(int))) return -EFAULT; - val = i8k_set_fan(val, speed); + val = i8k_set_fan(data, val, speed); break; default: @@ -539,11 +539,12 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg) static long i8k_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) { + struct dell_smm_data *data = PDE_DATA(file_inode(fp)); long ret; - mutex_lock(&i8k_mutex); - ret = i8k_ioctl_unlocked(fp, cmd, arg); - mutex_unlock(&i8k_mutex); + mutex_lock(&data->i8k_mutex); + ret = i8k_ioctl_unlocked(fp, data, cmd, arg); + mutex_unlock(&data->i8k_mutex); return ret; } @@ -553,17 +554,18 @@ static long i8k_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) */ static int i8k_proc_show(struct seq_file *seq, void *offset) { + struct dell_smm_data *data = seq->private; int fn_key, cpu_temp, ac_power; int left_fan, right_fan, left_speed, right_speed; - cpu_temp = i8k_get_temp(0); /* 11100 µs */ - left_fan = i8k_get_fan_status(I8K_FAN_LEFT); /* 580 µs */ - right_fan = i8k_get_fan_status(I8K_FAN_RIGHT); /* 580 µs */ - left_speed = i8k_get_fan_speed(I8K_FAN_LEFT); /* 580 µs */ - right_speed = i8k_get_fan_speed(I8K_FAN_RIGHT); /* 580 µs */ - fn_key = i8k_get_fn_status(); /* 750 µs */ + cpu_temp = i8k_get_temp(0); /* 11100 µs */ + left_fan = i8k_get_fan_status(data, I8K_FAN_LEFT); /* 580 µs */ + right_fan = i8k_get_fan_status(data, I8K_FAN_RIGHT); /* 580 µs */ + left_speed = i8k_get_fan_speed(data, I8K_FAN_LEFT); /* 580 µs */ + right_speed = i8k_get_fan_speed(data, I8K_FAN_RIGHT); /* 580 µs */ + fn_key = i8k_get_fn_status(); /* 750 µs */ if (power_status) - ac_power = i8k_get_power_status(); /* 14700 µs */ + ac_power = i8k_get_power_status(); /* 14700 µs */ else ac_power = -1; @@ -583,8 +585,8 @@ static int i8k_proc_show(struct seq_file *seq, void *offset) */ seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n", I8K_PROC_FMT, - bios_version, - (restricted && !capable(CAP_SYS_ADMIN)) ? "-1" : bios_machineid, + data->bios_version, + (restricted && !capable(CAP_SYS_ADMIN)) ? "-1" : data->bios_machineid, cpu_temp, left_fan, right_fan, left_speed, right_speed, ac_power, fn_key); @@ -594,7 +596,7 @@ static int i8k_proc_show(struct seq_file *seq, void *offset) static int i8k_open_fs(struct inode *inode, struct file *file) { - return single_open(file, i8k_proc_show, NULL); + return single_open(file, i8k_proc_show, PDE_DATA(inode)); } static const struct proc_ops i8k_proc_ops = { @@ -612,8 +614,10 @@ static void i8k_exit_procfs(void *param) static void __init i8k_init_procfs(struct device *dev) { + struct dell_smm_data *data = dev_get_drvdata(dev); + /* Register the proc entry */ - proc_create("i8k", 0, NULL, &i8k_proc_ops); + proc_create_data("i8k", 0, NULL, &i8k_proc_ops, data); devm_add_action_or_reset(dev, i8k_exit_procfs, NULL); } @@ -670,6 +674,7 @@ static ssize_t i8k_hwmon_fan_label_show(struct device *dev, struct device_attribute *devattr, char *buf) { + struct dell_smm_data *data = dev_get_drvdata(dev); static const char * const labels[] = { "Processor Fan", "Motherboard Fan", @@ -682,7 +687,7 @@ static ssize_t i8k_hwmon_fan_label_show(struct device *dev, bool dock = false; int type; - type = i8k_get_fan_type(index); + type = i8k_get_fan_type(data, index); if (type < 0) return type; @@ -700,10 +705,11 @@ static ssize_t i8k_hwmon_fan_label_show(struct device *dev, static ssize_t i8k_hwmon_fan_show(struct device *dev, struct device_attribute *devattr, char *buf) { + struct dell_smm_data *data = dev_get_drvdata(dev); int index = to_sensor_dev_attr(devattr)->index; int fan_speed; - fan_speed = i8k_get_fan_speed(index); + fan_speed = i8k_get_fan_speed(data, index); if (fan_speed < 0) return fan_speed; return sprintf(buf, "%d\n", fan_speed); @@ -712,19 +718,21 @@ static ssize_t i8k_hwmon_fan_show(struct device *dev, static ssize_t i8k_hwmon_pwm_show(struct device *dev, struct device_attribute *devattr, char *buf) { + struct dell_smm_data *data = dev_get_drvdata(dev); int index = to_sensor_dev_attr(devattr)->index; int status; - status = i8k_get_fan_status(index); + status = i8k_get_fan_status(data, index); if (status < 0) return -EIO; - return sprintf(buf, "%d\n", clamp_val(status * i8k_pwm_mult, 0, 255)); + return sprintf(buf, "%d\n", clamp_val(status * data->i8k_pwm_mult, 0, 255)); } static ssize_t i8k_hwmon_pwm_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + struct dell_smm_data *data = dev_get_drvdata(dev); int index = to_sensor_dev_attr(attr)->index; unsigned long val; int err; @@ -732,11 +740,11 @@ static ssize_t i8k_hwmon_pwm_store(struct device *dev, err = kstrtoul(buf, 10, &val); if (err) return err; - val = clamp_val(DIV_ROUND_CLOSEST(val, i8k_pwm_mult), 0, i8k_fan_max); + val = clamp_val(DIV_ROUND_CLOSEST(val, data->i8k_pwm_mult), 0, data->i8k_fan_max); - mutex_lock(&i8k_mutex); - err = i8k_set_fan(index, val); - mutex_unlock(&i8k_mutex); + mutex_lock(&data->i8k_mutex); + err = i8k_set_fan(data, index, val); + mutex_unlock(&data->i8k_mutex); return err < 0 ? -EIO : count; } @@ -745,11 +753,12 @@ static ssize_t i8k_hwmon_pwm_enable_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + struct dell_smm_data *data = dev_get_drvdata(dev); int err; bool enable; unsigned long val; - if (!auto_fan) + if (!data->auto_fan) return -ENODEV; err = kstrtoul(buf, 10, &val); @@ -763,9 +772,9 @@ static ssize_t i8k_hwmon_pwm_enable_store(struct device *dev, else return -EINVAL; - mutex_lock(&i8k_mutex); - err = i8k_enable_fan_auto_mode(enable); - mutex_unlock(&i8k_mutex); + mutex_lock(&data->i8k_mutex); + err = i8k_enable_fan_auto_mode(data, enable); + mutex_unlock(&data->i8k_mutex); return err ? err : count; } @@ -838,53 +847,56 @@ static struct attribute *i8k_attrs[] = { static umode_t i8k_is_visible(struct kobject *kobj, struct attribute *attr, int index) { - if (disallow_fan_support && index >= 20) + struct device *dev = kobj_to_dev(kobj); + struct dell_smm_data *data = dev_get_drvdata(dev); + + if (data->disallow_fan_support && index >= 20) return 0; - if (disallow_fan_type_call && + if (data->disallow_fan_type_call && (index == 21 || index == 25 || index == 28)) return 0; if (index >= 0 && index <= 1 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1)) return 0; if (index >= 2 && index <= 3 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP2)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP2)) return 0; if (index >= 4 && index <= 5 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP3)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP3)) return 0; if (index >= 6 && index <= 7 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4)) return 0; if (index >= 8 && index <= 9 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP5)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP5)) return 0; if (index >= 10 && index <= 11 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP6)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP6)) return 0; if (index >= 12 && index <= 13 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP7)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP7)) return 0; if (index >= 14 && index <= 15 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP8)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP8)) return 0; if (index >= 16 && index <= 17 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP9)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP9)) return 0; if (index >= 18 && index <= 19 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP10)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP10)) return 0; if (index >= 20 && index <= 23 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1)) return 0; if (index >= 24 && index <= 26 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2)) return 0; if (index >= 27 && index <= 29 && - !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN3)) + !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_FAN3)) return 0; - if (index == 23 && !auto_fan) + if (index == 23 && !data->auto_fan) return 0; return attr->mode; @@ -898,65 +910,65 @@ __ATTRIBUTE_GROUPS(i8k); static int __init dell_smm_init_hwmon(struct device *dev) { + struct dell_smm_data *data = dev_get_drvdata(dev); + struct device *i8k_hwmon_dev; int err; - i8k_hwmon_flags = 0; - /* CPU temperature attributes, if temperature type is OK */ err = i8k_get_temp_type(0); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP1; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP1; /* check for additional temperature sensors */ err = i8k_get_temp_type(1); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP2; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP2; err = i8k_get_temp_type(2); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP3; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP3; err = i8k_get_temp_type(3); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4; err = i8k_get_temp_type(4); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP5; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP5; err = i8k_get_temp_type(5); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP6; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP6; err = i8k_get_temp_type(6); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP7; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP7; err = i8k_get_temp_type(7); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP8; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP8; err = i8k_get_temp_type(8); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP9; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP9; err = i8k_get_temp_type(9); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP10; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP10; /* First fan attributes, if fan status or type is OK */ - err = i8k_get_fan_status(0); + err = i8k_get_fan_status(data, 0); if (err < 0) - err = i8k_get_fan_type(0); + err = i8k_get_fan_type(data, 0); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN1; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN1; /* Second fan attributes, if fan status or type is OK */ - err = i8k_get_fan_status(1); + err = i8k_get_fan_status(data, 1); if (err < 0) - err = i8k_get_fan_type(1); + err = i8k_get_fan_type(data, 1); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN2; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN2; /* Third fan attributes, if fan status or type is OK */ - err = i8k_get_fan_status(2); + err = i8k_get_fan_status(data, 2); if (err < 0) - err = i8k_get_fan_type(2); + err = i8k_get_fan_type(data, 2); if (err >= 0) - i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN3; + data->i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN3; - i8k_hwmon_dev = devm_hwmon_device_register_with_groups(dev, "dell_smm", NULL, i8k_groups); + i8k_hwmon_dev = devm_hwmon_device_register_with_groups(dev, "dell_smm", data, i8k_groups); return PTR_ERR_OR_ZERO(i8k_hwmon_dev); } @@ -1217,25 +1229,38 @@ static struct dmi_system_id i8k_whitelist_fan_control[] __initdata = { static int __init dell_smm_probe(struct platform_device *pdev) { + struct dell_smm_data *data; const struct dmi_system_id *id, *fan_control; int fan, ret; + data = devm_kzalloc(&pdev->dev, sizeof(struct dell_smm_data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + mutex_init(&data->i8k_mutex); + data->i8k_fan_mult = I8K_FAN_MULT; + data->i8k_fan_max = I8K_FAN_HIGH; + data->types[0] = INT_MIN; + data->types[1] = INT_MIN; + data->types[2] = INT_MIN; + platform_set_drvdata(pdev, data); + if (dmi_check_system(i8k_blacklist_fan_support_dmi_table)) { - pr_warn("broken Dell BIOS detected, disallow fan support\n"); + dev_warn(&pdev->dev, "broken Dell BIOS detected, disallow fan support\n"); if (!force) - disallow_fan_support = true; + data->disallow_fan_support = true; } if (dmi_check_system(i8k_blacklist_fan_type_dmi_table)) { - pr_warn("broken Dell BIOS detected, disallow fan type call\n"); + dev_warn(&pdev->dev, "broken Dell BIOS detected, disallow fan type call\n"); if (!force) - disallow_fan_type_call = true; + data->disallow_fan_type_call = true; } - strscpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), - sizeof(bios_version)); - strscpy(bios_machineid, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), - sizeof(bios_machineid)); + strscpy(data->bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), + sizeof(data->bios_version)); + strscpy(data->bios_machineid, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), + sizeof(data->bios_machineid)); /* * Set fan multiplier and maximal fan speed from dmi config @@ -1247,20 +1272,21 @@ static int __init dell_smm_probe(struct platform_device *pdev) if (!fan_mult && conf->fan_mult) fan_mult = conf->fan_mult; + if (!fan_max && conf->fan_max) fan_max = conf->fan_max; } - i8k_fan_max = fan_max ? : I8K_FAN_HIGH; /* Must not be 0 */ - i8k_pwm_mult = DIV_ROUND_UP(255, i8k_fan_max); + data->i8k_fan_max = fan_max ? : I8K_FAN_HIGH; /* Must not be 0 */ + data->i8k_pwm_mult = DIV_ROUND_UP(255, data->i8k_fan_max); fan_control = dmi_first_match(i8k_whitelist_fan_control); if (fan_control && fan_control->driver_data) { - const struct i8k_fan_control_data *data = fan_control->driver_data; + const struct i8k_fan_control_data *control = fan_control->driver_data; - manual_fan = data->manual_fan; - auto_fan = data->auto_fan; - pr_info("enabling support for setting automatic/manual fan control\n"); + data->manual_fan = control->manual_fan; + data->auto_fan = control->auto_fan; + dev_info(&pdev->dev, "enabling support for setting automatic/manual fan control\n"); } if (!fan_mult) { @@ -1269,16 +1295,17 @@ static int __init dell_smm_probe(struct platform_device *pdev) * If fan reports rpm value too high then set multiplier to 1 */ for (fan = 0; fan < 2; ++fan) { - ret = i8k_get_fan_nominal_speed(fan, i8k_fan_max); + ret = i8k_get_fan_nominal_speed(data, fan, data->i8k_fan_max); if (ret < 0) continue; + if (ret > I8K_FAN_MAX_RPM) - i8k_fan_mult = 1; + data->i8k_fan_mult = 1; break; } } else { /* Fan multiplier was specified in module param or in dmi */ - i8k_fan_mult = fan_mult; + data->i8k_fan_mult = fan_mult; } ret = dell_smm_init_hwmon(&pdev->dev); From patchwork Wed Jul 28 20:51:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12406701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71C4CC04FE3 for ; Wed, 28 Jul 2021 20:52:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B1166023D for ; Wed, 28 Jul 2021 20:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231488AbhG1Uw0 (ORCPT ); Wed, 28 Jul 2021 16:52:26 -0400 Received: from mout.gmx.net ([212.227.17.22]:56043 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231777AbhG1UwQ (ORCPT ); Wed, 28 Jul 2021 16:52:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627505517; bh=a/vCVW+VvAZpSuBflERa7BISTq4HIIC8eo99ta3kJDE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=BPYBMQAJJWPtD2UE7B3RqfjFK44sqI08fEtkjJGQChMbYz9RIn6vqB+X/+l1k94Dg 6w9iuj8n2IN2Psw6gw4uYKvaG2GW0aiePViSQW4sHQ8UC5U+VO+CelL+Zbt442u/lz EywSYsWi9WocKbIg2tw5yWle4ClmMTt4n8H47hcA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.190.212]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MvK4f-1mzA2G17RZ-00rFmA; Wed, 28 Jul 2021 22:51:57 +0200 From: W_Armin@gmx.de To: pali@kernel.org Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [PATCH v6 5/6] hwmon: (dell-smm-hwmon) Convert to devm_hwmon_device_register_with_info() Date: Wed, 28 Jul 2021 22:51:41 +0200 Message-Id: <20210728205142.8959-6-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210728205142.8959-1-W_Armin@gmx.de> References: <20210728205142.8959-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:0ZGzrWK6bQBJEe02/ga871IufS3s8Ixgb3xxO27tU4QhstGOBFU dPFROe0ZrDqT2OrepbHrMUUjUF1e/AveiUeJHosatScUNmYeV04aN5zoGOn8Yd/Hb2QUtWv PdAy532Z3UDr3rd295cCl96Ci/ou6pDSfj8zmb2N3gqDtesUyn3CgcPgeTDSYoxPeIMSiUP xkPBgZxMLs5+x8q1XH56A== X-UI-Out-Filterresults: notjunk:1;V03:K0:aa7U10g62iY=:aTlt7QxkqkgJy3J7nlkq+U qVCNp6+m5vIJwDGPemkyiz4mPozi/SV+VxLmuEXwS9DNVv8obgGmRxEAVPpnuddR2QJ63nNdo XDqwLUNaD0onSZlbLC8yPgDKNCp0Y2WmoO7V7bcG9CJcfaoIPKzJyM7/qqamufQ7o1LYUr9u/ 9bvikucdpn1frFYXQBwhmZd9IPQQ3iX5rYnO3rwpM/CYVf+lkzkRlx03ak4160Ln0e6JvDOC2 n3B042ZyyUnYM2X8zfykWIXdXw3gJNgKqmKtXELQasWy9BKPdUSOAuWizGf1h8JRIsp8R7jmq wq1vgyvC2hLu6OBFD+y7ygHQyCUL9HBXxBCRWFOzUUhtUo2FJJmCXNabEUS/+NSbiRL/Ni51k j90N84L0Yc3R1EX83jNpXX2YLXskpIDE0bRLOHaEWRMsnbpX9arZTcfjX3S4P1z9aGjSQBkUb Y2sfCqdh2S9U2EiK0/fI/4TLHMhwm6nSXFRddD4n18ZidAeayDX1JrQnH7aDIUklg7cFD5aRb aTTger54neTlwfQVzQz9egWAwgOvOe5rWYjcHqPAl3abo9P6U8mt3ELReWp+kO02gJodiGvlM hqabYM7HlLO4FAfXi03pBKsEz/FiA+0W4RlnDYi7kEfl4+TEfgQBFmG61rri0kbAJj8YMLS4c Lx0eEQrxnGMl/OifEsO2IiI+z+hefCfuFfWthwPNTRFzsS22T1g8Xpv+LXlqZs7zIyVOvzy2L BL/KjD447/IZXO149343mTiL5jH8eT8FN6G+zEpJYurXDtKg0SMYBdQTiGgwUlSFGjnYe41ef 94o+gcx5s1FCMaat7M7AGz84mbcCZqnAgRMYuF22sS8R4TXBlhTWV5JemYN/fc2TFWlIo8mcN cRRyiHmnNaa9jeeextqFFFwD3nGof6csXMli6YuqVwju1zM4kyMcf8MnICPToraQ/m/PAJ8iH zkFyawok0QdH+4TOOdpUyGMZ6hx7dPrHupFNBZeC73LuVzUmgT4P2r24zLYBYo8Z9bfvrqtXN NrVanyRAQDIDdS2YCB3XsS6g5SlAy0iJ1iToHaMOjuOzj3GwNnAYbVUE6GpEuEpK9QW30ElUF D7PEBMD1LvRM7so5LpVhujMKfZmQvvmP989 Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Armin Wolf Convert to new registration API to get rid of attribute magic numbers and reduce module size. Signed-off-by: Armin Wolf --- drivers/hwmon/dell-smm-hwmon.c | 583 +++++++++++++++------------------ 1 file changed, 273 insertions(+), 310 deletions(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index 8841fc1e5872..e842901d770f 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -60,11 +59,13 @@ #define I8K_POWER_AC 0x05 #define I8K_POWER_BATTERY 0x01 +#define DELL_SMM_NO_TEMP 10 +#define DELL_SMM_NO_FANS 3 + struct dell_smm_data { struct mutex i8k_mutex; /* lock for sensors writes */ char bios_version[4]; char bios_machineid[16]; - u32 i8k_hwmon_flags; uint i8k_fan_mult; uint i8k_pwm_mult; uint i8k_fan_max; @@ -72,23 +73,11 @@ struct dell_smm_data { bool disallow_fan_support; unsigned int manual_fan; unsigned int auto_fan; - int types[3]; + int temp_type[DELL_SMM_NO_TEMP]; + bool fan[DELL_SMM_NO_FANS]; + int fan_type[DELL_SMM_NO_FANS]; }; -#define I8K_HWMON_HAVE_TEMP1 (1 << 0) -#define I8K_HWMON_HAVE_TEMP2 (1 << 1) -#define I8K_HWMON_HAVE_TEMP3 (1 << 2) -#define I8K_HWMON_HAVE_TEMP4 (1 << 3) -#define I8K_HWMON_HAVE_TEMP5 (1 << 4) -#define I8K_HWMON_HAVE_TEMP6 (1 << 5) -#define I8K_HWMON_HAVE_TEMP7 (1 << 6) -#define I8K_HWMON_HAVE_TEMP8 (1 << 7) -#define I8K_HWMON_HAVE_TEMP9 (1 << 8) -#define I8K_HWMON_HAVE_TEMP10 (1 << 9) -#define I8K_HWMON_HAVE_FAN1 (1 << 10) -#define I8K_HWMON_HAVE_FAN2 (1 << 11) -#define I8K_HWMON_HAVE_FAN3 (1 << 12) - MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)"); MODULE_AUTHOR("Pali Rohár "); MODULE_DESCRIPTION("Dell laptop SMM BIOS hwmon driver"); @@ -130,6 +119,33 @@ struct smm_regs { unsigned int edi __packed; }; +static const char * const temp_labels[] = { + "CPU", + "GPU", + "SODIMM", + "Other", + "Ambient", + "Other", +}; + +static const char * const fan_labels[] = { + "Processor Fan", + "Motherboard Fan", + "Video Fan", + "Power Supply Fan", + "Chipset Fan", + "Other Fan", +}; + +static const char * const docking_labels[] = { + "Docking Processor Fan", + "Docking Motherboard Fan", + "Docking Video Fan", + "Docking Power Supply Fan", + "Docking Chipset Fan", + "Docking Other Fan", +}; + static inline const char __init *i8k_get_dmi_data(int field) { const char *dmi_data = dmi_get_system_info(field); @@ -284,10 +300,10 @@ static int _i8k_get_fan_type(const struct dell_smm_data *data, int fan) static int i8k_get_fan_type(struct dell_smm_data *data, int fan) { /* I8K_SMM_GET_FAN_TYPE SMM call is expensive, so cache values */ - if (data->types[fan] == INT_MIN) - data->types[fan] = _i8k_get_fan_type(data, fan); + if (data->fan_type[fan] == INT_MIN) + data->fan_type[fan] = _i8k_get_fan_type(data, fan); - return data->types[fan]; + return data->fan_type[fan]; } /* @@ -334,7 +350,7 @@ static int i8k_set_fan(const struct dell_smm_data *data, int fan, int speed) return i8k_smm(®s) ? : i8k_get_fan_status(data, fan); } -static int i8k_get_temp_type(int sensor) +static int __init i8k_get_temp_type(int sensor) { struct smm_regs regs = { .eax = I8K_SMM_GET_TEMP_TYPE, }; @@ -634,343 +650,293 @@ static void __init i8k_init_procfs(struct device *dev) * Hwmon interface */ -static ssize_t i8k_hwmon_temp_label_show(struct device *dev, - struct device_attribute *devattr, - char *buf) +static umode_t dell_smm_is_visible(const void *drvdata, enum hwmon_sensor_types type, u32 attr, + int channel) { - static const char * const labels[] = { - "CPU", - "GPU", - "SODIMM", - "Other", - "Ambient", - "Other", - }; - int index = to_sensor_dev_attr(devattr)->index; - int type; + const struct dell_smm_data *data = drvdata; - type = i8k_get_temp_type(index); - if (type < 0) - return type; - if (type >= ARRAY_SIZE(labels)) - type = ARRAY_SIZE(labels) - 1; - return sprintf(buf, "%s\n", labels[type]); + switch (type) { + case hwmon_temp: + switch (attr) { + case hwmon_temp_input: + case hwmon_temp_label: + if (data->temp_type[channel] >= 0) + return 0444; + + break; + default: + break; + } + break; + case hwmon_fan: + if (data->disallow_fan_support) + break; + + switch (attr) { + case hwmon_fan_input: + if (data->fan[channel]) + return 0444; + + break; + case hwmon_fan_label: + if (data->fan[channel] && !data->disallow_fan_type_call) + return 0444; + + break; + default: + break; + } + break; + case hwmon_pwm: + if (data->disallow_fan_support) + break; + + switch (attr) { + case hwmon_pwm_input: + if (data->fan[channel]) + return 0644; + + break; + case hwmon_pwm_enable: + if (data->auto_fan) + return 0200; + + break; + default: + break; + } + break; + default: + break; + } + + return 0; } -static ssize_t i8k_hwmon_temp_show(struct device *dev, - struct device_attribute *devattr, - char *buf) +static int dell_smm_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, + long *val) { - int index = to_sensor_dev_attr(devattr)->index; - int temp; + struct dell_smm_data *data = dev_get_drvdata(dev); + int ret; + + switch (type) { + case hwmon_temp: + switch (attr) { + case hwmon_temp_input: + ret = i8k_get_temp(channel); + if (ret < 0) + return ret; + + *val = ret * 1000; + + return 0; + default: + break; + } + break; + case hwmon_fan: + switch (attr) { + case hwmon_fan_input: + ret = i8k_get_fan_speed(data, channel); + if (ret < 0) + return ret; - temp = i8k_get_temp(index); - if (temp < 0) - return temp; - return sprintf(buf, "%d\n", temp * 1000); + *val = ret; + + return 0; + default: + break; + } + break; + case hwmon_pwm: + switch (attr) { + case hwmon_pwm_input: + ret = i8k_get_fan_status(data, channel); + if (ret < 0) + return ret; + + *val = clamp_val(ret * data->i8k_pwm_mult, 0, 255); + + return 0; + default: + break; + } + break; + default: + break; + } + + return -EOPNOTSUPP; } -static ssize_t i8k_hwmon_fan_label_show(struct device *dev, - struct device_attribute *devattr, - char *buf) +static const char *dell_smm_fan_label(struct dell_smm_data *data, int channel) { - struct dell_smm_data *data = dev_get_drvdata(dev); - static const char * const labels[] = { - "Processor Fan", - "Motherboard Fan", - "Video Fan", - "Power Supply Fan", - "Chipset Fan", - "Other Fan", - }; - int index = to_sensor_dev_attr(devattr)->index; bool dock = false; - int type; + int type = i8k_get_fan_type(data, channel); - type = i8k_get_fan_type(data, index); if (type < 0) - return type; + return ERR_PTR(type); if (type & 0x10) { dock = true; type &= 0x0F; } - if (type >= ARRAY_SIZE(labels)) - type = (ARRAY_SIZE(labels) - 1); + if (type >= ARRAY_SIZE(fan_labels)) + type = ARRAY_SIZE(fan_labels) - 1; - return sprintf(buf, "%s%s\n", (dock ? "Docking " : ""), labels[type]); + return dock ? docking_labels[type] : fan_labels[type]; } -static ssize_t i8k_hwmon_fan_show(struct device *dev, - struct device_attribute *devattr, char *buf) +static int dell_smm_read_string(struct device *dev, enum hwmon_sensor_types type, u32 attr, + int channel, const char **str) { struct dell_smm_data *data = dev_get_drvdata(dev); - int index = to_sensor_dev_attr(devattr)->index; - int fan_speed; - - fan_speed = i8k_get_fan_speed(data, index); - if (fan_speed < 0) - return fan_speed; - return sprintf(buf, "%d\n", fan_speed); -} -static ssize_t i8k_hwmon_pwm_show(struct device *dev, - struct device_attribute *devattr, char *buf) -{ - struct dell_smm_data *data = dev_get_drvdata(dev); - int index = to_sensor_dev_attr(devattr)->index; - int status; + switch (type) { + case hwmon_temp: + switch (attr) { + case hwmon_temp_label: + *str = temp_labels[data->temp_type[channel]]; + return 0; + default: + break; + } + break; + case hwmon_fan: + switch (attr) { + case hwmon_fan_label: + *str = dell_smm_fan_label(data, channel); + return PTR_ERR_OR_ZERO(*str); + default: + break; + } + break; + default: + break; + } - status = i8k_get_fan_status(data, index); - if (status < 0) - return -EIO; - return sprintf(buf, "%d\n", clamp_val(status * data->i8k_pwm_mult, 0, 255)); + return -EOPNOTSUPP; } -static ssize_t i8k_hwmon_pwm_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static int dell_smm_write(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, + long val) { struct dell_smm_data *data = dev_get_drvdata(dev); - int index = to_sensor_dev_attr(attr)->index; - unsigned long val; + unsigned long pwm; + bool enable; int err; - err = kstrtoul(buf, 10, &val); - if (err) - return err; - val = clamp_val(DIV_ROUND_CLOSEST(val, data->i8k_pwm_mult), 0, data->i8k_fan_max); + switch (type) { + case hwmon_pwm: + switch (attr) { + case hwmon_pwm_input: + pwm = clamp_val(DIV_ROUND_CLOSEST(val, data->i8k_pwm_mult), 0, + data->i8k_fan_max); - mutex_lock(&data->i8k_mutex); - err = i8k_set_fan(data, index, val); - mutex_unlock(&data->i8k_mutex); + mutex_lock(&data->i8k_mutex); + err = i8k_set_fan(data, channel, pwm); + mutex_unlock(&data->i8k_mutex); - return err < 0 ? -EIO : count; -} + if (err < 0) + return err; -static ssize_t i8k_hwmon_pwm_enable_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) -{ - struct dell_smm_data *data = dev_get_drvdata(dev); - int err; - bool enable; - unsigned long val; + return 0; + case hwmon_pwm_enable: + if (!val) + return -EINVAL; - if (!data->auto_fan) - return -ENODEV; + if (val == 1) + enable = false; + else + enable = true; - err = kstrtoul(buf, 10, &val); - if (err) - return err; + mutex_lock(&data->i8k_mutex); + err = i8k_enable_fan_auto_mode(data, enable); + mutex_unlock(&data->i8k_mutex); - if (val == 1) - enable = false; - else if (val == 2) - enable = true; - else - return -EINVAL; + if (err < 0) + return err; - mutex_lock(&data->i8k_mutex); - err = i8k_enable_fan_auto_mode(data, enable); - mutex_unlock(&data->i8k_mutex); + return 0; + default: + break; + } + break; + default: + break; + } - return err ? err : count; + return -EOPNOTSUPP; } -static SENSOR_DEVICE_ATTR_RO(temp1_input, i8k_hwmon_temp, 0); -static SENSOR_DEVICE_ATTR_RO(temp1_label, i8k_hwmon_temp_label, 0); -static SENSOR_DEVICE_ATTR_RO(temp2_input, i8k_hwmon_temp, 1); -static SENSOR_DEVICE_ATTR_RO(temp2_label, i8k_hwmon_temp_label, 1); -static SENSOR_DEVICE_ATTR_RO(temp3_input, i8k_hwmon_temp, 2); -static SENSOR_DEVICE_ATTR_RO(temp3_label, i8k_hwmon_temp_label, 2); -static SENSOR_DEVICE_ATTR_RO(temp4_input, i8k_hwmon_temp, 3); -static SENSOR_DEVICE_ATTR_RO(temp4_label, i8k_hwmon_temp_label, 3); -static SENSOR_DEVICE_ATTR_RO(temp5_input, i8k_hwmon_temp, 4); -static SENSOR_DEVICE_ATTR_RO(temp5_label, i8k_hwmon_temp_label, 4); -static SENSOR_DEVICE_ATTR_RO(temp6_input, i8k_hwmon_temp, 5); -static SENSOR_DEVICE_ATTR_RO(temp6_label, i8k_hwmon_temp_label, 5); -static SENSOR_DEVICE_ATTR_RO(temp7_input, i8k_hwmon_temp, 6); -static SENSOR_DEVICE_ATTR_RO(temp7_label, i8k_hwmon_temp_label, 6); -static SENSOR_DEVICE_ATTR_RO(temp8_input, i8k_hwmon_temp, 7); -static SENSOR_DEVICE_ATTR_RO(temp8_label, i8k_hwmon_temp_label, 7); -static SENSOR_DEVICE_ATTR_RO(temp9_input, i8k_hwmon_temp, 8); -static SENSOR_DEVICE_ATTR_RO(temp9_label, i8k_hwmon_temp_label, 8); -static SENSOR_DEVICE_ATTR_RO(temp10_input, i8k_hwmon_temp, 9); -static SENSOR_DEVICE_ATTR_RO(temp10_label, i8k_hwmon_temp_label, 9); -static SENSOR_DEVICE_ATTR_RO(fan1_input, i8k_hwmon_fan, 0); -static SENSOR_DEVICE_ATTR_RO(fan1_label, i8k_hwmon_fan_label, 0); -static SENSOR_DEVICE_ATTR_RW(pwm1, i8k_hwmon_pwm, 0); -static SENSOR_DEVICE_ATTR_WO(pwm1_enable, i8k_hwmon_pwm_enable, 0); -static SENSOR_DEVICE_ATTR_RO(fan2_input, i8k_hwmon_fan, 1); -static SENSOR_DEVICE_ATTR_RO(fan2_label, i8k_hwmon_fan_label, 1); -static SENSOR_DEVICE_ATTR_RW(pwm2, i8k_hwmon_pwm, 1); -static SENSOR_DEVICE_ATTR_RO(fan3_input, i8k_hwmon_fan, 2); -static SENSOR_DEVICE_ATTR_RO(fan3_label, i8k_hwmon_fan_label, 2); -static SENSOR_DEVICE_ATTR_RW(pwm3, i8k_hwmon_pwm, 2); - -static struct attribute *i8k_attrs[] = { - &sensor_dev_attr_temp1_input.dev_attr.attr, /* 0 */ - &sensor_dev_attr_temp1_label.dev_attr.attr, /* 1 */ - &sensor_dev_attr_temp2_input.dev_attr.attr, /* 2 */ - &sensor_dev_attr_temp2_label.dev_attr.attr, /* 3 */ - &sensor_dev_attr_temp3_input.dev_attr.attr, /* 4 */ - &sensor_dev_attr_temp3_label.dev_attr.attr, /* 5 */ - &sensor_dev_attr_temp4_input.dev_attr.attr, /* 6 */ - &sensor_dev_attr_temp4_label.dev_attr.attr, /* 7 */ - &sensor_dev_attr_temp5_input.dev_attr.attr, /* 8 */ - &sensor_dev_attr_temp5_label.dev_attr.attr, /* 9 */ - &sensor_dev_attr_temp6_input.dev_attr.attr, /* 10 */ - &sensor_dev_attr_temp6_label.dev_attr.attr, /* 11 */ - &sensor_dev_attr_temp7_input.dev_attr.attr, /* 12 */ - &sensor_dev_attr_temp7_label.dev_attr.attr, /* 13 */ - &sensor_dev_attr_temp8_input.dev_attr.attr, /* 14 */ - &sensor_dev_attr_temp8_label.dev_attr.attr, /* 15 */ - &sensor_dev_attr_temp9_input.dev_attr.attr, /* 16 */ - &sensor_dev_attr_temp9_label.dev_attr.attr, /* 17 */ - &sensor_dev_attr_temp10_input.dev_attr.attr, /* 18 */ - &sensor_dev_attr_temp10_label.dev_attr.attr, /* 19 */ - &sensor_dev_attr_fan1_input.dev_attr.attr, /* 20 */ - &sensor_dev_attr_fan1_label.dev_attr.attr, /* 21 */ - &sensor_dev_attr_pwm1.dev_attr.attr, /* 22 */ - &sensor_dev_attr_pwm1_enable.dev_attr.attr, /* 23 */ - &sensor_dev_attr_fan2_input.dev_attr.attr, /* 24 */ - &sensor_dev_attr_fan2_label.dev_attr.attr, /* 25 */ - &sensor_dev_attr_pwm2.dev_attr.attr, /* 26 */ - &sensor_dev_attr_fan3_input.dev_attr.attr, /* 27 */ - &sensor_dev_attr_fan3_label.dev_attr.attr, /* 28 */ - &sensor_dev_attr_pwm3.dev_attr.attr, /* 29 */ +static const struct hwmon_ops dell_smm_ops = { + .is_visible = dell_smm_is_visible, + .read = dell_smm_read, + .read_string = dell_smm_read_string, + .write = dell_smm_write, +}; + +static const struct hwmon_channel_info *dell_smm_info[] = { + HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL, + HWMON_T_INPUT | HWMON_T_LABEL + ), + HWMON_CHANNEL_INFO(fan, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL, + HWMON_F_INPUT | HWMON_F_LABEL + ), + HWMON_CHANNEL_INFO(pwm, + HWMON_PWM_INPUT | HWMON_PWM_ENABLE, + HWMON_PWM_INPUT, + HWMON_PWM_INPUT + ), NULL }; -static umode_t i8k_is_visible(struct kobject *kobj, struct attribute *attr, - int index) +static const struct hwmon_chip_info dell_smm_chip_info = { + .ops = &dell_smm_ops, + .info = dell_smm_info, +}; + +static int __init dell_smm_init_hwmon(struct device *dev) { - struct device *dev = kobj_to_dev(kobj); struct dell_smm_data *data = dev_get_drvdata(dev); + struct device *dell_smm_hwmon_dev; + int i, err; - if (data->disallow_fan_support && index >= 20) - return 0; - if (data->disallow_fan_type_call && - (index == 21 || index == 25 || index == 28)) - return 0; - if (index >= 0 && index <= 1 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1)) - return 0; - if (index >= 2 && index <= 3 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP2)) - return 0; - if (index >= 4 && index <= 5 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP3)) - return 0; - if (index >= 6 && index <= 7 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4)) - return 0; - if (index >= 8 && index <= 9 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP5)) - return 0; - if (index >= 10 && index <= 11 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP6)) - return 0; - if (index >= 12 && index <= 13 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP7)) - return 0; - if (index >= 14 && index <= 15 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP8)) - return 0; - if (index >= 16 && index <= 17 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP9)) - return 0; - if (index >= 18 && index <= 19 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP10)) - return 0; - - if (index >= 20 && index <= 23 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1)) - return 0; - if (index >= 24 && index <= 26 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2)) - return 0; - if (index >= 27 && index <= 29 && - !(data->i8k_hwmon_flags & I8K_HWMON_HAVE_FAN3)) - return 0; - - if (index == 23 && !data->auto_fan) - return 0; + for (i = 0; i < DELL_SMM_NO_TEMP; i++) { + data->temp_type[i] = i8k_get_temp_type(i); + if (data->temp_type[i] < 0) + continue; - return attr->mode; -} + if (data->temp_type[i] >= ARRAY_SIZE(temp_labels)) + data->temp_type[i] = ARRAY_SIZE(temp_labels) - 1; + } -static const struct attribute_group i8k_group = { - .attrs = i8k_attrs, - .is_visible = i8k_is_visible, -}; -__ATTRIBUTE_GROUPS(i8k); + for (i = 0; i < DELL_SMM_NO_FANS; i++) { + data->fan_type[i] = INT_MIN; + err = i8k_get_fan_status(data, i); + if (err < 0) + err = i8k_get_fan_type(data, i); + if (err >= 0) + data->fan[i] = true; + } -static int __init dell_smm_init_hwmon(struct device *dev) -{ - struct dell_smm_data *data = dev_get_drvdata(dev); - struct device *i8k_hwmon_dev; - int err; + dell_smm_hwmon_dev = devm_hwmon_device_register_with_info(dev, "dell_smm", data, + &dell_smm_chip_info, NULL); - /* CPU temperature attributes, if temperature type is OK */ - err = i8k_get_temp_type(0); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP1; - /* check for additional temperature sensors */ - err = i8k_get_temp_type(1); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP2; - err = i8k_get_temp_type(2); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP3; - err = i8k_get_temp_type(3); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4; - err = i8k_get_temp_type(4); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP5; - err = i8k_get_temp_type(5); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP6; - err = i8k_get_temp_type(6); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP7; - err = i8k_get_temp_type(7); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP8; - err = i8k_get_temp_type(8); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP9; - err = i8k_get_temp_type(9); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP10; - - /* First fan attributes, if fan status or type is OK */ - err = i8k_get_fan_status(data, 0); - if (err < 0) - err = i8k_get_fan_type(data, 0); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN1; - - /* Second fan attributes, if fan status or type is OK */ - err = i8k_get_fan_status(data, 1); - if (err < 0) - err = i8k_get_fan_type(data, 1); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN2; - - /* Third fan attributes, if fan status or type is OK */ - err = i8k_get_fan_status(data, 2); - if (err < 0) - err = i8k_get_fan_type(data, 2); - if (err >= 0) - data->i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN3; - - i8k_hwmon_dev = devm_hwmon_device_register_with_groups(dev, "dell_smm", data, i8k_groups); - - return PTR_ERR_OR_ZERO(i8k_hwmon_dev); + return PTR_ERR_OR_ZERO(dell_smm_hwmon_dev); } struct i8k_config_data { @@ -1240,9 +1206,6 @@ static int __init dell_smm_probe(struct platform_device *pdev) mutex_init(&data->i8k_mutex); data->i8k_fan_mult = I8K_FAN_MULT; data->i8k_fan_max = I8K_FAN_HIGH; - data->types[0] = INT_MIN; - data->types[1] = INT_MIN; - data->types[2] = INT_MIN; platform_set_drvdata(pdev, data); if (dmi_check_system(i8k_blacklist_fan_support_dmi_table)) { From patchwork Wed Jul 28 20:51:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12406699 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F8A4C432BE for ; Wed, 28 Jul 2021 20:52:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8023E60FD7 for ; Wed, 28 Jul 2021 20:52:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231719AbhG1UwZ (ORCPT ); Wed, 28 Jul 2021 16:52:25 -0400 Received: from mout.gmx.net ([212.227.17.21]:50767 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231807AbhG1UwT (ORCPT ); Wed, 28 Jul 2021 16:52:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627505520; bh=pBqnwbhq2wS79c+CFpFdztPnuWDlqUQe4f4HZKsls3w=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=efPM1lilIbWY0w9uH8UQMTLy6zJbIqFQ+NAPYERQqkKH/RV9gacNTDFl/Kob5zMAN fQypEWuxk6eAv6IK2WClilaCUT3T4WQQpo+BR+j+nA5UAy7KiRDLayVRufu0EO6eUR rhm5c5N9ZbpT9lGqwC8ZwWwdrHMrTKWJjDdJVxbE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.190.212]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MvbG2-1n15a21sf8-00sfEh; Wed, 28 Jul 2021 22:52:00 +0200 From: W_Armin@gmx.de To: pali@kernel.org Cc: linux@roeck-us.net, jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [PATCH v6 6/6] hwmon: (dell-smm-hwmon) Fix fan mutliplier detection for 3rd fan Date: Wed, 28 Jul 2021 22:51:42 +0200 Message-Id: <20210728205142.8959-7-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210728205142.8959-1-W_Armin@gmx.de> References: <20210728205142.8959-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:hbmkCm8+mNraPO3r/PDd/wQ74KRKxJ0QPe+Frfn6/emBgZfSHbU BAryU3rUdBdB+8QJtJMbR6/M5BMyDNf7u6V/Eu5B+QuPQPIERXHW37TGPnG13olfLHOHAhs fOav0wHRHg7zaxgyYoUreH+M/4G9dMRF3ek5/gJmQck72uRwMoBnDqSHAX/WNvfutVEupFg Aw1Pdxs7lZbCoD9F0wJ8g== X-UI-Out-Filterresults: notjunk:1;V03:K0:s9r9+7BVRnU=:yPbFcStBISBvztLST5bdNs fvgEh3NBQTiDwpEZkDF0RuJLBx+IMwdXC7WTZ4EnX1Pckn7dwXytUx2oWP/XdUt9jipmn6i9i RAyCTbEFpFF71g/y51t++MgW62nt6JjRMu4sb+ol565o164V4C1EWi7/ZbMG63Y/qZ7JmUiov 7jEY33wANJ9PihbXtBA6Ayv1FiAFl0y6AWNv/QxHUkA+CL4ru43bziBIokqdztXWhVRaD3eAg pQQN++jffOlClnZb38/Fw2/wry9WPUkM4942rnWkHvBC2cVEBC8pmfcHH1qCbErac+PfcR1/n PNzE9uT56bILqsHetQbGmHB1UqUIin3mfydoluJV6boAJPoKNJKEPr9N5DHZzu9jsyyfxoa5n j3vxfeEYfyXHLerJ2HyBp5WT5Pf4ep7LOWFpZ5+abQBkJucvbjAhv7vqHbVp3KBSDb4c+RAuf 776juqyogO47eTiMZtKsCgbdz7AJ05j3S3V53iTw8vExjNI2EoFAd4oJfkd/FCGkWdXlYvmtX VW4GLBzn7OItGLNQ6UivHxuUHo/1MxPNstPWukfA8VdY0ljzdBR1218ScTmQxYhcJGSy1QRbC WYGF2ErpIhKnm+UQnELLnKZBr7ATtictpnje0XIXi7EQ099Cjjvblw84Qkbv4kmY6/xynM2vB juYmss5sZffiWwXnKee8YMNjefx1okJGC+fzHnYGTcHo5F1X47W6k5ORVKAj2RtcA5Gup7rlg BovV601cM9CWP2bCCNjof3JQPPEDBEpinghUC35JPq1JEckldZIBSJ3VNR2VtEiWG5LCoEII6 QY3Sz5X57/Zw0LijTKXovbV/okx8vzSXZnRxX+KyQlZ+EY7sWboXUF6uZiD1Me76X78HFa95X vPOdCJpjsk9pqOPWjZsL5vZn2yEFkoP10JXFFeEaiCggRjrEAGtgIhbnngVF/XAPG7p8/ViW/ HX4nZPdLY5clx3RnxhyV/UFW70kiQCCfNKumFTFJPWg+0prHaC8hFgo5bPK6TPvIWRciwRKdk j0qMdA1Gvu5C040+iry+kz7kmeGvmMoBfOlqV2NVJfFqVsnoSaBdsK82IDgR64eh/PGFTTBGK b9gCvijqM6l7iQZjdX56AhXw/QxOmV0QHMt Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org From: Armin Wolf There are up to three fans, but the detection omits the 3rd one. Fix that by using DELL_SMM_NO_FANS. Signed-off-by: Armin Wolf Fixes: 747bc8b063ae (hwmon: (dell-smm) Detect fan with index=2) --- drivers/hwmon/dell-smm-hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index e842901d770f..1305e73e6741 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -1257,7 +1257,7 @@ static int __init dell_smm_probe(struct platform_device *pdev) * Autodetect fan multiplier based on nominal rpm * If fan reports rpm value too high then set multiplier to 1 */ - for (fan = 0; fan < 2; ++fan) { + for (fan = 0; fan < DELL_SMM_NO_FANS; ++fan) { ret = i8k_get_fan_nominal_speed(data, fan, data->i8k_fan_max); if (ret < 0) continue;