From nobody Mon Oct 21 12: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 4XXDyF28Pkz5Yws8; Mon, 21 Oct 2024 12:24: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 4XXDyD3lKVz4DYR; Mon, 21 Oct 2024 12: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=1729513460; 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=R3GJQi8toFhGzAEbZWXjnVs8FTwUqiqSUFh3Q1xwioM=; b=f9loeM8eHzkdkStzUapfv7KBMks36RJzHFDx7Y1DsMyO8nYKeQKRNWK9GgIlGPpLYT7CVj ljDm1vngjV9RmE1+zWqHkwooIBVG4/dYh+rPLXPIWkVJ5nfNXWqZpAa7PGFOeAlArbPTUi 2w4sTKx8LGk7K4K44QOfLsU6rb7BaRaolz995waObY0vHdnX6ctoAYGK8z8uEnu2sZUvSx GbHS27L3awxTipWvuNfc+XyK/eLN4QCHkuPvohXJdCHSAezVT1S73biDwPX+FzbfbCcFwV Cu5F6zciZBXPI4u2y/Az2Y5YcvqAeh9+L7jW7qN3Mryg+B3w7E865OsW5NmzaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513460; 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=R3GJQi8toFhGzAEbZWXjnVs8FTwUqiqSUFh3Q1xwioM=; b=ynDI9EiWug0nse4bZQE+QCPxwYglhC98Jeic2tL9zdE7XJdgChaUTJnd10yPr2k2BU5bRs aQ58cIzbdeqmyHfEvN0jNV+6c2cVQhRUwF4ax44pWDAMkwxiBbXemKJtLKZivzkt+L0hEr XPd1LheS82BE2S3CzjnZ6dVhPKLIhE8WFySSsEPTG71ISPpxt+4riDx6Zjd9TJmjN9QkhS dJt5ykGLe8Y2gSGH6smrv336F1w9uMnKlcjp5AeVDWikaCi8YlGqJCeKtYj3Ba0DwUOfEf gm0mafFu6gtZnA91Oj8Jd3ZPe6fGi+JCyrCx1q1eAndsYBI0Z0byCDXYwaa26w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513460; a=rsa-sha256; cv=none; b=tQQur6ToJ802rGRkAtA5WrAttrCS3RMgAIw85m/QjF1YNKXouNAF6R22SPVxytBRdsqVqv KmaqnU5QgeSL7KHVtWwsWMUFfxZYHPCKaG6KeYrkta+5qD2b7RtVbmha6Wo+gCAdR0oIjp 8p4xvZXtLAld5tIf93anzb3fS/AMFZQoGME9huUNFbNpb6ui3YstUPxUqYKRYUmN6V06yL 3LUuCRsnUJf4fPhCCUc6ddGs4uHMgWrgHnP+4oCXQHUXmpOzuAPNtXtcFghUcEKFppxLr5 ySBze+7xGiRKC/0iddBt9LHk47sZoHq6FzlmgMLBhH2vZeP/lZb5sP5OdyrHMw== 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 4XXDyD3JGmzV67; Mon, 21 Oct 2024 12: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 49LCOK2I049113; Mon, 21 Oct 2024 12: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 49LCOKPB049110; Mon, 21 Oct 2024 12:24:20 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:20 GMT Message-Id: <202410211224.49LCOKPB049110@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: e5f33d429780 - main - arm64: Handle RES1 ID register fields 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5f33d429780f649635452ef4142e1072ed149c8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e5f33d429780f649635452ef4142e1072ed149c8 commit e5f33d429780f649635452ef4142e1072ed149c8 Author: Andrew Turner AuthorDate: 2024-10-18 09:17:01 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Handle RES1 ID register fields Some special registers we may want to emulate for userspace have fields that are reserved to be 1. Add support for these fields. As there is no value to print jump over printing them in print_id_fields. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47123 --- sys/arm64/arm64/identcpu.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 48ac5c59274d..126df01edfa3 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -365,6 +365,15 @@ struct mrs_field { u_int shift; }; +#define MRS_FIELD_RES1(_width, _shift) \ + { \ + .sign = false, \ + .type = MRS_EXACT | MRS_SAFE((1u << (_width)) - 1) | \ + MRS_USERSPACE, \ + .width = (_width), \ + .shift = (_shift), \ + } + #define MRS_FIELD_HWCAP(_register, _name, _sign, _type, _visibility, \ _values, _hwcap) \ { \ @@ -2549,9 +2558,8 @@ print_id_fields(struct sbuf *sb, uint64_t reg, const void *arg) for (i = 0; fields[i].type != 0; i++) { fv = fields[i].values; - /* TODO: Handle with an unknown message */ if (fv == NULL) - continue; + goto next; field = (reg & fields[i].mask) >> fields[i].shift; for (j = 0; fv[j].desc != NULL; j++) { @@ -2566,6 +2574,7 @@ print_id_fields(struct sbuf *sb, uint64_t reg, const void *arg) sbuf_printf(sb, "%sUnknown %s(%x)", SEP_STR, fields[i].name, field); +next: reg &= ~(((1ul << fields[i].width) - 1) << fields[i].shift); }