From b830c19f64a84174c1677b9a3390a716e211e1d1 Mon Sep 17 00:00:00 2001
From: Fuhai Wang <fuhaiwang@tencent.com>
Date: Sat, 14 Aug 2021 16:51:20 +0800
Subject: [PATCH] irqchip: phytium2500: fixed interrupts are concentrated in
 one cpu

---
 drivers/irqchip/irq-gic-phytium-2500-its.c | 4 +---
 drivers/irqchip/irq-gic-phytium-2500.c     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/irqchip/irq-gic-phytium-2500-its.c b/drivers/irqchip/irq-gic-phytium-2500-its.c
index fe8d5e485..a92187703 100644
--- a/drivers/irqchip/irq-gic-phytium-2500-its.c
+++ b/drivers/irqchip/irq-gic-phytium-2500-its.c
@@ -1181,9 +1181,7 @@ static int its_cpumask_select(struct its_device *its_dev,
     }
 
     cpu = cpumask_any_and(mask_val, cpu_mask);
-    if ((cpu > cpus) && (cpu < (cpus + skt_cpu_cnt[skt_id]))) {
-        cpus = cpu;
-    }
+    cpus = cpus + cpu % skt_cpu_cnt[skt_id];
 
     return cpus;
 }
diff --git a/drivers/irqchip/irq-gic-phytium-2500.c b/drivers/irqchip/irq-gic-phytium-2500.c
index e308b429c..8c44a55d7 100644
--- a/drivers/irqchip/irq-gic-phytium-2500.c
+++ b/drivers/irqchip/irq-gic-phytium-2500.c
@@ -1293,9 +1293,7 @@ static int gic_cpumask_select(struct irq_data *d, const struct cpumask *mask_val
     }
 
     cpu = cpumask_any_and(mask_val, cpu_online_mask);
-    if ((cpu > cpus) && (cpu < (cpus + skt_cpu_cnt[irq_skt]))) {
-        cpus = cpu;
-    }
+    cpus = cpus + cpu % skt_cpu_cnt[irq_skt];
 
     return cpus;
 }