Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src/sys/arch/arm Pull up following revision(s) (requested by ...
details: https://anonhg.NetBSD.org/src/rev/8a6403cfa9ef
branches: netbsd-9
changeset: 458506:8a6403cfa9ef
user: martin <martin%NetBSD.org@localhost>
date: Tue Oct 15 19:40:34 2019 +0000
description:
Pull up following revision(s) (requested by jmcneill in ticket #334):
sys/arch/arm/cortex/gic_v2m.c: revision 1.7
sys/arch/arm/acpi/gicv3_acpi.c: revision 1.5
sys/arch/arm/acpi/files.acpi: revision 1.8
sys/arch/arm/acpi/gic_acpi.c: revision 1.4
sys/arch/arm/cortex/files.cortex: revision 1.13
sys/arch/arm/acpi/gic_v2m_acpi.c: revision 1.1
sys/arch/arm/acpi/gic_v2m_acpi.h: revision 1.1
sys/arch/arm/cortex/gic_v2m.h: revision 1.2
Add support for Amazon's Graviton MSI controller.
Graviton has a GICv3 with a modified GICv2m (!) for MSIs. Instead of
sending messages to a fixed address with the SPI as data, the Graviton's
GICv2m uses a different address for each vector with "don't care" as data.
diffstat:
sys/arch/arm/acpi/files.acpi | 4 +-
sys/arch/arm/acpi/gic_acpi.c | 57 +----------------
sys/arch/arm/acpi/gic_v2m_acpi.c | 122 +++++++++++++++++++++++++++++++++++++++
sys/arch/arm/acpi/gic_v2m_acpi.h | 37 +++++++++++
sys/arch/arm/acpi/gicv3_acpi.c | 14 ++-
sys/arch/arm/cortex/files.cortex | 6 +-
sys/arch/arm/cortex/gic_v2m.c | 35 ++++++++--
sys/arch/arm/cortex/gic_v2m.h | 4 +-
8 files changed, 212 insertions(+), 67 deletions(-)
diffs (truncated from 474 to 300 lines):
diff -r 21cdbb90e870 -r 8a6403cfa9ef sys/arch/arm/acpi/files.acpi
--- a/sys/arch/arm/acpi/files.acpi Tue Oct 15 19:37:58 2019 +0000
+++ b/sys/arch/arm/acpi/files.acpi Tue Oct 15 19:40:34 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.6.6.1 2019/09/23 07:06:31 martin Exp $
+# $NetBSD: files.acpi,v 1.6.6.2 2019/10/15 19:40:34 martin Exp $
#
# Configuration info for ACPI compliant ARM boards.
#
@@ -26,6 +26,8 @@
attach gicvthree at acpimadtbus with gicv3_acpi
file arch/arm/acpi/gicv3_acpi.c gicv3_acpi
+file arch/arm/acpi/gic_v2m_acpi.c (gic_acpi | gicv3_acpi) & pci
+
attach gtmr at acpisdtbus with gtmr_acpi
file arch/arm/acpi/gtmr_acpi.c gtmr_acpi
diff -r 21cdbb90e870 -r 8a6403cfa9ef sys/arch/arm/acpi/gic_acpi.c
--- a/sys/arch/arm/acpi/gic_acpi.c Tue Oct 15 19:37:58 2019 +0000
+++ b/sys/arch/arm/acpi/gic_acpi.c Tue Oct 15 19:40:34 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_acpi.c,v 1.3 2018/11/12 12:56:05 jmcneill Exp $ */
+/* $NetBSD: gic_acpi.c,v 1.3.6.1 2019/10/15 19:40:34 martin 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.3 2018/11/12 12:56:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_acpi.c,v 1.3.6.1 2019/10/15 19:40:34 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -43,16 +43,17 @@
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
+#include <dev/fdt/fdtvar.h>
+
#include <arm/cortex/gic_intr.h>
#include <arm/cortex/gic_reg.h>
#include <arm/cortex/gic_v2m.h>
#include <arm/cortex/mpcore_var.h>
-#include <dev/fdt/fdtvar.h>
+#include <arm/acpi/gic_v2m_acpi.h>
#define GICD_SIZE 0x1000
#define GICC_SIZE 0x1000
-#define GICMSIFRAME_SIZE 0x1000
extern struct bus_space arm_generic_bs_tag;
extern struct pic_softc *pic_list[];
@@ -61,9 +62,6 @@
static void gic_acpi_attach(device_t, device_t, void *);
static ACPI_STATUS gic_acpi_find_gicc(ACPI_SUBTABLE_HEADER *, void *);
-#if NPCI > 0
-static ACPI_STATUS gic_acpi_find_msi_frame(ACPI_SUBTABLE_HEADER *, void *);
-#endif
CFATTACH_DECL_NEW(gic_acpi, 0, gic_acpi_match, gic_acpi_attach, NULL, NULL);
@@ -130,7 +128,7 @@
arm_fdt_irq_set_handler(armgic_irq_handler);
#if NPCI > 0
- acpi_madt_walk(gic_acpi_find_msi_frame, armgic);
+ acpi_madt_walk(gic_v2m_acpi_find_msi_frame, armgic);
#endif
}
@@ -146,46 +144,3 @@
return AE_LIMIT;
}
-
-#if NPCI > 0
-static ACPI_STATUS
-gic_acpi_find_msi_frame(ACPI_SUBTABLE_HEADER *hdrp, void *aux)
-{
- ACPI_MADT_GENERIC_MSI_FRAME *msi_frame = (ACPI_MADT_GENERIC_MSI_FRAME *)hdrp;
- struct gic_v2m_frame *frame;
- struct pic_softc *pic = pic_list[0];
- device_t armgic = aux;
-
- if (hdrp->Type != ACPI_MADT_TYPE_GENERIC_MSI_FRAME)
- return AE_OK;
-
- frame = kmem_zalloc(sizeof(*frame), KM_SLEEP);
- frame->frame_reg = msi_frame->BaseAddress;
- frame->frame_pic = pic;
- if (msi_frame->Flags & ACPI_MADT_OVERRIDE_SPI_VALUES) {
- frame->frame_base = msi_frame->SpiBase;
- frame->frame_count = msi_frame->SpiCount;
- } else {
- bus_space_tag_t bst = &arm_generic_bs_tag;
- bus_space_handle_t bsh;
- if (bus_space_map(bst, frame->frame_reg, GICMSIFRAME_SIZE, 0, &bsh) != 0) {
- printf("%s: failed to map frame\n", __func__);
- return AE_OK;
- }
- const uint32_t typer = bus_space_read_4(bst, bsh, GIC_MSI_TYPER);
- bus_space_unmap(bst, bsh, GICMSIFRAME_SIZE);
-
- frame->frame_base = __SHIFTOUT(typer, GIC_MSI_TYPER_BASE);
- frame->frame_count = __SHIFTOUT(typer, GIC_MSI_TYPER_NUMBER);
- }
-
- if (gic_v2m_init(frame, armgic, msi_frame->MsiFrameId) != 0)
- aprint_error_dev(armgic, "failed to initialize GICv2m\n");
- else
- aprint_normal_dev(armgic, "GICv2m @ %#" PRIx64 ", SPIs %u-%u\n",
- (uint64_t)frame->frame_reg, frame->frame_base,
- frame->frame_base + frame->frame_count);
-
- return AE_OK;
-}
-#endif
diff -r 21cdbb90e870 -r 8a6403cfa9ef sys/arch/arm/acpi/gic_v2m_acpi.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/acpi/gic_v2m_acpi.c Tue Oct 15 19:40:34 2019 +0000
@@ -0,0 +1,122 @@
+/* $NetBSD: gic_v2m_acpi.c,v 1.1.2.2 2019/10/15 19:40:34 martin Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jared McNeill <jmcneill%invisible.ca@localhost>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: gic_v2m_acpi.c,v 1.1.2.2 2019/10/15 19:40:34 martin Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/kmem.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+
+#include <arm/cortex/gic_v2m.h>
+
+#include <arm/acpi/gic_v2m_acpi.h>
+
+#define GICMSIFRAME_SIZE 0x1000
+
+extern struct bus_space arm_generic_bs_tag;
+extern struct pic_softc *pic_list[];
+
+static const struct gic_v2m_acpi_quirk {
+ const char q_oemid[ACPI_OEM_ID_SIZE+1];
+ const char q_oemtableid[ACPI_OEM_TABLE_ID_SIZE+1];
+ uint32_t q_flags;
+} gic_v2m_acpi_quirks[] = {
+ { "AMAZON", "GRAVITON", GIC_V2M_FLAG_GRAVITON },
+};
+
+static uint32_t
+gic_v2m_acpi_flags(void)
+{
+ ACPI_TABLE_MADT *madt;
+ ACPI_STATUS rv;
+ int n;
+
+ rv = AcpiGetTable(ACPI_SIG_MADT, 0, (ACPI_TABLE_HEADER **)&madt);
+ if (ACPI_FAILURE(rv))
+ return 0;
+
+ for (n = 0; n < __arraycount(gic_v2m_acpi_quirks); n++) {
+ const struct gic_v2m_acpi_quirk *q = &gic_v2m_acpi_quirks[n];
+ if (memcmp(q->q_oemid, madt->Header.OemId, ACPI_OEM_ID_SIZE) == 0 &&
+ memcmp(q->q_oemtableid, madt->Header.OemTableId, ACPI_OEM_TABLE_ID_SIZE) == 0)
+ return q->q_flags;
+ }
+
+ return 0;
+}
+
+ACPI_STATUS
+gic_v2m_acpi_find_msi_frame(ACPI_SUBTABLE_HEADER *hdrp, void *aux)
+{
+ ACPI_MADT_GENERIC_MSI_FRAME *msi_frame = (ACPI_MADT_GENERIC_MSI_FRAME *)hdrp;
+ struct gic_v2m_frame *frame;
+ struct pic_softc *pic = pic_list[0];
+ device_t dev = aux;
+
+ if (hdrp->Type != ACPI_MADT_TYPE_GENERIC_MSI_FRAME)
+ return AE_OK;
+
+ frame = kmem_zalloc(sizeof(*frame), KM_SLEEP);
+ frame->frame_reg = msi_frame->BaseAddress;
+ frame->frame_pic = pic;
+ frame->frame_flags = gic_v2m_acpi_flags();
+ if (msi_frame->Flags & ACPI_MADT_OVERRIDE_SPI_VALUES) {
+ frame->frame_base = msi_frame->SpiBase;
+ frame->frame_count = msi_frame->SpiCount;
+ } else {
+ bus_space_tag_t bst = &arm_generic_bs_tag;
+ bus_space_handle_t bsh;
+ if (bus_space_map(bst, frame->frame_reg, GICMSIFRAME_SIZE, 0, &bsh) != 0) {
+ printf("%s: failed to map frame\n", __func__);
+ return AE_OK;
+ }
+ const uint32_t typer = bus_space_read_4(bst, bsh, GIC_MSI_TYPER);
+ bus_space_unmap(bst, bsh, GICMSIFRAME_SIZE);
+
+ frame->frame_base = __SHIFTOUT(typer, GIC_MSI_TYPER_BASE);
+ frame->frame_count = __SHIFTOUT(typer, GIC_MSI_TYPER_NUMBER);
+ }
+
+ if (gic_v2m_init(frame, dev, msi_frame->MsiFrameId) != 0)
+ aprint_error_dev(dev, "failed to initialize GICv2m\n");
+ else
+ aprint_normal_dev(dev, "GICv2m @ %#" PRIx64 ", SPIs %u-%u\n",
+ (uint64_t)frame->frame_reg, frame->frame_base,
+ frame->frame_base + frame->frame_count);
+
+ return AE_OK;
+}
diff -r 21cdbb90e870 -r 8a6403cfa9ef sys/arch/arm/acpi/gic_v2m_acpi.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/acpi/gic_v2m_acpi.h Tue Oct 15 19:40:34 2019 +0000
@@ -0,0 +1,37 @@
+/* $NetBSD: gic_v2m_acpi.h,v 1.1.2.2 2019/10/15 19:40:34 martin Exp $ */
+
+/*-
+ * Copyright (c) 2019 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jared McNeill <jmcneill%invisible.ca@localhost>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ARM_GIC_V2M_ACPI_H
+#define _ARM_GIC_V2M_ACPI_H
+
+ACPI_STATUS gic_v2m_acpi_find_msi_frame(ACPI_SUBTABLE_HEADER *, void *);
+
+#endif /* !_ARM_GIC_V2M_ACPI_H */
diff -r 21cdbb90e870 -r 8a6403cfa9ef sys/arch/arm/acpi/gicv3_acpi.c
--- a/sys/arch/arm/acpi/gicv3_acpi.c Tue Oct 15 19:37:58 2019 +0000
+++ b/sys/arch/arm/acpi/gicv3_acpi.c Tue Oct 15 19:40:34 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_acpi.c,v 1.3.8.1 2019/09/22 12:42:12 martin Exp $ */
+/* $NetBSD: gicv3_acpi.c,v 1.3.8.2 2019/10/15 19:40:34 martin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#define _INTR_PRIVATE
Home |
Main Index |
Thread Index |
Old Index