Module Name: src
Committed By: martin
Date: Sun Sep 22 12:42:12 UTC 2019
Modified Files:
src/sys/arch/arm/acpi [netbsd-9]: gicv3_acpi.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #227):
sys/arch/arm/acpi/gicv3_acpi.c: revision 1.4
Redistributors with virtual LPI support have larger register spaces. Take
this into consideration when scanning LPI regions.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/arm/acpi/gicv3_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/gicv3_acpi.c
diff -u src/sys/arch/arm/acpi/gicv3_acpi.c:1.3 src/sys/arch/arm/acpi/gicv3_acpi.c:1.3.8.1
--- src/sys/arch/arm/acpi/gicv3_acpi.c:1.3 Mon Nov 12 12:56:05 2018
+++ src/sys/arch/arm/acpi/gicv3_acpi.c Sun Sep 22 12:42:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_acpi.c,v 1.3 2018/11/12 12:56:05 jmcneill Exp $ */
+/* $NetBSD: gicv3_acpi.c,v 1.3.8.1 2019/09/22 12:42:12 martin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3_acpi.c,v 1.3 2018/11/12 12:56:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_acpi.c,v 1.3.8.1 2019/09/22 12:42:12 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -200,6 +200,10 @@ gicv3_acpi_map_gicr(ACPI_SUBTABLE_HEADER
const uint32_t typer = bus_space_read_4(sc->sc_gic.sc_bst, sc->sc_gic.sc_bsh_r[redist], GICR_TYPER);
if (typer & GICR_TYPER_Last)
break;
+
+ /* If the redistributor supports virtual LPIs, skip the VLPI register region */
+ if (typer & GICR_TYPER_VLPIS)
+ off += GICR_SIZE;
}
return AE_OK;
