Module Name: src
Committed By: jmcneill
Date: Thu Feb 13 02:12:07 UTC 2020
Modified Files:
src/sys/arch/arm/cortex: gicv3.c gicv3_its.c
Log Message:
Make intr affinity work with MSIs again
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/cortex/gicv3.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/cortex/gicv3_its.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/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.23 src/sys/arch/arm/cortex/gicv3.c:1.24
--- src/sys/arch/arm/cortex/gicv3.c:1.23 Thu Feb 13 00:42:59 2020
+++ src/sys/arch/arm/cortex/gicv3.c Thu Feb 13 02:12:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.23 2020/02/13 00:42:59 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.24 2020/02/13 02:12:06 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.23 2020/02/13 00:42:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.24 2020/02/13 02:12:06 jmcneill Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -634,6 +634,7 @@ gicv3_lpi_get_affinity(struct pic_softc
struct gicv3_softc * const sc = LPITOSOFTC(pic);
struct gicv3_lpi_callback *cb;
+ kcpuset_zero(affinity);
LIST_FOREACH(cb, &sc->sc_lpi_callbacks, list)
cb->get_affinity(cb->priv, irq, affinity);
}
@@ -647,11 +648,11 @@ gicv3_lpi_set_affinity(struct pic_softc
LIST_FOREACH(cb, &sc->sc_lpi_callbacks, list) {
error = cb->set_affinity(cb->priv, irq, affinity);
- if (error)
+ if (error != EPASSTHROUGH)
return error;
}
- return error;
+ return EINVAL;
}
#endif
Index: src/sys/arch/arm/cortex/gicv3_its.c
diff -u src/sys/arch/arm/cortex/gicv3_its.c:1.26 src/sys/arch/arm/cortex/gicv3_its.c:1.27
--- src/sys/arch/arm/cortex/gicv3_its.c:1.26 Thu Feb 13 00:42:59 2020
+++ src/sys/arch/arm/cortex/gicv3_its.c Thu Feb 13 02:12:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.c,v 1.26 2020/02/13 00:42:59 jmcneill Exp $ */
+/* $NetBSD: gicv3_its.c,v 1.27 2020/02/13 02:12:06 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.26 2020/02/13 00:42:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.27 2020/02/13 02:12:06 jmcneill Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -806,7 +806,6 @@ gicv3_its_get_affinity(void *priv, size_
struct gicv3_its * const its = priv;
struct cpu_info *ci;
- kcpuset_zero(affinity);
ci = its->its_targets[irq];
if (ci)
kcpuset_set(affinity, cpu_index(ci));
@@ -825,7 +824,7 @@ gicv3_its_set_affinity(void *priv, size_
pa = its->its_pa[irq];
if (pa == NULL)
- return EINVAL;
+ return EPASSTHROUGH;
ci = cpu_lookup(kcpuset_ffs(affinity) - 1);
its->its_targets[irq] = ci;
