change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/arch/mips/dec/setup.c
..
..
@@ -6,7 +6,7 @@
6
6
  * for more details.
7
7
  *
8
8
  * Copyright (C) 1998 Harald Koerfgen
9
- * Copyright (C) 2000, 2001, 2002, 2003, 2005  Maciej W. Rozycki
9
+ * Copyright (C) 2000, 2001, 2002, 2003, 2005, 2020  Maciej W. Rozycki
10
10
  */
11
11
 #include <linux/console.h>
12
12
 #include <linux/export.h>
..
..
@@ -15,6 +15,7 @@
15
15
 #include <linux/ioport.h>
16
16
 #include <linux/irq.h>
17
17
 #include <linux/irqnr.h>
18
+#include <linux/memblock.h>
18
19
 #include <linux/param.h>
19
20
 #include <linux/percpu-defs.h>
20
21
 #include <linux/sched.h>
..
..
@@ -22,6 +23,7 @@
22
23
 #include <linux/types.h>
23
24
 #include <linux/pm.h>
24
25
 
26
+#include <asm/addrspace.h>
25
27
 #include <asm/bootinfo.h>
26
28
 #include <asm/cpu.h>
27
29
 #include <asm/cpu-features.h>
..
..
@@ -29,7 +31,9 @@
29
31
 #include <asm/irq.h>
30
32
 #include <asm/irq_cpu.h>
31
33
 #include <asm/mipsregs.h>
34
+#include <asm/page.h>
32
35
 #include <asm/reboot.h>
36
+#include <asm/sections.h>
33
37
 #include <asm/time.h>
34
38
 #include <asm/traps.h>
35
39
 #include <asm/wbflush.h>
..
..
@@ -103,28 +107,8 @@
103
107
 int cpu_fpu_mask = DEC_CPU_IRQ_MASK(DEC_CPU_INR_FPU);
104
108
 int *fpu_kstat_irq;
105
109
 
106
-static struct irqaction ioirq = {
107
-	.handler = no_action,
108
-	.name = "cascade",
109
-	.flags = IRQF_NO_THREAD,
110
-};
111
-static struct irqaction fpuirq = {
112
-	.handler = no_action,
113
-	.name = "fpu",
114
-	.flags = IRQF_NO_THREAD,
115
-};
116
-
117
-static struct irqaction busirq = {
118
-	.name = "bus error",
119
-	.flags = IRQF_NO_THREAD,
120
-};
121
-
122
-static struct irqaction haltirq = {
123
-	.handler = dec_intr_halt,
124
-	.name = "halt",
125
-	.flags = IRQF_NO_THREAD,
126
-};
127
-
110
+static irq_handler_t busirq_handler;
111
+static unsigned int busirq_flags = IRQF_NO_THREAD;
128
112
 
129
113
 /*
130
114
  * Bus error (DBE/IBE exceptions and bus interrupts) handling setup.
..
..
@@ -134,21 +118,21 @@
134
118
 	switch (mips_machtype) {
135
119
 	case MACH_DS23100:	/* DS2100/DS3100 Pmin/Pmax */
136
120
 		board_be_handler = dec_kn01_be_handler;
137
-		busirq.handler = dec_kn01_be_interrupt;
138
-		busirq.flags |= IRQF_SHARED;
121
+		busirq_handler = dec_kn01_be_interrupt;
122
+		busirq_flags |= IRQF_SHARED;
139
123
 		dec_kn01_be_init();
140
124
 		break;
141
125
 	case MACH_DS5000_1XX:	/* DS5000/1xx 3min */
142
126
 	case MACH_DS5000_XX:	/* DS5000/xx Maxine */
143
127
 		board_be_handler = dec_kn02xa_be_handler;
144
-		busirq.handler = dec_kn02xa_be_interrupt;
128
+		busirq_handler = dec_kn02xa_be_interrupt;
145
129
 		dec_kn02xa_be_init();
146
130
 		break;
147
131
 	case MACH_DS5000_200:	/* DS5000/200 3max */
148
132
 	case MACH_DS5000_2X0:	/* DS5000/240 3max+ */
149
133
 	case MACH_DS5900:	/* DS5900 bigmax */
150
134
 		board_be_handler = dec_ecc_be_handler;
151
-		busirq.handler = dec_ecc_be_interrupt;
135
+		busirq_handler = dec_ecc_be_interrupt;
152
136
 		dec_ecc_be_init();
153
137
 		break;
154
138
 	}
..
..
@@ -166,6 +150,9 @@
166
150
 
167
151
 	ioport_resource.start = ~0UL;
168
152
 	ioport_resource.end = 0UL;
153
+
154
+	/* Stay away from the firmware working memory area for now. */
155
+	memblock_reserve(PHYS_OFFSET, __pa_symbol(&_text) - PHYS_OFFSET);
169
156
 }
170
157
 
171
158
 /*
..
..
@@ -759,25 +746,35 @@
759
746
 		dec_interrupt[DEC_IRQ_HALT] = -1;
760
747
 
761
748
 	/* Register board interrupts: FPU and cascade. */
762
-	if (dec_interrupt[DEC_IRQ_FPU] >= 0 && cpu_has_fpu) {
749
+	if (IS_ENABLED(CONFIG_MIPS_FP_SUPPORT) &&
750
+	    dec_interrupt[DEC_IRQ_FPU] >= 0 && cpu_has_fpu) {
763
751
 		struct irq_desc *desc_fpu;
764
752
 		int irq_fpu;
765
753
 
766
754
 		irq_fpu = dec_interrupt[DEC_IRQ_FPU];
767
-		setup_irq(irq_fpu, &fpuirq);
755
+		if (request_irq(irq_fpu, no_action, IRQF_NO_THREAD, "fpu",
756
+				NULL))
757
+			pr_err("Failed to register fpu interrupt\n");
768
758
 		desc_fpu = irq_to_desc(irq_fpu);
769
759
 		fpu_kstat_irq = this_cpu_ptr(desc_fpu->kstat_irqs);
770
760
 	}
771
-	if (dec_interrupt[DEC_IRQ_CASCADE] >= 0)
772
-		setup_irq(dec_interrupt[DEC_IRQ_CASCADE], &ioirq);
773
-
761
+	if (dec_interrupt[DEC_IRQ_CASCADE] >= 0) {
762
+		if (request_irq(dec_interrupt[DEC_IRQ_CASCADE], no_action,
763
+				IRQF_NO_THREAD, "cascade", NULL))
764
+			pr_err("Failed to register cascade interrupt\n");
765
+	}
774
766
 	/* Register the bus error interrupt. */
775
-	if (dec_interrupt[DEC_IRQ_BUS] >= 0 && busirq.handler)
776
-		setup_irq(dec_interrupt[DEC_IRQ_BUS], &busirq);
777
-
767
+	if (dec_interrupt[DEC_IRQ_BUS] >= 0 && busirq_handler) {
768
+		if (request_irq(dec_interrupt[DEC_IRQ_BUS], busirq_handler,
769
+				busirq_flags, "bus error", busirq_handler))
770
+			pr_err("Failed to register bus error interrupt\n");
771
+	}
778
772
 	/* Register the HALT interrupt. */
779
-	if (dec_interrupt[DEC_IRQ_HALT] >= 0)
780
-		setup_irq(dec_interrupt[DEC_IRQ_HALT], &haltirq);
773
+	if (dec_interrupt[DEC_IRQ_HALT] >= 0) {
774
+		if (request_irq(dec_interrupt[DEC_IRQ_HALT], dec_intr_halt,
775
+				IRQF_NO_THREAD, "halt", NULL))
776
+			pr_err("Failed to register halt interrupt\n");
777
+	}
781
778
 }
782
779
 
783
780
 asmlinkage unsigned int dec_irq_dispatch(unsigned int irq)