From nobody Thu May 15 15:27:57 2025 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 4ZyvH21hYSz5wVlC; Thu, 15 May 2025 15:27:58 +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 4ZyvH213JFz46N3; Thu, 15 May 2025 15:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747322878; 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=Dk84RJrOs5XBx+AD+HS8Pjgrp7T8JS5SN3r5w8CHJW8=; b=Po9UP4UtcyMjY3B+KsqDZNs48are57sPCKFotuauKqYeGS9PIcT1X1W3x5dO4OyVxx27nx eQKgd9QILq1Or3p7BrVuCw1+WtA7wadbrGXBbZsUOHHDx0lm+1uNc/gadBBs4tg/HMvxQo 4KjUuD3M0CG1PeY2GmITbGCtGWvIbLyK3zKUN7AYzsiUq5O5bBZHz0729v8J142BT/N+RW y8krN/J5ow1QESAaL4DAMu33gFSDirM2sP4lR4Su7sBk7cDmtr2jhB8HWppzQICYCmfxRw yRqIiOH3IN1Hyf4EHZyM0igPZVdZysG5tsg5b6gCanWbEuK34F4EmkMBnVzlMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747322878; 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=Dk84RJrOs5XBx+AD+HS8Pjgrp7T8JS5SN3r5w8CHJW8=; b=vzotl/mMTGRWAXl+g2E8ipQ+QC8AJNqzCrfUlPilYB3PW3MUmTqIuB8YrCzQYgrXu0mVXb OsUIFzs8cRIidK/rjI2h9Y/tibrj6Zj/yqO3JiDsmNa3ZrihZ2P85KmBHnxp6/0qoosvQo 52Pv0avd+F68QVYjXCZoQ8FK5OFLOHVG17tG7lW1bd0GZabKX7KXRXR58KFgcEvjY7pB7h tl2jE5wbZJArYXTKmcH7ZJP5GRxCd8XObhKgXLTsfyKxJ7iMYpQRU1N0iy0UFSdmroFDW9 VgyDdvfptc9Hvn+Y+M6rY3upxTIflAnrpAa4M0e/0egR0xrlqX8WCflqVRxjRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747322878; a=rsa-sha256; cv=none; b=l8qHXl1ESrVOBtlL9h92IEdp4FbHwf3QncyIuoDfW8cD/ALWJdo6Y/XWpJnJ44cxzUSlJp l066a6xmgQA+JylnbZDrjnQooUc0CQDiJDggLbu50vAwHKHZvgq6QqmmMDFzX2O9S+9vhk 5P9ur3sL04+WS69WZtM402SDfOipEybjJy2+WaeXA+pYKtLqvenlQohA41clWEezubQMX+ i2cNNRqJGPjBlUxtJDczGWdwC6CdBbSBiEyw7DSac7pjie5939ov9U5DQLkfHnAPaW2IR+ gZZzERzqMamhVwp7lAmtiSoEjobImRfDnoALgFFbTi+SHhVxY8UUXcppjzcItg== 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 4ZyvH2022Gz7Jt; Thu, 15 May 2025 15:27:58 +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 54FFRv7r071450; Thu, 15 May 2025 15:27:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FFRvU5071447; Thu, 15 May 2025 15:27:57 GMT (envelope-from git) Date: Thu, 15 May 2025 15:27:57 GMT Message-Id: <202505151527.54FFRvU5071447@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: 68baf043e48b - main - arm: Make the pmap_kenter signature like 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 68baf043e48bac021389f844516ea74ca2d8e115 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=68baf043e48bac021389f844516ea74ca2d8e115 commit 68baf043e48bac021389f844516ea74ca2d8e115 Author: Andrew Turner AuthorDate: 2025-05-15 14:50:14 +0000 Commit: Andrew Turner CommitDate: 2025-05-15 15:09:46 +0000 arm: Make the pmap_kenter signature like arm64 To support a common pmap_mapdev_attr change pmap_kenter to include the size any memory type in the signature. Reviewed by: mhorne Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50307 --- sys/arm/arm/mem.c | 4 ++-- sys/arm/arm/pmap-v6.c | 43 +++++++++++++++++++++++-------------------- sys/arm/include/pmap.h | 2 +- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/sys/arm/arm/mem.c b/sys/arm/arm/mem.c index 7f149892ab9d..cec253f60b51 100644 --- a/sys/arm/arm/mem.c +++ b/sys/arm/arm/mem.c @@ -114,8 +114,8 @@ memrw(struct cdev *dev, struct uio *uio, int flags) if (!address_valid) return (EINVAL); sx_xlock(&tmppt_lock); - pmap_kenter((vm_offset_t)_tmppt, v); - pmap_tlb_flush(kernel_pmap, (vm_offset_t)_tmppt); + pmap_kenter((vm_offset_t)_tmppt, PAGE_SIZE, v, + VM_MEMATTR_DEFAULT); o = (int)uio->uio_offset & PAGE_MASK; c = (u_int)(PAGE_SIZE - ((int)iov->iov_base & PAGE_MASK)); c = min(c, (u_int)(PAGE_SIZE - o)); diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index fafa8908dcd1..a0e0b007ffaa 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1150,7 +1150,7 @@ pmap_dump_kextract(vm_offset_t va, pt2_entry_t *pte2p) * After pmap_bootstrap() is called, the following functions for * mappings can be used: * - * void pmap_kenter(vm_offset_t va, vm_paddr_t pa); + * void pmap_kenter(vm_offset_t va, vm_size_t size, vm_paddr_t pa, int mode); * void pmap_kremove(vm_offset_t va); * vm_offset_t pmap_map(vm_offset_t *virt, vm_paddr_t start, vm_paddr_t end, * int prot); @@ -1308,11 +1308,28 @@ pmap_kenter_prot_attr(vm_offset_t va, vm_paddr_t pa, uint32_t prot, pte2_store(pte2p, PTE2_KERN(pa, prot, attr)); } -PMAP_INLINE void -pmap_kenter(vm_offset_t va, vm_paddr_t pa) +static __inline void +pmap_kenter_noflush(vm_offset_t va, vm_size_t size, vm_paddr_t pa, int mode) { + uint32_t l2attr; + + KASSERT((size & PAGE_MASK) == 0, + ("%s: device mapping not page-sized", __func__)); - pmap_kenter_prot_attr(va, pa, PTE2_AP_KRW, PTE2_ATTR_DEFAULT); + l2attr = vm_memattr_to_pte2(mode); + while (size != 0) { + pmap_kenter_prot_attr(va, pa, PTE2_AP_KRW, l2attr); + va += PAGE_SIZE; + pa += PAGE_SIZE; + size -= PAGE_SIZE; + } +} + +PMAP_INLINE void +pmap_kenter(vm_offset_t va, vm_size_t size, vm_paddr_t pa, int mode) +{ + pmap_kenter_noflush(va, size, pa, mode); + tlb_flush_range(va, size); } /* @@ -1453,7 +1470,7 @@ pmap_kenter_temporary(vm_paddr_t pa, int i) /* QQQ: 'i' should be less or equal to MAXDUMPPGS. */ va = (vm_offset_t)crashdumpmap + (i * PAGE_SIZE); - pmap_kenter(va, pa); + pmap_kenter_noflush(va, PAGE_SIZE, pa, VM_MEMATTR_DEFAULT); tlb_flush_local(va); return ((void *)crashdumpmap); } @@ -6253,21 +6270,7 @@ pmap_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t *pap) void pmap_kenter_device(vm_offset_t va, vm_size_t size, vm_paddr_t pa) { - vm_offset_t sva; - uint32_t l2attr; - - KASSERT((size & PAGE_MASK) == 0, - ("%s: device mapping not page-sized", __func__)); - - sva = va; - l2attr = vm_memattr_to_pte2(VM_MEMATTR_DEVICE); - while (size != 0) { - pmap_kenter_prot_attr(va, pa, PTE2_AP_KRW, l2attr); - va += PAGE_SIZE; - pa += PAGE_SIZE; - size -= PAGE_SIZE; - } - tlb_flush_range(sva, va - sva); + pmap_kenter(va, size, pa, VM_MEMATTR_DEVICE); } void diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h index 671e2af52423..dcd4e0a83ab1 100644 --- a/sys/arm/include/pmap.h +++ b/sys/arm/include/pmap.h @@ -135,7 +135,7 @@ extern ttb_entry_t pmap_kern_ttb; /* TTB for kernel pmap */ * vtopte2(). */ void pmap_bootstrap(vm_offset_t); -void pmap_kenter(vm_offset_t, vm_paddr_t); +void pmap_kenter(vm_offset_t, vm_size_t, vm_paddr_t, int); void pmap_kremove(vm_offset_t); bool pmap_page_is_mapped(vm_page_t); bool pmap_ps_enabled(pmap_t pmap);