From nobody Wed Jul 5 09:46:09 2023 X-Original-To: dev-commits-src-main@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 4QwvtT2zGcz4lJVH; Wed, 5 Jul 2023 09:46:09 +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 4QwvtT2XcFz3Bnv; Wed, 5 Jul 2023 09:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688550369; 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=1Y1ZRNrSNHAmCN2B8Yb35w/sulwRlUTIyWcvMd3VJRU=; b=S4VRC7FI3/5BcSiFaSCbcJBN6RVWZOafiCi4Z5fFs44yPmli2twer6Mm5xX46aVVelb5w7 9G8iNM7VvlfEDGp6SZZH3nM33ipvzKW43TE0b3c2KV2rTUSOdAGEHC4n8FCqBU0o2/CONK nTnKlXy1qvnam+QzrDDeLN0mwB/EQIwcUwb2nnKnNVDejpFSC5SuZVODQbard9OFaZ5Tnx ENbG63MVo+p1SZHEm7cZBWBu8h8OLJjr+z+6BAPjk4kbEOPxZxbw2Ucbs+2WmD3SzyiHOd MvjubPulBZ9BPQEKYtsJZ9uVw76JesUHrIuX1LoUg4fw2fk8CYAtA1iC0RWWwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688550369; 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=1Y1ZRNrSNHAmCN2B8Yb35w/sulwRlUTIyWcvMd3VJRU=; b=afhRko2PHl476LfHHnrOogmk86bXxDQMEdBdlPy/1GoMKYkEIXrnqS6h54lpW5QDSysfT1 ++stkXXXXe/qxtUUWEwq0O1STbGjYwsZh3YIAOtkvREXer17rfAaB015H/sCUW/MoHp/3+ HzzWrv+6AiXXvYi4oQ1GZpukxReoB1USoR0DAZ5wA3vXB5OKKtdgLFOP/jb3LWUKcxhZEQ ATEbNbdjsuvTVem3EQ2VcPwiwut2jfWWI/iaJh30yPqHl7Sz8mKnjq6d3el59bz2RPK3ri yurkuAGPRg39mGflQpuFzgX6h75+duO7RGq/n2IK78Ry3YfSGpJPohjPWkgL9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688550369; a=rsa-sha256; cv=none; b=pwkvdwzlQ2jymVgcDG8k4SmawX6cULWtXL/F2D2WIAkilspKUFEupBnzAfcxnAm1HE+Gug v0LWiZs5mHfN7Ed8xlmsh1KmS4l+CRQOeJxpar11pOEB3myIaJUtknb4yd+oqhTg9Z6y4E S0QgFFhSIJI1O4oo++syKxBSkKVFBPVgoGc17cMd3RbOSBFm90VvHk9UmkCe3F+dKkopRg r0IwP5i/ffvWGP/qm3wCxUza2A+fHVbUpb/eDLgpm3VjKBxw65Np9YrAK8bu0h1CWSZqv3 OxKhUWba2Lggc/kaiWmuErnC1bMubXIGNdO5mMpcpVVZp84WF6EBEZ2IQqaSiw== 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 4QwvtT1c5Sz18tv; Wed, 5 Jul 2023 09:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3659k9g7039195; Wed, 5 Jul 2023 09:46:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3659k9Xw039194; Wed, 5 Jul 2023 09:46:09 GMT (envelope-from git) Date: Wed, 5 Jul 2023 09:46:09 GMT Message-Id: <202307050946.3659k9Xw039194@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: 6b1f53295148 - main - arm64: Fix a use of update_lower_register List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6b1f53295148fb1a10b1193dbd22cb00a796f8d6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6b1f53295148fb1a10b1193dbd22cb00a796f8d6 commit 6b1f53295148fb1a10b1193dbd22cb00a796f8d6 Author: Andrew Turner AuthorDate: 2023-07-03 09:38:10 +0000 Commit: Andrew Turner CommitDate: 2023-07-05 09:42:14 +0000 arm64: Fix a use of update_lower_register In get_kernel_reg_masked we use update_lower_register to get the lower value of two registers for a given field. It will return the entire register value with just the single field updated. Because of this get_kernel_reg_masked needs to use the returned value directly rather than ORing each field together. Fix this by updating the mask and returning that from get_kernel_reg_masked. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D40846 --- sys/arm64/arm64/identcpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 20ef74f58de2..bbb3e2d1484b 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -1821,12 +1821,12 @@ get_kernel_reg_masked(u_int reg, uint64_t *valp, uint64_t mask) for (int i = 0; i < nitems(user_regs); i++) { if (user_regs[i].reg == reg) { val = CPU_DESC_FIELD(kern_cpu_desc, i); - *valp = 0; fields = user_regs[i].fields; for (int j = 0; fields[j].type != 0; j++) { - *valp |= update_lower_register(mask, val, + mask = update_lower_register(mask, val, fields[j].shift, 4, fields[j].sign); } + *valp = mask; return (true); } }