From nobody Sun Oct 13 13:22:48 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 4XRLdP2Fh1z5Ywx8; Sun, 13 Oct 2024 13:22:49 +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 4XRLdP11mVz4yvW; Sun, 13 Oct 2024 13:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728825769; 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=JaDgdjvniDE4w8wITdBmnrwFZyDqV5Q2F5RLdUifLJ0=; b=w2ai8HaOUL8PPcJSUVCCaVIPf4DvjuhiiXfWhEjww9wjIsaQ/aIzS7alRJvyo7b27DaV4Z saf9+oQg9tJYSopPlety+xwWa1rtqvIPBpJn9aNIMbo9bu6cj1fAFCavG4DGoslrmo6SUF E1eNqSmTeFVC1wgf++liT0BpAc8Mu7TfthWYfHBAJU+FUPquleQ65mURUXZZkmA2Q/hMxW 3eGVbQJGsH4BmLrVrGsfPLCLb6ZRCKuuSADW5iyXSscTB70ATIlhvpA3lqybHaaKRVcMxI WCW0hvwwduKAY/2GFIYXZ3i8+5szAOkV3QA7GBoeKH22/Ayes7fgAoP6I1z2pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728825769; 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=JaDgdjvniDE4w8wITdBmnrwFZyDqV5Q2F5RLdUifLJ0=; b=ZTnKNbxDjFwPkf/y2pJ54wR83nPDV7jrdTtwxqGxpmAAF90DWJ7IWCLucI1goVQTUtqy1q sJI8TA1l1ACfC8UuHOLhdId9PDlz7sH+Fa48M9zzRvQAiZRiztua/hO51KAP1fZtlAVhVz WBV0GAoOG8XsCzz0olOohJWXplG06V3QJjwUjgaXtyTRbDMT0vsdw1dUX6IdkGloQmlv6e kB1tPPJSUIv7UvUNVhRKjgrabKhZlp1xKDS0ciy8ZR5K0Plho0UPu4zoLVdSLeUxvLZezC rfBG3qWDEOXyg4Ctwnqu+3OCFDGRVysyTx6E4pbgf7XbqBlR3MZUHaID2PwSLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728825769; a=rsa-sha256; cv=none; b=EVZh4/S+w6MhRQXTY4gDkSO3yynxbDbXakvIrjzNHf7w3DUpmBjUVYiH8oOSSiUHrIT9Jf gwG+RkhEOnHtE9iuXB9Mv7PxtEX5SZHSMVeC/qgSEbVMS3yEaG7NkH4fb4yw0/kDIEqyla j8RQzRmI4V9+9ukH4RwMVbyRymbCo7Mws4Vq+k8j5e+ChxKOOht6b6rYghMJbrWOSd78DD FCwfTRH6Udj0DaWKb03VHKtNzBMu/SuCEhM9tAOC0WgnrYn4bPBdAZMnewJNf+TY0Bhq6z fwYj6a+rqzc4QYUKaJQwfmGhTS1hOPHvCvNzlhHMh/DmtIOfyQFLTmve50/v3g== 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 4XRLdP04mhzw3Q; Sun, 13 Oct 2024 13:22:49 +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 49DDMm38012950; Sun, 13 Oct 2024 13:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49DDMmub012947; Sun, 13 Oct 2024 13:22:48 GMT (envelope-from git) Date: Sun, 13 Oct 2024 13:22:48 GMT Message-Id: <202410131322.49DDMmub012947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ecbe99e16276 - main - 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/main X-Git-Reftype: branch X-Git-Commit: ecbe99e1627627b6797153899e4d95fde3e230e2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ecbe99e1627627b6797153899e4d95fde3e230e2 commit ecbe99e1627627b6797153899e4d95fde3e230e2 Author: Matthias Lanter AuthorDate: 2024-10-13 13:21:19 +0000 Commit: Mark Johnston CommitDate: 2024-10-13 13:21:19 +0000 amdtemp: add support for AMD Family 19h Models 40h-4Fh PR: 281962 MFC after: 2 weeks --- 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 ff9866c6221b..431890dfce20 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -114,6 +114,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 @@ -141,6 +142,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 }, }; @@ -874,6 +876,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;