From nobody Tue Nov 19 17:47:03 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 4XtBlD2cr7z5fGDg; Tue, 19 Nov 2024 17:47:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XtBlD0Rpcz4R0Z; Tue, 19 Nov 2024 17:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732038424; 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=3lAD7X7t/OhyZsytHMp02Ce3tb3rjzYapGdwWZqmb40=; b=vKWMSCSzUHWib9NRkifBkuiGGAQNzOxEOj32ER/6OslWtRVOi43OHnunDBnOKUuaWkhVAK oaimNsm5PYs1c2s/7QS4T636QhXloOFdhYlhDGeUqTsAaHuNKwwe/nPWCt6LY/29NKqtQs FdOzsSAQzSQgycQQpop80ougFf8acyWaELPo7RcmWddxEitveX7cJKSsIQIaXluWwR5VGp iKj3KnLAwyDSIEm8qaPz0k5T9Ffqh2QtoYm83w6bUnkZiXPXfcZhyKY/iTNzHeX+6RfxIP qRMgs++cZtTI3WWy4IhKfd7D0CzU535Z77l1uzy76ntdTLsdMEiC55G8C04CTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732038424; 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=3lAD7X7t/OhyZsytHMp02Ce3tb3rjzYapGdwWZqmb40=; b=t7u8lKOqNWnDiD43LuM/cKlhPrC80qVDAGyU0Pm2lBBJv0SLM3e6FP1OhvZxOouLKssnLe MgwK2V+4mHa/SpejSXOXgAY6ONiMxYcVCvKWmzfEvQ41Uae+hNvl6M3YRLvJsLCuL27ry5 iKZ4JzCYf9guhJxEMsERJYhAlh0KpqSAN1oVKSVkZaKrg2vLY8ewn3ngu6CR/YDw+0pz1j kFi+l1ken9r3Wz6WzUaJG7iHYQVoNFxwmxhhaVilrfGVq8tCHidWt3FMU8KPcMxoWwpM+U WL48V3HUGsmrdehyjNAdFWOWhNQ3QdtWm+eKnEGusbM5bwyNOFBjPk1nnzwQsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732038424; a=rsa-sha256; cv=none; b=xk0fmIJZcsqnGRVSX3c1XV9hZyRcmFcORSfJXiLiNPStvNCxwh4QatEVu3oI8ISh06IpUn odGJNnz5YEVzUDvQ9xJxXqCOyp0cvooJ+BL3AjAYSlGfdKWV/y1ESreaLb0SDq3pfBQGQs +FDQpHXegJXuFIe8ACBBVnPVmfNbBCyL5X/71hojbelCfkkcx+Bzo/UE0EEYMzEgglHJUS pbsOwLA+fz85ozRKBpQI48Hade/a0YKUJS4BNI/K7WgIyRt1l/hoH8lIRc1oM97bGbEq/s GJG2BbeomQFFO+y4xRXkdX83x9iTPenAAAnJTIplKI3y4L1Oa+oZOJMgHgIlKA== 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 4XtBlC6vdnzK3s; Tue, 19 Nov 2024 17:47:03 +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 4AJHl3rZ000934; Tue, 19 Nov 2024 17:47:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJHl3Zt000931; Tue, 19 Nov 2024 17:47:03 GMT (envelope-from git) Date: Tue, 19 Nov 2024 17:47:03 GMT Message-Id: <202411191747.4AJHl3Zt000931@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: ce284dded5d5 - main - arm64: Fix comparing 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: ce284dded5d5db6b1bceda309dccba616f485ade Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ce284dded5d5db6b1bceda309dccba616f485ade commit ce284dded5d5db6b1bceda309dccba616f485ade Author: Andrew Turner AuthorDate: 2024-11-19 10:20:24 +0000 Commit: Andrew Turner CommitDate: 2024-11-19 17:31:00 +0000 arm64: Fix comparing ID register fields The logic in update_special_reg_field was reversed. Fix by swapping the order of the arguments. PR: 282505 Fixes: f1fb1d5c9017 ("arm64: Support more ID register field types") Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47437 --- sys/arm64/arm64/identcpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index f4d297e7d9bc..95e7669d053e 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2261,14 +2261,14 @@ update_special_reg_field(uint64_t user_reg, u_int type, uint64_t value, switch (type & MRS_TYPE_MASK) { case MRS_EXACT_IF_DIFFERENT: - if (mrs_field_cmp(cur, new_val, shift, width, sign) != 0) + if (mrs_field_cmp(new_val, cur, shift, width, sign) != 0) break; /* FALLTHROUGH */ case MRS_EXACT: cur = (uint64_t)MRS_SAFE_VAL(type) << shift; break; case MRS_LOWER: - if (mrs_field_cmp(cur, new_val, shift, width, sign) < 0) + if (mrs_field_cmp(new_val, cur, shift, width, sign) < 0) cur = new_val; break; case MRS_HIGHER_OR_ZERO: @@ -2278,7 +2278,7 @@ update_special_reg_field(uint64_t user_reg, u_int type, uint64_t value, } /* FALLTHROUGH */ case MRS_HIGHER: - if (mrs_field_cmp(cur, new_val, shift, width, sign) > 0) + if (mrs_field_cmp(new_val, cur, shift, width, sign) > 0) cur = new_val; break; default: