Module Name: src
Committed By: jmcneill
Date: Mon Jul 27 18:38:10 UTC 2020
Modified Files:
src/sys/arch/arm/acpi: gic_acpi.c
Log Message:
Skip v2m probe if armgic fails to attach
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/sys/arch/arm/acpi/gic_acpi.c:1.5
--- src/sys/arch/arm/acpi/gic_acpi.c:1.4 Mon Oct 14 11:00:13 2019
+++ src/sys/arch/arm/acpi/gic_acpi.c Mon Jul 27 18:38:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_acpi.c,v 1.4 2019/10/14 11:00:13 jmcneill Exp $ */
+/* $NetBSD: gic_acpi.c,v 1.5 2020/07/27 18:38:10 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.4 2019/10/14 11:00:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_acpi.c,v 1.5 2020/07/27 18:38:10 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -124,12 +124,13 @@ gic_acpi_attach(device_t parent, device_
};
armgic = config_found(self, &mpcaa, NULL);
- if (armgic != NULL)
+ if (armgic != NULL) {
arm_fdt_irq_set_handler(armgic_irq_handler);
#if NPCI > 0
- acpi_madt_walk(gic_v2m_acpi_find_msi_frame, armgic);
+ acpi_madt_walk(gic_v2m_acpi_find_msi_frame, armgic);
#endif
+ }
}
static ACPI_STATUS
