From nobody Fri Nov 24 09:37:54 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 4Sc8zQ3GGXz51xSY; Fri, 24 Nov 2023 09:37:54 +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 4Sc8zQ2p6nz3fFq; Fri, 24 Nov 2023 09:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700818674; 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=hoZ5gYt81iWvFlAkQiuA+D2RbAah6oY4sUIdvdOm7DY=; b=TVMXFJF3jn9rn0IJDUnUKJqSB9MlADlmN3kKagdehJnW9c5iuTrzTPd4uvHZMZXYgTIrce zw6dFzAfKXOaj1TqKKM9cjmXxiw7/wEI8ZpIeK3+E+BYJZft/roqM3ZoAp8onXyf8ZKIC7 SQ3vrEZc98hWZbA9dbq6Y2wdWFB/WeO1QweZQChQJsg3+erVxgDbfbNL9yJU9tj8KP08YQ chkXVQ0Cyt2Hk/87m6apk4Uz9Qd6MpZk3q3LJx/96715w4stizYZKd+1VA5wEljWrQG/dx kIhY4oDlNCUhIfcGJV1bnW/uf3SYe6tAR3+//6Gh54cVt6rQqoQJQrsSAYdO7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700818674; 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=hoZ5gYt81iWvFlAkQiuA+D2RbAah6oY4sUIdvdOm7DY=; b=F8ZqkfmdFshd9TXGm7YavzzOAZp4bO1uDTlHdCP8NmBFxGtLVsLAlApquI6DrcWKOdTb8D gAdYtKaefdkkf4wYA6lgxi3ODtCvIhrydvE/8QsDmBXBSRR8Af0bsMit0+VJHhVJHA423r a9c7Vt+Y47meZkr4WgPAUwv7Oe3HDoXNe7JY2xVZAeoLDiSn3nzd9bUwkFjAeFacsTL9rN v6zKQ/98rb83dRsS0cNPq8aDVKrGb+Ni+bLvelzYpK2wWE1+JKYwy4zBA4BUJYF35ETfUJ BKVwKdBcMm3Sj27YaXDQLIKo2bCF8K7ptg1sxFAOi19tKKtuBjPFOuiLz8hcOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700818674; a=rsa-sha256; cv=none; b=guXd0EZRX2t2Y+WRQ3X9+4MhY1ta1d/qC2MuaydN2hMGcD9xRRJs9mIbzxXQQaRCSFlWjE QfLaKL3I4Ig6fkPhYEsi6TC/n0yl38Im+EOfTBwAOPmBv6yGQnuQcL6LGxHiA1yvVVWgcx GfBnhikfVeyKzYgJqx1AHoauVpl3EiINkcXR7rRxCQBjcmACxIg4l1AzmqSybdejI/a7H7 MmP3+YtseJKDTKBXZhZXaSP7sEwuEki0syCzK16cf9xFbd87tyV2v3ly3ygdEVrJmf5zii M58oqujbiw4hGTC7NUfn0467M5/cMMJ4yBqUDBjMs5HiV1tg9p9KHn9x4a9Agw== 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 4Sc8zQ1s0GzgJq; Fri, 24 Nov 2023 09:37:54 +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 3AO9bsTA063541; Fri, 24 Nov 2023 09:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AO9bsoo063538; Fri, 24 Nov 2023 09:37:54 GMT (envelope-from git) Date: Fri, 24 Nov 2023 09:37:54 GMT Message-Id: <202311240937.3AO9bsoo063538@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: 231c5bc3a4c9 - main - sysutils/edk2: set IO port range properly for bhyve 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: 231c5bc3a4c964746ccd21f3d44720617dd3d40a Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/ports/commit/?id=231c5bc3a4c964746ccd21f3d44720617dd3d40a commit 231c5bc3a4c964746ccd21f3d44720617dd3d40a Author: Corvin Köhne AuthorDate: 2023-11-16 05:58:01 +0000 Commit: Corvin Köhne CommitDate: 2023-11-24 09:30:35 +0000 sysutils/edk2: set IO port range properly for bhyve Bhyve uses an io port range of [ 0x2000, 0x10000 ] [1]. At the moment, EDKII is using a subset of this range [ 0xC000, 0x10000 ] [2]. Even though the EDKII range doesn't exceed the bhyve range, it's causing issues on some guests like OpenBSD. We don't know why it's causing issues yet. However, using the same IO port range in EDKII fixes the issue. [1] https://github.com/freebsd/freebsd-src/blob/82ea0132c8b17a7a6067c8a36c6434e587ede6de/usr.sbin/bhyve/pci_emul.c#L133-L134 [2] https://github.com/tianocore/edk2/blob/fb044b7fe893a4545995bfe2701fd38e593355d9/OvmfPkg/Bhyve/PlatformPei/Platform.c#L156-L157 PR: 274389 Reviewed by: manu, markj Approved by: manu Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D42627 --- sysutils/edk2/Makefile | 2 +- .../edk2/files/patch-OvmfPkg_Bhyve_PlatformPei_Platform.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index 839b3aa3fa88..8cc289fb77ec 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -1,6 +1,6 @@ PORTNAME= edk2 PORTVERSION= g202308 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/sysutils/edk2/files/patch-OvmfPkg_Bhyve_PlatformPei_Platform.c b/sysutils/edk2/files/patch-OvmfPkg_Bhyve_PlatformPei_Platform.c new file mode 100644 index 000000000000..38dd3d905ee1 --- /dev/null +++ b/sysutils/edk2/files/patch-OvmfPkg_Bhyve_PlatformPei_Platform.c @@ -0,0 +1,13 @@ +--- OvmfPkg/Bhyve/PlatformPei/Platform.c.orig 2023-11-17 12:26:16 UTC ++++ OvmfPkg/Bhyve/PlatformPei/Platform.c +@@ -153,8 +153,8 @@ MemMapInitialization ( + UINT64 PciIoSize; + RETURN_STATUS PcdStatus; + +- PciIoBase = 0xC000; +- PciIoSize = 0x4000; ++ PciIoBase = 0x2000; ++ PciIoSize = 0xE000; + + // + // Create Memory Type Information HOB