From nobody Fri May 2 15:45:03 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 4ZpwGm49mtz5td00; Fri, 02 May 2025 15:45:04 +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 4ZpwGm1KN0z3lQS; Fri, 02 May 2025 15:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746200704; 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=k0eZ8WzNdUOqTM41qAhDbsMql8SPIX43Ta8Pfk0LPmk=; b=AcErVzVKbNCV9FRYPyWmIJuwzSUVgYPWkg/9GJuO4lfabrJkicb6PVlckVY/Lg7abRNRUy UxKC/Z1U9z/aPnoAPm8/ZiT3G6SBP8s0krMs2GkcoirVMAKmv6+ZqiRoKu1YT8y75zOyDt xplSCqLlsOr2KFnhdyt0E8658I/FMiaPZgzUIgzOakPaA9oFTyf5fCHhomr3PJZG9D1t7f wcYC1BzNS6bEYllzEwi6yMa2BjqvD+MLP8P1m+JvxzLgiEj7HE6QeHJCrVl50c2npYDAW/ GJ0Z21OgoX662IMV6kv+kM+gkGiPskstsu3LlR1l0Nc3gPFBmvAsWiDo6/jvXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746200704; 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=k0eZ8WzNdUOqTM41qAhDbsMql8SPIX43Ta8Pfk0LPmk=; b=qGx2UPuphZhZo/9FQXodNhs2P25MNhyDx5bIMwILt1sIPIcnpXvk4/wbl39hzE8KJZADVW 7pSkozvo6w1Tts5XasBERCeysSlPHCOg28VbcFd3NXMH6MWtFF57Y6PL2qGV5r5VYI/wT1 W8ujqgIaRqcAxwlIUNSZSVavyXz2jn22/X2sEksU+HArTeTPSlaqyGKXSwZocbQJDNVaxl MIdFszfW+vYLIGh8v90dKljd6ZQr2KAUxj2pLUeVETZ5HAkOCbhQaz9sC53KzI80pfgxqa OkJTQlrdLid/8dgkY/nKDkW83OUexqJi0XuhKOW0OybNTTwSrrD2wY9q1bjoJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746200704; a=rsa-sha256; cv=none; b=vodnjUfefgcq2f6Blh7cWg3NCFM4TFy2umlG86XclzJZfM87YR3mNmcpHJu1wO8OpYoyAP NERYm9F//o8HQg1Y2EvNAWcx9CS6OzZBU7tEt+ojM1juS4t5kGkU94GbMurFimKDZFjHJ6 Ga6+CrLUvQPcF5i5HqqhLRb1FUcPQZFWGqLDOyjPRZCL7OF78Joyg+3pyVp+FuQ++ID2Fq x3olymEf+BrJXYRPLTL7gnMvrLO4WV32Bj8gCJVfjh/Sjj4yLmDkt/kwp1RAo5Y5TGzdEi j9eS8VMXbjrzC6ompt+oujB/Iwrp4oxXHbc4RMusZJH/s/s6Tgb3XdR21HFcvQ== 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 4ZpwGl6zPjz1J28; Fri, 02 May 2025 15:45:03 +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 542Fj39H097623; Fri, 2 May 2025 15:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 542Fj34W097620; Fri, 2 May 2025 15:45:03 GMT (envelope-from git) Date: Fri, 2 May 2025 15:45:03 GMT Message-Id: <202505021545.542Fj34W097620@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: 789aed31dc84 - main - subr_devmap: Make devmap_ptov static 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: 789aed31dc840765416e88066c027e8f56c292a3 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=789aed31dc840765416e88066c027e8f56c292a3 commit 789aed31dc840765416e88066c027e8f56c292a3 Author: Andrew Turner AuthorDate: 2025-05-02 15:34:17 +0000 Commit: Andrew Turner CommitDate: 2025-05-02 15:39:04 +0000 subr_devmap: Make devmap_ptov static The devmap_ptov and devmap_vtop functions are only used in this file. Reviewed by: mhorne Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50015 --- sys/kern/subr_devmap.c | 6 ++++-- sys/sys/devmap.h | 14 -------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/sys/kern/subr_devmap.c b/sys/kern/subr_devmap.c index 1592db1790d5..79f3c75269ca 100644 --- a/sys/kern/subr_devmap.c +++ b/sys/kern/subr_devmap.c @@ -41,6 +41,8 @@ #include #endif +#define DEVMAP_PADDR_NOTFOUND ((vm_paddr_t)(-1)) + static const struct devmap_entry *devmap_table; static boolean_t devmap_bootstrap_done = false; @@ -198,7 +200,7 @@ devmap_bootstrap(void) * Look up the given physical address in the static mapping data and return the * corresponding virtual address, or NULL if not found. */ -void * +static void * devmap_ptov(vm_paddr_t pa, vm_size_t size) { const struct devmap_entry *pd; @@ -218,7 +220,7 @@ devmap_ptov(vm_paddr_t pa, vm_size_t size) * Look up the given virtual address in the static mapping data and return the * corresponding physical address, or DEVMAP_PADDR_NOTFOUND if not found. */ -vm_paddr_t +static vm_paddr_t devmap_vtop(void * vpva, vm_size_t size) { const struct devmap_entry *pd; diff --git a/sys/sys/devmap.h b/sys/sys/devmap.h index 914bec31af4c..69e696a20fc9 100644 --- a/sys/sys/devmap.h +++ b/sys/sys/devmap.h @@ -76,20 +76,6 @@ void devmap_register_table(const struct devmap_entry * _table); */ void devmap_bootstrap(void); -/* - * Translate between virtual and physical addresses within a region that is - * static-mapped by the devmap code. If the given address range isn't - * static-mapped, then ptov returns NULL and vtop returns DEVMAP_PADDR_NOTFOUND. - * The latter implies that you can't vtop just the last byte of physical address - * space. This is not as limiting as it might sound, because even if a device - * occupies the end of the physical address space, you're only prevented from - * doing vtop for that single byte. If you vtop a size bigger than 1 it works. - */ -#define DEVMAP_PADDR_NOTFOUND ((vm_paddr_t)(-1)) - -void * devmap_ptov(vm_paddr_t _pa, vm_size_t _sz); -vm_paddr_t devmap_vtop(void * _va, vm_size_t _sz); - /* Print the static mapping table; used for bootverbose output. */ void devmap_print_table(void);