From nobody Fri Sep 8 06:54:18 2023 X-Original-To: dev-commits-ports-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 4Rhn0B3y9pz4shJ4; Fri, 8 Sep 2023 06:54:18 +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 4Rhn0B3Ldsz4cwJ; Fri, 8 Sep 2023 06:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694156058; 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=QWw5sbRXfVFWmm1KWzNVPfiYf9DshNKZobyCsEneaEA=; b=bO5pJlCHKc0Urq4KnEkFi6NVFa1UqhBjyaCygy0aXu6E1D3qSXmEENuK27K/zb8suDCP97 MySvgjx2ByPHa+Vvdc5LrJdBjhZjuWw8LbzI5V3z+43RvfDaJq47Zbnff233uogdA7UfCa h6rRtHzgrtW6JguCkDYEWE7n2BkkpOf1OA794yCrcidyMki8E7wbBafn1cX2UPL/rZWDze aERanCAhE/llgRxMSH6nQkScQA20FL7HqJ6cz+dWGZARUY0ITQZJC9ikvETyC111by8pww vRgmeYTen/Pp/p/aihVJv43jX8Xj4fc8WkG3Jyp/xBUjPjuSRdRo8WVhxScifw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694156058; a=rsa-sha256; cv=none; b=WRiF9H1CpqrPfUtT9bn4aAxzkHJ/CwbibbRW6RN+u4qS6BrrlmKjQyLkdF3xx8FbBAHkkn cUeOmsy4sAScLOJXZC2QhWDTzPGfNdmQAthQVRkXVRPUCFfVj38A+4Dlz+pLaU1iMKKNDF LrkhSdC4eBHiwQpydEHUV7ogv1IjOpEuwxp/xqDMgif0oy43y1yy5MWJPFuaaEBgcGbeSB iswqeI0zdn0P7wi7XRqaioYBQqv8myetprz58BFVzH8pnm1QUKsZxk5zpCGUlN4SOplxLx iHgY7zVYB49S9UXc4II1Wi63Aka6WGfpq43Tw78/lcb5nRKmVf6KxoOkUyUFpQ== 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=1694156058; 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=QWw5sbRXfVFWmm1KWzNVPfiYf9DshNKZobyCsEneaEA=; b=jynVRaW7EDZyK/4tppgAuR88bXm/6lI3vX27/G7kuQNjMXvlmoP4BSKU7QKJe8d8hll+4a 26VuJtkprreBNeQjUV/aSJgGbnsU0oZ/zIbmjc0A94m1hcp62RyzXqRpRmckfmDCLV+73q +BQ53YgxdLk88XEwuKj2UWR7ApiX+Z3HpqH92R3bsB+uaFSDmJxP+e544Bey0iEdV7rEbb iUearBL7S6RPWdnWI3e6OJhFAsGVsZ5g3XeoQcNYbjM4dzTGQMG/i2r/+TSgF8QZ61hOwO RxQAsQ9aFvNLgdtZPLLaN7efGjyLsOec8Yv/8I6XRGS9CYW1mf5iCUSKzVmMxA== 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 4Rhn0B2RlpzXSs; Fri, 8 Sep 2023 06:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3886sIUU008112; Fri, 8 Sep 2023 06:54:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3886sIms008110; Fri, 8 Sep 2023 06:54:18 GMT (envelope-from git) Date: Fri, 8 Sep 2023 06:54:18 GMT Message-Id: <202309080654.3886sIms008110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: d64f4b43b1d2 - main - OvmfPkg/Bhyve: don't exit early if RSDP is not found in memory List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d64f4b43b1d2e784c837bf38e3c2c0829e9c9f27 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/ports/commit/?id=d64f4b43b1d2e784c837bf38e3c2c0829e9c9f27 commit d64f4b43b1d2e784c837bf38e3c2c0829e9c9f27 Author: Corvin Köhne AuthorDate: 2023-09-07 08:35:35 +0000 Commit: Corvin Köhne CommitDate: 2023-09-08 06:53:32 +0000 OvmfPkg/Bhyve: don't exit early if RSDP is not found in memory If OVMF fails to find the RSDP in memory, it should fall back installing the statically provided ACPI tables. Signed-off-by: Corvin Köhne PR: 273560 Reviewed by: madpilot, manu Approved by: manu Fixes: 8097dda40a03b8a27a1edf1f31a8af0455a52baf ("sysutils/edk2: update to 202308") Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41769 --- sysutils/edk2/Makefile | 1 + ...ch-OvmfPkg_Bhyve_AcpiPlatformDxe_AcpiPlatform.c | 38 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index cb6ed51d0105..a6131c3127c8 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -1,5 +1,6 @@ PORTNAME= edk2 PORTVERSION= g202308 +PORTREVISION= 1 CATEGORIES= sysutils PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/sysutils/edk2/files/patch-OvmfPkg_Bhyve_AcpiPlatformDxe_AcpiPlatform.c b/sysutils/edk2/files/patch-OvmfPkg_Bhyve_AcpiPlatformDxe_AcpiPlatform.c new file mode 100644 index 000000000000..1096a5e4d30c --- /dev/null +++ b/sysutils/edk2/files/patch-OvmfPkg_Bhyve_AcpiPlatformDxe_AcpiPlatform.c @@ -0,0 +1,38 @@ +--- OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c.orig 2023-09-07 08:35:06 UTC ++++ OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c +@@ -259,19 +259,17 @@ InstallAcpiTables ( + BHYVE_BIOS_PHYSICAL_END, + &Rsdp + ); +- if (EFI_ERROR (Status)) { +- return Status; +- } +- +- Status = InstallAcpiTablesFromRsdp ( +- AcpiTable, +- Rsdp +- ); + if (!EFI_ERROR (Status)) { +- return EFI_SUCCESS; ++ Status = InstallAcpiTablesFromRsdp ( ++ AcpiTable, ++ Rsdp ++ ); ++ if (!EFI_ERROR (Status)) { ++ return EFI_SUCCESS; ++ } + } + +- if (Status != EFI_NOT_FOUND) { ++ if (EFI_ERROR (Status)) { + DEBUG ( + ( + DEBUG_WARN, +@@ -280,7 +278,6 @@ InstallAcpiTables ( + Status + ) + ); +- return Status; + } + + Status = InstallOvmfFvTables (AcpiTable);