aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/kernel/irq-mb93091.c36
-rw-r--r--arch/frv/kernel/irq-mb93093.c36
-rw-r--r--arch/frv/kernel/irq-mb93493.c35
-rw-r--r--arch/frv/kernel/irq.c15
4 files changed, 53 insertions, 69 deletions
diff --git a/arch/frv/kernel/irq-mb93091.c b/arch/frv/kernel/irq-mb93091.c
index 635d23437666..369bc0a7443d 100644
--- a/arch/frv/kernel/irq-mb93091.c
+++ b/arch/frv/kernel/irq-mb93091.c
@@ -36,41 +36,45 @@
36/* 36/*
37 * on-motherboard FPGA PIC operations 37 * on-motherboard FPGA PIC operations
38 */ 38 */
39static void frv_fpga_enable(unsigned int irq) 39static void frv_fpga_mask(unsigned int irq)
40{ 40{
41 uint16_t imr = __get_IMR(); 41 uint16_t imr = __get_IMR();
42 42
43 imr &= ~(1 << (irq - IRQ_BASE_FPGA)); 43 imr |= 1 << (irq - IRQ_BASE_FPGA);
44 44
45 __set_IMR(imr); 45 __set_IMR(imr);
46} 46}
47 47
48static void frv_fpga_disable(unsigned int irq) 48static void frv_fpga_ack(unsigned int irq)
49{
50 __clr_IFR(1 << (irq - IRQ_BASE_FPGA));
51}
52
53static void frv_fpga_mask_ack(unsigned int irq)
49{ 54{
50 uint16_t imr = __get_IMR(); 55 uint16_t imr = __get_IMR();
51 56
52 imr |= 1 << (irq - IRQ_BASE_FPGA); 57 imr |= 1 << (irq - IRQ_BASE_FPGA);
53
54 __set_IMR(imr); 58 __set_IMR(imr);
55}
56 59
57static void frv_fpga_ack(unsigned int irq)
58{
59 __clr_IFR(1 << (irq - IRQ_BASE_FPGA)); 60 __clr_IFR(1 << (irq - IRQ_BASE_FPGA));
60} 61}
61 62
62static void frv_fpga_end(unsigned int irq) 63static void frv_fpga_unmask(unsigned int irq)
63{ 64{
65 uint16_t imr = __get_IMR();
66
67 imr &= ~(1 << (irq - IRQ_BASE_FPGA));
68
69 __set_IMR(imr);
64} 70}
65 71
66static struct irq_chip frv_fpga_pic = { 72static struct irq_chip frv_fpga_pic = {
67 .name = "mb93091", 73 .name = "mb93091",
68 .enable = frv_fpga_enable,
69 .disable = frv_fpga_disable,
70 .ack = frv_fpga_ack, 74 .ack = frv_fpga_ack,
71 .mask = frv_fpga_disable, 75 .mask = frv_fpga_mask,
72 .unmask = frv_fpga_enable, 76 .mask_ack = frv_fpga_mask_ack,
73 .end = frv_fpga_end, 77 .unmask = frv_fpga_unmask,
74}; 78};
75 79
76/* 80/*
@@ -79,7 +83,6 @@ static struct irq_chip frv_fpga_pic = {
79static irqreturn_t fpga_interrupt(int irq, void *_mask, struct pt_regs *regs) 83static irqreturn_t fpga_interrupt(int irq, void *_mask, struct pt_regs *regs)
80{ 84{
81 uint16_t imr, mask = (unsigned long) _mask; 85 uint16_t imr, mask = (unsigned long) _mask;
82 irqreturn_t iret = 0;
83 86
84 imr = __get_IMR(); 87 imr = __get_IMR();
85 mask = mask & ~imr & __get_IFR(); 88 mask = mask & ~imr & __get_IFR();
@@ -92,11 +95,10 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask, struct pt_regs *regs)
92 irq = 31 - irq; 95 irq = 31 - irq;
93 mask &= ~(1 << irq); 96 mask &= ~(1 << irq);
94 97
95 if (__do_IRQ(IRQ_BASE_FPGA + irq, regs)) 98 generic_handle_irq(IRQ_BASE_FPGA + irq, regs);
96 iret |= IRQ_HANDLED;
97 } 99 }
98 100
99 return iret; 101 return IRQ_HANDLED;
100} 102}
101 103
102/* 104/*
diff --git a/arch/frv/kernel/irq-mb93093.c b/arch/frv/kernel/irq-mb93093.c
index f60db7988e78..a43a22158956 100644
--- a/arch/frv/kernel/irq-mb93093.c
+++ b/arch/frv/kernel/irq-mb93093.c
@@ -35,40 +35,44 @@
35/* 35/*
36 * off-CPU FPGA PIC operations 36 * off-CPU FPGA PIC operations
37 */ 37 */
38static void frv_fpga_enable(unsigned int irq) 38static void frv_fpga_mask(unsigned int irq)
39{ 39{
40 uint16_t imr = __get_IMR(); 40 uint16_t imr = __get_IMR();
41 41
42 imr &= ~(1 << (irq - IRQ_BASE_FPGA)); 42 imr |= 1 << (irq - IRQ_BASE_FPGA);
43
44 __set_IMR(imr); 43 __set_IMR(imr);
45} 44}
46 45
47static void frv_fpga_disable(unsigned int irq) 46static void frv_fpga_ack(unsigned int irq)
47{
48 __clr_IFR(1 << (irq - IRQ_BASE_FPGA));
49}
50
51static void frv_fpga_mask_ack(unsigned int irq)
48{ 52{
49 uint16_t imr = __get_IMR(); 53 uint16_t imr = __get_IMR();
50 54
51 imr |= 1 << (irq - IRQ_BASE_FPGA); 55 imr |= 1 << (irq - IRQ_BASE_FPGA);
52
53 __set_IMR(imr); 56 __set_IMR(imr);
54}
55 57
56static void frv_fpga_ack(unsigned int irq)
57{
58 __clr_IFR(1 << (irq - IRQ_BASE_FPGA)); 58 __clr_IFR(1 << (irq - IRQ_BASE_FPGA));
59} 59}
60 60
61static void frv_fpga_end(unsigned int irq) 61static void frv_fpga_unmask(unsigned int irq)
62{ 62{
63 uint16_t imr = __get_IMR();
64
65 imr &= ~(1 << (irq - IRQ_BASE_FPGA));
66
67 __set_IMR(imr);
63} 68}
64 69
65static struct irq_chip frv_fpga_pic = { 70static struct irq_chip frv_fpga_pic = {
66 .name = "mb93093", 71 .name = "mb93093",
67 .enable = frv_fpga_enable,
68 .disable = frv_fpga_disable,
69 .ack = frv_fpga_ack, 72 .ack = frv_fpga_ack,
70 .mask = frv_fpga_disable, 73 .mask = frv_fpga_mask,
71 .unmask = frv_fpga_enable, 74 .mask_ack = frv_fpga_mask_ack,
75 .unmask = frv_fpga_unmask,
72 .end = frv_fpga_end, 76 .end = frv_fpga_end,
73}; 77};
74 78
@@ -78,7 +82,6 @@ static struct irq_chip frv_fpga_pic = {
78static irqreturn_t fpga_interrupt(int irq, void *_mask, struct pt_regs *regs) 82static irqreturn_t fpga_interrupt(int irq, void *_mask, struct pt_regs *regs)
79{ 83{
80 uint16_t imr, mask = (unsigned long) _mask; 84 uint16_t imr, mask = (unsigned long) _mask;
81 irqreturn_t iret = 0;
82 85
83 imr = __get_IMR(); 86 imr = __get_IMR();
84 mask = mask & ~imr & __get_IFR(); 87 mask = mask & ~imr & __get_IFR();
@@ -91,11 +94,10 @@ static irqreturn_t fpga_interrupt(int irq, void *_mask, struct pt_regs *regs)
91 irq = 31 - irq; 94 irq = 31 - irq;
92 mask &= ~(1 << irq); 95 mask &= ~(1 << irq);
93 96
94 if (__do_IRQ(IRQ_BASE_FPGA + irq, regs)) 97 generic_irq_handle(IRQ_BASE_FPGA + irq, regs);
95 iret |= IRQ_HANDLED;
96 } 98 }
97 99
98 return iret; 100 return IRQ_HANDLED;
99} 101}
100 102
101/* 103/*
diff --git a/arch/frv/kernel/irq-mb93493.c b/arch/frv/kernel/irq-mb93493.c
index 8ad9abfc7c13..39c0188a3498 100644
--- a/arch/frv/kernel/irq-mb93493.c
+++ b/arch/frv/kernel/irq-mb93493.c
@@ -43,8 +43,9 @@
43 43
44/* 44/*
45 * daughter board PIC operations 45 * daughter board PIC operations
46 * - there is no way to ACK interrupts in the MB93493 chip
46 */ 47 */
47static void frv_mb93493_enable(unsigned int irq) 48static void frv_mb93493_mask(unsigned int irq)
48{ 49{
49 uint32_t iqsr; 50 uint32_t iqsr;
50 volatile void *piqsr; 51 volatile void *piqsr;
@@ -55,11 +56,15 @@ static void frv_mb93493_enable(unsigned int irq)
55 piqsr = __addr_MB93493_IQSR(0); 56 piqsr = __addr_MB93493_IQSR(0);
56 57
57 iqsr = readl(piqsr); 58 iqsr = readl(piqsr);
58 iqsr |= 1 << (irq - IRQ_BASE_MB93493 + 16); 59 iqsr &= ~(1 << (irq - IRQ_BASE_MB93493 + 16));
59 writel(iqsr, piqsr); 60 writel(iqsr, piqsr);
60} 61}
61 62
62static void frv_mb93493_disable(unsigned int irq) 63static void frv_mb93493_ack(unsigned int irq)
64{
65}
66
67static void frv_mb93493_unmask(unsigned int irq)
63{ 68{
64 uint32_t iqsr; 69 uint32_t iqsr;
65 volatile void *piqsr; 70 volatile void *piqsr;
@@ -70,26 +75,16 @@ static void frv_mb93493_disable(unsigned int irq)
70 piqsr = __addr_MB93493_IQSR(0); 75 piqsr = __addr_MB93493_IQSR(0);
71 76
72 iqsr = readl(piqsr); 77 iqsr = readl(piqsr);
73 iqsr &= ~(1 << (irq - IRQ_BASE_MB93493 + 16)); 78 iqsr |= 1 << (irq - IRQ_BASE_MB93493 + 16);
74 writel(iqsr, piqsr); 79 writel(iqsr, piqsr);
75} 80}
76 81
77static void frv_mb93493_ack(unsigned int irq)
78{
79}
80
81static void frv_mb93493_end(unsigned int irq)
82{
83}
84
85static struct irq_chip frv_mb93493_pic = { 82static struct irq_chip frv_mb93493_pic = {
86 .name = "mb93093", 83 .name = "mb93093",
87 .enable = frv_mb93493_enable,
88 .disable = frv_mb93493_disable,
89 .ack = frv_mb93493_ack, 84 .ack = frv_mb93493_ack,
90 .mask = frv_mb93493_disable, 85 .mask = frv_mb93493_mask,
91 .unmask = frv_mb93493_enable, 86 .mask_ack = frv_mb93493_mask,
92 .end = frv_mb93493_end, 87 .unmask = frv_mb93493_unmask,
93}; 88};
94 89
95/* 90/*
@@ -98,7 +93,6 @@ static struct irq_chip frv_mb93493_pic = {
98static irqreturn_t mb93493_interrupt(int irq, void *_piqsr, struct pt_regs *regs) 93static irqreturn_t mb93493_interrupt(int irq, void *_piqsr, struct pt_regs *regs)
99{ 94{
100 volatile void *piqsr = _piqsr; 95 volatile void *piqsr = _piqsr;
101 irqreturn_t iret = 0;
102 uint32_t iqsr; 96 uint32_t iqsr;
103 97
104 iqsr = readl(piqsr); 98 iqsr = readl(piqsr);
@@ -112,11 +106,10 @@ static irqreturn_t mb93493_interrupt(int irq, void *_piqsr, struct pt_regs *regs
112 irq = 31 - irq; 106 irq = 31 - irq;
113 iqsr &= ~(1 << irq); 107 iqsr &= ~(1 << irq);
114 108
115 if (__do_IRQ(IRQ_BASE_MB93493 + irq, regs)) 109 generic_handle_irq(IRQ_BASE_MB93493 + irq, regs);
116 iret |= IRQ_HANDLED;
117 } 110 }
118 111
119 return iret; 112 return IRQ_HANDLED;
120} 113}
121 114
122/* 115/*
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index e1ab9f2e43fb..5ac041c7c0a4 100644
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
@@ -97,19 +97,8 @@ int show_interrupts(struct seq_file *p, void *v)
97/* 97/*
98 * on-CPU PIC operations 98 * on-CPU PIC operations
99 */ 99 */
100static void frv_cpupic_enable(unsigned int irqlevel)
101{
102 __clr_MASK(irqlevel);
103}
104
105static void frv_cpupic_disable(unsigned int irqlevel)
106{
107 __set_MASK(irqlevel);
108}
109
110static void frv_cpupic_ack(unsigned int irqlevel) 100static void frv_cpupic_ack(unsigned int irqlevel)
111{ 101{
112 __set_MASK(irqlevel);
113 __clr_RC(irqlevel); 102 __clr_RC(irqlevel);
114 __clr_IRL(); 103 __clr_IRL();
115} 104}
@@ -138,8 +127,6 @@ static void frv_cpupic_end(unsigned int irqlevel)
138 127
139static struct irq_chip frv_cpu_pic = { 128static struct irq_chip frv_cpu_pic = {
140 .name = "cpu", 129 .name = "cpu",
141 .enable = frv_cpupic_enable,
142 .disable = frv_cpupic_disable,
143 .ack = frv_cpupic_ack, 130 .ack = frv_cpupic_ack,
144 .mask = frv_cpupic_mask, 131 .mask = frv_cpupic_mask,
145 .mask_ack = frv_cpupic_mask_ack, 132 .mask_ack = frv_cpupic_mask_ack,
@@ -156,7 +143,7 @@ static struct irq_chip frv_cpu_pic = {
156asmlinkage void do_IRQ(void) 143asmlinkage void do_IRQ(void)
157{ 144{
158 irq_enter(); 145 irq_enter();
159 __do_IRQ(__get_IRL(), __frame); 146 generic_handle_irq(__get_IRL(), __frame);
160 irq_exit(); 147 irq_exit();
161} 148}
162 149
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-16 05:03:50 -0500