From nobody Tue Jan 24 22:10: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 4P1h4H4r4fz3bf3w; Tue, 24 Jan 2023 22:10: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 4P1h4H49rWz4Kv9; Tue, 24 Jan 2023 22:10:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598239; 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=0v+R1mtf1uy1nlyREG+RbtHLlPYZiHE4KXL+Ndz6gRQ=; b=F3SfjqDjlMzWMjHSPaiCIKMVbC/i32Z4Z+ooEx3xqaXymD21CVZ3VNw3rBDupd3KqXphng +ef5COK7Buh93k7ilBoOtb10bO3btWCiGHFUdkUwmFNsBPh5kAcETMEBcOFW2RKB3TDv0H Xc0B8PGinKWVbzcRFXqzNBmzC4/4962PLXG+DVO4XUDr3oID/LjIpNTsimnb2JPLCc5VuZ ZuO9nDX/rpoatUQaFjpGQPzLCOzj1vknUjwqVgE/dBNPuJywvPACFJZen8ix+OoeoafM1k fhO95JM9jNkIsXcJZFs21wl+M+g81Dmb9DJeXih2f/8rYyza9jKiSft2P/Leug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598239; 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=0v+R1mtf1uy1nlyREG+RbtHLlPYZiHE4KXL+Ndz6gRQ=; b=XN2YZaOvmyBm6NZZKMiaJ8yiCfV/LvfWJeRGCP8t+V5fINOG2B9rVIBQHdZMJlYj3XI/9S IYX0EF8ugJRr4Fb5EWI9gE0AzvLDHiLwcI8N6VqaA3UzFCKsm7HoWGxVM7HXviBOf/AZ9b wrcYoqs1MfCsyY7qZc59FPdUUs91x5ABLzUCssZbgeKP7w3rz2gsmGMCZ8tcIXuDrXcVlJ DfnCSeoJG43Rt1XCXRmQgBG6/sR4arnYKvvOkb59L4Rz5WuXxB+KnqXkma89Y9mStJU25N 3NQRAC0218xMrhh0kwPZqUbk2oG8ga3iY+2BlD+a0LoupuaWuVNP/hroWV+Kdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598239; a=rsa-sha256; cv=none; b=rQbSdOugYM7QoC9LnJHhqWHukZyalIBr7STt6mrsuY9RPjYUl6EuagF8I8wFsUARM9CaQu KCzvbKVWNpjNCYFhy8TFJmbFn3CaLJWQ7QE9efNsXtTTeBerfMlq55h+XJdlE8L/hk3Q5g Te2QvZ1hg/jvW1r+CbNyZqvRdZW7ecXsbXExlnUYRPLmhHcT8zzjUJTYMX6B0EYk2qho2c 97lAVYvLN4qabcWEEY3lJNwmE0ebwg3vKYl7t/kgXwqbKBBnwfCQfX5hITTGv+ta0bXmtn 4GszuBuGXbOO9kYFpd2WfTlKzqKy+6hCOV6qdId9NZWKViPc9Jq4BTJZHWymiw== 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 4P1h4H35knzQWp; Tue, 24 Jan 2023 22:10: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 30OMAdgU080356; Tue, 24 Jan 2023 22:10:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAdWx080355; Tue, 24 Jan 2023 22:10:39 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:39 GMT Message-Id: <202301242210.30OMAdWx080355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 3878d84ac412 - stable/13 - amd64/efi: Remove setting hints for rsdp 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3878d84ac412af68838d91d46febf828bc9dc929 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3878d84ac412af68838d91d46febf828bc9dc929 commit 3878d84ac412af68838d91d46febf828bc9dc929 Author: Warner Losh AuthorDate: 2022-07-02 14:01:09 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:22 +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 (cherry picked from commit 2753bbe71b5adce61a1bfb9535bc33735c35887c) --- 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); } }