From nobody Sun Jan 12 12:14:21 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 4YWDpP6NbQz5kZyH; Sun, 12 Jan 2025 12:14:21 +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 4YWDpP4yNtz4XV6; Sun, 12 Jan 2025 12:14:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736684061; 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=mMqwvf+OKBjLuNFyR+6fekqXcTjnqGq5AsozGZFG5dI=; b=YStQLX+qBwK2lCmmTPW7hFSRmUwSfRptjOiLuTYXuBV/EorbnP+hBYln5UFHvbKu2SbgOD 5xOlwMaVZ2r9wTK90B2B0FxQ8JuUkGRxhMeanhUNtbTIVPCWPe6WlJjVD1Tw2/RnjmGPc4 57LPPaxrIjfOXz2xFyF+tq1XmZxi2gdtf2dxu2ANorfgxGVAJsInip0MmzA2AGv0JLdbAS 5IzUZkYJaxxiECUiRoDbXTVI4XxnKSvIfii2o1Cgh+eKLXO7sS/pENOxPbfAQcWhNj++GG OaRHaeVIUiYbuyBMPXpHOr5mHUPnHUuT02FaGT7HingLT0hg8RvaNha+RwGN/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736684061; 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=mMqwvf+OKBjLuNFyR+6fekqXcTjnqGq5AsozGZFG5dI=; b=G3Hwwb8YTiXFfEorz4TVXfzgaio1zAn0byQ359z4PM6v49D8rhUxZl8+na4f5gEJhrLCMl a+8PKF3XfnNzAO7Ge7sVejI8LWkLdlHFfi1SNUVZD2fiw02J7OuaULz5/LLDatRritiGmI OVqbZ7uZxQnyNajIRZC0c1jTOAXK5k02mWrh3tCY3GTZY2YwF/SkTO50Aa+vHFkn0w4iu5 k7bdJfRW9V0sV1kzCC1Oan5IpP8Z4YuCPLX36Ve3PmbYzz9ejH5mUbiMuzb2DTjzucPeM1 i9z78sudzEt0z9PBXXOuPeN8tMnTp5p27FHkzQPJHCoTW2Jc3PXB1W+c6OixAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736684061; a=rsa-sha256; cv=none; b=NwfpAxcKsxzTTaY/Ccs53REEU8Q5cfcXGV/b7B9zW0yMmojSLERTRAV4zqZgtgmfbzpAHV adRqseUYsLwSFyWb5fQI8xLR6gBrMnrKtV8hTslY+c6Rl4IZO+56oxyb7R6NOb4xHtiL2b tJPaQjMM/uH5t3NtdCMk4Y4eFOw74otvbMfwZaXIOAwxIaKKZ1cV0gnD3eBDo0EI8nhtbY MXF8/4Di8LhyVPTj7h3TAbbAVZYONr/A2SkS9atPN6yOiW4nAR4gBYg/aMImtL+ko0VemK V5b59FGi1nAM0vaImviWgJ8uzXinDaWOhFXzvRmCSHTy3hPd8AEMNJhyS1P7yQ== 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 4YWDpP4SZlzjZN; Sun, 12 Jan 2025 12:14:21 +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 50CCELAh026710; Sun, 12 Jan 2025 12:14:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50CCELGa026707; Sun, 12 Jan 2025 12:14:21 GMT (envelope-from git) Date: Sun, 12 Jan 2025 12:14:21 GMT Message-Id: <202501121214.50CCELGa026707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7aa6eeb220d8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7aa6eeb220d89a3c29eb4f768f258622c3803f46 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7aa6eeb220d89a3c29eb4f768f258622c3803f46 commit 7aa6eeb220d89a3c29eb4f768f258622c3803f46 Author: Simon Wells AuthorDate: 2025-01-12 11:45:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-12 12:14:01 +0000 amdsmn(4), amdtemp(4): add support for AMD Ryzen 7 "Cezanne" cpus Tested on AMD 5700G PR: 284009 MFC after: 1 week --- 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 111c3cc8e7c1..9f5c55b1abd6 100644 --- a/sys/dev/amdsmn/amdsmn.c +++ b/sys/dev/amdsmn/amdsmn.c @@ -57,7 +57,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 431890dfce20..0c423e0b2502 100644 --- a/sys/dev/amdtemp/amdtemp.c +++ b/sys/dev/amdtemp/amdtemp.c @@ -112,7 +112,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 @@ -868,6 +868,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;