upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-19 02:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bus: Activate INTRNG interrupts in common code

Browse source 
[MFC note: This is not a direct cherry-pick due to API changes in HEAD
which are not present in stable/14.]

We need to call into INTRNG to activate all interrupts on platforms that
use it.  Currently, interrupts are only activated in the nexus drivers for
INTRNG platforms, but this does not handle other bus devices such as
gpiobus that manage their own IRQ space.

Reported by:	cperciva
Reviewed by:	cperciva, jhb
Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D47282

(cherry picked from commit c85855a72db9f9d7b4326b676241e1dffabf0fae)
This commit is contained in:
Andrew Turner 2024-10-29 10:19:45 +00:00 committed by Colin Percival
parent 1f69417607
commit c54bdf84d5
1 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
sys/kern/subr_bus.c
View file

@ -53,6 +53,9 @@
#include <sys/systm.h>
#include <sys/bus.h>
#include <sys/cpuset.h>
#ifdef INTRNG
#include <sys/intr.h>
#endif
#include <net/vnet.h>
@ -4382,17 +4385,26 @@ bus_generic_rman_activate_resource(device_t dev, device_t child, int type,
if (error != 0)
return (error);
if ((rman_get_flags(r) & RF_UNMAPPED) == 0 &&
(type == SYS_RES_MEMORY || type == SYS_RES_IOPORT)) {
error = BUS_MAP_RESOURCE(dev, child, type, r, NULL, &map);
if (error != 0) {
rman_deactivate_resource(r);
return (error);
}
switch (type) {
case SYS_RES_IOPORT:
case SYS_RES_MEMORY:
if ((rman_get_flags(r) & RF_UNMAPPED) == 0) {
error = BUS_MAP_RESOURCE(dev, child, type, r, NULL, &map);
if (error != 0)
break;
rman_set_mapping(r, &map);
rman_set_mapping(r, &map);
}
break;
#ifdef INTRNG
case SYS_RES_IRQ:
error = intr_activate_irq(child, r);
break;
#endif
}
return (0);
if (error != 0)
rman_deactivate_resource(r);
return (error);
}
/**
@ -4421,10 +4433,19 @@ bus_generic_rman_deactivate_resource(device_t dev, device_t child, int type,
if (error != 0)
return (error);
if ((rman_get_flags(r) & RF_UNMAPPED) == 0 &&
(type == SYS_RES_MEMORY || type == SYS_RES_IOPORT)) {
rman_get_mapping(r, &map);
BUS_UNMAP_RESOURCE(dev, child, type, r, &map);
switch (type) {
case SYS_RES_IOPORT:
case SYS_RES_MEMORY:
if ((rman_get_flags(r) & RF_UNMAPPED) == 0) {
rman_get_mapping(r, &map);
BUS_UNMAP_RESOURCE(dev, child, type, r, &map);
}
break;
#ifdef INTRNG
case SYS_RES_IRQ:
intr_deactivate_irq(child, r);
break;
#endif
}
return (0);
}