d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mips: fix NLM platforms breakage caused by e0a0a3ef

Browse Source 
NetLogic platforms have their own implementation of cpu_init_interrupts.
Apply the same logic to it as to intr_machdep.c.

PR:	253051
This commit is contained in:
Oleksandr Tymoshenko 2021-01-31 23:56:22 -08:00
parent e6ff6154d2
commit d6f9c5a6d2
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/mips/nlm/intr_machdep.c
View File

@ -59,6 +59,17 @@ __FBSDID("$FreeBSD$");
#include <mips/nlm/hal/pic.h> #include <mips/nlm/hal/pic.h>
#include <mips/nlm/xlp.h> #include <mips/nlm/xlp.h>
#define INTRCNT_COUNT 256
#define INTRNAME_LEN (2*MAXCOMLEN + 1)
MALLOC_DECLARE(M_MIPSINTR);
MALLOC_DEFINE(M_MIPSINTR, "mipsintr", "MIPS interrupt handling");
u_long *intrcnt;
char *intrnames;
size_t sintrcnt;
size_t sintrnames;
struct xlp_intrsrc { struct xlp_intrsrc {
void (*bus_ack)(int, void *); /* Additional ack */ void (*bus_ack)(int, void *); /* Additional ack */
void *bus_ack_arg; /* arg for additional ack */ void *bus_ack_arg; /* arg for additional ack */
@ -295,6 +306,13 @@ cpu_init_interrupts()
int i; int i;
char name[MAXCOMLEN + 1]; char name[MAXCOMLEN + 1];
intrcnt = mallocarray(INTRCNT_COUNT, sizeof(u_long), M_MIPSINTR,
M_WAITOK | M_ZERO);
intrnames = mallocarray(INTRCNT_COUNT, INTRNAME_LEN, M_MIPSINTR,
M_WAITOK | M_ZERO);
sintrcnt = INTRCNT_COUNT * sizeof(u_long);
sintrnames = INTRCNT_COUNT * INTRNAME_LEN;
/* /*
* Initialize all available vectors so spare IRQ * Initialize all available vectors so spare IRQ
* would show up in systat output * would show up in systat output