From nobody Sun Oct 20 15:24:20 2024 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 4XWj0N2YZBz5ZQhM; Sun, 20 Oct 2024 15:24:20 +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 4XWj0N218xz44XC; Sun, 20 Oct 2024 15:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729437860; 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=KSUzkbofLV/U+nZnWIqCB7UCMkAZeLUMCsBOKdNoEa0=; b=C/gd4kYLKr61w3cYwOJ92+iv7OG6K6Dlpy3IGBMSZFauXYBRzo6x8eeZxjEGzflLhCRczj uP64EBhqOPwEEZtzN2v3Fl0Ep2VhWuNmNJa9gXHW+tcLP6yHXPdzoB/xEI4spPPQYJFARx s/pveFPiJy8F80MyBO5ICMO5SWzwsAlb3KMz+1glwug+QuuMe3oHCu6Wp2lR0cMoVVSm6G 1V9Ki69snPBSxRIdS98fVKX5+hAP/9i034p79C8xIkugf30FVFg16DsC70cISeBglSYJaU gnIhzdtmiDl9YUUbeKHFChY0WKSrEHI4X0A1K+D2pAMSGaywqq03k17ZhhGfng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729437860; 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=KSUzkbofLV/U+nZnWIqCB7UCMkAZeLUMCsBOKdNoEa0=; b=Z6FAHPCLIek22P1rFC/rJkPERzPOlZcKsR3mokn3bIhjltlWOGPT4rt26z1Ff6Ckg6irps swe06z7igHGKw0YiicEp8T5iFvf/CFW6+KNNRkUsRh7d8dQEiAFayvzMLyU6/I1GOXiF++ TX3J7CXbPs84c5KY/sjuQ6Nwhiu8copHrKxZMjVsN76tBRqL9O/NOza/ihWgwXYjK7T1RX woxkAXOKzy4iux4tjjbgcBffF+uu0t1ILXIHAnTsjM6zUbqkolVvEks0MSe5VhG3jomhAo kVG63srjV0cusbDknVihjrY7Dia1xR+KcAQvr6T1nvZUUCqCS+Np/OSr6DtO3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729437860; a=rsa-sha256; cv=none; b=JLRbNgrRgiHO1h0mxC56XJb608AY7TJu0V5FAK8LaV5JLDaUUlfdqU6KPWMYEdpsMPMV3Q F8D3zQq/QxxQ8wObP3Tz03nulElj3nvZjhZrI3SgEGG8XI47WQZWag7f/FnZci5/dkECr3 OmJyRucGdRltFl1EDZMcqktcc1yF9yc/ZEGZ25Xhihp6bzlHQVsCTnYakrcljxptkCaKBt nV+/rLUUo8rZaZ0ADk+xpjMICavTwnEH/UNxLymKXc+tkxMPlB+dN6Se8PugD+SqectnMX HsHctHVwY/jrK6YZbdTefV9LRSDyLlDWZ3oSe8DgaVd/bBy0cpF0tMt2l8yEPg== 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 4XWj0N1LpQz16lX; Sun, 20 Oct 2024 15:24:20 +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 49KFOKlY009726; Sun, 20 Oct 2024 15:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49KFOK8G009723; Sun, 20 Oct 2024 15:24:20 GMT (envelope-from git) Date: Sun, 20 Oct 2024 15:24:20 GMT Message-Id: <202410201524.49KFOK8G009723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 745965ffb69e - stable/14 - amdtemp: add support for AMD Family 19h Models 40h-4Fh 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 745965ffb69e37101c8c0453a681ad4ae4b6ff9f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=745965ffb69e37101c8c0453a681ad4ae4b6ff9f commit 745965ffb69e37101c8c0453a681ad4ae4b6ff9f Author: Matthias Lanter AuthorDate: 2024-10-13 13:21:19 +0000 Commit: Mark Johnston CommitDate: 2024-10-20 15:22:41 +0000 amdtemp: add support for AMD Family 19h Models 40h-4Fh PR: 281962 MFC after: 2 weeks (cherry picked from commit ecbe99e1627627b6797153899e4d95fde3e230e2) --- sys/dev/amdtemp/amdtemp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c index 583ff80cac69..37ec49f6975b 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -115,6 +115,7 @@ struct amdtemp_softc { #define DEVICEID_AMD_HOSTB17H_M30H_ROOT 0x1480 /* Also M70H, F19H M00H/M20H */ #define DEVICEID_AMD_HOSTB17H_M60H_ROOT 0x1630 #define DEVICEID_AMD_HOSTB19H_M10H_ROOT 0x14a4 +#define DEVICEID_AMD_HOSTB19H_M40H_ROOT 0x14b5 #define DEVICEID_AMD_HOSTB19H_M60H_ROOT 0x14d8 #define DEVICEID_AMD_HOSTB19H_M70H_ROOT 0x14e8 @@ -142,6 +143,7 @@ static const struct amdtemp_product { { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M30H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB17H_M60H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M10H_ROOT, false }, + { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M40H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M60H_ROOT, false }, { VENDORID_AMD, DEVICEID_AMD_HOSTB19H_M70H_ROOT, false }, }; @@ -875,6 +877,7 @@ amdtemp_probe_ccd_sensors19h(device_t dev, uint32_t model) maxreg = 12; _Static_assert((int)NUM_CCDS >= 12, ""); break; + case 0x40 ... 0x4f: /* Zen3+ Ryzen "Rembrandt" */ case 0x60 ... 0x6f: /* Zen4 Ryzen "Raphael" */ case 0x70 ... 0x7f: /* Zen4 Ryzen "Phoenix" */ sc->sc_temp_base = AMDTEMP_ZEN4_CCD_TMP_BASE;