From nobody Tue May 24 10:27:09 2022 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 2871B1AEECA7; Tue, 24 May 2022 10:27:10 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L6r3d6Cx4z3NXL; Tue, 24 May 2022 10:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653388029; 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=Au6ZZdIdRKjp0o5GOIU0xbm0bQQtQnP9DYhMezbywmE=; b=fOApUqpHrt5px6y7w7P1nxcPVYCvV7GmccP9hLWs1CG9cZk8OPBIrvQLzRfvQJk75A/s8Q bvljDTzMU2tB6k/ko/XxazC2B/UarEYm4NI+IIZeXG9/HhKtJ2ehl+/muAzDnJt4YWhM6e IuZeIpI7G7M4jjutoTbzVSVNARpC58vaKOTR1OGEWV8o4dyWrrfpY3bAVUTu4ewiq9MFUn Iyq2L0MOWOm5W+qt7T8suIhRrIONdacmrdihsBSR4c65xrJk1pfDliyjP90Huj3+YxQx5T 1FVw+oiH8HZn2tQA6cV+hnGiK9ym/fT24lVSd6KzJ7nvV6hQA2zJlMRNH49MyA== 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 A393B22B32; Tue, 24 May 2022 10:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24OAR9cd082923; Tue, 24 May 2022 10:27:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OAR9DB082922; Tue, 24 May 2022 10:27:09 GMT (envelope-from git) Date: Tue, 24 May 2022 10:27:09 GMT Message-Id: <202205241027.24OAR9DB082922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 477204e70b65 - main - Decode all Arm GIC feature ID bits 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 477204e70b658c518064a02203a2050d5a0841be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653388029; 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=Au6ZZdIdRKjp0o5GOIU0xbm0bQQtQnP9DYhMezbywmE=; b=tTUeP408PKysPuuJPMYGqMep+7SnrkGQDpb6cpBir16gDlXQEYJWtCg8nX3hBjH0ZU6ug6 UpmZ6HY1FBZYBlBwNCe6sjv+vq+e6dZH8VRDR0+buS3ub+1m0041GgdGcgdMa9SLL7H/JY UAjv0opHfplu33XGLbwkqLzfbdoxWUAbsHlwlyTBFZiMNxXEQYxhtOjSJJxLJ3xyebMu45 FWOx6zptaWUMpL6UtNHKCED8lo/wF0c4HF2mY+KP7ULMbN0CqcmcNPutX8RdUgCNorecL/ CXeMiJNc+NGjiI5Po6x33sl3Y9mAE4WbCIw+dtDYG/5NvLBZLjS8Sv48Zwmamg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653388029; a=rsa-sha256; cv=none; b=a9xpigg1olieCyOu13vow8pdbouZd6tE4RUDxOk4koytLisjOhsIrfVe5NoxO+m2RYxV+Q nmYuNa6dYid5/8aUd3fLbRXQG1mAcXhiO13TTHCCgim9H44W1mNtiFBPORE90VQ3L7CwNv 1HoLgsSXGxdpSeyMZtlmTd69n1wZocE7Oxoo+1+Cgd55G4DBLx4ZJD5WehcKVAwyanBR00 U0XIuczyJJFbyC34XSDT3L6HJZdsZlu+FMKrf0BiUu+Nbz69uZEvIQfrrwtOIWfi+3ZWis OX2lfCyVcGeH414gax7LG4dczluZDxgG5VO7d0WAfa65tMxL47ZKHCurgtanfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=477204e70b658c518064a02203a2050d5a0841be commit 477204e70b658c518064a02203a2050d5a0841be Author: Andrew Turner AuthorDate: 2022-05-24 10:03:13 +0000 Commit: Andrew Turner CommitDate: 2022-05-24 10:04:57 +0000 Decode all Arm GIC feature ID bits The AWS Graviton3 CPU features a GIC 4.1 CPU Interface. Teach the CPU identift code to decode it. Sponsored by: The FreeBSD Foundation --- sys/arm64/arm64/identcpu.c | 3 +++ sys/arm64/include/armreg.h | 1 + 2 files changed, 4 insertions(+) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 8ad604ceb754..def7c0c0838b 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -1127,6 +1127,9 @@ static struct mrs_field_value id_aa64pfr0_ras[] = { static struct mrs_field_value id_aa64pfr0_gic[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64PFR0, GIC, CPUIF_NONE, CPUIF_EN), + MRS_FIELD_VALUE(ID_AA64PFR0_GIC_CPUIF_NONE, ""), + MRS_FIELD_VALUE(ID_AA64PFR0_GIC_CPUIF_EN, "GIC"), + MRS_FIELD_VALUE(ID_AA64PFR0_GIC_CPUIF_4_1, "GIC 4.1"), MRS_FIELD_VALUE_END, }; diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 44b11617fbf1..c16c5b77f3c0 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -891,6 +891,7 @@ #define ID_AA64PFR0_GIC_VAL(x) ((x) & ID_AA64PFR0_GIC_MASK) #define ID_AA64PFR0_GIC_CPUIF_NONE (UL(0x0) << ID_AA64PFR0_GIC_SHIFT) #define ID_AA64PFR0_GIC_CPUIF_EN (UL(0x1) << ID_AA64PFR0_GIC_SHIFT) +#define ID_AA64PFR0_GIC_CPUIF_4_1 (UL(0x3) << ID_AA64PFR0_GIC_SHIFT) #define ID_AA64PFR0_RAS_SHIFT 28 #define ID_AA64PFR0_RAS_MASK (UL(0xf) << ID_AA64PFR0_RAS_SHIFT) #define ID_AA64PFR0_RAS_VAL(x) ((x) & ID_AA64PFR0_RAS_MASK)