svn commit: r306070 - head/sys/arm/arm
Wojciech Macek
wma at FreeBSD.org
Wed Sep 21 05:33:20 UTC 2016
Author: wma
Date: Wed Sep 21 05:33:18 2016
New Revision: 306070
URL: https://svnweb.freebsd.org/changeset/base/306070
Log:
Add support for SPI-mapped MSI interrupts outside of GICv2m.
SPI-mapped MSI interrupts coming from a controller other
than GICv2m need to have their trigger and polarity
properly configured. This patch fixes MSI/MSI-X
on Annapurna Alpine platform with GICv2.
Obtained from: Semihalf
Submitted by: Michal Stanek <mst at semihalf.com>
Sponsored by: Annapurna Labs
Reviewed by: skra, wma
Differential Revision: https://reviews.freebsd.org/D7698
Modified:
head/sys/arm/arm/gic.c
Modified: head/sys/arm/arm/gic.c
==============================================================================
--- head/sys/arm/arm/gic.c Wed Sep 21 05:22:49 2016 (r306069)
+++ head/sys/arm/arm/gic.c Wed Sep 21 05:33:18 2016 (r306070)
@@ -835,6 +835,26 @@ gic_map_fdt(device_t dev, u_int ncells,
#endif
static int
+gic_map_msi(device_t dev, struct intr_map_data_msi *msi_data, u_int *irqp,
+ enum intr_polarity *polp, enum intr_trigger *trigp)
+{
+ struct gic_irqsrc *gi;
+
+ /* Map a non-GICv2m MSI */
+ gi = (struct gic_irqsrc *)msi_data->isrc;
+ if (gi == NULL)
+ return (ENXIO);
+
+ *irqp = gi->gi_irq;
+
+ /* MSI/MSI-X interrupts are always edge triggered with high polarity */
+ *polp = INTR_POLARITY_HIGH;
+ *trigp = INTR_TRIGGER_EDGE;
+
+ return (0);
+}
+
+static int
gic_map_intr(device_t dev, struct intr_map_data *data, u_int *irqp,
enum intr_polarity *polp, enum intr_trigger *trigp)
{
@@ -842,6 +862,7 @@ gic_map_intr(device_t dev, struct intr_m
enum intr_polarity pol;
enum intr_trigger trig;
struct arm_gic_softc *sc;
+ struct intr_map_data_msi *dam;
#ifdef FDT
struct intr_map_data_fdt *daf;
#endif
@@ -860,6 +881,12 @@ gic_map_intr(device_t dev, struct intr_m
__func__));
break;
#endif
+ case INTR_MAP_DATA_MSI:
+ /* Non-GICv2m MSI */
+ dam = (struct intr_map_data_msi *)data;
+ if (gic_map_msi(dev, dam, &irq, &pol, &trig) != 0)
+ return (EINVAL);
+ break;
default:
return (ENOTSUP);
}
@@ -907,6 +934,7 @@ arm_gic_setup_intr(device_t dev, struct
enum intr_polarity pol;
if ((gi->gi_flags & GI_FLAG_MSI) == GI_FLAG_MSI) {
+ /* GICv2m MSI */
pol = gi->gi_pol;
trig = gi->gi_trig;
KASSERT(pol == INTR_POLARITY_HIGH,
More information about the svn-src-head
mailing list