From owner-dev-commits-src-main@freebsd.org Sun Jan 3 02:10:33 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E2AA84C0C1E; Sun, 3 Jan 2021 02:10:33 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D7j0960M7z3mN4; Sun, 3 Jan 2021 02:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C09611FD10; Sun, 3 Jan 2021 02:10:33 +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 1032AXwl049059; Sun, 3 Jan 2021 02:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1032AXpB049058; Sun, 3 Jan 2021 02:10:33 GMT (envelope-from git) Date: Sun, 3 Jan 2021 02:10:33 GMT Message-Id: <202101030210.1032AXpB049058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 486580c44ce2 - main - arm: fix atomic_testand{set, clear}_64 for ops on high bits MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 486580c44ce29c1e3b1d9b858a08d9df9428b699 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2021 02:10:33 -0000 The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=486580c44ce29c1e3b1d9b858a08d9df9428b699 commit 486580c44ce29c1e3b1d9b858a08d9df9428b699 Author: Ryan Libby AuthorDate: 2021-01-03 02:09:37 +0000 Commit: Ryan Libby CommitDate: 2021-01-03 02:09:37 +0000 arm: fix atomic_testand{set,clear}_64 for ops on high bits The fix in bd03acedb804add1e22178d50eb2bfb703974ddf worked for 32-bit ops, and for 64-bit ops for bit arguments of 0 - 95, but then was broken for operations on the high 32 bits after that. Reviewed by: markj, mmel Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D27897 --- sys/arm/include/atomic-v6.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/arm/include/atomic-v6.h b/sys/arm/include/atomic-v6.h index ede879cb9fa8..b81ad6447ef7 100644 --- a/sys/arm/include/atomic-v6.h +++ b/sys/arm/include/atomic-v6.h @@ -913,9 +913,8 @@ atomic_testandclear_64(volatile uint64_t *p, u_int v) * Assume little-endian, * atomic_testandclear_32() uses only last 5 bits of v */ - if (v >= 32) { + if ((v & 0x20) != 0) p32++; - } return (atomic_testandclear_32(p32, v)); } @@ -973,9 +972,8 @@ atomic_testandset_64(volatile uint64_t *p, u_int v) * Assume little-endian, * atomic_testandset_32() uses only last 5 bits of v */ - if (v >= 32) { + if ((v & 0x20) != 0) p32++; - } return (atomic_testandset_32(p32, v)); }