From nobody Fri Nov 24 09:39:10 2023 X-Original-To: dev-commits-ports-branches@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 4Sc90t43hnz51xgr; Fri, 24 Nov 2023 09:39:10 +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 4Sc90t3b82z3fw6; Fri, 24 Nov 2023 09:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700818750; 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=CPgGavJRSdRIzN7NCRoDpNoT2WvUbaPNWbfJTyQJjWI=; b=xFVaUD21Jpm+lv+r6gcA16M6AH0WpQNOY7zf3YwvCfJHT5BhC8LZOU7FUIaLv0SJ3Yasw1 u5hm8ay/Qjln9kfGWKrWmP2mJq3V5tMJuTUNy12CiPUEPGUdwElU+OJ6CyBfuxZdnoM0cA DBTE0vZ+mepy7sdjAv0unc78VjbBWpDALmcwNTdU+OMLbIIxzCDcs2PPwmu8+NqLrJhaDY y5Fd3HFAZWY3FViD5IOYN1KrtdrMGEkpGBr0jGwWZmIoIpUay6ifmzIlJ4qgkv9vyz45v7 Hp+VYheWeFmHfyjqexvWVmOAtgIu/vARkVevIL6TDmqsvFQCUE9ts5zFQDTb7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700818750; 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=CPgGavJRSdRIzN7NCRoDpNoT2WvUbaPNWbfJTyQJjWI=; b=HliMCGGEQKPJGSjSpY1auuFNKEMVnSwCIOIREqk+Hkn/QzL25PIqKoY86uPL3/pjUlSvYI HIiL94lL/0dNFAgFyxDAp6BvfvqDGkuB+EhKMEn1ZV5D8wTUaQnRrLpDgCDtHBttCJtFrj AVxp3ELjBBpJtYb5jJHg4inZnO3KhUzjYSXOc3o56LtmI8tu3qR1eNbpv4cBnvGyexzV82 5D604lu0liyElCUWzKjvZc8tSOl0nXXwls6jaXz4tNe78RNwy1FRMlMLSG0/eKJKATFsgJ frBwqZxfCStcJtp0g1H6gxv6poe6jQTctCzLpCVZf6EhyJUXHFbjxyYZl7dJVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700818750; a=rsa-sha256; cv=none; b=wdEo0euWkB2RTrLAuUYxEV0O/kfF9etq2XHlrj4jrGCnIQIv4WdyOv7YIbGMF9+zirpfko X9U4+DH2L7G6x7mTvUF2nzmYD5xRjNjnp8aVKT2I7YonznTAVrUK4+fF/o2c5ZhKsLk68q ATK/o/yU9b+TI2tvJZb83/4W9jlt/Q3bj0lmYJ3AznUJu7TFnm7fJCCRb7HSZYeB/Ax5gd wBrE7ZclFNbcTciNmFh/SOEuZIvgQs6moQqYiucvsCqE6GSdaAn86udy9ALNM7Xrrn+Eju OkSsk3F6kBiyZFqr/ZpIjpBUsjXUBGbo14dlVU9owTo6gNOXwUY2JUGN0Cx3/A== 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 4Sc90t2fndzg5Y; Fri, 24 Nov 2023 09:39:10 +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 3AO9dAjY063874; Fri, 24 Nov 2023 09:39:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AO9dA58063871; Fri, 24 Nov 2023 09:39:10 GMT (envelope-from git) Date: Fri, 24 Nov 2023 09:39:10 GMT Message-Id: <202311240939.3AO9dA58063871@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 9b7e23c09b6b - 2023Q4 - sysutils/edk2: set IO port range properly for bhyve List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 9b7e23c09b6b4c693a89044b1dd848aedfed0361 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by corvink: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b7e23c09b6b4c693a89044b1dd848aedfed0361 commit 9b7e23c09b6b4c693a89044b1dd848aedfed0361 Author: Corvin Köhne AuthorDate: 2023-11-16 05:58:01 +0000 Commit: Corvin Köhne CommitDate: 2023-11-24 09:38:53 +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 (cherry picked from commit 231c5bc3a4c964746ccd21f3d44720617dd3d40a) --- 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