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.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 3FE92C433E0 for ; Mon, 27 Jul 2020 14:24:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 169992177B for ; Mon, 27 Jul 2020 14:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859845; bh=KHiEmeSDHEk36Ap081u5lxBnesPSBOC4MwK1QNOPB98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XkuOq/jZGrXEzAcDnVle+VaTZv4tersOrxVP7+ABNOl3Wm/yapYkWMo/CgyWy+b4J pvtf4P23aNgxStb2fSFeIbxAVXA90mq79OQpw6voxBSXacgsJ0Ki58QHDtV9MnlDNO dRi0PbhAyIUYt+zIZPvJP9SYUfyZgDcUwYKTzFIo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732197AbgG0OYD (ORCPT ); Mon, 27 Jul 2020 10:24:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:53430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732195AbgG0OYC (ORCPT ); Mon, 27 Jul 2020 10:24:02 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CE9832075A; Mon, 27 Jul 2020 14:24:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859842; bh=KHiEmeSDHEk36Ap081u5lxBnesPSBOC4MwK1QNOPB98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kz8Bu13D4wcymZ+eawTMcUX7uW8EKyueGNrhucID9xSBZ3JAYw7Lh2EmhYy3zyJyv sF4PTjxzfD3oWh31uZ6YrwM2MD3VUsGl0WFunMZS2zGwHq95XoWeuhiQy6odILtyD0 zfBGAdpQhVuvMfWnxhEbjIzPUAQSZPnnIWgW5esQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Dietrich , Guenter Roeck , Sasha Levin Subject: [PATCH 5.7 127/179] hwmon: (nct6775) Accept PECI Calibration as temperature source for NCT6798D Date: Mon, 27 Jul 2020 16:05:02 +0200 Message-Id: <20200727134938.836226027@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134932.659499757@linuxfoundation.org> References: <20200727134932.659499757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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