From patchwork Wed Dec 21 17:59:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 35469 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3663811wrn; Wed, 21 Dec 2022 10:01:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXs4MUto+nj2NR+ctlwK2jB/+MB5i+UonDeUAQEPibswPbtZTZoqeGEFnPpSoxX3AK3ECY4T X-Received: by 2002:a17:906:d0d0:b0:7c1:23f2:5b51 with SMTP id bq16-20020a170906d0d000b007c123f25b51mr5917764ejb.60.1671645710356; Wed, 21 Dec 2022 10:01:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671645710; cv=none; d=google.com; s=arc-20160816; b=PJRwlZAxLHaHkL5apVra8DFY4Yl/LOkYHNo73oGyfZT6GX/jwTy35g+VycMUcvvgzn Rl7nUo+N6wMQlYyycU7Rvw8wu85pWC7LWQmimMEzGtYoh4zwOkwQs+41W61gv6dZxdvO 1NUI7B1Y4J7y43GzYsqFfrw3siWBqoINR9GGd2E/VmXKdrihTVvnDUnnNlgDJGTZCJLj Ivl5VXlaKzmSwPnrRQN+ZZEArDGOCMitpdcKuTqN+Nd1r5Tv18AOSGXr4uvM0r/uA63q uSPIBRvKMr+oC6nGvMImESr8a2a0bIP0KjtFHHINqPiC4Vt57hSxgyRVZ3kOyQ5PiphN /eqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:dkim-signature :from; bh=alvgn9bHbveO6ux4LL3dt2IoldaL2h4BJ09bINXi5Ec=; b=IE0eWv6YjZNS/5AzJasilH3O6K5Kzuw1tQpuG5TTmG62tRO31gtkcVI7ZJgDeJSeyd kdrZVXl6gBH/haF96q/uuCc+qzFT7Ct5tguc/ObAvqkoxTMCOTCcS3YfuE9lm+RRyBby UFU6TQ1mwt2GHbzPNY0sXStMmCX32kaE2zjQRh3mJ96W2CuVqSICHjhhuadoIpagnp+p t1szGWSUhAxTs93YgdnZfYKya4Y3rNvgm4cINNMzC7cpGilLaQuOfZqzzEw0hZvWO/XO aosAeI4NK1kbGu4o5RE3OoBXYs+s5KBemD45uOCTaTSvtUpDZxY4myCWy/Gs/conW6aN OC7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=eF8CmCCF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n17-20020a170906841100b007c163a17f44si12140384ejx.995.2022.12.21.10.01.26; Wed, 21 Dec 2022 10:01:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=eF8CmCCF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230395AbiLUSAF (ORCPT + 99 others); Wed, 21 Dec 2022 13:00:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229620AbiLUSAB (ORCPT ); Wed, 21 Dec 2022 13:00:01 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1C8E24BC2; Wed, 21 Dec 2022 10:00:00 -0800 (PST) From: Thomas =?utf-8?q?Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1671645598; bh=6GqkRUcKuJwMJo72qVD9f/Gx/0oC7Cwj+9937ZraC8U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eF8CmCCFfRQRyq96H5YPy2zQhG11HnEGg9Zz+Kkq6PXoPld3lna9OQhzM5XkmDaFq vgg5So5htnyqdBd/0io2IM+6KLg8JZhFtFf+0OZj+wSc1Cf8/dYdplUm41IKXxX40D PXa4T6I+dcSseQCo6xgs+lKrR1OPCIgAgnHQOc5g= Date: Wed, 21 Dec 2022 17:59:49 +0000 Subject: [PATCH 1/3] platform/x86: asus-wmi: Add quirk wmi_ignore_fan MIME-Version: 1.0 Message-Id: <20221221-asus-fan-v1-1-e07f3949725b@weissschuh.net> References: <20221221-asus-fan-v1-0-e07f3949725b@weissschuh.net> In-Reply-To: <20221221-asus-fan-v1-0-e07f3949725b@weissschuh.net> To: Corentin Chary , Hans de Goede , Mark Gross , "Luke D. Jones" Cc: acpi4asus-user@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas =?utf-8?q?Wei=C3=9Fschuh?= X-Mailer: b4 0.11.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1671645591; l=1566; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=6GqkRUcKuJwMJo72qVD9f/Gx/0oC7Cwj+9937ZraC8U=; b=2tJc6DdqWrSkjnXYGSw8yaqYHBQu5/Z3B5QJ0VkOvuyF1+Qm8E8EBzmDmgCLGOBQQo/uNfLdaaJQ RaPrQD+8BZPt5OmCmoDeI3lPts7nCNe+oZN9MiwYEqlSIQdXPC5R X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752847572502051526?= X-GMAIL-MSGID: =?utf-8?q?1752847572502051526?= Some laptops have a fan device listed in their ACPI tables but do not actually contain a fan. Introduce a quirk that can be used to override the fan detection logic. This was observed with a ASUS VivoBook E410MA running firmware E410MAB.304. Signed-off-by: Thomas Weißschuh --- drivers/platform/x86/asus-wmi.c | 4 +++- drivers/platform/x86/asus-wmi.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 6f81b2844dcb..4a289ca7e76c 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -2243,7 +2243,9 @@ static int asus_wmi_fan_init(struct asus_wmi *asus) asus->fan_type = FAN_TYPE_NONE; asus->agfn_pwm = -1; - if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_CPU_FAN_CTRL)) + if (asus->driver->quirks->wmi_ignore_fan) + asus->fan_type = FAN_TYPE_NONE; + else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_CPU_FAN_CTRL)) asus->fan_type = FAN_TYPE_SPEC83; else if (asus_wmi_has_agfn_fan(asus)) asus->fan_type = FAN_TYPE_AGFN; diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h index 65316998b898..a478ebfd34df 100644 --- a/drivers/platform/x86/asus-wmi.h +++ b/drivers/platform/x86/asus-wmi.h @@ -38,6 +38,7 @@ struct quirk_entry { bool store_backlight_power; bool wmi_backlight_set_devstate; bool wmi_force_als_set; + bool wmi_ignore_fan; enum asus_wmi_tablet_switch_mode tablet_switch_mode; int wapf; /* From patchwork Wed Dec 21 17:59:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 35470 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3663813wrn; Wed, 21 Dec 2022 10:01:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXsnuzlkONQhgDYzVXhzlzjL9WIZiL4DGDUk40Nfqs6Md50viTj6x3G6gMrobQhfgKmACcNL X-Received: by 2002:a17:907:cb85:b0:7c0:f216:cc14 with SMTP id un5-20020a170907cb8500b007c0f216cc14mr2295297ejc.11.1671645710545; Wed, 21 Dec 2022 10:01:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671645710; cv=none; d=google.com; s=arc-20160816; b=WZ6WVYT37iB8BCa0PqgwZyKY9JMyxLOreZQdyaPixq6ElZ4rNyPKylYgLdDNdu0Er/ 7xJaGt6IHlR2WaHZ7tCczcqi4iilUklYO1cQ0cU3dswfbKoM/owzGmK1kPEJ4ROJu5V5 2gEBENpzMnxFudx7W9Dqhz+JnDEftbsbXtEP0P3FGQE/wdVwXLa0pgnABrEPBz5I0wCE B5CObSDi5/9+I2VWgm9C2TceGi5P3h1te6l326eMiI0aZZdYr6NKVlgCZAkjD3Ii62CC bVaI/llmiOtFMAT2LjyefMqaOfhf3esaKdrQ+DHW103+Gs1CPthwBL+ZxRgzAwGgUjwI TnhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:dkim-signature :from; bh=mmDcz6KnSitfI2O2+ZDY3HzWlcBG3BCRTt/fZzYDlYM=; b=cC/aJvbHuPOw+bjZDqhkBt4leBTPxQ+8yy4EUMKrg9mVTSv2yxTsJVGD8+hmtoH5Am 4quqn3Yb4xnFnFc7TbvdGGN5cAa1zPpMMJWEA7+wbRV4zBOCNOVpM1irjcT1g7SmHzAN BUJg5/tbsdfErCLC+gpM7MeG2EpswFINy5eJG5R1kAREU39Gx56CIppDuDl62w0U9s9l qHDi+ugplku0zRQrMMMLGc9bSI1GIy72lrBQc/cmQ4yNJvWpTQmNRrWl4fI++Yqp4aZ+ FufNqBXuCg8Yi/6jblM79SU1GdGTEke1+6XoVHjPzA7nYNm4C835kz3co+ujKKrx3B1E DvwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=Iqs1b+RI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hv13-20020a17090760cd00b007c171bf2316si2042710ejc.634.2022.12.21.10.01.26; Wed, 21 Dec 2022 10:01:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=Iqs1b+RI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234565AbiLUSAL (ORCPT + 99 others); Wed, 21 Dec 2022 13:00:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230103AbiLUSAC (ORCPT ); Wed, 21 Dec 2022 13:00:02 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 546F624BC5; Wed, 21 Dec 2022 10:00:01 -0800 (PST) From: Thomas =?utf-8?q?Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1671645598; bh=BKyn4L5rGVDIx0LQ1r4Z4c57jvx4ixuqMWSoYecKAck=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Iqs1b+RIkAYD5w6CkJJkyw5HM+R3zTa0Nwk/7A2kjt8qDlCGnR4XB2Df1ry2/fuk4 jMR+IemR5T5gveJPq3ts40EI/+Be5Vi6tfYatI9Hop/hLi+QXgoXkXWOyGItrxtu1D TRDQE2nMqPpuarOlcFOAL4WCWRMuQGw2Laoqv1bo= Date: Wed, 21 Dec 2022 17:59:50 +0000 Subject: [PATCH 2/3] platform/x86: asus-wmi: Ignore fan on E410MA MIME-Version: 1.0 Message-Id: <20221221-asus-fan-v1-2-e07f3949725b@weissschuh.net> References: <20221221-asus-fan-v1-0-e07f3949725b@weissschuh.net> In-Reply-To: <20221221-asus-fan-v1-0-e07f3949725b@weissschuh.net> To: Corentin Chary , Hans de Goede , Mark Gross , "Luke D. Jones" Cc: acpi4asus-user@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas =?utf-8?q?Wei=C3=9Fschuh?= X-Mailer: b4 0.11.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1671645591; l=1274; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=BKyn4L5rGVDIx0LQ1r4Z4c57jvx4ixuqMWSoYecKAck=; b=TPX3qg+3FekqQNnjfwWv+uM4mOthddidtLw5lc+cg3Jcs0H/Je0MNbvnWonrttIzLrzaO9GrQTLF 8ciGd5SqBEKhoGzgy/N+rGq1y3ycecsNPU3Auwhz78rQOh1bv1z/ X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752847572706784531?= X-GMAIL-MSGID: =?utf-8?q?1752847572706784531?= The ASUS VivoBook has a fan device described in its ACPI tables but does not actually contain any physical fan. Use the quirk to inhibit fan handling. Signed-off-by: Thomas Weißschuh --- drivers/platform/x86/asus-nb-wmi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c index c685a705b73d..5b603c686c8a 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c @@ -121,6 +121,10 @@ static struct quirk_entry quirk_asus_tablet_mode = { .tablet_switch_mode = asus_wmi_lid_flip_rog_devid, }; +static struct quirk_entry quirk_asus_ignore_fan = { + .wmi_ignore_fan = true, +}; + static int dmi_matched(const struct dmi_system_id *dmi) { pr_info("Identified laptop model '%s'\n", dmi->ident); @@ -473,6 +477,15 @@ static const struct dmi_system_id asus_quirks[] = { }, .driver_data = &quirk_asus_tablet_mode, }, + { + .callback = dmi_matched, + .ident = "ASUS VivoBook E410MA", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "E410MA"), + }, + .driver_data = &quirk_asus_ignore_fan, + }, {}, }; From patchwork Wed Dec 21 17:59:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 35471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3664311wrn; Wed, 21 Dec 2022 10:02:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXugnyByrAY0vLRCyByqrK+DOWDXa74CMf1D1Ek5T439/bq/ZppZGbuBrhMInFC8jf+rsQ1g X-Received: by 2002:a17:906:311b:b0:7c1:64dc:ac25 with SMTP id 27-20020a170906311b00b007c164dcac25mr2235814ejx.23.1671645754033; Wed, 21 Dec 2022 10:02:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671645754; cv=none; d=google.com; s=arc-20160816; b=AaFrT1GadWPZqjkZrse0dNnO+NYIFl3Oqe02iAGmlEpJLYK1f5uU4S5SNyqZ32Xuiq TjX/pg+sAau0xHBDJitmp3LSYgs1he/yuU+tR7orKBVKZq31+DXQYWJsRZrjQq0EZoyC POakPi3xEvw9P5GFyKgZyh4zSWgcvvCq8v4liHXaLV3PIIsx9w1Lmy9xira1goJotuem HBiFDHL656rNN+0dalc7aVaZD3xFfPsBX44eCK5SjR8IiS7RNdEMtKOGmef0lGGJtNdk 1JvroWuJYMppqBifxO0VjGu1rUyPk5sDZy0AGVGMN0ywjCQyV3Hk64yDlyrEzQjJXQ5x 73gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:dkim-signature :from; bh=RPLq6XW0wypFd0d/Hml8zjAdjx7imI5Ex9Iw2VHURi0=; b=eNcSz5PZa/norEDbdUDu+zNHoqnSfkcPKVJg0lrec1DSM3zyX3f824LxxwkOwFjdGo umE5n2W1BhnKX0uecW/2PyleqWr6S4tbBCZp0L4A/ar9mbDi68ZDPwYelycZ9cEuT48X GMxC58qjJN/Q9dWuRxnar2wRbZWCT/wfwP5P4NJ2j5Xjg/qW1sRf5EZVXy0qMUT9e2zg mTWi0m9pSiwSAd5wjS7GhhjXEK+0s1KkUVDKaCFGiNQeBmoQrBU2INmkMfH0gZGPUTb6 zshr9uaH2w7KouUICc8s50ZHaYd1man17fEpSfR1zGXEHW2sYeP3jkLf7jDDGZalLj38 iutw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=dYAO+UHz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw18-20020a170906479200b007b7f39942c1si15099712ejc.632.2022.12.21.10.02.02; Wed, 21 Dec 2022 10:02:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@weissschuh.net header.s=mail header.b=dYAO+UHz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234635AbiLUSAT (ORCPT + 99 others); Wed, 21 Dec 2022 13:00:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230057AbiLUSAC (ORCPT ); Wed, 21 Dec 2022 13:00:02 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5412724BC3; Wed, 21 Dec 2022 10:00:00 -0800 (PST) From: Thomas =?utf-8?q?Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1671645598; bh=DHzQpmWJLFTqwBAVXLFg5D5O5N+Kl9i3nR9nIThPLww=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=dYAO+UHzW5wXut+nOIQHrC2wo6lmHyElQIRI3ngQoD1uu7CGf8qlsuU11Z4T3bNDU alABiGCHrlwhXIGV24XZjLqysz9C7LwQ0mB2zJzSZ9lEzaw/IiNkJ/QGMg8Om7bF5u MzYWEsN+/qotALjcBkMA/v+TsnGD9T4r8+LQ2AtM= Date: Wed, 21 Dec 2022 17:59:51 +0000 Subject: [PATCH 3/3] platform/x86: asus-wmi: Don't load fan curves without fan MIME-Version: 1.0 Message-Id: <20221221-asus-fan-v1-3-e07f3949725b@weissschuh.net> References: <20221221-asus-fan-v1-0-e07f3949725b@weissschuh.net> In-Reply-To: <20221221-asus-fan-v1-0-e07f3949725b@weissschuh.net> To: Corentin Chary , Hans de Goede , Mark Gross , "Luke D. Jones" Cc: acpi4asus-user@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas =?utf-8?q?Wei=C3=9Fschuh?= X-Mailer: b4 0.11.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1671645591; l=968; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=DHzQpmWJLFTqwBAVXLFg5D5O5N+Kl9i3nR9nIThPLww=; b=0lNvk6oQrIRPYyinJtYvmunAkwZDHlhbE8W8EwaIJNnKGwRrg5brZHoLaHbTFN06zZU2Gr/kS68z hJdfJkugBqlv/GytiG5L3tHo39rJBGxTFp0+6Zwuxe3AG5+AOJog X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752847618331229670?= X-GMAIL-MSGID: =?utf-8?q?1752847618331229670?= If we do not have a fan it does not make sense to load curves for it. This removes the following warnings from the kernel log: asus_wmi: fan_curve_get_factory_default (0x00110024) failed: -19 asus_wmi: fan_curve_get_factory_default (0x00110025) failed: -19 Fixes: a2bdf10ce96e ("platform/x86: asus-wmi: Increase FAN_CURVE_BUF_LEN to 32") Signed-off-by: Thomas Weißschuh --- drivers/platform/x86/asus-wmi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 4a289ca7e76c..104188d70988 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -2438,6 +2438,9 @@ static int fan_curve_check_present(struct asus_wmi *asus, bool *available, *available = false; + if (asus->fan_type == FAN_TYPE_NONE) + return 0; + err = fan_curve_get_factory_default(asus, fan_dev); if (err) { return 0;