From nobody Sat Jul 02 14:04:10 2022 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 8F78A87B892; Sat, 2 Jul 2022 14:04:11 +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 4LZv230ywZz3DnB; Sat, 2 Jul 2022 14:04:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656770651; 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=P2RUVVFfxM4rG2z2JSDfUY/UAAkQl1tCJmaRqm3Sq4g=; b=fwrl+zL0smhrWxd9jHm3Xv4a8sgx/JFNw5sb9JDoGJ1tGwdgSexwojpLwx0hES1Llwrq/x /guHdkt/D2nVUTju+3ZDA7Pf47jjtNhKrwvhsGz2t98vFSOZgZ0KZnJvOPVOeE2pFHI0hq f6TrGy2o2IQFvCxpSOVtPtcnh2u+eCa54qED4pR0ghaDdXJuuxhXn5zUlZdifOkciVcUuO bU6hyaDKm9aDJaqXWhL8ywaXqprZmjxza7OS5mxXmvpPcHOD9XfoPN2/eUwhCIRVfolzxh jo9iIyUELp0qvXoTm/0r/VHl1oejAdeZfwhquhS+iPnoBZNI8x8JpYfyPrQJFA== 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 C027011798; Sat, 2 Jul 2022 14:04:10 +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 262E4AmJ038904; Sat, 2 Jul 2022 14:04:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 262E4AXY038903; Sat, 2 Jul 2022 14:04:10 GMT (envelope-from git) Date: Sat, 2 Jul 2022 14:04:10 GMT Message-Id: <202207021404.262E4AXY038903@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: 2753bbe71b5a - main - amd64/efi: Remove setting hints for rsdp 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2753bbe71b5adce61a1bfb9535bc33735c35887c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656770651; 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=P2RUVVFfxM4rG2z2JSDfUY/UAAkQl1tCJmaRqm3Sq4g=; b=U4sr4vY+I/AGwxFh9MJB32L4hfDcKd0GzK9V9L4guxSbllEH8cpya0KJehwiWqcw8eWn7n tKndKWKP+oFvMvL8HzakjqAoHbY1Bava57p7lbGkhr2JlSEbrI59kBXRu8IyuxVlFm4emL 5Zo5pvUA1IvwA3a/KBSVm03UYwgK+NCQcAeMYRc9pDuskeJ+xfk/D+iNUiTtOD3j5izhhK T2XOtSgYZxruPPHOJFHVNKACIVAFrBOeizQ0qhdYRB9Z8Mp6T87DW+piUAlaLwRwfRRW3l 70zOAuQgfxfDgaaGtNmZOAXTWcnWrVbEvvH9qM0uAZva0LP5QLPUBRYaO6Pk4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656770651; a=rsa-sha256; cv=none; b=k/3TTnZF7pQ7Rqm4tH1i3OVseUVafS8OQXiExkM92uOnOCZeJEoSRfPFAfr97hfQGjdP9R BRsOiO4hY5laSxC8G1oVl2oi+53eov9uihXza/FBcr6us5Xf9uEkDeqnfmoAaHeNqS30vg a3jj0CoPeB48k+Wq9qoGIixY9SMEzhC1w+Zny5iTSM1Twc7hLoY47HpE2R2Mw+XMYG/VMD WjPZX4DYtpfy8pgJxtBN5Bs9+NEVJbQe+8+IRCp8ZLUdJjvHTJ6dA2PbqbSSnnLk0mirAC TDsozlLqsE/8FTXC+UOP9K9plIAGPYHV5TbJrlc5V4kzdgP/V+8uyXO6CYh+qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2753bbe71b5adce61a1bfb9535bc33735c35887c commit 2753bbe71b5adce61a1bfb9535bc33735c35887c Author: Warner Losh AuthorDate: 2022-07-02 14:01:09 +0000 Commit: Warner Losh CommitDate: 2022-07-02 14:02:12 +0000 amd64/efi: Remove setting hints for rsdp Given that hints set this way don't work when a static kenv is compiled into the kernel. acpi.rsdp has been set for this for the past 6 years, and all kernels in that time have used it in preference to the hints. As such, we no longer hints.*, so remove them. Sponsored by: Netflix Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D35634 --- stand/efi/loader/arch/amd64/elf64_freebsd.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/stand/efi/loader/arch/amd64/elf64_freebsd.c b/stand/efi/loader/arch/amd64/elf64_freebsd.c index 4bdf675cd5a3..290d1c4696da 100644 --- a/stand/efi/loader/arch/amd64/elf64_freebsd.c +++ b/stand/efi/loader/arch/amd64/elf64_freebsd.c @@ -119,12 +119,6 @@ elf64_exec(struct preloaded_file *fp) /* * Report the RSDP to the kernel. While this can be found with * a BIOS boot, the RSDP may be elsewhere when booted from UEFI. - * The old code used the 'hints' method to communite this to - * the kernel. However, while convenient, the 'hints' method - * is fragile and does not work when static hints are compiled - * into the kernel. Instead, move to setting different tunables - * that start with acpi. The old 'hints' can be removed before - * we branch for FreeBSD 12. */ rsdp = efi_get_table(&acpi20_guid); @@ -133,29 +127,23 @@ elf64_exec(struct preloaded_file *fp) } if (rsdp != NULL) { sprintf(buf, "0x%016llx", (unsigned long long)rsdp); - setenv("hint.acpi.0.rsdp", buf, 1); setenv("acpi.rsdp", buf, 1); revision = rsdp->Revision; if (revision == 0) revision = 1; sprintf(buf, "%d", revision); - setenv("hint.acpi.0.revision", buf, 1); setenv("acpi.revision", buf, 1); strncpy(buf, rsdp->OemId, sizeof(rsdp->OemId)); buf[sizeof(rsdp->OemId)] = '\0'; - setenv("hint.acpi.0.oem", buf, 1); setenv("acpi.oem", buf, 1); sprintf(buf, "0x%016x", rsdp->RsdtPhysicalAddress); - setenv("hint.acpi.0.rsdt", buf, 1); setenv("acpi.rsdt", buf, 1); if (revision >= 2) { /* XXX extended checksum? */ sprintf(buf, "0x%016llx", (unsigned long long)rsdp->XsdtPhysicalAddress); - setenv("hint.acpi.0.xsdt", buf, 1); setenv("acpi.xsdt", buf, 1); sprintf(buf, "%d", rsdp->Length); - setenv("hint.acpi.0.xsdt_length", buf, 1); setenv("acpi.xsdt_length", buf, 1); } }