From patchwork Wed May 19 13:29:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12267357 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 6BABDC43461 for ; Wed, 19 May 2021 13:29:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 47CA26105A for ; Wed, 19 May 2021 13:29:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353723AbhESNbI (ORCPT ); Wed, 19 May 2021 09:31:08 -0400 Received: from mout.gmx.net ([212.227.17.21]:34441 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353711AbhESNbE (ORCPT ); Wed, 19 May 2021 09:31:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1621430965; bh=9ioOuZHrB615DINpZx/84r2gsWltQRh6q331stYqAwI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=TWClKzml2oTDLWpoOHdQhqA90RZf1RfqhWBZ5RnneRBwVXAW6LjxNnoBl5YDM8fy5 k+x6fdUb5zEqFidQOrTAuTxAPAt2GbswnGuzYeek/T9co4n+a70UJLabFg3nMDbhAZ DmQD7STp+HylyqjGFzButIfmsOkaGRYkEJ6covZQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.184.149]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MwwZX-1lYpWY2lPX-00yRul; Wed, 19 May 2021 15:29:25 +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 1/5] hwmon: (dell-smm-hwmon) Use platform device Date: Wed, 19 May 2021 15:29:06 +0200 Message-Id: <20210519132910.14453-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519132910.14453-1-W_Armin@gmx.de> References: <20210519132910.14453-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:0FsGCgDEVwwRFjyhd+Cj2V1n1P3q0NSu/IAOlAhjjcE9i0wSHpx VHyboXKccCP8FOexGFOa+samEZwt5lGXcjTTMnfAVY9F0GQe2JcNrqtbwWDFCX9N8DZGQGe SFpBs7PZVXFnmgmL7DrkLUZvgWbDw0iBRcdLAMFmtwwoQSu7DbrNxWOrNwUFkoaaOIMCY5s 1P6+lcGzkeMrIar53q+GQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:M3Cj1F67roc=:E61ttOrN3ToC5+eEgZuaEI 39jmgIhbmiYeyPXaz6M8OB3wu+g3bkLmNl/v5sBZy49kDlZ7upjRFSDp50hok33T3zGhV+SAd jiJXS+pI9KGm8cxuP3hrMx1wBUy55FqoqMaHQV5H8RtBiE0LtfVJBFGelXmYjpQEIThj0hnRQ vgLSTd2Oh4euNt8etmG6NqMeVuvcKGQGzOV72PraI8iF/PERGJwnj3AjnUJRigiP7zWt3GFjo Z2fbol5XFZqao+smUcH+PCMg2Ei1NPhNErcwryptVmgJIdOyLksYctvTAfBEgzG/NS9VNJdxz B01iVkVp41DGCEi+WWMp9Nd72ATMmpIseMZZMVn+2NJHa1C15+760t/ddWOrXGr91xszyiNZQ DqE6v6SAk2jP9r8Pf8vgEnfl3ny49gdFfllKQjJNRLaEEkGCSkdfdPei+HrdEDixSCsn+DFqZ FWi7I7/5QJK9Pr3saS8k7latrHfDlJmjUKewaHOZH3nDZyH3bXYz/rLX9TsxmcnvFkcXIjBLw UY+CNApJOyCypV6/dBV4of3dfmY7yEFq+P9IL0zLnaA3WS3sR9Q3razE2kGZhvHVGo8tp5xo0 4kR8y5hDXPtP3MTUNvRnBRxh5oI4zEVAbWoCukV23odPCJQs4k6G5FHBrfgCKfGw/dc1l52el xq7yt4u4t7yKyIEupnU8bjqtNsrU+HoeIRwIrjdKmnehX0HJCIRxzwFk8GCgrFgyQvH7SEoD5 IPsgd2k1b6wFXLQqnZjx6rUFNyieC5/dZ2m/hjpZQrP67due/DJaINClvFJiRrxttAcOkqCn/ G9g01C4rPN7icXAyAHk2gSTnM6q2ICF9gWfacvja/QvAGgKzZWxjky+V1G2Ef0v5EpjbQNgKL /d0shNghA0gQDJgeJitNlxZTogwLnhPXAmJ5UX2Iax7UGCqKJMHxVTeb+eZMCcOkBEyhdz38c ADxkTvveFJX5VDXyCd5LAxWB0hc06BCWeR1vFvp2/+pudQv+WPG9DeL5+bv9prX3BIbvi1biv lBBElgQUMoHDFQmsl2pGziHN0AGUyUOKfOM1N3HmUoUI1lBjkmo4RW+3QxDsgXxQxbO/H9EvZ oyWcjLbhFVWxsIrBdFpV9vFuQPlmtxrl4P2FtU2dMEcYs5C8WW8FB1Qo/chFNE+edqGjjW6Fm G3ltTsUh75IaMEjdBskP8Ybn37cpcOJbKOPKAjTUxjrTyajGSfftnu4rad/b7IbO43yzI= 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. Also the platform device is necessary for future changes. Signed-off-by: Armin Wolf --- drivers/hwmon/dell-smm-hwmon.c | 115 ++++++++++++++++++--------------- 1 file changed, 63 insertions(+), 52 deletions(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index f2221ca0aa7b..2038f2a50e11 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,13 +1246,14 @@ 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) fan_max = conf->fan_max; } - i8k_fan_max = fan_max ? : I8K_FAN_HIGH; /* Must not be 0 */ + i8k_fan_max = fan_max ? : I8K_FAN_HIGH; /* Must not be 0 */ i8k_pwm_mult = DIV_ROUND_UP(255, i8k_fan_max); fan_control = dmi_first_match(i8k_whitelist_fan_control); @@ -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 May 19 13:29:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12267353 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 7B5D2C433B4 for ; Wed, 19 May 2021 13:29:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5FEDF60E08 for ; Wed, 19 May 2021 13:29:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353719AbhESNbH (ORCPT ); Wed, 19 May 2021 09:31:07 -0400 Received: from mout.gmx.net ([212.227.17.21]:36591 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353716AbhESNbE (ORCPT ); Wed, 19 May 2021 09:31:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1621430967; bh=JoDvYIsMHtx6gueKLKKW45Zj/pND9+2ajlZZg/tERBE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=TocSugbos7TPJhxC5PLUpE2fv7Kr0VghmOyfnWaXxLoiDmI8nPwaM4rwUCuIuMRKs 0OIbeUdJhT3lCNNxYFf+1KgIqkyQiWrwvtUhat5wFYZPqPkmO99OQewwHZ0mhI+FyM P7YaetRWugLrQQ3E74SRjl1qC0oDwLzI0D/1eqLc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.184.149]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MHoNC-1leQZF0lMc-00Exol; Wed, 19 May 2021 15:29:27 +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 2/5] hwmon: (dell-smm-hwmon) Mark functions as __init Date: Wed, 19 May 2021 15:29:07 +0200 Message-Id: <20210519132910.14453-3-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519132910.14453-1-W_Armin@gmx.de> References: <20210519132910.14453-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:I/VNrHkn32WlNTltlhHPzCU2Q7r4NCjLeiAvNfSzdVwvNnUoC4j FrouHm5RFRwXqjaF1IONzxCIfiWg2Oj4jZf8cZ6QnTjUSJLXFeS1IL4fZT1wfkZKsQ6lXv8 JqVt4S9SqMEESVJRqB29eCJDsymwRoXAib1Cam8d1xAlJq0OhIcB0oqJWMLEw6jcMvXKvfX k9jDYpsYdM0KFKibSetdw== X-UI-Out-Filterresults: notjunk:1;V03:K0:DGUayB1M4n0=:hin5EdlmCEoMYhHM2QbftE DDTU33fIf0D/wkXzOEtzTOsu+OUpufxqww498DJ3bY+Pfii8A3CpRMVxroU68quXkeMWu+5PP dgajiOj5bn4iHZFKlMrnCPpUJX5h+XCrRPdq+dxYSZhyb/KOE6Zb3gHoeDtzF4jwnlFb89jLd 5GJ3a4XQJAv6YhprUjp0i6CFmJlzCCb0w9FkEM8tFyQyYaFs6wW12VmJXBqn8P9BYbIu6HPsl h6Qwit5hh8o2z2j4OxaSsXfWgsmwC6ADTa+EhXtJ8actW8F8L5kOAUJ1WnTjPsq1zHw05iz3z w901bIBxEn6v3eVr0LgfGq7AbPO4yW3dCxYAi76lcGzR6rHOH9/KKys3rgjeoJiNEMbz1qaeW MCQCauQYBvTPVPtE7YvD98xXg4mo0nZpqV2ZGozOj1EB2/oXEAJPdJRRqKk8tnF4WIffaCU64 nPkc95j6goFB8yy7xehjD/c/zR7X2C9Oc4NGM4UxGAqXcYZ4KZpyhLPw0EbImbwKrR3cw6q2I cKMj0F9CoJ1HWR2ixMAVWayHu1lDcYflGVhhJYWwgMNrIZlF4efKq/HBsoXPCjjpUOGy5d7Oq N4H4o3gsoMKjhdM7E/atZSSb2qUQ17/0Lv+o97oeN3yDgu3wEcXMyXUTJR2+zmxXP6PZMOA3K fmMAJrrLXUfxw0TsAni+xWSDlcuYt5lb9/7gFTPGH5XNN3s75+uFuukHPGpmELcwlsOJJdnEU 1qB25BoBE+EyF+wk2hIEi7I5EO3Jo5HVsLPV4nyAhfPGZJtt+tqMJgmOWnk3MI/X4xh0tcVcm 9OBBTyGgIvufSBht9F++EInHi2yUNOjwB/LdLHIrS+LJgaNMbcYdzEXdEuknbBPafn/h2rVnL frHhCGkKAlsD+BYJX5gADUJSrxClQjYLYEshnD7gxN3npAQhMx6by4MX16UXakqmXA3fsD8T/ 3Glu3mgeYnRvfGm4GG4dZnWgbMSD9U+TCiV3JWC0ijz8zGd7pAHCNh4Dgm7p5te8bkWup/F38 ASoEhP7s4BVCkyLG+dL8dpW/KDt84QmTyoQgXe/rjtbkIkk0k9ytv0DobwNPWM/1CYcWPcibH MaYHPIMm9lA75khYq5HT6j8gtelHFF8/3B9bHFl0BY9ufUuPxF6t0JDtVIg1wxraCegd9naiS wjQcaIjONu24ntetCF8Y1PCaRfrLbb3d0acV/PSFkiccYjlj0/jGccKRkUaKR/UUUWLWI= 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 --- 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 2038f2a50e11..deba8819164d 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 May 19 13:29:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12267355 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 2378AC43460 for ; Wed, 19 May 2021 13:29:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F216660E08 for ; Wed, 19 May 2021 13:29:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353716AbhESNbH (ORCPT ); Wed, 19 May 2021 09:31:07 -0400 Received: from mout.gmx.net ([212.227.17.21]:40037 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353724AbhESNbE (ORCPT ); Wed, 19 May 2021 09:31:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1621430968; bh=4/ljCOdE+I1VICQb1TLHMJkok/Dqbw0P8Sqj81hRNDg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=hYLusmx8YLr4EJDZOYdhjswtV60VZLnVOcyG9W3n1/KGyLu1ZUWgrlIpdEzE3wVbx +2KBXmLegs/Chv3qSgIfX933FYUyQN0nmrvIZ1R8BNFGjfs/L8W1ivRh2B/34K/6Gx fpeLh2txDrB+gEDmWvHOdKonZ7HpK5/RUJumCmg8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.184.149]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N5G9t-1lHpYD2fUD-011EHo; Wed, 19 May 2021 15:29:28 +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 3/5] hwmon: (dell-smm-hwmon) Use devm_add_action_or_reset() Date: Wed, 19 May 2021 15:29:08 +0200 Message-Id: <20210519132910.14453-4-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519132910.14453-1-W_Armin@gmx.de> References: <20210519132910.14453-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:89Lo0N+pBQDeeAg9mr8ufE5c4sGjnieJMxwPCJss69o3l36dR6t 5o18cEH3AomN2OK+BdlqLdsJmiXFxqZ85gg08sX/jI9IVCykR9sMhZwB4GIVuLuwXJE/LGw QfpRse4N5omgGp5QmB3Wnbe2Nzd1mBQAhLa1/PPMdOnIBHqRhl/tal+7UcieiwxAdmCLuSO 1cHH3ZOYTlwgy/dwdB24Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:7BF/2ivoS+k=:rouMNryU2SJvleYRVcApTp NXM0JSWdYX2kyBV31bZhEOq+if2y5XStFYvBJM1GAP+reQI4od0gyQjFCkp9n4KloLVhQrsW6 9CXaSk8rP58PPD+P+nmrSpjzPSbdoAd8+3sWrTzea3sSx9Bs77+9ik+Wjnvfq+pkcmY8Ubrdq /GV/H0pJZgPp/hM2x2lZ3uk2wuRd3w9XDvg5CcPrmr0JX+71mFZj2dhWhkOv3DJ+Xs9VZmN9E OakB26XiwrrDeJbt4f9/IHFBzD7U4MBVMGxAjcB4dHAelKDzhg+Uoo323U/bUMGs3nJJpFpc+ oNokBpIcx75e6tVbB2zHX6dL43iUiwz9vQcP8HbKjmDEn+NJ13FS9OVLaKZllV5fHMIjDvhQg Ys0W8UvTHRWFwgQ6yep6xkqfQUqzIIt8eVNy5RTUAU1GmPXtxubnfT5vAZpjUkPfwXtzvpZWy tnQxeBKNxrQu7Xel1iH4pBhmxiDLZ613Ip79rmHisvSdxG8bi5BXhxuR/3SrOJvhLx38Phtlk 6DhpASYtjgvcc3eu5pGEf6R+dZOxqKFvnKcPEdq74ZxCI/5lMbKSTINrX3JQLt/ciVDSG+jxl HBwktc0i6kur7jeKQvI54FEDB4EPasSlrCCfXbbCjYCBC8799bfy28HkVQWlwrlRrtsqVnO1l GOl/ru9zza46ZvZoSa9KEJZsSU7hOo38MFhcij5BWw6nBhlUOwB3SHJYraH1ccJYu9rVM0wft 3vzkMPP3UoFMmyRHMVAVntnp7W3qYd1mcekuJQm2D/Nen2RzUpa8ATmTad/TpU47QQdIIvdnH D11l3Ii4MUCUDNs368bVSLbqQUza4KAWS6mG5P9D2Tb9v7rYbRzUpsP88uB2xLw09h8WX7u3l D6c4IdmppihaSHGs4H9jWBDT8xtS+QS4SccyKtCAfLh4dphGFdM0O1mirWssDODE5q6ozCxZW jJDluY8+DznnjmsoXGE4NEVqtg7tbUC7L6ooTL3ZrEIm3K6eS58fuJDlaOSbEoIM1FGlu2Kzr AeGa22S8Xp8Drd1TYd9v+EodGuAjBHISSeEJtSERFiUtphUaUP3KvzLvZ3uzu5NgDX0WGh48r do3iM40Yfh0ftEYIGT1gJpWwjPx1OFuWjYSGfQ5tqKfPvP0nMHQIt3Poa1waGUzbhpQoCDuiB myQJQaRm6TTCXkKH87AQSL7ylJ8p5o9MPeYyKpxIPkfxTxAH1bEzb0rYnv0pZqEL0ui2k= 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 --- 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 deba8819164d..ed2c42badf1a 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 May 19 13:29:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12267359 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 8395BC433B4 for ; Wed, 19 May 2021 13:29:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B54A60E08 for ; Wed, 19 May 2021 13:29:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353699AbhESNbJ (ORCPT ); Wed, 19 May 2021 09:31:09 -0400 Received: from mout.gmx.net ([212.227.17.21]:39531 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353717AbhESNbH (ORCPT ); Wed, 19 May 2021 09:31:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1621430970; bh=GXqomoZSdBjRB0oq6Z2cHzh/ASxySPbR36fTfHmt1+Q=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=D/7FHivZ/wMH7StfVwMgjHWBdPftcnPVGU+rytTpswQTfMH0vZdAxByYDRUHzLQs8 f4PFJAmhnbtymIY65fFPnHSA5C5v/y+f5vdmR53SKUpj43fs5yttxdJcZLrC8Eodya hd9I78PeWHWaBS4nNxCdfnxqOsT60zBz5EfoQ/5s= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.184.149]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MhU9j-1lExBp01R5-00egC1; Wed, 19 May 2021 15:29:30 +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 4/5] hwmon: (dell-smm-hwmon) Move variables into a driver private data structure Date: Wed, 19 May 2021 15:29:09 +0200 Message-Id: <20210519132910.14453-5-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519132910.14453-1-W_Armin@gmx.de> References: <20210519132910.14453-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:UwcJXbJla5VqMxD8wOCsm1LCrkyySJjJ5G2hcPcEVgIZUOg1tT2 DyaHVtl2xpKMLH0pJZZ4dCHkr7qJja2eKyUCYSvvBwGEMbgAbfY4OG9JyocgK7GaVjmnWgf 1jzR6q7U+PR50kerQbu9XoZP/O3giGZO0aOh/Sp4pR3S2hbg3e+UL0ussBxB4I+PHiaGQRR 2Y78Hy6jusXyZnfI2LSfA== X-UI-Out-Filterresults: notjunk:1;V03:K0:84MdrZ5FEzQ=:Lk1cXK9cG7tNLPok9U67nu BmqyDa3GaQm/k0pTgB4TaLuDNERN9o3PSacUxcdgtD855bOjT8uZqGdkC0xmlGEkrOudRFiV8 ZkAbf+souSf44SfRvEhIRsFHSP8UExVFphtdbai6m0LN7CMgMNL/rr4PZ1Pk/J84xuViIuvcf ko0nLQnA/17cMRMU0KCCMyrvetldblKSKSxdIC83i5ENgS6ETrO+VUYi15WOKA5N5+HMH7S23 h+MK2H3jYqvKpqfdvJcs+MZ0rKIfSTMS9g2WCtIAPomWfo18ZKBL1lOLjsfjwd6YkfHakz2PX aCNJph3P3/SN1Vrti45txoMKJ2WN+MisEReCwVLP50w1+xoK1qzmh54RUnLuJUCNUeoHM2Z4j 6QDHO7zCvY0xkkOaY8O8QuCYnbyjUboEIRWi0Hv4wXOcABU3JdpbgqThBUVjWY9MaOwZja9eu EB5/bfTJxwx8OqjdNdJFTNwGCEwyOiyk9Qtcw9bMEPTJwDzUuaN3b/Ft8jdbg04ZqTur05Q1e rOHEpHwr8sOyzwGJNFMFXIgg8oZM1lWnv91iO3A6tGlTkg+sV0twP0Van3tIHHFpDoywVu1as BGAcOHiWg8IE7Dc2CpcFZI/44gFnx0aeiaH5g8gq12JLn/GJhjdY51SVuOSlfgu4j2Uxd/CT1 wMTChPE8lu+LKRTbvLmn9Br6FV6hVf96r1JVKv1aUnFxnK3MpxYKnJcNW5SJ+egmlHd7lgxXV Pwx+4NIFAQKSYTVnvhH5gcoHoCGrXaqiNiCNF9ItF6So2Z3ya3SG9NSanp4hfKVv4X51WQ4ad MSxFTEMwlfHH1bcqIxwVheUMMrElp80kEfaPha29sLlu7roEH4F9Jp42ys+bjAJKxn5nZa0EO koAW0bNhATb5M4GvI1X5KJzNAMcwhI9ScPPgefJCB4h6MPtt8PD20P3jWZ15y/+LxkRD0/Txq Y36Mf9Nh7XLrd99GrCRkv7VJNJCppEJ+QewQROlNnOiVmKDDmC48wW8M/zHXsJli/h9XwUQrV /lnZP2gLN7afLlFZaeSHaVxt/d5lEp0JQGv4w+K7QUmMGt70oH1K/AGQMF1xJ/pZtUlro2/cT U7sLDfi0nJkmDZ62jiDhrZMVQyWvZSEPvJeKE5nWVS+woUzsQDCzDBTgBXleVX1W3lmAemwnF LpJ1WOErVhQieL+zKAjGv7vDcvDO+DeFPTEqGilX2YV8wwc6BYvlNEj4N+NV3Xo4r6P8M= 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 ed2c42badf1a..420fdd2de2fb 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(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 May 19 13:29:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 12267361 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 164A5C433ED for ; Wed, 19 May 2021 13:29:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E904860FF2 for ; Wed, 19 May 2021 13:29:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353710AbhESNbK (ORCPT ); Wed, 19 May 2021 09:31:10 -0400 Received: from mout.gmx.net ([212.227.17.20]:59997 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353722AbhESNbJ (ORCPT ); Wed, 19 May 2021 09:31:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1621430972; bh=Es0Et/WjfefCemrJFp9Q6R97s+nioEiM1TtUj01wmwA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Kr8OAX3z5AD29lpVUmnO/N+LttR6aZWu5hhzLv59xg70olA0q6MFAAtYpAai6OMrG COHTInTgL7Dv6r90EGj6IuUzo3TwHq/thw0ycFonAQRi/7j6kslrpzz1GUGU4Mi9Of SpEXy4xoHBYEoZpuKXpaV5LsL5aAY32I9C+UTDGU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from esprimo-mx.fritz.box ([79.242.184.149]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MjS9C-1l4HwH3Pcg-00kwlm; Wed, 19 May 2021 15:29:32 +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 5/5] hwmon: (dell-smm-hwmon) Convert to devm_hwmon_device_register_with_info() Date: Wed, 19 May 2021 15:29:10 +0200 Message-Id: <20210519132910.14453-6-W_Armin@gmx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519132910.14453-1-W_Armin@gmx.de> References: <20210519132910.14453-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:qTDKEMvnlfKe4db0WTakDwfvzky3pRHhWPioxXIogysdIxJsA/v s09g0i+DmY/6d5tLjl5+Mq8K+A0XZxoxvr70RCJ+eATIp21SxB6HgE2Q++NS5JVmk8sF6Dy DeRpbVsoyV/xi81wOcGAGsnrZkbkeWhDsb2EDeZgnBcv4ftvV4ftr5H93JLsSKXcedwLXIi EE+1lxKGIrzxhafhMQ4hg== X-UI-Out-Filterresults: notjunk:1;V03:K0:F22yLMQ8me4=:s/XziTT1kU8uIgQciGG0yc 3C5FCoCbO0QWvyJLCSvc1ZNN5AGPKVUY0KJdideo4EIs0gaTgOXEQf8Tqt/VCmiqLt5GxBUbx WbS9bj3bPxoBnym+dIIf2ct3tDhWKtll4NJKUzwSzj8BnKtm5kf9lv3gmS5fpmrX/f71AUYOB UyE15cKVHH7sXN/MAb6qdRQuIsnSdT36a0sYPux+YzprvLL8el1Am3YnH790tSZDAHkPS8WTL Y+XHq1I/X2TEY2utKThJaDK2Y3e4hW3SpyHfaoKzEYKpr0Cio3YuETZhACswTh+vb8wF5Z8c1 QbmOIcnoCkI9IEzWh6aEyyrgJxVMNQO6zyUvNZvqE3gyApgsPMLk5pxrnVWFhCc9etXdDttEX Wefo3vRI467vpbj2FlV7uF+OA/1QIGc+BbqthmIAIPSZraHLkXr320qMmbwPMgZVUKlcoc8Uw cTj/v5Fax7NLd0hpkQW189xj6DEnjma87peo7ZiIjuE8Apub6tsClO/eynlIeF0QvhiY34EP2 9yyu1xi3XN4lDnM6C/FsaKwS3rigznL+1BdngpRnZ41Gv40i/D+Rsu/AIklHw89Niy0oWfBe4 5RmQ7KEaLXsKBULk+JcOGNtHG8Wmvol7iUO5TcLqn/dQwDCWqm+ml/VkNPuvrdXu1PpvNhk/J OTLDm8ItRhz8lCk5AE/hfFhYffmBuo5NFBs/mjgF/qV4Gmn2cnzlsFDQzugz1+y35Pee6rTSM vhZCoCEubn/UKW+N7y1TsZF/NxXf/+BMi6Mfe8J1IaeBM37w+Z+ZVwwa90hTBhoZe388IrSK1 MUktC4GsZP5EwOKhRIX6JvFgR/ayrSyeUPfDJOnXR1x8GjdE1/Rt4V7xXFOlVW+U9g901Q8Lx M8P+TDa6ia0QUNsdPeqpQggAylxaT/t6mzDzaR3zSjfY09Zz9qy7zfQ9bWD37+dTQvQxqopY3 /ZooYHyWqrThn7/89dQAKVA/4ODHJHu0trjSXoUJU9On07NosRmdyDaw7r9hsG8L16S0E80PD q+4wh3l22tJ/MqvGCkBp+syPMM/HxtQZRyvguCV5FjEWIzKUdz3kOE20XNQ0JvFPGtFsE+4Hf axL2kCbToGdGBMGY3yXW0dnOau2oTGELo6maDJke37x5g9JHwRwJmF+JVI3qlyN5khmpp7pvU sDzKZe5UQ1ecy1Vd9ZwG416mKk3ebA2e/gKUEOfv6AxBvs3z8DFyjC934PzyRR6UDA1TU= 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 | 600 +++++++++++++++------------------ 1 file changed, 281 insertions(+), 319 deletions(-) -- 2.20.1 diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index 420fdd2de2fb..504ade34833e 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]; + long auto_fan_enable; + const char *temp_label[DELL_SMM_NO_TEMP]; + const char *fan_label[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); @@ -270,7 +286,7 @@ static int i8k_get_fan_speed(const struct dell_smm_data *data, int fan) /* * Read the fan type. */ -static int _i8k_get_fan_type(struct dell_smm_data *data, int fan) +static int __init i8k_get_fan_type(const struct dell_smm_data *data, int fan) { struct smm_regs regs = { .eax = I8K_SMM_GET_FAN_TYPE, }; @@ -281,15 +297,6 @@ static int _i8k_get_fan_type(struct dell_smm_data *data, int fan) return i8k_smm(®s) ? : regs.eax & 0xff; } -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); - - return data->types[fan]; -} - /* * Read the fan nominal rpm for specific fan speed. */ @@ -334,7 +341,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 +641,300 @@ 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 (!IS_ERR(data->temp_label[channel])) + return 0444; -static ssize_t i8k_hwmon_temp_show(struct device *dev, - struct device_attribute *devattr, - char *buf) -{ - int index = to_sensor_dev_attr(devattr)->index; - int temp; + break; + default: + break; + } + break; + case hwmon_fan: + if (data->disallow_fan_support) + break; - temp = i8k_get_temp(index); - if (temp < 0) - return temp; - return sprintf(buf, "%d\n", temp * 1000); -} + switch (attr) { + case hwmon_fan_input: + if (i8k_get_fan_speed(data, channel) >= 0) + return 0444; -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", - "Video Fan", - "Power Supply Fan", - "Chipset Fan", - "Other Fan", - }; - int index = to_sensor_dev_attr(devattr)->index; - bool dock = false; - int type; + break; + case hwmon_fan_label: + if (!IS_ERR(data->fan_label[channel])) + return 0444; - type = i8k_get_fan_type(data, index); - if (type < 0) - return type; + break; + default: + break; + } + break; + case hwmon_pwm: + if (data->disallow_fan_support) + break; - if (type & 0x10) { - dock = true; - type &= 0x0F; - } + switch (attr) { + case hwmon_pwm_input: + if (i8k_get_fan_status(data, channel) >= 0) + return 0644; - if (type >= ARRAY_SIZE(labels)) - type = (ARRAY_SIZE(labels) - 1); + break; + case hwmon_pwm_enable: + if (data->auto_fan) + return 0644; + + break; + default: + break; + } + break; + default: + break; + } - return sprintf(buf, "%s%s\n", (dock ? "Docking " : ""), labels[type]); + return 0; } -static ssize_t i8k_hwmon_fan_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) { struct dell_smm_data *data = dev_get_drvdata(dev); - int index = to_sensor_dev_attr(devattr)->index; - int fan_speed; + 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; + + *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; + case hwmon_pwm_enable: + *val = data->auto_fan_enable; + + return 0; + default: + break; + } + break; + default: + break; + } - fan_speed = i8k_get_fan_speed(data, index); - if (fan_speed < 0) - return fan_speed; - return sprintf(buf, "%d\n", fan_speed); + return -EOPNOTSUPP; } -static ssize_t i8k_hwmon_pwm_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 status; - 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)); + switch (type) { + case hwmon_temp: + switch (attr) { + case hwmon_temp_label: + *str = data->temp_label[channel]; + return 0; + default: + break; + } + break; + case hwmon_fan: + switch (attr) { + case hwmon_fan_label: + *str = data->fan_label[channel]; + return 0; + default: + break; + } + break; + default: + break; + } + + 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); + data->auto_fan_enable = val; - return err ? err : count; + return 0; + default: + break; + } + break; + default: + break; + } + + 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) -{ - struct device *dev = kobj_to_dev(kobj); - struct dell_smm_data *data = dev_get_drvdata(dev); +static const struct hwmon_chip_info dell_smm_chip_info = { + .ops = &dell_smm_ops, + .info = dell_smm_info, +}; - 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; +static const char __init *dell_smm_temp_label(int channel) +{ + int type = i8k_get_temp_type(channel); - 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 (type < 0) + return ERR_PTR(type); - if (index == 23 && !data->auto_fan) - return 0; + if (type >= ARRAY_SIZE(temp_labels)) + type = ARRAY_SIZE(temp_labels) - 1; - return attr->mode; + return temp_labels[type]; } -static const struct attribute_group i8k_group = { - .attrs = i8k_attrs, - .is_visible = i8k_is_visible, -}; -__ATTRIBUTE_GROUPS(i8k); +static const char __init *dell_smm_fan_label(struct dell_smm_data *data, int channel) +{ + bool dock = false; + int type = i8k_get_fan_type(data, channel); + + if (type < 0) + return ERR_PTR(type); + + if (type & 0x10) { + dock = true; + type &= 0x0F; + } + + if (type >= ARRAY_SIZE(fan_labels)) + type = ARRAY_SIZE(fan_labels) - 1; + + return dock ? docking_labels[type] : fan_labels[type]; +} 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; + struct device *dell_smm_hwmon_dev; + int i; + + for (i = 0; i < DELL_SMM_NO_TEMP; i++) + data->temp_label[i] = dell_smm_temp_label(i); + + for (i = 0; i < DELL_SMM_NO_FANS; i++) + data->fan_label[i] = dell_smm_fan_label(data, i); + + 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 +1204,7 @@ 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; + data->auto_fan_enable = 2; platform_set_drvdata(pdev, data); if (dmi_check_system(i8k_blacklist_fan_support_dmi_table)) {