From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/irqchip/irq-gic.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernel/drivers/irqchip/irq-gic.c b/kernel/drivers/irqchip/irq-gic.c
index cd3f72b..7f4edce 100644
--- a/kernel/drivers/irqchip/irq-gic.c
+++ b/kernel/drivers/irqchip/irq-gic.c
@@ -271,7 +271,8 @@
u32 reg;
#ifdef CONFIG_ROCKCHIP_AMP
- if (rockchip_amp_check_amp_irq(gic_irq(d)))
+ if (which != IRQCHIP_STATE_PENDING &&
+ rockchip_amp_check_amp_irq(gic_irq(d)))
return -EINVAL;
#endif
switch (which) {
@@ -533,7 +534,7 @@
maskval = 0;
for (j = 0; j < 4; j++) {
- if (rockchip_amp_check_amp_irq(i + j)) {
+ if (rockchip_amp_need_init_amp_irq(i + j)) {
maskval |= rockchip_amp_get_irq_cpumask(i + j) <<
(j * 8);
} else {
@@ -1348,6 +1349,9 @@
goto error;
}
+#ifdef CONFIG_ROCKCHIP_AMP
+ rockchip_amp_get_gic_info(gic->gic_irqs, GIC_V2);
+#endif
gic_dist_init(gic);
ret = gic_cpu_init(gic);
if (ret)
@@ -1565,10 +1569,6 @@
gic->percpu_offset = 0;
gic_enable_of_quirks(node, gic_quirks, gic);
-
-#ifdef CONFIG_ROCKCHIP_AMP
- rockchip_amp_get_gic_info();
-#endif
return 0;
--
Gitblit v1.6.2