From nobody Sun Jan 19 00:25:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YbDlJ1mjnz5l5LQ; Sun, 19 Jan 2025 00:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YbDlJ1DDkz3bk8; Sun, 19 Jan 2025 00:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737246332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2PqtUXM8xzlAkvPTAlYlMR9dcXuwNCoqyjPUxsa4Fhk=; b=oMTFezeFbjJk/k+sn1Uz/Onn5M42FzRHty+uauoM8imT5BuQwh0SUxIuRJ5seYMsV9U0tV hll0iSAuFnH9QKsJyvRU9zGeu8z623YczXsWARGDI7fDCMHZEr1h5y4OBTmXPCZ4U+XLbq tuCJ8xOkkb6CbsrkC5bN1GpT810wJh09JYwR8T7BzdXVCHUmgNI7Eh7Yq4Dz4TC1Iel+3m AcStIdImV4zCCZU34q66rqWm9swH8RTeSFh42UZe+L0NuH+FcRgYsBqbSXm+nHJuQojaNV yQcx/Pdunb3FZhGVr8v4m27LfBMlYH6jxJbwIy4ucoL2Gyg/FU2PE8xiZL6f8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737246332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2PqtUXM8xzlAkvPTAlYlMR9dcXuwNCoqyjPUxsa4Fhk=; b=g8hu+wPH6dg96QjJiPqQ9Eu411lFz2q90nKNSSdYCkcar3i6A3nELZtw3rTX44BwqdjiGm tFeKp9ansQrjbVkhvWl/qdDTYkto7oaFwHwMOn4k2SG/TN2+WbfayFJNHL6WTXGFJccEhB NN6+DXX9YMUpWNmuztAjIJrQlQ5bL0+vzNvL23fZ3CKtoCnQcu2bDibzHIUGfJtOb4VW6W +4zuBeZPXRtGJ1ISlUsE1NLG91LEgeAdB408V8ok49uA+yS+7DR5bo2fLHvu/6ra8kzXrp LElGke0NneJIwfzPzTOm7YRkWkTqnHvJuQjvz2iCha9sskYDNu9cTDW0RnkKHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737246332; a=rsa-sha256; cv=none; b=GdrhqJ2QjeHWmf0xhgUXx9Vbu5ph8f6+BBRitjNr82wwoIm7A8mmz8RONuqYQb6iVDs+lm tcrr/I6mXUQ37IBrqB5aQJnH6anKa8Th2d0/flvSqesAkvYORlOTEHNcY79uExIw/duwzy 0iVIMHpSE9tok4QqyGw/zXRku6OnHJ2T4AhIxmP7z4CO3f0JL+3SDoKXZyqS+9KG3dWDgt ob/mBJBDSpZyXuxluMhKxnz6e9Iqo3k7ratJ52PFzD2HJmzY+KnRZ2WHrQrru6ICR0TT4B QT1edrpFl/AKYETQF6PDLmWyV5/FKupPpi7xqPvi2b2cIji5HppmXrEQetK6TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YbDlJ0cx9z9gJ; Sun, 19 Jan 2025 00:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50J0PVdO029547; Sun, 19 Jan 2025 00:25:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50J0PVoV029542; Sun, 19 Jan 2025 00:25:31 GMT (envelope-from git) Date: Sun, 19 Jan 2025 00:25:31 GMT Message-Id: <202501190025.50J0PVoV029542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6823172ca2c5 - stable/14 - amdsmn(4), amdtemp(4): add support for AMD Ryzen 7 "Cezanne" cpus List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6823172ca2c5a3d2ad1a2937046dd5961919f458 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6823172ca2c5a3d2ad1a2937046dd5961919f458 commit 6823172ca2c5a3d2ad1a2937046dd5961919f458 Author: Simon Wells AuthorDate: 2025-01-12 11:45:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-19 00:24:57 +0000 amdsmn(4), amdtemp(4): add support for AMD Ryzen 7 "Cezanne" cpus PR: 284009 (cherry picked from commit 7aa6eeb220d89a3c29eb4f768f258622c3803f46) --- sys/dev/amdsmn/amdsmn.c | 2 +- sys/dev/amdtemp/amdtemp.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/amdsmn/amdsmn.c b/sys/dev/amdsmn/amdsmn.c index 4f85c830b327..1380eff98114 100644 --- a/sys/dev/amdsmn/amdsmn.c +++ b/sys/dev/amdsmn/amdsmn.c @@ -58,7 +58,7 @@ #define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450 #define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 #define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480 /* Also M70H, F19H M00H/M20H */ -#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 +#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 /* Also F19H M50H */ #define PCI_DEVICE_ID_AMD_19H_M10H_ROOT 0x14a4 #define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index 37ec49f6975b..2e1be3c54f8d 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -113,7 +113,7 @@ struct amdtemp_softc { #define DEVICEID_AMD_HOSTB17H_ROOT 0x1450 #define DEVICEID_AMD_HOSTB17H_M10H_ROOT 0x15d0 #define DEVICEID_AMD_HOSTB17H_M30H_ROOT 0x1480 /* Also M70H, F19H M00H/M20H */ -#define DEVICEID_AMD_HOSTB17H_M60H_ROOT 0x1630 +#define DEVICEID_AMD_HOSTB17H_M60H_ROOT 0x1630 /* Also F19H M50H */ #define DEVICEID_AMD_HOSTB19H_M10H_ROOT 0x14a4 #define DEVICEID_AMD_HOSTB19H_M40H_ROOT 0x14b5 #define DEVICEID_AMD_HOSTB19H_M60H_ROOT 0x14d8 @@ -869,6 +869,7 @@ amdtemp_probe_ccd_sensors19h(device_t dev, uint32_t model) switch (model) { case 0x00 ... 0x0f: /* Zen3 EPYC "Milan" */ case 0x20 ... 0x2f: /* Zen3 Ryzen "Vermeer" */ + case 0x50 ... 0x5f: /* Zen3 Ryzen "Cezanne" */ maxreg = 8; _Static_assert((int)NUM_CCDS >= 8, ""); break;