From nobody Mon Oct 21 12:24:19 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 4XXDyC5JBvz5Yws1; Mon, 21 Oct 2024 12:24:19 +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 4XXDyC2fpcz4Dgj; Mon, 21 Oct 2024 12:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513459; 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=CQ95Npofk0qjujo7o2oM+kS62hBex9p5DiYSfEULDEw=; b=QnZrNiZvAoE1C4BlOLlMhOSB9MDrAW5Us0OgfggTXOV9Wp9Lwnu/TdubDScQBDZyylmvxL pzqjOKVFfsSGtpEWB+KzO1AbYKnczIBt2VTht4i0nOVmQ4BTWN8tTzNHrFVx9tCsFV0+G1 EGnq5Llzi3dPbhByCpLK5WWgDfkJGeUsa3E9LUJm1Bp5HO0SS6dOHNxjf5qUbfoNQnBlkq CAXb5T3EoPqKT9x70BAGKP5qz7jm6up/E4G3qAGEZ4V/OmXfVF3iHw7oazdSCY+3Y6yA7D UvfIdzYjWeTpkUOKnCuFeWHosimc6b4c127Ur+ArYRqHztzMcrXhdDTMfvikKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513459; 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=CQ95Npofk0qjujo7o2oM+kS62hBex9p5DiYSfEULDEw=; b=UZtGj+7XXdGSPqxI8jLcULtE560ujBdO+pN0208Ejxl6HT74ArETdPguqRFOjITXoxICgA W2w9qFzgAtg1DPGG65hWOucfk8w7igYJox/YdkgFbSgDz+bSam2/Xcgt33QwGwhktm77bz +dVNh8pR7LHrO6JReuD6CzEuIiOHbg1qnATQY4OqmjknUhMVboPJ/UBPgepyYqZRkT7HNQ 3v98B/k5UDIphOIeB+haX7DzDwwSjzNHmbO6faznfRjj4IClGtmFftiHeGlmJfSDgD6a1L xXAdShiaqpB6DzXfhM7Y59vp1efV8HgNIA3AF6/MjP4IjfKd4DRMYsT7Ad2USg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513459; a=rsa-sha256; cv=none; b=WFoEJJb2/jykre59sCbJoHQc3M1LEt9gPQlbrta3dpyj5706y9AwWpfZi6JGbWBEAb/LPj TbbV+nDVtdM546bZDpmoNg+BDvxVq/RV/tKLLMX5msAf/npQNTRwgRx8KXR0ySEEFg3Ncb 1WLUlaWdmw6imDKUwddcUvUmqhBEXMX2mGMm+Ml1G5NkQOtqqn54x6MKVjEWH7J6FG78Mf SXRskwv9M3vn8enYEEbUhKHbvJcrJ4hFWWDgkn1Ii0qEsE3E+YiZcHmYGZ5oFhhI0PYCAG BVZm3YoUjbkwby9Db4/p+6vruYEgkUbMutx6f2i94DiZEOtVLpG/GKuke3j24Q== 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 4XXDyC2Dw0zW66; Mon, 21 Oct 2024 12:24:19 +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 49LCOJjP049064; Mon, 21 Oct 2024 12:24:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCOJS8049061; Mon, 21 Oct 2024 12:24:19 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:19 GMT Message-Id: <202410211224.49LCOJS8049061@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: f1fb1d5c9017 - main - arm64: Support more ID register field types 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: f1fb1d5c901797b80e17d5c1d2a38aee6b63fcd2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f1fb1d5c901797b80e17d5c1d2a38aee6b63fcd2 commit f1fb1d5c901797b80e17d5c1d2a38aee6b63fcd2 Author: Andrew Turner AuthorDate: 2024-10-18 09:16:41 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Support more ID register field types Add MRS_EXACT_IF_DIFFERENT, MRS_HIGHER_OR_ZERO, and MRS_HIGHER. These will be used to handle the cache CTR_EL0 register, and make some ID register values safer. They are: - MRS_EXACT_IF_DIFFERENT: If the field is the same on all CPUs then use this value, otherwise use the safe value. - MRS_HIGHER_OR_ZERO: Use the highest value, or zero if seen, - MRS_HIGHER: Use the highest value. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47122 --- sys/arm64/arm64/identcpu.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 83d934af345e..48ac5c59274d 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -292,7 +292,10 @@ const struct cpu_implementers cpu_implementers[] = { #define MRS_TYPE_MASK 0xf #define MRS_INVALID 0 #define MRS_EXACT 1 -#define MRS_LOWER 2 +#define MRS_EXACT_IF_DIFFERENT 2 +#define MRS_LOWER 3 +#define MRS_HIGHER_OR_ZERO 4 +#define MRS_HIGHER 5 #define MRS_SAFE_SHIFT 4 #define MRS_SAFE_MASK (0xfu << MRS_SAFE_SHIFT) #define MRS_SAFE(x) (((x) << MRS_SAFE_SHIFT) & MRS_SAFE_MASK) @@ -2175,19 +2178,41 @@ static uint64_t update_special_reg_field(uint64_t user_reg, u_int type, uint64_t value, u_int width, u_int shift, bool sign) { + uint64_t cur, mask, new_val; + + mask = ((1ul << width) - 1) << shift; + cur = user_reg & mask; + new_val = value & mask; + switch (type & MRS_TYPE_MASK) { + case MRS_EXACT_IF_DIFFERENT: + if (mrs_field_cmp(cur, new_val, shift, width, sign) != 0) + break; + /* FALLTHROUGH */ case MRS_EXACT: - user_reg &= ~(0xful << shift); - user_reg |= (uint64_t)MRS_SAFE(type) << shift; + cur = (uint64_t)MRS_SAFE_VAL(type) << shift; break; case MRS_LOWER: - user_reg = update_lower_register(user_reg, value, shift, width, - sign); + if (mrs_field_cmp(cur, new_val, shift, width, sign) < 0) + cur = new_val; + break; + case MRS_HIGHER_OR_ZERO: + if (cur == 0 || new_val == 0) { + cur = 0; + break; + } + /* FALLTHROUGH */ + case MRS_HIGHER: + if (mrs_field_cmp(cur, new_val, shift, width, sign) > 0) + cur = new_val; break; default: panic("Invalid field type: %d", type); } + user_reg &= ~mask; + user_reg |= cur; + return (user_reg); }