Module Name: src
Committed By: jmcneill
Date: Sat Nov 25 20:17:52 UTC 2023
Modified Files:
src/sys/arch/arm/acpi: gic_acpi.c
Log Message:
gicv2: Fix truncation of GICC / GICD base addresses above 4GB.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/acpi/gic_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/acpi/gic_acpi.c
diff -u src/sys/arch/arm/acpi/gic_acpi.c:1.7 src/sys/arch/arm/acpi/gic_acpi.c:1.8
--- src/sys/arch/arm/acpi/gic_acpi.c:1.7 Sat Aug 7 16:18:42 2021
+++ src/sys/arch/arm/acpi/gic_acpi.c Sat Nov 25 20:17:52 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_acpi.c,v 1.7 2021/08/07 16:18:42 thorpej Exp $ */
+/* $NetBSD: gic_acpi.c,v 1.8 2023/11/25 20:17:52 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic_acpi.c,v 1.7 2021/08/07 16:18:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_acpi.c,v 1.8 2023/11/25 20:17:52 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -102,8 +102,8 @@ gic_acpi_attach(device_t parent, device_
return;
}
- const bus_addr_t addr = uimin(gicd->BaseAddress, gicc->BaseAddress);
- const bus_size_t end = uimax(gicd->BaseAddress + GICD_SIZE, gicc->BaseAddress + GICC_SIZE);
+ const bus_addr_t addr = ulmin(gicd->BaseAddress, gicc->BaseAddress);
+ const bus_size_t end = ulmax(gicd->BaseAddress + GICD_SIZE, gicc->BaseAddress + GICC_SIZE);
const bus_size_t size = end - addr;
error = bus_space_map(&arm_generic_bs_tag, addr, size, 0, &bsh);
