diff options
Diffstat (limited to 'sys/arch/octeon/dev')
| -rw-r--r-- | sys/arch/octeon/dev/octcit.c | 12 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/octciu.c | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/sys/arch/octeon/dev/octcit.c b/sys/arch/octeon/dev/octcit.c index 785cafa4019..06b79b1b2b4 100644 --- a/sys/arch/octeon/dev/octcit.c +++ b/sys/arch/octeon/dev/octcit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octcit.c,v 1.5 2018/01/23 14:47:21 visa Exp $ */ +/* $OpenBSD: octcit.c,v 1.6 2018/02/24 11:42:31 visa Exp $ */ /* * Copyright (c) 2017 Visa Hankala @@ -404,10 +404,7 @@ octcit_intr(uint32_t hwpend, struct trapframe *frame) if (!ISSET(destpp, CIU3_DEST_PP_INT_INTR)) goto spurious; - __asm__ (".set noreorder\n"); ipl = ci->ci_ipl; - mips_sync(); - __asm__ (".set reorder\n"); intsn = (destpp & CIU3_DEST_PP_INT_INTSN) >> CIU3_DEST_PP_INT_INTSN_SHIFT; @@ -458,10 +455,7 @@ octcit_intr(uint32_t hwpend, struct trapframe *frame) break; } - __asm__ (".set noreorder\n"); ci->ci_ipl = ipl; - mips_sync(); - __asm__ (".set reorder\n"); spurious: if (handled == 0) @@ -478,11 +472,7 @@ octcit_splx(int newipl) struct cpu_info *ci = curcpu(); unsigned int core = ci->ci_cpuid; - /* Update IPL. Order highly important! */ - __asm__ (".set noreorder\n"); ci->ci_ipl = newipl; - mips_sync(); - __asm__ (".set reorder\n"); if (newipl < sc->sc_minipl[ci->ci_cpuid]) CIU3_WR_8(sc, CIU3_IDT_PP(CIU3_IDT(core, 0)), 1ul << core); diff --git a/sys/arch/octeon/dev/octciu.c b/sys/arch/octeon/dev/octciu.c index 6014d069cd1..c26c4005c48 100644 --- a/sys/arch/octeon/dev/octciu.c +++ b/sys/arch/octeon/dev/octciu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octciu.c,v 1.9 2018/01/23 14:47:21 visa Exp $ */ +/* $OpenBSD: octciu.c,v 1.10 2018/02/24 11:42:31 visa Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -462,10 +462,7 @@ octciu_intr_bank(struct octciu_softc *sc, struct intrbank *bank, * Now process allowed interrupts. */ - __asm__ (".set noreorder\n"); ipl = ci->ci_ipl; - mips_sync(); - __asm__ (".set reorder\n"); while ((irq = octciu_next_irq(&isr)) >= 0) { irq += bank->id * BANK_SIZE; @@ -500,10 +497,7 @@ octciu_intr_bank(struct octciu_softc *sc, struct intrbank *bank, printf("spurious interrupt %d\n", irq); } - __asm__ (".set noreorder\n"); ci->ci_ipl = ipl; - mips_sync(); - __asm__ (".set reorder\n"); /* * Reenable interrupts which have been serviced. @@ -543,11 +537,7 @@ octciu_splx(int newipl) struct octciu_softc *sc = octciu_sc; struct octciu_cpu *scpu = &sc->sc_cpu[ci->ci_cpuid]; - /* Update IPL. Order highly important! */ - __asm__ (".set noreorder\n"); ci->ci_ipl = newipl; - mips_sync(); - __asm__ (".set reorder\n"); /* Set hardware masks. */ bus_space_write_8(sc->sc_iot, sc->sc_ioh, scpu->scpu_ibank[0].en, |