| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: omap2_icu.c,v 1.9 2012/08/20 12:38:28 matt Exp $ */ | | 1 | /* $NetBSD: omap2_icu.c,v 1.10 2016/10/04 15:38:31 kiyohara Exp $ */ |
2 | /* | | 2 | /* |
3 | * Define the SDP2430 specific information and then include the generic OMAP | | 3 | * Define the SDP2430 specific information and then include the generic OMAP |
4 | * interrupt header. | | 4 | * interrupt header. |
5 | */ | | 5 | */ |
6 | | | 6 | |
7 | /* | | 7 | /* |
8 | * Redistribution and use in source and binary forms, with or without | | 8 | * Redistribution and use in source and binary forms, with or without |
9 | * modification, are permitted provided that the following conditions | | 9 | * modification, are permitted provided that the following conditions |
10 | * are met: | | 10 | * are met: |
11 | * 1. Redistributions of source code must retain this list of conditions | | 11 | * 1. Redistributions of source code must retain this list of conditions |
12 | * and the following disclaimer. | | 12 | * and the following disclaimer. |
13 | * 2. Redistributions in binary form must reproduce this list of conditions | | 13 | * 2. Redistributions in binary form must reproduce this list of conditions |
14 | * and the following disclaimer in the documentation and/or other materials | | 14 | * and the following disclaimer in the documentation and/or other materials |
| @@ -20,27 +20,27 @@ | | | @@ -20,27 +20,27 @@ |
20 | * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | | 20 | * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
21 | * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | | 21 | * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
22 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | | 22 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
23 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | | 23 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
24 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | | 24 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
25 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | | 25 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
26 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | | 26 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ | | 27 | */ |
28 | #include "opt_omap.h" | | 28 | #include "opt_omap.h" |
29 | | | 29 | |
30 | #define _INTR_PRIVATE | | 30 | #define _INTR_PRIVATE |
31 | | | 31 | |
32 | #include <sys/cdefs.h> | | 32 | #include <sys/cdefs.h> |
33 | __KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.9 2012/08/20 12:38:28 matt Exp $"); | | 33 | __KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.10 2016/10/04 15:38:31 kiyohara Exp $"); |
34 | | | 34 | |
35 | #include <sys/param.h> | | 35 | #include <sys/param.h> |
36 | #include <sys/evcnt.h> | | 36 | #include <sys/evcnt.h> |
37 | #include <sys/device.h> | | 37 | #include <sys/device.h> |
38 | | | 38 | |
39 | #include <uvm/uvm_extern.h> | | 39 | #include <uvm/uvm_extern.h> |
40 | | | 40 | |
41 | #include <machine/intr.h> | | 41 | #include <machine/intr.h> |
42 | #include <sys/bus.h> | | 42 | #include <sys/bus.h> |
43 | | | 43 | |
44 | #include <arm/cpu.h> | | 44 | #include <arm/cpu.h> |
45 | #include <arm/armreg.h> | | 45 | #include <arm/armreg.h> |
46 | #include <arm/cpufunc.h> | | 46 | #include <arm/cpufunc.h> |
| @@ -72,31 +72,39 @@ static const struct pic_ops omap2icu_pic | | | @@ -72,31 +72,39 @@ static const struct pic_ops omap2icu_pic |
72 | #if 0 | | 72 | #if 0 |
73 | .pic_source_name = omap2icu_source_name, | | 73 | .pic_source_name = omap2icu_source_name, |
74 | #endif | | 74 | #endif |
75 | }; | | 75 | }; |
76 | | | 76 | |
77 | #define PICTOSOFTC(pic) \ | | 77 | #define PICTOSOFTC(pic) \ |
78 | ((void *)((uintptr_t)(pic) - offsetof(struct omap2icu_softc, sc_pic))) | | 78 | ((void *)((uintptr_t)(pic) - offsetof(struct omap2icu_softc, sc_pic))) |
79 | | | 79 | |
80 | static struct omap2icu_softc { | | 80 | static struct omap2icu_softc { |
81 | device_t sc_dev; | | 81 | device_t sc_dev; |
82 | bus_space_tag_t sc_memt; | | 82 | bus_space_tag_t sc_memt; |
83 | bus_space_handle_t sc_memh; | | 83 | bus_space_handle_t sc_memh; |
84 | struct pic_softc sc_pic; | | 84 | struct pic_softc sc_pic; |
| | | 85 | #if defined(TI_AM335X) |
| | | 86 | uint32_t sc_enabled_irqs[4]; |
| | | 87 | #else |
85 | uint32_t sc_enabled_irqs[3]; | | 88 | uint32_t sc_enabled_irqs[3]; |
| | | 89 | #endif |
86 | } omap2icu_softc = { | | 90 | } omap2icu_softc = { |
87 | .sc_pic = { | | 91 | .sc_pic = { |
88 | .pic_ops = &omap2icu_picops, | | 92 | .pic_ops = &omap2icu_picops, |
| | | 93 | #if defined(TI_AM335X) |
| | | 94 | .pic_maxsources = 128, |
| | | 95 | #else |
89 | .pic_maxsources = 96, | | 96 | .pic_maxsources = 96, |
| | | 97 | #endif |
90 | .pic_name = "omap2icu", | | 98 | .pic_name = "omap2icu", |
91 | }, | | 99 | }, |
92 | }; | | 100 | }; |
93 | | | 101 | |
94 | static void | | 102 | static void |
95 | omap2icu_unblock_irqs(struct pic_softc *pic, size_t irqbase, uint32_t irq_mask) | | 103 | omap2icu_unblock_irqs(struct pic_softc *pic, size_t irqbase, uint32_t irq_mask) |
96 | { | | 104 | { |
97 | struct omap2icu_softc * const sc = PICTOSOFTC(pic); | | 105 | struct omap2icu_softc * const sc = PICTOSOFTC(pic); |
98 | const size_t group = irqbase / 32; | | 106 | const size_t group = irqbase / 32; |
99 | KASSERT((irq_mask & sc->sc_enabled_irqs[group]) == 0); | | 107 | KASSERT((irq_mask & sc->sc_enabled_irqs[group]) == 0); |
100 | sc->sc_enabled_irqs[group] |= irq_mask; | | 108 | sc->sc_enabled_irqs[group] |= irq_mask; |
101 | INTC_WRITE(sc, group, INTC_MIR_CLEAR, irq_mask); | | 109 | INTC_WRITE(sc, group, INTC_MIR_CLEAR, irq_mask); |
102 | | | 110 | |
| @@ -151,27 +159,27 @@ omap_irq_handler(void *frame) | | | @@ -151,27 +159,27 @@ omap_irq_handler(void *frame) |
151 | /* force INTC to recomputq IRQ */ | | 159 | /* force INTC to recomputq IRQ */ |
152 | INTC_WRITE(sc, 0, INTC_CONTROL, INTC_CONTROL_NEWIRQAGR); | | 160 | INTC_WRITE(sc, 0, INTC_CONTROL, INTC_CONTROL_NEWIRQAGR); |
153 | | | 161 | |
154 | /* | | 162 | /* |
155 | * Record the pending_ipls and deliver them if we can. | | 163 | * Record the pending_ipls and deliver them if we can. |
156 | */ | | 164 | */ |
157 | if ((ipl_mask & ~oldipl_mask) > oldipl_mask) | | 165 | if ((ipl_mask & ~oldipl_mask) > oldipl_mask) |
158 | pic_do_pending_ints(I32_bit, oldipl, frame); | | 166 | pic_do_pending_ints(I32_bit, oldipl, frame); |
159 | } | | 167 | } |
160 | | | 168 | |
161 | void | | 169 | void |
162 | omap2icu_establish_irq(struct pic_softc *pic, struct intrsource *is) | | 170 | omap2icu_establish_irq(struct pic_softc *pic, struct intrsource *is) |
163 | { | | 171 | { |
164 | KASSERT(is->is_irq < 96); | | 172 | KASSERT(is->is_irq < omap2icu_softc.sc_pic.pic_maxsources); |
165 | KASSERT(is->is_type == IST_LEVEL); | | 173 | KASSERT(is->is_type == IST_LEVEL); |
166 | } | | 174 | } |
167 | | | 175 | |
168 | int | | 176 | int |
169 | omap2icu_match(device_t parent, cfdata_t cf, void *aux) | | 177 | omap2icu_match(device_t parent, cfdata_t cf, void *aux) |
170 | { | | 178 | { |
171 | struct obio_attach_args * const oa = aux; | | 179 | struct obio_attach_args * const oa = aux; |
172 | | | 180 | |
173 | #if defined(OMAP_2430) || defined(OMAP_2420) | | 181 | #if defined(OMAP_2430) || defined(OMAP_2420) |
174 | return oa->obio_addr == INTC_BASE; | | 182 | return oa->obio_addr == INTC_BASE; |
175 | #elif defined(OMAP3) | | 183 | #elif defined(OMAP3) |
176 | return oa->obio_addr == INTC_BASE_3530; | | 184 | return oa->obio_addr == INTC_BASE_3530; |
177 | #else | | 185 | #else |