git: bd62eb84db62 - main - sysutils/u-boot-bhyve-arm64: Fix the GIC redistributor size

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Thu, 14 Dec 2023 02:53:52 UTC
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bd62eb84db620c0fc007730248be22c77cf5940b

commit bd62eb84db620c0fc007730248be22c77cf5940b
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-12-11 16:55:12 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-12-14 02:53:46 +0000

    sysutils/u-boot-bhyve-arm64: Fix the GIC redistributor size
    
    This is needed when booting multi-vCPU guests.
    
    Reviewed by:    manu
    Obtained from:  jrtc27
    Sponsored by:   Innovate UK
    Differential Revision:  https://reviews.freebsd.org/D42995
---
 sysutils/u-boot-bhyve-arm64/Makefile                                    | 2 ++
 .../files/patch-board_emulation_bhyve-arm_bhyve-arm.c                   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sysutils/u-boot-bhyve-arm64/Makefile b/sysutils/u-boot-bhyve-arm64/Makefile
index 380254843ab6..1d4ccde6a4db 100644
--- a/sysutils/u-boot-bhyve-arm64/Makefile
+++ b/sysutils/u-boot-bhyve-arm64/Makefile
@@ -1,5 +1,7 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+U_BOOT_SLAVE_PORTREVISION_2023.10=	1
+
 MODEL=		bhyve-arm64
 BOARD_CONFIG=	bhyve_arm64_defconfig
 FAMILY=		bhyve
diff --git a/sysutils/u-boot-bhyve-arm64/files/patch-board_emulation_bhyve-arm_bhyve-arm.c b/sysutils/u-boot-bhyve-arm64/files/patch-board_emulation_bhyve-arm_bhyve-arm.c
index 9cf46325cc08..38ef6709ffcb 100644
--- a/sysutils/u-boot-bhyve-arm64/files/patch-board_emulation_bhyve-arm_bhyve-arm.c
+++ b/sysutils/u-boot-bhyve-arm64/files/patch-board_emulation_bhyve-arm_bhyve-arm.c
@@ -36,7 +36,7 @@
 +		/* GICv3 */
 +		.virt = 0x2f100000UL,
 +		.phys = 0x2f100000UL,
-+		.size = 0x20000UL,
++		.size = 0xf00000UL,
 +		.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
 +			 PTE_BLOCK_NON_SHARE |
 +			 PTE_BLOCK_PXN | PTE_BLOCK_UXN