2 files changed, 7 insertions, 3 deletions

diff --git a/drivers/soc/fsl/qbman/bman_portal.c b/drivers/soc/fsl/qbman/bman_portal.c
index 2f71f7df3465..088cdfa7c034 100644
--- a/drivers/soc/fsl/qbman/bman_portal.c
+++ b/drivers/soc/fsl/qbman/bman_portal.c
@@ -65,7 +65,9 @@ static int bman_offline_cpu(unsigned int cpu)
         if (!pcfg)
                 return 0;
 
-        irq_set_affinity(pcfg->irq, cpumask_of(0));
+        /* use any other online CPU */
+        cpu = cpumask_any_but(cpu_online_mask, cpu);
+        irq_set_affinity(pcfg->irq, cpumask_of(cpu));
         return 0;
 }
 
diff --git a/drivers/soc/fsl/qbman/qman_portal.c b/drivers/soc/fsl/qbman/qman_portal.c
index 3e9391d117c5..661c9b234d32 100644
--- a/drivers/soc/fsl/qbman/qman_portal.c
+++ b/drivers/soc/fsl/qbman/qman_portal.c
@@ -195,8 +195,10 @@ static int qman_offline_cpu(unsigned int cpu)
         if (p) {
                 pcfg = qman_get_qm_portal_config(p);
                 if (pcfg) {
-                        irq_set_affinity(pcfg->irq, cpumask_of(0));
-                        qman_portal_update_sdest(pcfg, 0);
+                        /* select any other online CPU */
+                        cpu = cpumask_any_but(cpu_online_mask, cpu);
+                        irq_set_affinity(pcfg->irq, cpumask_of(cpu));
+                        qman_portal_update_sdest(pcfg, cpu);
                 }
         }
         return 0;