From nobody Mon Jan 31 11:32:51 2022 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 B44A01982B25; Mon, 31 Jan 2022 11:32:53 +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 4JnQsc4k5gz3LpD; Mon, 31 Jan 2022 11:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643628773; 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=lyup9tAn2kMVmW8fXBL27lt9a9v/V/SqQpuoQNFQfsg=; b=Xxi9vJhMA1pY6o8QmgBjg3tQN4oRvS+szGsisB5jLaicmjEv5AP/MDzTmFbN+6zNZWOQZh iz8uSMcWTkLeeNwCCRcPzKsPO0z5siJD/8iD4enCKUYfn26q/pH0nDsVjuhzPU8u0mXKUU hpZq6IPuyC10QtsGhagENcOl/FtUzkaAApdiOWL5k5ReUPP1IHOMEqBcTNuzC/hfsp7kcu 623xMv+EuJnHVg0OAuedx5YsPWxlIyJ0ZBeXnsYyM8ArW6/b0qzaQ0WxL6M0dYnQ6k7Wzr 5sOdGmjFmCimw4BAQS16aWryiCGMujZjg+qhHUspUKzY+5hTktdpvf7gRljPMg== 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 82EAA1BA91; Mon, 31 Jan 2022 11:32:51 +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 20VBWpnT015127; Mon, 31 Jan 2022 11:32:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20VBWprE015126; Mon, 31 Jan 2022 11:32:51 GMT (envelope-from git) Date: Mon, 31 Jan 2022 11:32:51 GMT Message-Id: <202201311132.20VBWprE015126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 1ffa52023ba9 - stable/13 - Use the arm64 ttbr macro to define the ASID shift 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1ffa52023ba9413db613b248c0e4335b2b27071e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643628773; 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=lyup9tAn2kMVmW8fXBL27lt9a9v/V/SqQpuoQNFQfsg=; b=Hpn1WiavbGy0Lor9JUu5cPcvGGAS6OH1FiCyj6hW8ge5IXZ0PQO5fkBpdSjJf+vo2tQuKd Gi4NehwVp0gUJV6MEWJypFA5PC1VURcSArERld+gjZuKm+6FpCJcwGNLjzh5vy5EAP2zRr AJTBivrJ/0WzjsdH10/T0N+Sk35eMc6YzF+PNAVqa9deU+DrOWIIyvd0c/nL3dbgoHADaq 1SI1vaIf3B5cj6+EB+SO25+SAjEPwqXtwdsG03ifEmCKbjiMfJIfwDDksDkwKzezBGKDau hXPxTonRvAAT4SWSL5XOuN+8lkesUx4R+EyMpmHQXokeguCgm6xCJKH9942Qfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643628773; a=rsa-sha256; cv=none; b=msyffWKddBskqzuP/WAaFkKEB2CHLefXjXJplQcy9FAx2nhDYLbR8HevzFP/+/g8nGazob VOCAKYesKZrkNE8ePouWB6tqp2M9t7QLGXDndDIwV+rB/2kfCAmRQtBhVtyZUapmaCrmzZ wSwAqbLqCBkY1orHEngoxbt8EWe91LoK69lFzNoi0G4r5SY++79iCznup1Wf7/Izr471PJ Y30gJRpqm0VdFw+IDo8N8z2rV2ViR7eTpVJuZMJk4isZ20cNgZsTLc7WFHBUtkZFMTjKIL ED1PpKA9ZD4TTR6MzwVUdbDlbHpRuFiC2cKr90CZivnHA3IM18SbfxyX15jG7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1ffa52023ba9413db613b248c0e4335b2b27071e commit 1ffa52023ba9413db613b248c0e4335b2b27071e Author: Andrew Turner AuthorDate: 2022-01-05 14:30:40 +0000 Commit: Andrew Turner CommitDate: 2022-01-31 10:05:47 +0000 Use the arm64 ttbr macro to define the ASID shift Now we have a macro to descrive the arm64 TTBR registers use it in the ASID_TO_OPERAND pmap macro. Sponsored by: The FreeBSD Foundation (cherry picked from commit 459e0b92e8aef0048e19a306c4626ed72356a3d0) --- sys/arm64/include/pmap.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 11a0388ab350..23fc5d1404f1 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -146,10 +146,9 @@ extern struct pmap kernel_pmap_store; #define ASID_RESERVED_FOR_PID_0 0 #define ASID_RESERVED_FOR_EFI 1 #define ASID_FIRST_AVAILABLE (ASID_RESERVED_FOR_EFI + 1) -#define ASID_TO_OPERAND_SHIFT 48 #define ASID_TO_OPERAND(asid) ({ \ KASSERT((asid) != -1, ("invalid ASID")); \ - (uint64_t)(asid) << ASID_TO_OPERAND_SHIFT; \ + (uint64_t)(asid) << TTBR_ASID_SHIFT; \ }) extern vm_offset_t virtual_avail;