The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=95b948c1d11831e4a47735371097a397bf0cf707
commit 95b948c1d11831e4a47735371097a397bf0cf707 Author: Jessica Clarke <[email protected]> AuthorDate: 2024-02-19 22:40:24 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2024-04-10 15:17:56 +0000 bhyve: Fix arm64 PCI I/O range to match FDT This is supposed to combine with the memory range to make one contiguous block, as is laid out in the FDT, so make this match what the OS is told and thus actually configures. Also drop the confusing leading zero from all three of these constants that is making these 9 rather than 8 hex digits long (as one would expect for a 32-bit address). Reviewed by: jhb MFC after: 2 weeks Obtained from: CheriBSD --- usr.sbin/bhyve/pci_emul.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 0b0be09c4de7..8eaa9b71fa15 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -136,9 +136,9 @@ static TAILQ_HEAD(boot_list, boot_device) boot_devices = TAILQ_HEAD_INITIALIZER( */ #define PCI_EMUL_MEMBASE32 0xc0000000 #elif defined(__aarch64__) -#define PCI_EMUL_IOBASE 0x00df00000UL -#define PCI_EMUL_IOLIMIT 0x00e000000UL -#define PCI_EMUL_MEMBASE32 0x0a0000000UL +#define PCI_EMUL_IOBASE 0xdf000000UL +#define PCI_EMUL_IOLIMIT 0xe0000000UL +#define PCI_EMUL_MEMBASE32 0xa0000000UL #else #error Unsupported platform #endif
