From nobody Thu Apr 17 21:59:21 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 4ZdsHb1WqXz5sqyK; Thu, 17 Apr 2025 21:59:23 +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 4ZdsHY2QBvz3Ty2; Thu, 17 Apr 2025 21:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744927161; 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=3JQN6lG25ShA7g9RrJz7yEqXbNtxZ7C33bVcFdkR3Ys=; b=TYk9socaxmIvdblctjDjWTmL22SUqaJeRDc+J9PaN3lUBg4J+aojJONZCrYEKsvJs0SGxV lkU+5o4g4wIyraB0QcqE+Fs4BtkZEEuPFAWnTVlQmEnzh1lVk3wV652sg0FVZmiOTwfZhc x5DuvxP6YUo4hjyNycwXSUES8OiClqMkfHOOZLq3QcegtA9LKUWbpshn27/cgH4bo4OhGL pzUPt2b6M/AfG04rVKNf4HUE2CJW+KqlwyBI+Xixn6vhZefGVPDugs1BSpL/cinKC0FotK z1pAgAcQvnF7/SzQBqVORt8mjFDXiXnxAXf/zsy0lO1zyf6ubpKblJ+l99NWQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744927161; a=rsa-sha256; cv=none; b=fTjU8BD1F9o/xPziXVPD8N2gdHfCVetrvEbHhL3jGm5NY/18E4cmDzMo+nzGb5703hW2xz DfRALzLIq7G8XpEcC+hUUfqiCtQd4HxdBw5jzDdwZoF+7+rHTWpJvkgdWkG/nebezygHkV f0AmtxcwBd2SajSsKrBiH+euFRGRsxAQMdxySmd/tDdQiadUQF1i7zTmOEdUlDiAR6woko FTGi1zln3PDVOzycJNAguk2Ina4o8nzDh+gr8m32UC2z+5mnekYMBRiHXxLzz0NcE0l0Mp 4d9pwvVzdI7Xt81k3K2uX+Etxlly2+rAZBKL+xbYvltfLWY4BEKsdXK8q9NPbA== 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=1744927161; 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=3JQN6lG25ShA7g9RrJz7yEqXbNtxZ7C33bVcFdkR3Ys=; b=ni+rBUJ+uoJizUyAHHv8a5fJ6Up99u+NVvyBedZS+/BOVcYYTOqEOue4lzFfKwBmNBUo76 Jmzcna7oBB0fNy1PT5B81qiSiut4dfcD/V4qs/A6CSrNjNSFGfIXT0tJbZFES3jUoq0yRv CBlM+uW0XhiEv8dF77jgHP3a8mYEHRQaTJNQ59Lw6+gadxVR4T9XqwjRcg4fgjVnIRSEsB jt1cQbUmFPn+cy9jti+FNEgpdcYscX8RxsVuST8U3kOJ8g/sAtNptxcpCevVR5mrneohyY Qax9Fg39lSq0S4+Qk6rkKBGZC5MKl891AzU88rEreAQN/rZ9aSc0Oc8yLcWdww== 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 4ZdsHY206Jz15lC; Thu, 17 Apr 2025 21:59:21 +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 53HLxL6v002867; Thu, 17 Apr 2025 21:59:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53HLxL5u002864; Thu, 17 Apr 2025 21:59:21 GMT (envelope-from git) Date: Thu, 17 Apr 2025 21:59:21 GMT Message-Id: <202504172159.53HLxL5u002864@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: b7d1c3fdde3b - main - kboot/amd64: Use efi_bi_loadsmap in bi_loadsmap 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: b7d1c3fdde3bcd9ec54f5fff49fc0970720fc045 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b7d1c3fdde3bcd9ec54f5fff49fc0970720fc045 commit b7d1c3fdde3bcd9ec54f5fff49fc0970720fc045 Author: Warner Losh AuthorDate: 2025-04-17 04:05:05 +0000 Commit: Warner Losh CommitDate: 2025-04-17 21:56:46 +0000 kboot/amd64: Use efi_bi_loadsmap in bi_loadsmap For the EFI case, we just need to call efi_bi_loadsmap in bi_loadsmap. If we need to do BIOS again, we'll revisit. Sponsored by: Netflix Reviewed by: kevans, jhibbits Differential Revision: https://reviews.freebsd.org/D49867 --- stand/kboot/kboot/arch/amd64/load_addr.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/stand/kboot/kboot/arch/amd64/load_addr.c b/stand/kboot/kboot/arch/amd64/load_addr.c index e0815cd0790f..7a878ae88cba 100644 --- a/stand/kboot/kboot/arch/amd64/load_addr.c +++ b/stand/kboot/kboot/arch/amd64/load_addr.c @@ -68,18 +68,5 @@ kboot_get_phys_load_segment(void) void bi_loadsmap(struct preloaded_file *kfp) { - struct bios_smap smap[32], *sm; - struct memory_segments *s; - int smapnum, len; - - for (smapnum = 0; smapnum < min(32, nr_seg); smapnum++) { - sm = &smap[smapnum]; - s = &segs[smapnum]; - sm->base = s->start; - sm->length = s->end - s->start + 1; - sm->type = SMAP_TYPE_MEMORY; - } - - len = smapnum * sizeof(struct bios_smap); - file_addmetadata(kfp, MODINFOMD_SMAP, len, &smap[0]); + efi_bi_loadsmap(kfp); }