add new system file

hc

2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c

 kernel/drivers/irqchip/irq-gic.c
..
..
@@ -47,6 +47,10 @@
47
47
 
48
48
 #include "irq-gic-common.h"
49
49
 
50
+#ifdef CONFIG_ROCKCHIP_AMP
51
+#include <soc/rockchip/rockchip_amp.h>
52
+#endif
53
+
50
54
 #ifdef CONFIG_ARM64
51
55
 #include <asm/cpufeature.h>
52
56
 
..
..
@@ -194,11 +198,19 @@
194
198
 
195
199
 static void gic_mask_irq(struct irq_data *d)
196
200
 {
201
+#ifdef CONFIG_ROCKCHIP_AMP
202
+	if (rockchip_amp_check_amp_irq(gic_irq(d)))
203
+		return;
204
+#endif
197
205
 	gic_poke_irq(d, GIC_DIST_ENABLE_CLEAR);
198
206
 }
199
207
 
200
208
 static void gic_eoimode1_mask_irq(struct irq_data *d)
201
209
 {
210
+#ifdef CONFIG_ROCKCHIP_AMP
211
+	if (rockchip_amp_check_amp_irq(gic_irq(d)))
212
+		return;
213
+#endif
202
214
 	gic_mask_irq(d);
203
215
 	/*
204
216
 	 * When masking a forwarded interrupt, make sure it is
..
..
@@ -214,6 +226,10 @@
214
226
 
215
227
 static void gic_unmask_irq(struct irq_data *d)
216
228
 {
229
+#ifdef CONFIG_ROCKCHIP_AMP
230
+	if (rockchip_amp_check_amp_irq(gic_irq(d)))
231
+		return;
232
+#endif
217
233
 	gic_poke_irq(d, GIC_DIST_ENABLE_SET);
218
234
 }
219
235
 
..
..
@@ -221,6 +237,10 @@
221
237
 {
222
238
 	u32 hwirq = gic_irq(d);
223
239
 
240
+#ifdef CONFIG_ROCKCHIP_AMP
241
+	if (rockchip_amp_check_amp_irq(hwirq))
242
+		return;
243
+#endif
224
244
 	if (hwirq < 16)
225
245
 		hwirq = this_cpu_read(sgi_intid);
226
246
 
..
..
@@ -231,6 +251,10 @@
231
251
 {
232
252
 	u32 hwirq = gic_irq(d);
233
253
 
254
+#ifdef CONFIG_ROCKCHIP_AMP
255
+	if (rockchip_amp_check_amp_irq(gic_irq(d)))
256
+		return;
257
+#endif
234
258
 	/* Do not deactivate an IRQ forwarded to a vcpu. */
235
259
 	if (irqd_is_forwarded_to_vcpu(d))
236
260
 		return;
..
..
@@ -246,6 +270,11 @@
246
270
 {
247
271
 	u32 reg;
248
272
 
273
+#ifdef CONFIG_ROCKCHIP_AMP
274
+	if (which != IRQCHIP_STATE_PENDING &&
275
+	    rockchip_amp_check_amp_irq(gic_irq(d)))
276
+		return -EINVAL;
277
+#endif
249
278
 	switch (which) {
250
279
 	case IRQCHIP_STATE_PENDING:
251
280
 		reg = val ? GIC_DIST_PENDING_SET : GIC_DIST_PENDING_CLEAR;
..
..
@@ -295,6 +324,11 @@
295
324
 	void __iomem *base = gic_dist_base(d);
296
325
 	unsigned int gicirq = gic_irq(d);
297
326
 	int ret;
327
+
328
+#ifdef CONFIG_ROCKCHIP_AMP
329
+	if (rockchip_amp_check_amp_irq(gic_irq(d)))
330
+		return -EINVAL;
331
+#endif
298
332
 
299
333
 	/* Interrupt configuration for SGIs can't be changed */
300
334
 	if (gicirq < 16)
..
..
@@ -492,10 +526,29 @@
492
526
 	 * Set all global interrupts to this CPU only.
493
527
 	 */
494
528
 	cpumask = gic_get_cpumask(gic);
529
+
530
+#ifdef CONFIG_ROCKCHIP_AMP
531
+	for (i = 32; i < gic_irqs; i += 4) {
532
+		u32 maskval;
533
+		unsigned int j;
534
+
535
+		maskval = 0;
536
+		for (j = 0; j < 4; j++) {
537
+			if (rockchip_amp_need_init_amp_irq(i + j)) {
538
+				maskval |= rockchip_amp_get_irq_cpumask(i + j) <<
539
+					   (j * 8);
540
+			} else {
541
+				maskval |= cpumask << (j * 8);
542
+			}
543
+		}
544
+		writel_relaxed(maskval, base + GIC_DIST_TARGET + i * 4 / 4);
545
+	}
546
+#else
495
547
 	cpumask |= cpumask << 8;
496
548
 	cpumask |= cpumask << 16;
497
549
 	for (i = 32; i < gic_irqs; i += 4)
498
550
 		writel_relaxed(cpumask, base + GIC_DIST_TARGET + i * 4 / 4);
551
+#endif
499
552
 
500
553
 	gic_dist_config(base, gic_irqs, NULL);
501
554
 
..
..
@@ -846,6 +899,11 @@
846
899
 {
847
900
 	void __iomem *reg = gic_dist_base(d) + GIC_DIST_TARGET + gic_irq(d);
848
901
 	unsigned int cpu;
902
+
903
+#ifdef CONFIG_ROCKCHIP_AMP
904
+	if (rockchip_amp_check_amp_irq(gic_irq(d)))
905
+		return -EINVAL;
906
+#endif
849
907
 
850
908
 	if (!force)
851
909
 		cpu = cpumask_any_and(mask_val, cpu_online_mask);
..
..
@@ -1291,6 +1349,9 @@
1291
1349
 		goto error;
1292
1350
 	}
1293
1351
 
1352
+#ifdef CONFIG_ROCKCHIP_AMP
1353
+	rockchip_amp_get_gic_info(gic->gic_irqs, GIC_V2);
1354
+#endif
1294
1355
 	gic_dist_init(gic);
1295
1356
 	ret = gic_cpu_init(gic);
1296
1357
 	if (ret)