From mboxrd@z Thu Jan 1 00:00:00 1970 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.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 4C31FC47276 for ; Mon, 20 Jul 2020 21:43:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15F83207FC for ; Mon, 20 Jul 2020 21:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595281402; bh=KHiEmeSDHEk36Ap081u5lxBnesPSBOC4MwK1QNOPB98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=icaScNOLB7QRX0Jq1hdjO+l/21pqolKCUavQcpEIQH5B7GDWB5/tjx7oKYQfWMyVb Jk7c8xeEkRSKwag3BKXYnnhTWV76Kj4Vtyv9limEOgDgzt8yYx6O1jHp5v+vo+VRfZ 3l0T/2N3suzZwz26ZJigKo4mE4HWzZbC6ukdb1vE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728930AbgGTVnU (ORCPT ); Mon, 20 Jul 2020 17:43:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:57288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728195AbgGTVig (ORCPT ); Mon, 20 Jul 2020 17:38:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 191F522BEF; Mon, 20 Jul 2020 21:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595281115; bh=KHiEmeSDHEk36Ap081u5lxBnesPSBOC4MwK1QNOPB98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E5zkPh6dKXvEFFbGbR2HykUWp7wGuI0mU2MTECnBEwIv1Atzow/9PS3eKLWG5SNVA 7htmZJLyDfCzQjTSafIEA5GyVnqeRo6fxXdFGXNJ2hFCUyyiIRdhEfoLEnd1Pv9lqe MFgjCQMYtOBmm21OAN9CsJuU1I/t6WER6Kw/mIJ8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guenter Roeck , Stefan Dietrich , Sasha Levin , linux-hwmon@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 23/34] hwmon: (nct6775) Accept PECI Calibration as temperature source for NCT6798D Date: Mon, 20 Jul 2020 17:37:56 -0400 Message-Id: <20200720213807.407380-23-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720213807.407380-1-sashal@kernel.org> References: <20200720213807.407380-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck [ Upstream commit 8a03746c8baf82e1616f05a1a716d34378dcf780 ] Stefan Dietrich reports invalid temperature source messages on Asus Formula XII Z490. nct6775 nct6775.656: Invalid temperature source 28 at index 0, source register 0x100, temp register 0x73 Debugging suggests that temperature source 28 reports the CPU temperature. Let's assume that temperature sources 28 and 29 reflect "PECI Agent {0,1} Calibration", similar to other chips of the series. Reported-by: Stefan Dietrich Cc: Stefan Dietrich Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/nct6775.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index 7efa6bfef0609..ba9b96973e808 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -786,13 +786,13 @@ static const char *const nct6798_temp_label[] = { "Agent1 Dimm1", "BYTE_TEMP0", "BYTE_TEMP1", - "", - "", + "PECI Agent 0 Calibration", /* undocumented */ + "PECI Agent 1 Calibration", /* undocumented */ "", "Virtual_TEMP" }; -#define NCT6798_TEMP_MASK 0x8fff0ffe +#define NCT6798_TEMP_MASK 0xbfff0ffe #define NCT6798_VIRT_TEMP_MASK 0x80000c00 /* NCT6102D/NCT6106D specific data */ -- 2.25.1