[src/netbsd-9]: src/sys/arch/arm/acpi Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c56b17c81c41
branches:  netbsd-9
changeset: 963003:c56b17c81c41
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 22 12:42:12 2019 +0000

description:
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.

diffstat:

 sys/arch/arm/acpi/gicv3_acpi.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r a5f266ab01a2 -r c56b17c81c41 sys/arch/arm/acpi/gicv3_acpi.c
--- a/sys/arch/arm/acpi/gicv3_acpi.c    Sun Sep 22 12:39:36 2019 +0000
+++ b/sys/arch/arm/acpi/gicv3_acpi.c    Sun Sep 22 12:42:12 2019 +0000
@@ -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 @@
                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;