From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794063019; b=wTe/zXtbSVLLNkqxW+EIynSCCuJyQDangYRpDl+11FmegaZH9c0SqpYL5sdbthehpd+b D6nx87icd2Ecqd4QYB6WaOvcQkK1pCMMfcz0amdXRTZ5puJ8uP5WPhCmWlqoUHCGU6gm+ 5xYSDu095VE/m134O6Ujwf+4iRl+dN2e/m5BgknWPf5a7e2jxzautWEL8S/2SQ53joAHp WMhAQrR/+HR2R6NWHLXH1Kk6QWNRzCOaEGFAAmsRyZ22cG7r08Fi3dYczhGTkQENBCbLm 4VxQZWL2QZ0qOC3vXDQ8OpwWV/BhZy5y9jnSj8hrzzB5bc3kBapTNLMpKQ64GKz3GtA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063019; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=zU2B8Y0V4R9c6Ym/h33H5H7pOQXCYnNzZepQAdx/Vic=; b=3zCOxMH+j4slwaWF5iIXqzcDXx08Ud1slQvSrGSXVvYJWs0wvjgo6u6o2gh4ePwV5+mk 7yW2hRuzEKiUQKOtJxZWjHI913PANbt/wOUEZMVaq62pHxSrbDmRb5QQ80TgZDTk0t7z+ GhGJM0bsvm/3kbgnDG8OW9NpoQQ8yvgHfhyR5PzqsN70wtE3yo7Wv+KiQaz6YxSwR/OaW +blbmtiaSG+9GKUGPgWU3lwntVNTzirl5S4zwVu+/JpOIe/f1DxrXTlmfszUKg+/5hcZk 4sHpxpb/1MKvqewzFJIF6niG5Lg0uqEcztqxOnp5F55llFfLd8hq6YBtMHloxkiovOQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=IKAKcd8x; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 454F9606D801; Sat, 7 Nov 2026 14:50:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=IKAKcd8x Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6F281F0089F; Sat, 7 Nov 2026 14:50:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063019; bh=zU2B8Y0V4R9c6Ym/h33H5H7pOQXCYnNzZepQAdx/Vic=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IKAKcd8x2qWS2snbtiIWnAr12q1qdTTlYIoB36NaUufkwYdO/I+yF5vKhm31LqvYg gglfu3NcNKguW6fLb/WOul78G8knxJRSy1D7y7kZ8/3huC0TPH1TWs6WVrYwnRGoQs +nzd5wsvCHHem6yy0BIYRDdqkdvypoyZsDF8T4Cs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lin Wang , Guenter Roeck , Sasha Levin Subject: [PATCH 6.18 232/869] hwmon: (k10temp) Stop matching Hygon devices Date: Sat, 7 Nov 2026 08:48:34 -0500 Message-ID: <20261107134859.704181167@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lin Wang [ Upstream commit 08e6615c909b2504a5862764f3a7fca00c7ab066 ] k10temp matches the Hygon F3 device, but derives the node passed to amd_smn_read() from the F3 PCI slot using the AMD fixed-slot mapping (slot - 0x18). Hygon PCI slots do not encode DF node identity, and their SMN roots are grouped by socket. The derived node number therefore cannot identify a valid Hygon SMN target or provide usable temperature monitoring. Removing the match does not disable a working monitoring path. Remove the Hygon PCI match and Family 0x18 branch. Hygon temperature monitoring will use the Hygon node and SMN interfaces in a separate series. Fixes: d93217d84c6c ("hwmon: (k10temp) Add Hygon Dhyana support") Cc: stable@vger.kernel.org Signed-off-by: Lin Wang Link: https://patch.msgid.link/20260921055603.25112-6-wanglin@open-hieco.net Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- Documentation/hwmon/k10temp.rst | 8 +++----- drivers/hwmon/k10temp.c | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Documentation/hwmon/k10temp.rst b/Documentation/hwmon/k10temp.rst index 91b99adc6c487..9680c4f3383c3 100644 --- a/Documentation/hwmon/k10temp.rst +++ b/Documentation/hwmon/k10temp.rst @@ -28,8 +28,6 @@ Supported chips: * AMD Family 17h processors: "Zen", "Zen 2" -* AMD Family 18h processors: "Hygon Dhyana" - * AMD Family 19h processors: "Zen 3" Prefix: 'k10temp' @@ -128,7 +126,7 @@ it. Models from 17h family report relative temperature, the driver aims to compensate and report the real temperature. -On Family 17h and Family 18h CPUs, additional temperature sensors may report -Core Complex Die (CCD) temperatures. Up to 8 such temperatures are reported -as temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU +On Family 17h CPUs, additional temperature sensors may report Core Complex +Die (CCD) temperatures. Up to 8 such temperatures are reported as +temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU variant. diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index b98d5ec72c4ff..15a0518ff209a 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -65,7 +65,7 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); #define F15H_M60H_HARDWARE_TEMP_CTRL_OFFSET 0xd8200c64 #define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET 0xd8200ca4 -/* Common for Zen CPU families (Family 17h and 18h and 19h and 1Ah) */ +/* Common for Zen CPU families (Family 17h, 19h and 1Ah) */ #define ZEN_REPORTED_TEMP_CTRL_BASE 0x00059800 #define ZEN_CCD_TEMP(offset, x) (ZEN_REPORTED_TEMP_CTRL_BASE + \ @@ -464,7 +464,7 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) data->read_tempreg = read_tempreg_pci; } - if (boot_cpu_data.x86 == 0x17 || boot_cpu_data.x86 == 0x18) { + if (boot_cpu_data.x86 == 0x17) { switch (boot_cpu_data.x86_model) { case 0x1: /* Zen */ case 0x8: /* Zen+ */ @@ -567,7 +567,6 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M60H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M70H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M90H_DF_F3) }, - { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) }, {} }; MODULE_DEVICE_TABLE(pci, k10temp_id_table); -- 2.53.0