From nobody Wed Jan 05 15:10:55 2022 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 B4C2D19251EA; Wed, 5 Jan 2022 15:10:56 +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 4JTXxD1Dq1z4XRS; Wed, 5 Jan 2022 15:10:56 +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 EB9A66540; Wed, 5 Jan 2022 15:10:55 +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 205FAtX2019181; Wed, 5 Jan 2022 15:10:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205FAt5w019180; Wed, 5 Jan 2022 15:10:55 GMT (envelope-from git) Date: Wed, 5 Jan 2022 15:10:55 GMT Message-Id: <202201051510.205FAt5w019180@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: 459e0b92e8ae - main - Use the arm64 ttbr macro to define the ASID shift 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: 459e0b92e8aef0048e19a306c4626ed72356a3d0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641395456; 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=Sl1+isQ24iEA5j6pMzlWq8qIb85Mmydgtf1/noN6dA4=; b=MchNxXVNYm2qGJ3k2B6Fr6kdPyyMlXGau3QYbMuZdGe4gWNgi0z+pAWSHBw9zflbkRGLYs WZeexkS/1y1W7o+EBzZU7gYFUoPCpxBdu7HCmb3X+bcjhrnxT0knlEXfv3OoU1k9AOH3Fm KOp3cp99U93wrj38aooqqN0YjibnSf546AzKO93omLwPskfH+35ppZi+4hBCZdPGbscsfR vrDPBE+pL8cy64mDvg0yXJuKm+IOXiT+m4X/uW6iJ4sRJPVD3sylc3ptd7FlsCVvaZrSm8 4iiM8NgR0DEdFuvFlemYILb3GWAV5jP3b1GqXNehsI7lLUzQUQOMRDA2IGhYHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641395456; a=rsa-sha256; cv=none; b=BPzIoGir03P5k/FsVr0950hjbmTkqNDC/QxGYuO+QaA5HzodPGXakgkVTOMLX/sBO1xJSD 84jQlgVW3jmKuL/M9fuDRaSXnPCwnpUv72HgVzEEWYOewdp/mqQSEUkzaM0eEF3qkssDIE EmA5MxZR4COdZRU/dMEZuTmsU+Fh20QasqTAEBsqubtGy6il6PVbzVL23edp+5CVElVDPr ZLBaOibwCoLJ/6BOSsw4rFQC0vErA5F+SLu5Eh0HjP1YkuCFB+xY2O2V2OZJJi86AJsbXi jdjdgmnnwscgaLlFfWFPSo5gtk2LT/9vUrFhY+s5DJM6wiBWjVLcjyvkBlI2lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=459e0b92e8aef0048e19a306c4626ed72356a3d0 commit 459e0b92e8aef0048e19a306c4626ed72356a3d0 Author: Andrew Turner AuthorDate: 2022-01-05 14:30:40 +0000 Commit: Andrew Turner CommitDate: 2022-01-05 14:56:25 +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 --- 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 1421d19aabda..90c70e8eca95 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;