github.com/rdolbeau.SBusFPGA
1
0
Fork 0
mirror of synced 2026-01-11 23:42:59 +00:00
Code Issues Projects Releases Wiki Activity

fix irq priority handling in ohci-sbus device

Browse Source
This commit is contained in:
Romain Dolbeau 2021-10-09 17:51:33 +02:00
parent 232b7795cd
commit 3e95f078f5
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NetBSD/9.0/usr/src/sys/dev/sbus/ohci_sbus.c
View File

@ -102,12 +102,8 @@ ohci_sbus_attach(device_t parent, device_t self, void *aux)
/* Clamp at parent's burst sizes */
sc->sc_burst &= sbusburst;
if (0) { /* in PCI there's a test for some specific controller */
sc->sc.sc_flags = OHCIF_SUPERIO;
}
/* check if memory space access is enabled */
/* CHECKME: not needed ? */
/* not needed */
/* Map I/O registers */
if (sbus_bus_map(sc->sc.iot, sa->sa_slot, sa->sa_offset, sc->sc.sc_size,
@ -116,7 +112,7 @@ ohci_sbus_attach(device_t parent, device_t self, void *aux)
return;
}
aprint_normal_dev(self, "nid 0x%x, bustag %p (0x%zx @ 0x%08lx), burst 0x%x (parent 0x%0x)\n",
aprint_normal_dev(self, "\nnid 0x%x, bustag %p (0x%zx @ 0x%08lx), burst 0x%x (parent 0x%0x)\n",
sc->sc_node,
sc->sc.iot,
(size_t)sc->sc.sc_size,
@ -124,9 +120,6 @@ ohci_sbus_attach(device_t parent, device_t self, void *aux)
sc->sc_burst,
sbsc->sc_burst);
/* we're SPECIAL!!! */
/* sc->sc.sc_endian = OHCI_BIG_ENDIAN; */
/* Disable interrupts, so we don't get any spurious ones. */
bus_space_write_4(sc->sc.iot, sc->sc.ioh, OHCI_INTERRUPT_DISABLE,
OHCI_ALL_INTRS);
@ -135,16 +128,17 @@ ohci_sbus_attach(device_t parent, device_t self, void *aux)
/* sc->sc.sc_bus.ub_dmatag = (void*)((char*)sc->sc.ioh + 0x10000); */
/* Enable the device. */
/* CHECKME: not needed ? */
/* not needed */
/* Map and establish the interrupt. */
if (sa->sa_nintr != 0) {
int ipl_pri = sbsc->sc_intr2ipl[sa->sa_pri];
sc->sc_ih = bus_intr_establish(sc->sc.iot, sa->sa_pri,
IPL_NET, ohci_intr, sc); // checkme: interrupt priority
ipl_pri, ohci_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt (%d)\n", sa->sa_nintr);
} else
aprint_normal_dev(self, "interrupting at %d / %d / %d\n", sa->sa_nintr, sa->sa_pri, IPL_NET);
aprint_normal_dev(self, "interrupting at %d / %d / %d\n", sa->sa_nintr, sa->sa_pri, ipl_pri);
} else {
aprint_error_dev(self, "no interrupt defined in PROM\n");
goto fail;