From nobody Fri Feb 3 15:50:39 2023 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 4P7g9C45xCz3kRdd; Fri, 3 Feb 2023 15:50:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P7g9C3Pnjz3HR2; Fri, 3 Feb 2023 15:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675439439; 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=2AnQszO0MXVgB7/YeAdmRhLmRy9+kTdgbOj3RtOQj1I=; b=pLtf+qq/3dDlXuDtiuY7BLXEma1mILVTi3SKINxKdBHbdQ1/2eN5yd35Rygnl6j6xhSJzU 5o6W4k0NAw1AJeoIWyRa7uIWbpDhFFmuXYyDQXMT1g+blSDYWjyUosw2qCFZmN4XJLjBfB btEyfjCXLXHfdRpY+Y4vccfBabUasYVQ48nZWYNJdajYLKlhzbu5Lxi2tW+xlxUU6WfoXl xB/bmDUy5YL1SaMNTCXyl8ePkwz3gBr18CSOoSpyCeteiu0rgLCY8oy6I4zo6WXtBS1yav OWuSYomSGqSqnvCCltz6RA5ot35q2hGrEO1vu1+B/bM7RyoGqwnyDaaAHEosag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675439439; 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=2AnQszO0MXVgB7/YeAdmRhLmRy9+kTdgbOj3RtOQj1I=; b=wQFG/MLMs8Zr0Gd+YG+yHFjhrozSf9fdRO6tWPeix/5CocfrIT0fEumOBWhhGPJyZhPtzo 1c+AERhTL0TrdOHjeKqg/7NmgJAjr6qcEe+0jFxjl6fJk12qZN09SPRnCjbGR8ZTXwWeAC +pLFSrrHTJgYRfsF7NGJzQY2QVEs1Tu2PtNKE55S9CD4b7javyOpyTQeYWAY5JloAj3WNF C5uZbmPMN8UMNZPBIhPIj79dR1F/W5YZrBEgyPCnLCnJdf5H3fVth2ceORLHIXziktpnG2 ysAEoqLVHcbOW3MN4RUBwB3CwXxa2gWqngoDQbrnro630Bj7JVg5LvRTF/FdKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675439439; a=rsa-sha256; cv=none; b=SuO644Tc3JI+LaTQBUQrs6ui+W6wdHNufP6nf1kS7m7tey4rjnjqD4//IhA1qiz3V2zVsL nb3fW+kiqZrnSXGoglRBqLb+tLvY2R5KxUnEDzUmTrV7LMd+Rjg87SoxOfbgQ2nPDBQ/je Mh+POijBmSQNppVjPC2YPKcq0twVeXTydxckijkEFzmekWtoml7H72DCvyFMBgFqAs7YQj 4QFKXG40e6HyA8Apuss3iWd6PlHsYkD6iRSje04Adc+sbAbbai1aEmp1GPZvK+Gj8pVV3Z tjcIvNzQCJuo3TRQDYL4AsJ7j81rGhVbHb4ypRkv84sApALGnlz2CmpUknminQ== 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 4P7g9C2TSjzfTL; Fri, 3 Feb 2023 15:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 313FodcN023012; Fri, 3 Feb 2023 15:50:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 313Fod3D023010; Fri, 3 Feb 2023 15:50:39 GMT (envelope-from git) Date: Fri, 3 Feb 2023 15:50:39 GMT Message-Id: <202302031550.313Fod3D023010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1d5f967fa777 - main - kboot: Add powerpc stub for enumerate_memory_arch() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d5f967fa7776fd8119bab7fbe66bffde03e4735 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d5f967fa7776fd8119bab7fbe66bffde03e4735 commit 1d5f967fa7776fd8119bab7fbe66bffde03e4735 Author: Warner Losh AuthorDate: 2023-02-03 15:38:29 +0000 Commit: Warner Losh CommitDate: 2023-02-03 15:41:39 +0000 kboot: Add powerpc stub for enumerate_memory_arch() Add stub for new MI interface for enumerating memory. Right now powerpc looks in the FDT table at a later point in boot since we don't need to pass a specific memory table to the kernel. Leave it like that for now, but note plans for the future. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D38248 --- stand/kboot/arch/powerpc64/load_addr.c | 12 ++++++++++++ stand/kboot/main.c | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/stand/kboot/arch/powerpc64/load_addr.c b/stand/kboot/arch/powerpc64/load_addr.c index 81b5d0d50581..ac3374ff20f2 100644 --- a/stand/kboot/arch/powerpc64/load_addr.c +++ b/stand/kboot/arch/powerpc64/load_addr.c @@ -208,3 +208,15 @@ kboot_get_kernel_machine_bits(void) return (bits); } #endif + +/* Need to transition from current hacky FDT way to this code */ +bool enumerate_memory_arch(void) +{ + /* + * For now, we dig it out of the FDT, plus we need to pass all data into + * the kernel via the (adjusted) FDT we find. + */ + setenv("usefdt", "1", 1); + + return true; +} diff --git a/stand/kboot/main.c b/stand/kboot/main.c index b8523cb202a2..bc2dad96dbfe 100644 --- a/stand/kboot/main.c +++ b/stand/kboot/main.c @@ -254,7 +254,6 @@ main(int argc, const char **argv) printf("\n%s", bootprog_info); setenv("LINES", "24", 1); - setenv("usefdt", "1", 1); memory_limits();