From nobody Wed Mar 23 15:36:18 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 2D33F11D193A; Wed, 23 Mar 2022 15:36:19 +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 4KNsrz0ZMVz4vpX; Wed, 23 Mar 2022 15:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648049779; 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=WO9y4gDqRczNuu7hCL5z+abK8erevWLAS6txDrznsRw=; b=r2IiWwlBpx5yO4HrJRMzgaBWse/3UdAwU4qWM8PgZIg4jzYmMisuyODWW6fkW1GvWUzi3G WaPcXdgeEY/xdid4rsmrlZl4dYy8yGrA18MyHOY1amrA+bvpzXX2t7V/pSZ60VgSreYPF6 ZtgM7uQqxxSFURyDEbX3pkWnnIC4bMos51x8stUpxFEkUMzeMOdGFJ2wLw4l7ZOZEFHfva rj3qBW3KaHTcS/YMoJCm4x+LLuESFY2DD7rP3l4Xhj3UuNu+I2BYRETZwGxKLtsqJZI02/ HOTPRJwWM10sR8CFbJfD1C8DIHuhGpTZ6xCL+vVa2NTo9tKHHRqnfNoeH272lQ== 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 E3DEF25F6B; Wed, 23 Mar 2022 15:36:18 +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 22NFaI2p069169; Wed, 23 Mar 2022 15:36:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NFaIsr069168; Wed, 23 Mar 2022 15:36:18 GMT (envelope-from git) Date: Wed, 23 Mar 2022 15:36:18 GMT Message-Id: <202203231536.22NFaIsr069168@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: 6e1f7b9b3801 - main - Remove L2_BLOCK_MASK from arm64 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/main X-Git-Reftype: branch X-Git-Commit: 6e1f7b9b38011eaa54d06b92cd58c180788d141f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648049779; 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=WO9y4gDqRczNuu7hCL5z+abK8erevWLAS6txDrznsRw=; b=MdyO78MEcj1E6veoNl25mXbScOAcxnUZaFNyLDnG3tHnB6yl/FHm4UPA2ijDjL6tX4ug9F 1awGeCmzGxTpHgRr6VXe+w/jm4oBg7a4ASm2NX4RPIwcjIbbrUfKwRmFAgqIYREax4HZeT qXkrWZluBr3Dx155VsRPE39K9Y1OVYBJST/f22OkndmAGz/4EVMa42R61YnSVF9XRSJs5c Pa8zL0vV2tWhtHvDpJdRf4DPRBwUG3+Kvrxrq4hwKGicAOxsM1o9uTsWhpwqKkWYYqoDRg JTFUXNOmepN5SSqgL9NPMPyr09NKXx0xGJulq23zL9fdpo1EYxnLlWe27/qMDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648049779; a=rsa-sha256; cv=none; b=lEwKaxvw/w2Hby17OMP8JSHYS40C4cc2tRPsSdC2rzP3X+SvtJkTWgDBoN/pSCodTVMuR2 rgYXGjCY7nr6WIWSuHhn/OA/XlbCoqtVWxwJxJN1vyKl3mn5x1VBy9KH893Qm4/3GHDbla hYAlnZOErpebKft9MDsdi3TGuRTPx6UGEtIKgb6iuqb/yJ65vnKYEdDxfd7kmWIQ5s2j3R bkjZSBQyquPUtEDKSmBRh0myRM1L89i6YI+RezkRmvjeIV2yZmholzxc8rctDzwiVbmUZO q9k9r7NNlKN3+MI/xI7N19C3I19IM1DD6tZMRStFkauKKfydVA8tuaMRd7IZIA== 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=6e1f7b9b38011eaa54d06b92cd58c180788d141f commit 6e1f7b9b38011eaa54d06b92cd58c180788d141f Author: Andrew Turner AuthorDate: 2022-03-23 15:33:05 +0000 Commit: Andrew Turner CommitDate: 2022-03-23 15:33:05 +0000 Remove L2_BLOCK_MASK from arm64 It's unneeded as it was just used to align KERNBASE to a level 2 block start address. KERNBASE was already aligned correctly. Sponsored by: The FreeBSD Foundation --- sys/arm64/arm64/locore.S | 2 +- sys/arm64/include/pte.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index c9cf25aae37f..534c89ac32dc 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -455,7 +455,7 @@ common: /* Create the kernel space L2 table */ mov x6, x26 mov x7, #(ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK)) - mov x8, #(KERNBASE & L2_BLOCK_MASK) + mov x8, #(KERNBASE) mov x9, x28 bl build_l2_block_pagetable diff --git a/sys/arm64/include/pte.h b/sys/arm64/include/pte.h index 6b816464c167..3ce11133e2ef 100644 --- a/sys/arm64/include/pte.h +++ b/sys/arm64/include/pte.h @@ -134,8 +134,6 @@ typedef uint64_t pt_entry_t; /* page table entry */ #define L2_BLOCK L1_BLOCK #define L2_TABLE L1_TABLE -#define L2_BLOCK_MASK UINT64_C(0xffffffffffe00000) - /* Level 3 table, 4KiB per entry */ #define L3_SHIFT 12 #define L3_SIZE (1 << L3_SHIFT)