From patchwork Tue Nov 21 08:16:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xing Tong Wu X-Patchwork-Id: 167539 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp471547vqb; Tue, 21 Nov 2023 00:18:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IGDUcAA5NLyHX7aFQP8GCMRMBNUnPrATIiB9uCZ0N2hjk9rLG3tRMDHzm3QhUGX2ZEsuJ5u X-Received: by 2002:a17:902:f803:b0:1cf:5146:aca with SMTP id ix3-20020a170902f80300b001cf51460acamr6585676plb.20.1700554734307; Tue, 21 Nov 2023 00:18:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700554734; cv=none; d=google.com; s=arc-20160816; b=jRnVZ0KAPHWL65k9gCE2IOV4mAmNHR4ViX9/ib5LmeQwxfE724GfY652LfaD1L9QW1 sSXHe8cJURrSBfVccAgzdfb+7ooTKareEgj2B6JfUAY3lD13U6bAjntu+fWFJ9R6+dj2 Vq3wRpwealA6+OS3Mx0d5cVUEC+SpClmgqetsBqILIAeohGmjyvAm9RR+RjhKm1lUdPv fVTb6Q8K8KDaPjdwR+QbQmtuKx60Wfs7o4Mp8A1+pc0lwJ3Pvu26Of+pPjOFP6yAVRfJ 9eFNu/CiMpd5FWkT6V2F+bwwBIuBSzBeHi4kVSe3cZxts0cHRi32wxYzSLDPt0KhPP4w YHHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4veKM2idkxDDgkcK+uihBiUql8CUiZEyW6WHc/2gF70=; fh=brTD9uWwHSBEuDMsNSIyrWZVEeJXt4Ae/wkRCvfJiZk=; b=qZNstKzk6Mnw12X9df67i6MQHIYIAI5f0MgUR69TRGO2rpMGZAYV8hhj7osHlvkDWC fobESFdFmHOa7ifhdsShruPQaf6yxGeS/3gA3OskfwnRtouQNegxRdAaMuJf5hxiKYlz /5FKwZwN9/9wpokO6/sZm/WaRPiDI7GSV9vCOHTgf9seRPxEw/VKw3CYFDB3frQXMERS BMGPTyBufCeogxaOqe/33Va9QXJpNrzJcY17dacV7APDJy/r1cO4iAZb260sDqjQOlVf RaoO6NZ6yYZgEEfXDEGM9HsF4m9DOi2WXac73GSo40bVlbErIAswgDmBk745Hrn8sqai kXKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=HU+z765s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id bg4-20020a1709028e8400b001c566ea86eesi9622585plb.177.2023.11.21.00.18.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 00:18:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=HU+z765s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 7D21480DF5C4; Tue, 21 Nov 2023 00:16:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230097AbjKUIQn (ORCPT + 99 others); Tue, 21 Nov 2023 03:16:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229861AbjKUIQl (ORCPT ); Tue, 21 Nov 2023 03:16:41 -0500 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.219]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 13FF1F4; Tue, 21 Nov 2023 00:16:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=4veKM 2idkxDDgkcK+uihBiUql8CUiZEyW6WHc/2gF70=; b=HU+z765sz6BuAgsDLcSzC JomsSIuZiQpGRtj1+7fe7jhrF1Fdku+HzMY8jE75g32t6g3aH8O2q1f1pdTMwnem 6yo4WEdW1UfXs2LfLISRpmd1+ueYGrKDepBFzZjrqZwxGFjzIFuWk+aF4obuQQFN 6tEfOiPijs2/PFPHfizP/4= Received: from localhost.localdomain (unknown [39.144.137.247]) by zwqz-smtp-mta-g2-0 (Coremail) with SMTP id _____wAn9ctEZ1xlUJ6BDg--.31532S3; Tue, 21 Nov 2023 16:16:07 +0800 (CST) From: Xing Tong Wu To: Guenter Roeck , Jean Delvare , linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Cc: xingtong.wu@siemens.com, tobias.schaffner@siemens.com, gerd.haeussler.ext@siemens.com Subject: [PATCH v3 1/2] hwmon: (nct6775) Add support for 2 additional fan controls Date: Tue, 21 Nov 2023 16:16:03 +0800 Message-Id: <20231121081604.2499-2-xingtong_wu@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231121081604.2499-1-xingtong_wu@163.com> References: <20231121081604.2499-1-xingtong_wu@163.com> MIME-Version: 1.0 X-CM-TRANSID: _____wAn9ctEZ1xlUJ6BDg--.31532S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZrW3ZFWfGr1UCFyrKFyUWrg_yoW8Wr1fpF ykX3ySy3Wrt3Waqry3Ga1rua13Cwn7G34Syw18CwsakFn5tayxXF43tryvyw1YvFWfJa42 9FykZFWYq3WDGrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jzZXrUUUUU= X-Originating-IP: [39.144.137.247] X-CM-SenderInfo: p0lqw35rqjs4rx6rljoofrz/xtbBnAov0FghlftTwAAAst X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 21 Nov 2023 00:16:59 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783160881311797283 X-GMAIL-MSGID: 1783160881311797283 From: Xing Tong Wu The nct6116 has 2 additional PWM pins compared to the nct6106. Extend the nct6106 PWM arrays to support the nct6116. Signed-off-by: Xing Tong Wu --- drivers/hwmon/nct6775-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/nct6775-core.c b/drivers/hwmon/nct6775-core.c index d928eb8ae5a3..88300fb99bb9 100644 --- a/drivers/hwmon/nct6775-core.c +++ b/drivers/hwmon/nct6775-core.c @@ -767,9 +767,9 @@ static const u16 NCT6106_REG_FAN_MIN[] = { 0xe0, 0xe2, 0xe4 }; static const u16 NCT6106_REG_FAN_PULSES[] = { 0xf6, 0xf6, 0xf6 }; static const u16 NCT6106_FAN_PULSE_SHIFT[] = { 0, 2, 4 }; -static const u8 NCT6106_REG_PWM_MODE[] = { 0xf3, 0xf3, 0xf3 }; -static const u8 NCT6106_PWM_MODE_MASK[] = { 0x01, 0x02, 0x04 }; -static const u16 NCT6106_REG_PWM_READ[] = { 0x4a, 0x4b, 0x4c }; +static const u8 NCT6106_REG_PWM_MODE[] = { 0xf3, 0xf3, 0xf3, 0, 0 }; +static const u8 NCT6106_PWM_MODE_MASK[] = { 0x01, 0x02, 0x04, 0, 0 }; +static const u16 NCT6106_REG_PWM_READ[] = { 0x4a, 0x4b, 0x4c, 0xd8, 0xd9 }; static const u16 NCT6106_REG_FAN_MODE[] = { 0x113, 0x123, 0x133 }; static const u16 NCT6106_REG_TEMP_SOURCE[] = { 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5 }; @@ -3595,7 +3595,7 @@ int nct6775_probe(struct device *dev, struct nct6775_data *data, break; case nct6116: data->in_num = 9; - data->pwm_num = 3; + data->pwm_num = 5; data->auto_pwm_num = 4; data->temp_fixed_num = 3; data->num_temp_alarms = 3; From patchwork Tue Nov 21 08:16:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xing Tong Wu X-Patchwork-Id: 167533 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp470621vqb; Tue, 21 Nov 2023 00:16:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IFG9n+yoh9PM1diamK2Q8/G1GYjSH5at0xyjxDf9//Nj/wdpVKPPl+l33avMZ77mM1N679i X-Received: by 2002:a05:6a20:a1a5:b0:187:699b:84 with SMTP id r37-20020a056a20a1a500b00187699b0084mr7009122pzk.7.1700554605354; Tue, 21 Nov 2023 00:16:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700554605; cv=none; d=google.com; s=arc-20160816; b=X5i7hS9gjHnQKKW81UOdBHhDV3X0x5B8HCwHpPxAqr1Puv+J4ou1zv5sH++U5gK2Hb /JYoW/UkZlft0sMtdatOOMjbYiYGKPA9hc5/hpHc7eEjWR+rIYRDkbu40axCYQjTGiNo qxAhpqCSNgpLp+Kq2k9WSGdy9feAldxGsA2HxHAkPqvat7w4yyKFfhUCBJjEdxqXxcoT 4c6xJOy1PkJX046sSKZaTSKVv0f2w79kDtAJ9sZyd186I/7cPNcWBe9rAgfT8IsgVb8Z yntPhVPGv2YI8DRH5u6MKDsWlwQ3vc3sS3oOUFtpq54q765hDpj0wTq/NMo5RAM3wASN AqMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ivtSyt16d/q/4hJmFH8wkKbGBmxit30g3vcK59BKTWo=; fh=brTD9uWwHSBEuDMsNSIyrWZVEeJXt4Ae/wkRCvfJiZk=; b=xfYLcKy4psQhUQmEOQJPOrZbBJZTtYWLMZR1MbFbwLuY16IritHHT830gbYTeOE/Y+ PnsxImpm3BMrULpunKnMsHOaVoloVn63UfwsWNk8tbq3v6qycpn8IgKLpNNjzRC0X1mJ ia4bIoLFsmhK7pxugRsHmEHasWHRI44KrOFjM3J0bryWx3GJStjt5NpuHhFWzH+f1Vj3 M3TzwYA7R5yzudplReYaeqFkxbM8r1SF1lfi1JH6ogzatassh3WHPi9t0WOV/kZT+ZiC LsmUr5JyoBJ6lN9oAgAIvmZasn8UXCkTfFSmAeDa3OW18zLg6JEx18Nqp6WBGk8vU51N 1eyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=UjQpQ+yd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id oo5-20020a17090b1c8500b002839679c23csi10354934pjb.122.2023.11.21.00.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 00:16:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=UjQpQ+yd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 862BD80BD76A; Tue, 21 Nov 2023 00:16:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229837AbjKUIQk (ORCPT + 99 others); Tue, 21 Nov 2023 03:16:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbjKUIQi (ORCPT ); Tue, 21 Nov 2023 03:16:38 -0500 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.220]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 72DA7E3; Tue, 21 Nov 2023 00:16:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=ivtSy t16d/q/4hJmFH8wkKbGBmxit30g3vcK59BKTWo=; b=UjQpQ+ydwcmU2U/RDwMLt OgkISEd+zpBzgIM0inBdR910o5ZFYz+h0r8WNohLxD4CdjxSAy9l7iRTtDtyBXMT t7bDq+/fuDyuvAUM5k8Et9AlsNFzl2Pzs/kjjkwJcw3/mUbkufCWCeSmuIvqRMRL 5RcdYClFNeqyemhdZVFKYM= Received: from localhost.localdomain (unknown [39.144.137.247]) by zwqz-smtp-mta-g2-0 (Coremail) with SMTP id _____wAn9ctEZ1xlUJ6BDg--.31532S4; Tue, 21 Nov 2023 16:16:08 +0800 (CST) From: Xing Tong Wu To: Guenter Roeck , Jean Delvare , linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Cc: xingtong.wu@siemens.com, tobias.schaffner@siemens.com, gerd.haeussler.ext@siemens.com Subject: [PATCH v3 2/2] hwmon: (nct6775) Fix fan speed set failure in automatic mode Date: Tue, 21 Nov 2023 16:16:04 +0800 Message-Id: <20231121081604.2499-3-xingtong_wu@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231121081604.2499-1-xingtong_wu@163.com> References: <20231121081604.2499-1-xingtong_wu@163.com> MIME-Version: 1.0 X-CM-TRANSID: _____wAn9ctEZ1xlUJ6BDg--.31532S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrtFWDWr4UXw45ZrykWrWfZrb_yoWfKFb_Ww 4F93s7urs8tF1Sk34DuF9Yya4UtFW5WF4xXFnFg3sxJFyjvwn8ZFyvqr9Fqw12kFW29FyD Gw47WrWF934UCjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUeFApUUUUUU== X-Originating-IP: [39.144.137.247] X-CM-SenderInfo: p0lqw35rqjs4rx6rljoofrz/xtbBnAov0FghlftTwAABss X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 21 Nov 2023 00:16:40 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783160745552963377 X-GMAIL-MSGID: 1783160745552963377 From: Xing Tong Wu Setting the fan speed is only valid in manual mode; it is not possible to set the fan's speed in automatic mode. Return error when attempting to set the fan speed in automatic mode. Signed-off-by: Xing Tong Wu --- drivers/hwmon/nct6775-core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/hwmon/nct6775-core.c b/drivers/hwmon/nct6775-core.c index 88300fb99bb9..83f1da5acd22 100644 --- a/drivers/hwmon/nct6775-core.c +++ b/drivers/hwmon/nct6775-core.c @@ -2553,6 +2553,13 @@ store_pwm(struct device *dev, struct device_attribute *attr, const char *buf, int err; u16 reg; + /* + * The fan control mode should be set to manual if the user wants to adjust + * the fan speed. Otherwise, it will fail to set. + */ + if (index == 0 && data->pwm_enable[nr] > manual) + return -EBUSY; + err = kstrtoul(buf, 10, &val); if (err < 0) return err;