From nobody Tue Apr 08 10:49:13 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 4ZX2rV2Phwz5sBrR; Tue, 08 Apr 2025 10:49:14 +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 4ZX2rT5WlFz3kQr; Tue, 08 Apr 2025 10:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744109353; 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=OMAUeF/ANgMKdnaQVu4tuxlh/4E+I/EP4WClJhQ8fik=; b=YyJaJriP6rLFE3SzwmpEh7ZUFxfGwkJR4/mmfUTJuHS5Gm2OgrPd8olVoxGs95DyGQsAEg HcDV3JAp7VwDxjIT6QLIF8OtalMbuatVVaC3sd6K6cvok0y53uOtuP3nVY+DBp3Y6GcvQq ZvsJ+qC315BlzWkUnG7HjkUpA0cxgbpvV8iQoV8htXb11yHNUeudxl5Dm70Pl8xN1nDxb+ QPgmTIYzlbubq2a0Ewc6LN5kJkWeegqrOmOzmjCEqBNbkMXFaCME2arOjZkGsi83dB2g2F lhp74qXPmpzQ5GDANTbCdWYg4OJxoaT5nc2HCtgBmo5LrCS2JnsIKdJsG1xuvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744109353; a=rsa-sha256; cv=none; b=gK0quWOgKD6htAGI6PvcMFV+Khil18+n6jthon7s7FQPpw1YQS8DqQs4ZIfs8TjWkQD4SN onc9G0OtyIhuDdOFCS5lYjzgHaaKDxX91jFhQBA/SsE5DSlikUTseYa9oTHjT8BtgWrxjY WAEyGKmbtovTybuBhk42ODsLyJYLkDWZ81FGkXVFSDBBgz9FNMoiOG3wByam4gcSXGF5YL 6gj5N9DKKuTheMoN6t4jcUrXKTfWK6VEloVSm9G0ymEDCorQraLAujgDsylcK97x39DZN4 /5AfRlRPwTIhHjYPyJa/Hd1oFc2ZsIELQ/rt2dQXwWSRr+PQ4iOxpxxwk9s1dw== 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=1744109353; 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=OMAUeF/ANgMKdnaQVu4tuxlh/4E+I/EP4WClJhQ8fik=; b=FiklznrgRKSjUL5Rv07bmz0Ej0LVx155noWK/kHly8xm54b7BR0KlvBpAYVaDJ57VOPfRU SJ0pqP4rQL0jkHnDi70eQZedTFGIlrPde9ZJlQTgEZSszCYCouaDrQpLJdCsDOX++flaKy WRAjO49NSrfGXq5W1wgVqbtWx46Sz4GtU7jfa8aC6aSeApHXQPbR1bIbKR8X+Ao3ZTYvns 9mk3GxNx99sFEJ/u7QXBaeDlG77yhOOJNVe/JVe2Dp5e/2WGsCwzG0F3rIIr54vVuJrAx1 V5bX87m2+IxdunFUFbug4PZMbLVhLifcv/KY+1HXusGlSw7hH7oKM4Az6d3f9A== 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 4ZX2rT52YbzCr9; Tue, 08 Apr 2025 10:49:13 +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 538AnDs5002122; Tue, 8 Apr 2025 10:49:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538AnDBp002119; Tue, 8 Apr 2025 10:49:13 GMT (envelope-from git) Date: Tue, 8 Apr 2025 10:49:13 GMT Message-Id: <202504081049.538AnDBp002119@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: 211ca9061b5d - main - dev/fdt: Remove old fdt_get memory functions 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: 211ca9061b5d561405edeaf1df1f7fb296506d2c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=211ca9061b5d561405edeaf1df1f7fb296506d2c commit 211ca9061b5d561405edeaf1df1f7fb296506d2c Author: Andrew Turner AuthorDate: 2025-04-08 10:30:46 +0000 Commit: Andrew Turner CommitDate: 2025-04-08 10:48:28 +0000 dev/fdt: Remove old fdt_get memory functions These have been replaces with fdt_foreach equivalents so are unused. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D49702 --- sys/dev/fdt/fdt_common.c | 163 ----------------------------------------------- sys/dev/fdt/fdt_common.h | 3 - 2 files changed, 166 deletions(-) diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c index ba323ea56d96..8a0e414595f2 100644 --- a/sys/dev/fdt/fdt_common.c +++ b/sys/dev/fdt/fdt_common.c @@ -491,63 +491,6 @@ fdt_foreach_reserved_region(fdt_mem_region_cb cb, void *arg) return (0); } -int -fdt_get_reserved_regions(struct mem_region *mr, int *mrcnt) -{ - 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) { - rv = ENXIO; - goto out; - } - - if ((rv = fdt_addrsize_cells(OF_parent(memory), &addr_cells, - &size_cells)) != 0) - goto out; - - if (addr_cells > 2) { - rv = ERANGE; - goto out; - } - - tuple_size = sizeof(pcell_t) * (addr_cells + size_cells); - - res_len = OF_getproplen(root, "memreserve"); - if (res_len <= 0 || res_len > sizeof(reserve)) { - rv = ERANGE; - goto out; - } - - if (OF_getprop(root, "memreserve", reserve, res_len) <= 0) { - rv = ENXIO; - goto out; - } - - 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[i].mr_start, (u_long *)&mr[i].mr_size); - - if (rv != 0) - goto out; - - reservep += addr_cells + size_cells; - } - - *mrcnt = i; - rv = 0; -out: - return (rv); -} - int fdt_foreach_reserved_mem(fdt_mem_region_cb cb, void *arg) { @@ -586,47 +529,6 @@ fdt_foreach_reserved_mem(fdt_mem_region_cb cb, void *arg) return (0); } -int -fdt_get_reserved_mem(struct mem_region *reserved, int *mreserved) -{ - pcell_t reg[FDT_REG_CELLS]; - phandle_t child, root; - int addr_cells, size_cells; - int i, rv; - - root = OF_finddevice("/reserved-memory"); - if (root == -1) { - return (ENXIO); - } - - if ((rv = fdt_addrsize_cells(root, &addr_cells, &size_cells)) != 0) - return (rv); - - if (addr_cells + size_cells > FDT_REG_CELLS) - panic("Too many address and size cells %d %d", addr_cells, - size_cells); - - i = 0; - for (child = OF_child(root); child != 0; child = OF_peer(child)) { - if (!OF_hasprop(child, "no-map")) - continue; - - rv = OF_getprop(child, "reg", reg, sizeof(reg)); - if (rv <= 0) - /* XXX: Does a no-map of a dynamic range make sense? */ - continue; - - fdt_data_to_res(reg, addr_cells, size_cells, - (u_long *)&reserved[i].mr_start, - (u_long *)&reserved[i].mr_size); - i++; - } - - *mreserved = i; - - return (0); -} - int fdt_foreach_mem_region(fdt_mem_region_cb cb, void *arg) { @@ -674,71 +576,6 @@ fdt_foreach_mem_region(fdt_mem_region_cb cb, void *arg) return (0); } -int -fdt_get_mem_regions(struct mem_region *mr, int *mrcnt, uint64_t *memsize) -{ - pcell_t reg[FDT_REG_CELLS * FDT_MEM_REGIONS]; - pcell_t *regp; - phandle_t memory; - uint64_t memory_size; - int addr_cells, size_cells; - int i, reg_len, rv, tuple_size, tuples; - - memory = OF_finddevice("/memory"); - if (memory == -1) { - rv = ENXIO; - goto out; - } - - if ((rv = fdt_addrsize_cells(OF_parent(memory), &addr_cells, - &size_cells)) != 0) - goto out; - - if (addr_cells > 2) { - rv = ERANGE; - goto out; - } - - tuple_size = sizeof(pcell_t) * (addr_cells + size_cells); - reg_len = OF_getproplen(memory, "reg"); - if (reg_len <= 0 || reg_len > sizeof(reg)) { - rv = ERANGE; - goto out; - } - - if (OF_getprop(memory, "reg", reg, reg_len) <= 0) { - rv = ENXIO; - goto out; - } - - memory_size = 0; - tuples = reg_len / tuple_size; - regp = (pcell_t *)® - for (i = 0; i < tuples; i++) { - - rv = fdt_data_to_res(regp, addr_cells, size_cells, - (u_long *)&mr[i].mr_start, (u_long *)&mr[i].mr_size); - - if (rv != 0) - goto out; - - regp += addr_cells + size_cells; - memory_size += mr[i].mr_size; - } - - if (memory_size == 0) { - rv = ERANGE; - goto out; - } - - *mrcnt = i; - if (memsize != NULL) - *memsize = memory_size; - rv = 0; -out: - return (rv); -} - int fdt_get_chosen_bootargs(char *bootargs, size_t max_size) { diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h index 22842d0e6ae7..dbf809625da3 100644 --- a/sys/dev/fdt/fdt_common.h +++ b/sys/dev/fdt/fdt_common.h @@ -84,11 +84,8 @@ int fdt_data_to_res(pcell_t *, int, int, u_long *, u_long *); phandle_t fdt_find_compatible(phandle_t, const char *, int); phandle_t fdt_depth_search_compatible(phandle_t, const char *, int); 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 *); int fdt_immr_addr(vm_offset_t);