aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Horne <mhorne@FreeBSD.org>2023-03-31 15:32:39 +0000
committerMitchell Horne <mhorne@FreeBSD.org>2023-04-12 17:08:38 +0000
commit98ee3bb87a7a46b2ecae96159258632b8f6f3520 (patch)
tree4c8f04d1528b7ba8e54cd1ae8608f1b089d176f8
parent3d55de76e30d34a411630d986153ae803915e95f (diff)
downloadsrc-98ee3bb87a7a46b2ecae96159258632b8f6f3520.tar.gz
src-98ee3bb87a7a46b2ecae96159258632b8f6f3520.zip
arm64/gicv3: correct the size of the distributor resource
Use the GICD_SIZE macro (0x10000), which is half the size of the current fixed-sized mapping (128 * 1024 == 0x20000). In ARM64 Hyper-V instances, it seems the Distributor's registers are located immediately preceding a range of physical memory in the bus address space. Thus, when ram0 is attaching and attempts to reserve SYS_RES_MEMORY resources corresponding to its physmem ranges, it fails, because the first 0x10000 bytes of this range are already owned by gic0. PR: 270415 Reported by: whu Tested by: whu Differential Revision: https://reviews.freebsd.org/D39260 (cherry picked from commit 3462c371c2562a8144f4245f9967df99874e505f)
-rw-r--r--sys/arm64/arm64/gic_v3_acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c
index 9aaf9a783868..568e796a60cb 100644
--- a/sys/arm64/arm64/gic_v3_acpi.c
+++ b/sys/arm64/arm64/gic_v3_acpi.c
@@ -210,7 +210,7 @@ gic_v3_acpi_identify(driver_t *driver, device_t parent)
/* Add the MADT data */
BUS_SET_RESOURCE(parent, dev, SYS_RES_MEMORY, 0,
- madt_data.dist->BaseAddress, 128 * 1024);
+ madt_data.dist->BaseAddress, GICD_SIZE);
madt_data.dev = dev;
madt_data.rdist_use_gicc = false;