From patchwork Tue Jan 10 22:48:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Pauk X-Patchwork-Id: 41697 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3006929wrt; Tue, 10 Jan 2023 14:50:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXsRf/jhQuIsIKeIB65MamX3Xa4nZnkwPtCrqHnkHxKGTc1YtDI/29ljHpX0ZXslsETuOlQn X-Received: by 2002:a62:ee0e:0:b0:580:cf1a:f2b5 with SMTP id e14-20020a62ee0e000000b00580cf1af2b5mr58130399pfi.12.1673391044367; Tue, 10 Jan 2023 14:50:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673391044; cv=none; d=google.com; s=arc-20160816; b=CDJeUmTLzq6tDQ5fJr0nRwzcyp0rCgA/itrFSpUSGBxp2P0vMXCkBqZvOfRRQm+2Hh hNYEbZBFDZCBSlA5sgvS6YbUk+J1/kDjGPTOmVMLb1NvGphHdJsnE+g3BFW/fmKfTfJO jrIaNAXPddGMHhaW1z+iWAPpCoz41HK309XyMiq3znE9MAYMCc3pfMPBIBvU49M72/Z8 iXkV+8nWADkLaf53cMOo3WorpKfwOOY+SIJfeJOWjLNiFsLRgBauBB2L6be5ksRI99/4 LbMc9R4+m2HrcP94ctOfW9ZZbcFbEdMpV7XIj+wagPfjcn7p+6F+NC7QpGex+p4mBVEJ crhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=4Apst6IinAOrM3MxKuPZyOSipnjS5xclmkwkh43NC6Q=; b=HHz3xaRAlTP+qRzs97lUitZ/WswoM5e9LkPtn403dEIHAYcB2xuJAG0kk+zYazt6zq /teYZYTvkQIMjuPvy3ITL5JLR2wzvDu2CV9RncGBNoQqqmn2xaerJc4D0ixnc7WQ2bXr ySApOydO8cksvDK5rYJ126VSj9dJyIiRcWh/v3NpRivIZJpMSwPIzJWsM48jIwr44vSq MgfnN7HnI9LIYIavE0qO4RbAPnpC4cKwkmVL9eJwzv6PRwWei6OPB/T19dDWZJl9TRRI jd9Scql8Loa3kgGykEKpHSTvZRWHEY/0ZLjoYwu7N0CW7rxDtGogw09bXmwPnp+SBmRY EKCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20210112 header.b=jOuIvcxr; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d11-20020a056a00198b00b00573965be387si12899637pfl.103.2023.01.10.14.50.31; Tue, 10 Jan 2023 14:50:44 -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=@gmail.com header.s=20210112 header.b=jOuIvcxr; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235743AbjAJWtg (ORCPT + 99 others); Tue, 10 Jan 2023 17:49:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235433AbjAJWsq (ORCPT ); Tue, 10 Jan 2023 17:48:46 -0500 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 773FE392F3; Tue, 10 Jan 2023 14:48:45 -0800 (PST) Received: by mail-ej1-x62b.google.com with SMTP id az20so13441762ejc.1; Tue, 10 Jan 2023 14:48:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4Apst6IinAOrM3MxKuPZyOSipnjS5xclmkwkh43NC6Q=; b=jOuIvcxrEjbszfXmKVL1Ky4+ho7yOcLCtInKd7c7t40dvimDAIG6fHgceJ6v7p7YF9 Vfj79vpm/HjJTVOFiQTBi7G5T2e4U0n/1kmXGLyfKisPAG3aqcFu6CHPeUNa23KaPR+Q +0cRqBVjvay/4Y3abctsgzURm76Qj6X+XIH9gpNVy/vYif2IP7dsUpdPISlPT6bAwDE3 y6YtIEMBHehGcQFR1wuIYOP5MBS1SndMPnRWXveqvlXFzAfap+PV6PkgE9hPc9D7z00o pDJ85mgwCmH6aLglzzvWMzDs23/Nb/2sn05PxTF8hN59+5+n0obn7ysirK/vMMsGwNa4 J9HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4Apst6IinAOrM3MxKuPZyOSipnjS5xclmkwkh43NC6Q=; b=o08NLTOUdZfT2luK8UuGSMCiG+1sK94nbMvtbFWF8dl0vBQKftce7p5OaPzaWCS3Y/ O5x4Ov+icZKJ4dfQERo6LJfUuayJ8pMmWrDKP8wIZ6D6/xoKEPKxoA5k27iIirRJn9J1 bne6Y8kg4Lj97vTv/Z+SLTkaIki2gCAtn7uPHkczNTSRJ/zu6MT2Owa9eK/RUhqdyVDs vP4CbxSzKgygSg4zqolhL0/HAOD0Twu4kU2jzLl9m8rRAbj/P39Wj3BiweO+S5XN0HFa 5YYaLPUWm5naAVtl5xzI4q3FmyV2cywPuUoXBzC4brpQphvEVM1ZweFc8Bvs2V/tGVqj DTxg== X-Gm-Message-State: AFqh2koVaauQw1oMOpOJ71d9Ph4RLkclkTUoEFqRBrUM1yYEpYOjJ0/A R9FP9IDRG8bZadNnU4uK360= X-Received: by 2002:a17:907:80c3:b0:84d:134a:2080 with SMTP id io3-20020a17090780c300b0084d134a2080mr19307276ejc.7.1673390925075; Tue, 10 Jan 2023 14:48:45 -0800 (PST) Received: from localhost.localdomain ([46.211.6.169]) by smtp.googlemail.com with ESMTPSA id d14-20020a170906304e00b0077077c62cadsm5462089ejd.31.2023.01.10.14.48.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 14:48:44 -0800 (PST) From: Denis Pauk Cc: ahmad@khalifa.ws, chunkeey@gmail.com, greg@krypto.org, hubert.banas@gmail.com, igor@svelig.com, jaap.dehaan@freenet.de, jdelvare@suse.com, jeroen@beerstra.org, jonfarr87@gmail.com, jwp@redhat.com, kdudka@redhat.com, kernel@melin.net, kpietrzak@disroot.org, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org, linux@roeck-us.net, me@rebtoor.com, metalcaedes@gmail.com, michael@theoddone.net, mikhail.v.gavrilov@gmail.com, mundanedefoliation@gmail.com, nephartyz@gmail.com, oleksandr@natalenko.name, pauk.denis@gmail.com, pehlm@pekholm.org, renedis@hotmail.com, robert@swiecki.net, sahan.h.fernando@gmail.com, sebastian.arnhold@posteo.de, sst@poczta.fm, to.eivind@gmail.com, torvic9@mailbox.org Subject: [PATCH v3 2/2] hwmon: (nct6775) B650/B660/X670 ASUS boards support Date: Wed, 11 Jan 2023 00:48:23 +0200 Message-Id: <20230110224823.14524-2-pauk.denis@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110224823.14524-1-pauk.denis@gmail.com> References: <20230110224823.14524-1-pauk.denis@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=0.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SORTED_RECIPS,SPF_HELO_NONE,SPF_PASS, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) 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?1754677687789398456?= X-GMAIL-MSGID: =?utf-8?q?1754677687789398456?= Boards such as: "EX-B660M-V5 PRO D4", "PRIME B650-PLUS", "PRIME B650M-A", "PRIME B650M-A AX", "PRIME B650M-A II", "PRIME B650M-A WIFI", "PRIME B650M-A WIFI II", "PRIME B660M-A D4", "PRIME B660M-A WIFI D4", "PRIME X670-P", "PRIME X670-P WIFI", "PRIME X670E-PRO WIFI", "Pro B660M-C-D4", "ProArt B660-CREATOR D4", "ProArt X670E-CREATOR WIFI", "ROG CROSSHAIR X670E EXTREME", "ROG CROSSHAIR X670E GENE", "ROG CROSSHAIR X670E HERO", "ROG MAXIMUS XIII EXTREME GLACIAL", "ROG MAXIMUS Z690 EXTREME", "ROG MAXIMUS Z690 EXTREME GLACIAL", "ROG STRIX B650-A GAMING WIFI", "ROG STRIX B650E-E GAMING WIFI", "ROG STRIX B650E-F GAMING WIFI", "ROG STRIX B650E-I GAMING WIFI", "ROG STRIX B660-A GAMING WIFI D4", "ROG STRIX B660-F GAMING WIFI", "ROG STRIX B660-G GAMING WIFI", "ROG STRIX B660-I GAMING WIFI", "ROG STRIX X670E-A GAMING WIFI", "ROG STRIX X670E-E GAMING WIFI", "ROG STRIX X670E-F GAMING WIFI", "ROG STRIX X670E-I GAMING WIFI", "ROG STRIX Z590-A GAMING WIFI II", "ROG STRIX Z690-A GAMING WIFI D4", "TUF GAMING B650-PLUS", "TUF GAMING B650-PLUS WIFI", "TUF GAMING B650M-PLUS", "TUF GAMING B650M-PLUS WIFI", "TUF GAMING B660M-PLUS WIFI", "TUF GAMING X670E-PLUS", "TUF GAMING X670E-PLUS WIFI", "TUF GAMING Z590-PLUS WIFI", have got a nct6775 chip, but by default there's no use of it because of resource conflict with WMI method. This commit adds such boards to the monitoring list with new ACPI device UID. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204807 Signed-off-by: Denis Pauk Co-developed-by: Ahmad Khalifa Signed-off-by: Ahmad Khalifa Tested-by: Jeroen Beerstra Tested-by: Slawomir Stepien --- Changes: v1: no changes v2: no changes drivers/hwmon/nct6775-platform.c | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c index 082f48785999..e7412ce3fab9 100644 --- a/drivers/hwmon/nct6775-platform.c +++ b/drivers/hwmon/nct6775-platform.c @@ -114,6 +114,7 @@ struct nct6775_sio_data { #define ASUSWMI_UNSUPPORTED_METHOD 0xFFFFFFFE #define ASUSWMI_DEVICE_HID "PNP0C14" #define ASUSWMI_DEVICE_UID "ASUSWMI" +#define ASUSMSI_DEVICE_UID "AsusMbSwInterface" /* * ASUS boards have only one device with WMI "WMBD" method and have provided @@ -1106,6 +1107,52 @@ static const char * const asus_wmi_boards[] = { "TUF GAMING Z490-PLUS (WI-FI)", }; +static const char * const asus_msi_boards[] = { + "EX-B660M-V5 PRO D4", + "PRIME B650-PLUS", + "PRIME B650M-A", + "PRIME B650M-A AX", + "PRIME B650M-A II", + "PRIME B650M-A WIFI", + "PRIME B650M-A WIFI II", + "PRIME B660M-A D4", + "PRIME B660M-A WIFI D4", + "PRIME X670-P", + "PRIME X670-P WIFI", + "PRIME X670E-PRO WIFI", + "Pro B660M-C-D4", + "ProArt B660-CREATOR D4", + "ProArt X670E-CREATOR WIFI", + "ROG CROSSHAIR X670E EXTREME", + "ROG CROSSHAIR X670E GENE", + "ROG CROSSHAIR X670E HERO", + "ROG MAXIMUS XIII EXTREME GLACIAL", + "ROG MAXIMUS Z690 EXTREME", + "ROG MAXIMUS Z690 EXTREME GLACIAL", + "ROG STRIX B650-A GAMING WIFI", + "ROG STRIX B650E-E GAMING WIFI", + "ROG STRIX B650E-F GAMING WIFI", + "ROG STRIX B650E-I GAMING WIFI", + "ROG STRIX B660-A GAMING WIFI D4", + "ROG STRIX B660-F GAMING WIFI", + "ROG STRIX B660-G GAMING WIFI", + "ROG STRIX B660-I GAMING WIFI", + "ROG STRIX X670E-A GAMING WIFI", + "ROG STRIX X670E-E GAMING WIFI", + "ROG STRIX X670E-F GAMING WIFI", + "ROG STRIX X670E-I GAMING WIFI", + "ROG STRIX Z590-A GAMING WIFI II", + "ROG STRIX Z690-A GAMING WIFI D4", + "TUF GAMING B650-PLUS", + "TUF GAMING B650-PLUS WIFI", + "TUF GAMING B650M-PLUS", + "TUF GAMING B650M-PLUS WIFI", + "TUF GAMING B660M-PLUS WIFI", + "TUF GAMING X670E-PLUS", + "TUF GAMING X670E-PLUS WIFI", + "TUF GAMING Z590-PLUS WIFI", +}; + #if IS_ENABLED(CONFIG_ACPI) /* * Callback for acpi_bus_for_each_dev() to find the right device @@ -1170,6 +1217,11 @@ static int __init sensors_nct6775_platform_init(void) board_name); if (err >= 0) access = nct6775_determine_access(ASUSWMI_DEVICE_UID); + + err = match_string(asus_msi_boards, ARRAY_SIZE(asus_msi_boards), + board_name); + if (err >= 0) + access = nct6775_determine_access(ASUSMSI_DEVICE_UID); } /*