From nobody Tue Apr 08 10:49:12 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 4ZX2rT0BPjz5sC3r; Tue, 08 Apr 2025 10:49:13 +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 4ZX2rS4wxgz3kGK; Tue, 08 Apr 2025 10:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744109352; 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=PHHpdvp3y0edgwNS4+177mqLRCu20HAAPTpWpE4COuM=; b=NonQOmYjSKbexIfPioWOHD9KPA3oOK74ayGcacrKuBTMv/odZcA1++sevYD5C5tCUtQKM7 OBCa9r7y8d9KYODGwg7DAB6DZUwoVcRAqOSVryOXvfbljS3hg/7Orm58vFSjs84IvqKT7R nPQSmNf+JYf5UuwN+MYgY3ajcoFv38GgV7eATVk1rCLB76OBxx4To7yScahcnGFBYCp6mI 2v61705gkho7nJduKZGRJB8/L3Sd2l6/v7pWU5VZGs648cllBWQC21AeORHTX8pTXczpmh 9DsCsSokl2W4icItVj3+9C0QSW3/8/KTaTTlcMOviXsiIOfbgql85RvoMDI8FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744109352; a=rsa-sha256; cv=none; b=x58IAZp9Y53mDzZxQjfWvLsN1AEtxKFXN+mqb64WW6iIANtQrqbM6qmuWGhqMCv5X7Cl4w O+AbypaWsvAe+jrvsWwl0YVaoGPT0NpMkNiojb4SRPirBKJfdQ9d/ZRqMoW2JyIAfbtjqk R0WARp5lxM7xDDjZUiRsLU40Y2hkoBEYP0gGnVUn1RDqjf+Xr4YrJVAgmuM02hsgUt66c/ t1AlKSaLSBDMqrkx4D/YiqGIHsA06wu/H2RIG3BfaMOWHLVTDmDztV7hvFeLdX5EMOeY8o Fmi3irXKgJMrB3KYKfplFVfUR75sRZRlEaHXsShIIZXLrvsNPSEyNsQ0BVaKpQ== 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=1744109352; 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=PHHpdvp3y0edgwNS4+177mqLRCu20HAAPTpWpE4COuM=; b=xOqZ6sh9DpluSj8mNFpLHtihs8/8nuVGi7ocgdn4pXa35etXrbt3Bq0Vso6WaiUBJ3/LrP w9lutzHLkuhgfuouq2a1ih7hzKSV5lrpma+ih+PTlQZHLf5TlM6FHnsgvcgdXGnIpZKTjk 5mGDxFpVhXywMla8IsGsK3jaufuaizcbQrndKSFz3seM26LAWKBcJBmTYw5bs1XZ3GZq07 gEip5NZwZDms7lvzy7cA/SjPCgEfGAloR+SisIWEKSFUYTUTPFhnItuVqVS6GsF+B1x4JR MZQ3dEoDmsIw9HnlZcUhwkxfzEsHHlKZVIih1Io1K2j317bYPrPJQRQvOcjR0g== 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 4ZX2rS45y9zCr8; Tue, 08 Apr 2025 10:49:12 +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 538AnCsa002090; Tue, 8 Apr 2025 10:49:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538AnCBB002087; Tue, 8 Apr 2025 10:49:12 GMT (envelope-from git) Date: Tue, 8 Apr 2025 10:49:12 GMT Message-Id: <202504081049.538AnCBB002087@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: aa9ebe156011 - main - arm/mv: Convert to fdt_foreach_mem_region 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: aa9ebe1560114f06dbd9c4c5a9b72b056ee13c94 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=aa9ebe1560114f06dbd9c4c5a9b72b056ee13c94 commit aa9ebe1560114f06dbd9c4c5a9b72b056ee13c94 Author: Andrew Turner AuthorDate: 2025-04-08 10:30:39 +0000 Commit: Andrew Turner CommitDate: 2025-04-08 10:48:28 +0000 arm/mv: Convert to fdt_foreach_mem_region The Marvell platform code checks each DDR bank is in the FDT. This was using fdt_get_mem_regions. In preperation for removing this switch to fdt_foreach_mem_region. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D49701 --- sys/arm/mv/mv_common.c | 52 ++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/sys/arm/mv/mv_common.c b/sys/arm/mv/mv_common.c index a1302859644a..c4af5564ca13 100644 --- a/sys/arm/mv/mv_common.c +++ b/sys/arm/mv/mv_common.c @@ -984,40 +984,46 @@ decode_win_cpu_setup(void) } +struct ddr_data { + uint8_t window_valid[MV_WIN_DDR_MAX]; + uint32_t mr_count; + uint32_t valid_win_num; +}; + +static void +ddr_valid_cb(const struct mem_region *mr, void *arg) +{ + struct ddr_data *data = arg; + int j; + + for (j = 0; j < MV_WIN_DDR_MAX; j++) { + if (ddr_is_active(j) && + (ddr_base(j) == mr->mr_start) && + (ddr_size(j) == mr->mr_size)) { + data->window_valid[j] = 1; + data->valid_win_num++; + } + } + data->mr_count++; +} + static int decode_win_sdram_fixup(void) { - struct mem_region mr[FDT_MEM_REGIONS]; - uint8_t window_valid[MV_WIN_DDR_MAX]; - int mr_cnt, err, i, j; - uint32_t valid_win_num = 0; + struct ddr_data window_data; + int err, j; - /* Grab physical memory regions information from device tree. */ - err = fdt_get_mem_regions(mr, &mr_cnt, NULL); + memset(&window_data, 0, sizeof(window_data)); + err = fdt_foreach_mem_region(ddr_valid_cb, &window_data); if (err != 0) return (err); - for (i = 0; i < MV_WIN_DDR_MAX; i++) - window_valid[i] = 0; - - /* Try to match entries from device tree with settings from u-boot */ - for (i = 0; i < mr_cnt; i++) { - for (j = 0; j < MV_WIN_DDR_MAX; j++) { - if (ddr_is_active(j) && - (ddr_base(j) == mr[i].mr_start) && - (ddr_size(j) == mr[i].mr_size)) { - window_valid[j] = 1; - valid_win_num++; - } - } - } - - if (mr_cnt != valid_win_num) + if (window_data.mr_count != window_data.valid_win_num) return (EINVAL); /* Destroy windows without corresponding device tree entry */ for (j = 0; j < MV_WIN_DDR_MAX; j++) { - if (ddr_is_active(j) && (window_valid[j] != 1)) { + if (ddr_is_active(j) && (window_data.window_valid[j] != 1)) { printf("Disabling SDRAM decoding window: %d\n", j); ddr_disable(j); }