From nobody Fri May 2 15:45:01 2025 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 4ZpwGk03P0z5td68; Fri, 02 May 2025 15:45:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpwGj6YcNz3lKs; Fri, 02 May 2025 15:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746200701; 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=4GdYMwetp/AXffa6Rzg35XvMzFrCJexyqcImWYd3hSk=; b=le8KV7m92cvqjOWFOtKO1uEHM82dLWErfknaBZmD5byo5zLeCEb2nWOEXt/s94vlq/0lZU KCuDKxbEgyfa5Ri9Y6UdTVyuKc3yAVY86RF+uLhyFsbwfFufvwEDpdc86FI6ZSMPNSO7Hh BfXiKixmpg89aaDWqW+MoH1K/O0Al3StHTi+BOqB9gKAKsxni2kMcbPRaLq4/4xeBTBV0L rRL0itcSVpGDuz9NI00BpIqVJGAQ2GIXozti4ce4daA768cqS1/8X9Zb0i2TvMDNdSahbd N/M2L8iaZulTbysy+ZSZWp3NCCzBquIvUE2XOuVm1r4E15j3mH09xNXxqyU1YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746200701; 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=4GdYMwetp/AXffa6Rzg35XvMzFrCJexyqcImWYd3hSk=; b=VQBlLo0js/gJ5UIbUQwrzgov2pH+/jzMRoCopKLgFYPw/Gi66qY28vlpKLK7TmqpfFvjMI ib5IEKsX9EL1EF8K8M0KomhhVayUBctk7yHV1uEYcWmgclaQCkTiCLb9hG5BXWiMFxZTIw PFrXjzF6e6kjdOxFnsRC8jk2kDmxrUgfKBzBYTl9KkeQnR7nGmbwoTvk4pZubK8gok3Dax jCHWXmBrEeIukBH2e9s0ondBPFm8Mp30Oua+hUnsQmD+IY+iub5gb3dWsPZmIZYZZc+8qI L9X+EIIlGAr04TO7SI0hVrORfjhn2zUPNLoGV4sol8tYx68Wabd95t8G5qgUtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746200701; a=rsa-sha256; cv=none; b=ecFWCZFxvny//4fKElhpQjNs60DfoG3fCQZ0PsH//6B90Ea7K8np9T8eCgjfcfMwTCtDFt wWJaW3A75PmSpGJ5HDRi9WHR0bPgLNfnoXDcYH3gKtDCvKDdFPg/NXmkNVXGmtHkqOaHa7 WCVf6ZZ2XhZnT1CkwgcmTzloBYEI1+IaczqLiIJOPce0X/8gAFwI0SPeqVg73gpT+PRPhu DEhzsH4nc6Ls/cX/bxfPOjuhg1npY92kVPmUrt8sqYIV+0UiN+fZ8KxDHgB3QJUn0dcpdl X4pSAngSKsRHzHC8ZhYusjPTaoBpYdgTFKgbdHOCoSqSn6ESmc5q7O3ttPzbxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpwGj5sxYz1JCX; Fri, 02 May 2025 15:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 542Fj1La097550; Fri, 2 May 2025 15:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 542Fj1Q4097547; Fri, 2 May 2025 15:45:01 GMT (envelope-from git) Date: Fri, 2 May 2025 15:45:01 GMT Message-Id: <202505021545.542Fj1Q4097547@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: d90e3482b638 - main - subr_devmap: Use the arm L1_S macro 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d90e3482b63859673a29854ebddabcd8b627162b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d90e3482b63859673a29854ebddabcd8b627162b commit d90e3482b63859673a29854ebddabcd8b627162b Author: Andrew Turner AuthorDate: 2025-05-02 15:33:13 +0000 Commit: Andrew Turner CommitDate: 2025-05-02 15:39:04 +0000 subr_devmap: Use the arm L1_S macro These check if we can should use a superpage to create the static map. As it is arm specific we can use an arm-specific macro here. Reviewed by: mhorne Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50013 --- sys/kern/subr_devmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_devmap.c b/sys/kern/subr_devmap.c index 3ab20a2a4d43..1592db1790d5 100644 --- a/sys/kern/subr_devmap.c +++ b/sys/kern/subr_devmap.c @@ -37,6 +37,10 @@ #include #include +#ifdef __arm__ +#include +#endif + static const struct devmap_entry *devmap_table; static boolean_t devmap_bootstrap_done = false; @@ -139,7 +143,7 @@ devmap_add_entry(vm_paddr_t pa, vm_size_t sz) * also align the virtual address to the next-lower 1MB boundary so that * we end with a nice efficient section mapping. */ - if ((pa & 0x000fffff) == 0 && (sz & 0x000fffff) == 0) { + if ((pa & L1_S_OFFSET) == 0 && (sz & L1_S_OFFSET) == 0) { akva_devmap_vaddr = trunc_1mpage(akva_devmap_vaddr - sz); } else #endif