From nobody Wed Aug 10 16:06:26 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 4M2vv65Pmqz4Y808; Wed, 10 Aug 2022 16:06:26 +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 4M2vv64Ssmz4DT9; Wed, 10 Aug 2022 16:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660147586; 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=cTkXuHuGQH3mXGGvp6MKqj7U4eyx7M/e2PpYaZkWdL8=; b=EkPpxCfyI0Ckmw9mvXxnv+MswSWW43YoW4gvJUdgErJSJ1I8TTQg8xXlq+Nc+xnvbUkgXv Z9OQ6AUhJT0l/Pl2Ee3cBaABOBhw7de0JHIqsWC/ap0VZ7zKV8Pk3yx8eq+QV0K+Px/u/w vq2lE7c0i/BHaZB5iTV9yBDxV1sClIVxhFnr9Nr3Svvr4xxSPnL3d+RK8DABLp2Wq2MrCI /p7vBXEoqB4pA3U2mGnI0YLWdtOYpBZWSsGv9Lu67V+VZHNW1kVgx9Mc9s+vxnT4AAc8Hu TyVieHkEcSg2iycsSSm5WESCsepgnnXjnKu6ogCDRFdCz6B4BDSEJePQtLJHog== 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 4M2vv63ZmCzHn0; Wed, 10 Aug 2022 16:06:26 +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 27AG6QHh072105; Wed, 10 Aug 2022 16:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27AG6QSW072104; Wed, 10 Aug 2022 16:06:26 GMT (envelope-from git) Date: Wed, 10 Aug 2022 16:06:26 GMT Message-Id: <202208101606.27AG6QSW072104@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: abc7a4a0c1b0 - main - Simplify setting a non-4k PAGE_SIZE on arm64 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: abc7a4a0c1b0ecfd44fd7e0a9d47d6cd4eed1362 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660147586; 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=cTkXuHuGQH3mXGGvp6MKqj7U4eyx7M/e2PpYaZkWdL8=; b=QTNbR6NUIcH7KmDHt0y8ljzhnTJxkMIhAuvtALpTCNjrWlVGPwNai5cnQls8+t/B2/R5gi 2t0MA7MpBcNKUXOAwnxe17CeV4xu8ivMMWNIfeUrukzinON8jTTXizeRrpYWfoaKBcF5oS Hn11Q2786Dow+3ZWU0/GlUBsJP+7UW3Uw5JvC9yxm22zlodonYipwdxD1Ry5je/QVuUvI1 nPZD2sgk0PQRKspUS9uy6WLS2tMOvDF5tca2SqL3zUmvaWJ60f432R8JqqBurbFeb5Z5NQ qG87gDHieQqqGy4xKDeutkv3RBC+mLqSZJmJxRqxuUrsGx/PG3GhrcoHSkU41Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660147586; a=rsa-sha256; cv=none; b=Dq7TVGBloug8mWIcW2eLvrq47B9wU0IcTfDMRZL1VOwCudV/rFctuDPCJs3SpDFh6Af4mN owUKLJpgQgnwgLXgGN9GkIbh1uP2b3nb42R8bf6lGa/cShI+0yXidoOj/S2xHD9U5fsro9 +uq47MX8gkhgCYWqJuMkLBDoeqtQ+PK70fxCxVP7TESzqu6U+hyEjRgqXRffU/jqa55COh WhuY9hERcj6/rj+S3QJxL5kHILB5ubaBbr9h4PnDk4W+O4SON7p0Qq44Uy1Kyt7MJbx6kt apVuAaMkDhPzwywlP6Evd1Xap1VSByP+1kIIjBSo86YkWU4zBLpTB2Q5KbiDFw== 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=abc7a4a0c1b0ecfd44fd7e0a9d47d6cd4eed1362 commit abc7a4a0c1b0ecfd44fd7e0a9d47d6cd4eed1362 Author: Andrew Turner AuthorDate: 2022-08-09 15:15:56 +0000 Commit: Andrew Turner CommitDate: 2022-08-10 16:02:00 +0000 Simplify setting a non-4k PAGE_SIZE on arm64 Define PAGE_SIZE and PAGE_MASK based on PAGE_SHIFT. With this we only need to set one value to change one value to change the page size. While here remove the unused PAGE_MASK_* macros. Sponsored by: The FreeBSD Foundation --- sys/arm64/include/param.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/arm64/include/param.h b/sys/arm64/include/param.h index f331fd19e2c8..8b2ac8c9bd18 100644 --- a/sys/arm64/include/param.h +++ b/sys/arm64/include/param.h @@ -85,19 +85,16 @@ #define PAGE_SHIFT_4K 12 #define PAGE_SIZE_4K (1 << PAGE_SHIFT_4K) -#define PAGE_MASK_4K (PAGE_SIZE_4K - 1) #define PAGE_SHIFT_16K 14 #define PAGE_SIZE_16K (1 << PAGE_SHIFT_16K) -#define PAGE_MASK_16K (PAGE_SIZE_16K - 1) #define PAGE_SHIFT_64K 16 #define PAGE_SIZE_64K (1 << PAGE_SHIFT_64K) -#define PAGE_MASK_64K (PAGE_SIZE_64K - 1) #define PAGE_SHIFT PAGE_SHIFT_4K -#define PAGE_SIZE PAGE_SIZE_4K -#define PAGE_MASK PAGE_MASK_4K +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_MASK (PAGE_SIZE - 1) #define MAXPAGESIZES 3 /* maximum number of supported page sizes */