Module Name: src
Committed By: skrll
Date: Mon Dec 2 12:53:07 UTC 2024
Modified Files:
src/sys/arch/arm/fdt: gic_fdt.c
Log Message:
Fix attachment for GICs above 4GB
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/fdt/gic_fdt.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/fdt/gic_fdt.c
diff -u src/sys/arch/arm/fdt/gic_fdt.c:1.25 src/sys/arch/arm/fdt/gic_fdt.c:1.26
--- src/sys/arch/arm/fdt/gic_fdt.c:1.25 Thu Aug 11 13:04:35 2022
+++ src/sys/arch/arm/fdt/gic_fdt.c Mon Dec 2 12:53:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_fdt.c,v 1.25 2022/08/11 13:04:35 riastradh Exp $ */
+/* $NetBSD: gic_fdt.c,v 1.26 2024/12/02 12:53:07 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.25 2022/08/11 13:04:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.26 2024/12/02 12:53:07 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -165,8 +165,8 @@ gic_fdt_attach(device_t parent, device_t
return;
}
- const bus_addr_t addr = uimin(addr_d, addr_c);
- const bus_size_t end = uimax(addr_d + size_d, addr_c + size_c);
+ const bus_addr_t addr = ulmin(addr_d, addr_c);
+ const bus_size_t end = ulmax(addr_d + size_d, addr_c + size_c);
const bus_size_t size = end - addr;
error = bus_space_map(faa->faa_bst, addr, size, 0, &bsh);
