From nobody Thu Apr 17 21:59:20 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 4ZdsHZ28Ghz5sr89; Thu, 17 Apr 2025 21:59:22 +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 4ZdsHX1RnHz3Txy; Thu, 17 Apr 2025 21:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744927160; 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=rk+NA2yKvZfnIvtd6aAtkxaVX9jTZTjOsgg3umfp4Jw=; b=UAotMhNXlPn8VPqvnfIwWZ5LUCsqllyauWP4r8/czQYD2AL0OQjAa0AkhiPPKmStHUHFle yY8GbRZwa97g9h6NRY+jiJ8vbO/DmA9tUB15u+GVXCw9ReUWhasoWjw0XUcBVsWHNm86Ej b4pMSmcvDeibp87CSdXNtYYeYEFSrRimYB25hGIcDTFtanQ+992wnLMaJTWGu1U/Fp/BNH YbjgkxFcBMW9hVd/QvRCvDbGgBfEGUXo/pty3M+aicBQRXbEUxrqiptKRyCsM+Qpd8uO0v V3BpC6y7lmm/dwPgfxzQGfRVh6wZnGXaLyQoxP5KlwVI1mGDgs2+JWU90ipmNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744927160; a=rsa-sha256; cv=none; b=St835CwM5vrv10jiu/LBPvLU987WOZ5rtjCzZAUiOaoXqYferDil9rxf3gvWcvJOdKSu9A S7JHEQtNp2jpkG2SI/wC4iq3CWhTBNn9GGaUuVbSUk5CiLZoMu3XiBuCjL9cSbpL12Wh50 bt+ppT9WbBC7A3IDddX4CkuEmo7iM8oAi6W9ZOSGgU7a3/he/6pRAPuiRcwOW2olHKXG6q dGICmBt8hI/36DJANu/Du+y45FHCJWXQzsFMEC4FgktZKW2MAmp/hcUNCcROXDD8sggkzP N+4CKpVNLyTXD69BCO9iIdsyKpPerGTJhe32MldAfgU3lBE27d8761j0b8rcYA== 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=1744927160; 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=rk+NA2yKvZfnIvtd6aAtkxaVX9jTZTjOsgg3umfp4Jw=; b=mdfu5NYRCwhiZ4C7KhgNMig2v5/nuNdY43mSfCZHhVBilMXjmhdHx40s6Hvx51Y2zb0/nd NtRGOo2qwC6bkzGra57V0Yuh60XtU8WmvXIv5wSdmhqlVE9WnlVctOkWvikkD9u1Mn9vGv M7x7m72eaJpZKBQth8iOyaew3aE2x1Z5Mix3NFrt0ruxaPOQ/OaUBczFnqDmbs/KAKDETH K4rwScWCxU5J+3+G+wGC9ObxnNwTxtsaIkCFL05Vj7n9G3cNRz5cHi568hmuv6D4RNpHUI JGSRUzkIPJYxYLp4lg79JQDeuo01VbjXOxinRple/Vq6PXKVcO+aMLEdiGf39g== 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 4ZdsHX13D7z15XH; Thu, 17 Apr 2025 21:59:20 +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 53HLxKDm002834; Thu, 17 Apr 2025 21:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53HLxKrT002831; Thu, 17 Apr 2025 21:59:20 GMT (envelope-from git) Date: Thu, 17 Apr 2025 21:59:20 GMT Message-Id: <202504172159.53HLxKrT002831@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: 50bc81e7001c - main - kboot/amd64: Use segs framework to find kernel location 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50bc81e7001c3843339e5ea75edf8e908fb8ad8d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=50bc81e7001c3843339e5ea75edf8e908fb8ad8d commit 50bc81e7001c3843339e5ea75edf8e908fb8ad8d Author: Warner Losh AuthorDate: 2025-04-17 04:04:58 +0000 Commit: Warner Losh CommitDate: 2025-04-17 21:56:46 +0000 kboot/amd64: Use segs framework to find kernel location Use the segs framework to find a place to land the kernel, with the same super ugly defaults as aarch64. Sponsored by: Netflix Reviewed by: kevans, jhibbits Differential Revision: https://reviews.freebsd.org/D49866 --- stand/kboot/kboot/arch/amd64/load_addr.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/stand/kboot/kboot/arch/amd64/load_addr.c b/stand/kboot/kboot/arch/amd64/load_addr.c index ae53aa75da19..e0815cd0790f 100644 --- a/stand/kboot/kboot/arch/amd64/load_addr.c +++ b/stand/kboot/kboot/arch/amd64/load_addr.c @@ -43,23 +43,26 @@ enumerate_memory_arch(void) return (true); } +/* XXX refactor with aarch64 */ uint64_t kboot_get_phys_load_segment(void) { - static uint64_t base_seg = BAD_SEG; +#define HOLE_SIZE (64ul << 20) +#define KERN_ALIGN (2ul << 20) + static uint64_t s = 0; - if (base_seg != BAD_SEG) - return (base_seg); + if (s != 0) + return (s); - if (nr_seg > 0) - base_seg = find_ram(segs, nr_seg, 2ULL << 20, 2ULL << 20, - 64ULL << 20, 4ULL << 30); - if (base_seg == BAD_SEG) { - /* XXX Should fall back to using /proc/iomem maybe? */ - /* XXX PUNT UNTIL I NEED SOMETHING BETTER */ - base_seg = 300ULL * (1 << 20); - } - return (base_seg); + print_avail(); + s = first_avail(KERN_ALIGN, HOLE_SIZE, SYSTEM_RAM); + printf("KBOOT GET PHYS Using %#llx\n", (long long)s); + if (s != 0) + return (s); + s = 0x40000000 | 0x4200000; /* should never get here */ + /* XXX PANIC? XXX */ + printf("Falling back to the crazy address %#lx which works in qemu\n", s); + return (s); } void