From nobody Tue Apr 08 10:49:10 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 4ZX2rR1HVMz5sC3p; Tue, 08 Apr 2025 10:49:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZX2rQ2kpsz3k4S; Tue, 08 Apr 2025 10:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744109350; 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=5j0pBgpTOpwFufgeP1vcNkeg+28wU4lZ4OZ4Dokgc64=; b=Iks16Gt03aY7kMsq8uyTKHC/NVDZ0FsxCF7qoehrWfrv663n96T+o/FHDU6Cu6Qi2eNUYE 8MgzqFnLp/xzw+ZR4wqjkha4m7rCtMX4Xu0X/IA0cUFwYR4tDVKPY4Acl4q6g+mcFWMYMC NS9qlbi0lZhY1bAcLEVf7XqfaWPNY2c6JPV2RbsaWRanMFOUUQM+eRKHq3ebqkJwOWYwo8 5gxHEqN04Lo6hN+MViZBNMcBzIp14JaJrChanpU3nealEffaFlxOJVFXH8cBgAcxiS26xr upkpOPab5Qf+ChypHT8J1DavpOLESDdtGYVvbHtKPNipLNs5BDBJ4JExhVbrtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744109350; a=rsa-sha256; cv=none; b=yQPHc30xJ8k6kPkOqYOvKxKKlmF3Q4rAEvajtte/kRXpmjeVuya73Afd81LLRIrWoSm9Q+ NnWpR4nCojOJx3VoMBJETBdsRtGwcWuT+2xvyN6PZ4fgZIOo7b3v3JAU9ZpDIeaS9FShm3 5a0fBGJ5+lOixs7IlX9B70yevwnDZHTL8+q6ex4vcnQa2FsrDMk2YBhdKMnChVA+tuymQZ 39vDePqYbhVFNSC/A9aJI7rZ59JohX7MEUTYitGZf7k95N7tCaswgXVficx4/hdYpOwwcM EcbmoCfkWJEWWfWP/QneCeHkKS3LuXSocblWEWhXZQkXGNve6q2WSksYju3D5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744109350; 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=5j0pBgpTOpwFufgeP1vcNkeg+28wU4lZ4OZ4Dokgc64=; b=BUOEMT11y4j5NV7ycY7TgTMQP7XzTuPIdMOtG9y6mJ1PzM073+KGLWYr3iDuI32FdDSe5p +AjzDTgRNmDf1wWLCCTDTVzLOMXFDjTxFCbaAGHgIX9d5m0tTq0YduTy9F6bKfljq/hkEh Ls1DGHsbqTHy6AR7FZHYKJ6jYMq/Q1UMjUUVaqUoTjAKCOiqEO+pfiBw7lHiTOnqsi/qNR GD3r9rLqTtaKgIP+iNfGe575HIZvFE0NohjQ24wtlh3Zrd+vUBGTRtLizXPbMjDogtyabV DFJY8kCH42L4novHFW9azD+azdqgN2jyo3lMX1trc7iZEzvUAMsRwjMQnc0fsw== 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 4ZX2rQ2F02zCgC; Tue, 08 Apr 2025 10:49:10 +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 538AnAQF002026; Tue, 8 Apr 2025 10:49:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538AnAuK002022; Tue, 8 Apr 2025 10:49:10 GMT (envelope-from git) Date: Tue, 8 Apr 2025 10:49:10 GMT Message-Id: <202504081049.538AnAuK002022@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: 28bc1919f5d4 - main - dev/fdt: Add fdt_foreach_reserved_region 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: 28bc1919f5d42f699612f9335e25239bd30ed164 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=28bc1919f5d42f699612f9335e25239bd30ed164 commit 28bc1919f5d42f699612f9335e25239bd30ed164 Author: Andrew Turner AuthorDate: 2025-04-08 10:30:24 +0000 Commit: Andrew Turner CommitDate: 2025-04-08 10:48:28 +0000 dev/fdt: Add fdt_foreach_reserved_region As with fdt_foreach_mem_region add a function that calls a callback for each reserved memory region in /memreserve. This allows us to exclude this memory from the physical map in a way that is safe from overflowing a fixed array on the stack. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D49699 --- sys/dev/fdt/fdt_common.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/fdt/fdt_common.h | 1 + 2 files changed, 50 insertions(+) diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c index e23878750bea..ba323ea56d96 100644 --- a/sys/dev/fdt/fdt_common.c +++ b/sys/dev/fdt/fdt_common.c @@ -442,6 +442,55 @@ fdt_get_phyaddr(phandle_t node, device_t dev, int *phy_addr, void **phy_sc) return (0); } +int +fdt_foreach_reserved_region(fdt_mem_region_cb cb, void *arg) +{ + struct mem_region mr; + pcell_t reserve[FDT_REG_CELLS * FDT_MEM_REGIONS]; + pcell_t *reservep; + phandle_t memory, root; + int addr_cells, size_cells; + int i, res_len, rv, tuple_size, tuples; + + root = OF_finddevice("/"); + memory = OF_finddevice("/memory"); + if (memory == -1) + return (ENXIO); + + if ((rv = fdt_addrsize_cells(OF_parent(memory), &addr_cells, + &size_cells)) != 0) + return (rv); + + if (addr_cells > 2) + return (ERANGE); + + tuple_size = sizeof(pcell_t) * (addr_cells + size_cells); + + res_len = OF_getproplen(root, "memreserve"); + if (res_len <= 0 || res_len > sizeof(reserve)) + return (ERANGE); + + if (OF_getprop(root, "memreserve", reserve, res_len) <= 0) + return (ENXIO); + + tuples = res_len / tuple_size; + reservep = (pcell_t *)&reserve; + for (i = 0; i < tuples; i++) { + + rv = fdt_data_to_res(reservep, addr_cells, size_cells, + (u_long *)&mr.mr_start, (u_long *)&mr.mr_size); + + if (rv != 0) + return (rv); + + cb(&mr, arg); + + reservep += addr_cells + size_cells; + } + + return (0); +} + int fdt_get_reserved_regions(struct mem_region *mr, int *mrcnt) { diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h index d1db7c0620fd..22842d0e6ae7 100644 --- a/sys/dev/fdt/fdt_common.h +++ b/sys/dev/fdt/fdt_common.h @@ -87,6 +87,7 @@ int fdt_foreach_mem_region(fdt_mem_region_cb, void *); int fdt_get_mem_regions(struct mem_region *, int *, uint64_t *); int fdt_foreach_reserved_mem(fdt_mem_region_cb, void *); int fdt_get_reserved_mem(struct mem_region *, int *); +int fdt_foreach_reserved_region(fdt_mem_region_cb, void *); int fdt_get_reserved_regions(struct mem_region *, int *); int fdt_get_phyaddr(phandle_t, device_t, int *, void **); int fdt_get_range(phandle_t, int, u_long *, u_long *);