Re: [PATCH v2 41/57] irqdomain: ppc: Switch to irq_find_mapping()

Christophe Leroy Thu, 20 Mar 2025 11:20:26 -0700



Le 19/03/2025 à 10:29, Jiri Slaby (SUSE) a écrit :

irq_linear_revmap() is deprecated, so remove all its uses and supersede
them by an identical call to irq_find_mapping().

Signed-off-by: Jiri Slaby (SUSE) <jirisl...@kernel.org>
Cc: Madhavan Srinivasan <ma...@linux.ibm.com>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: Nicholas Piggin <npig...@gmail.com>
Cc: Christophe Leroy <christophe.le...@csgroup.eu>
Cc: Naveen N Rao <nav...@kernel.org>
Cc: Anatolij Gustschin <ag...@denx.de>
Cc: Scott Wood <o...@buserror.net>
Cc: linuxppc-dev@lists.ozlabs.org


Acked-by: Christophe Leroy <christophe.le...@csgroup.eu> # for 8xx

---
  arch/powerpc/platforms/44x/uic.c                 | 2 +-
  arch/powerpc/platforms/52xx/mpc52xx_gpt.c        | 2 +-
  arch/powerpc/platforms/52xx/mpc52xx_pic.c        | 2 +-
  arch/powerpc/platforms/85xx/socrates_fpga_pic.c  | 2 +-
  arch/powerpc/platforms/8xx/cpm1-ic.c             | 2 +-
  arch/powerpc/platforms/8xx/pic.c                 | 2 +-
  arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +-
  arch/powerpc/platforms/embedded6xx/hlwd-pic.c    | 2 +-
  arch/powerpc/platforms/powermac/pic.c            | 2 +-
  arch/powerpc/sysdev/cpm2_pic.c                   | 2 +-
  arch/powerpc/sysdev/ehv_pic.c                    | 2 +-
  arch/powerpc/sysdev/ge/ge_pic.c                  | 2 +-
  arch/powerpc/sysdev/ipic.c                       | 2 +-
  arch/powerpc/sysdev/mpic.c                       | 4 ++--
  14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/powerpc/platforms/44x/uic.c b/arch/powerpc/platforms/44x/uic.c
index 481ec25ce78f..85daf841fd3f 100644
--- a/arch/powerpc/platforms/44x/uic.c
+++ b/arch/powerpc/platforms/44x/uic.c
@@ -328,5 +328,5 @@ unsigned int uic_get_irq(void)
        msr = mfdcr(primary_uic->dcrbase + UIC_MSR);
        src = 32 - ffs(msr);

- return irq_linear_revmap(primary_uic->irqhost, src);

+       return irq_find_mapping(primary_uic->irqhost, src);
  }
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c 
b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index f042b21b2b73..3dbe5a5e5d1f 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -369,7 +369,7 @@ struct mpc52xx_gpt_priv *mpc52xx_gpt_from_irq(int irq)
        mutex_lock(&mpc52xx_gpt_list_mutex);
        list_for_each(pos, &mpc52xx_gpt_list) {
                gpt = container_of(pos, struct mpc52xx_gpt_priv, list);
-               if (gpt->irqhost && irq == irq_linear_revmap(gpt->irqhost, 0)) {
+               if (gpt->irqhost && irq == irq_find_mapping(gpt->irqhost, 0)) {
                        mutex_unlock(&mpc52xx_gpt_list_mutex);
                        return gpt;
                }
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c 
b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index 7ec56d3788a9..eb6a4e745c08 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -515,5 +515,5 @@ unsigned int mpc52xx_get_irq(void)
                return 0;
        }

- return irq_linear_revmap(mpc52xx_irqhost, irq);

+       return irq_find_mapping(mpc52xx_irqhost, irq);
  }
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c 
b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index b4f6360830b1..4b69fb321a68 100644
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -83,7 +83,7 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned 
int irq)
                if (cause >> (i + 16))
                        break;
        }
-       return irq_linear_revmap(socrates_fpga_pic_irq_host,
+       return irq_find_mapping(socrates_fpga_pic_irq_host,
                        (irq_hw_number_t)i);
  }

diff --git a/arch/powerpc/platforms/8xx/cpm1-ic.c b/arch/powerpc/platforms/8xx/cpm1-ic.c

index 1549f6cd29f4..a49d4a9ab3bc 100644
--- a/arch/powerpc/platforms/8xx/cpm1-ic.c
+++ b/arch/powerpc/platforms/8xx/cpm1-ic.c
@@ -59,7 +59,7 @@ static int cpm_get_irq(struct irq_desc *desc)
        cpm_vec = in_be16(&data->reg->cpic_civr);
        cpm_vec >>= 11;

- return irq_linear_revmap(data->host, cpm_vec);

+       return irq_find_mapping(data->host, cpm_vec);
  }

static void cpm_cascade(struct irq_desc *desc)

diff --git a/arch/powerpc/platforms/8xx/pic.c b/arch/powerpc/platforms/8xx/pic.c
index 7639f28172be..933d6ab7f512 100644
--- a/arch/powerpc/platforms/8xx/pic.c
+++ b/arch/powerpc/platforms/8xx/pic.c
@@ -80,7 +80,7 @@ unsigned int mpc8xx_get_irq(void)
        if (irq == PIC_VEC_SPURRIOUS)
                return 0;

- return irq_linear_revmap(mpc8xx_pic_host, irq);

+        return irq_find_mapping(mpc8xx_pic_host, irq);

}diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c

index a41649bf0cb8..91a8f0a7086e 100644
--- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
@@ -173,7 +173,7 @@ unsigned int flipper_pic_get_irq(void)
                return 0;       /* no more IRQs pending */

irq = __ffs(irq_status);

-       return irq_linear_revmap(flipper_irq_host, irq);
+       return irq_find_mapping(flipper_irq_host, irq);
  }

/*

diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c 
b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
index 9abb3da36ba5..b57e87b0b3ce 100644
--- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
@@ -190,7 +190,7 @@ static struct irq_domain *__init hlwd_pic_init(struct 
device_node *np)
  unsigned int hlwd_pic_get_irq(void)
  {
        unsigned int hwirq = __hlwd_pic_get_irq(hlwd_irq_host);
-       return hwirq ? irq_linear_revmap(hlwd_irq_host, hwirq) : 0;
+       return hwirq ? irq_find_mapping(hlwd_irq_host, hwirq) : 0;
  }

/*

diff --git a/arch/powerpc/platforms/powermac/pic.c 
b/arch/powerpc/platforms/powermac/pic.c
index 2eddc8bff7ab..c37783a03d25 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -250,7 +250,7 @@ static unsigned int pmac_pic_get_irq(void)
        raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
        if (unlikely(irq < 0))
                return 0;
-       return irq_linear_revmap(pmac_pic_host, irq);
+       return irq_find_mapping(pmac_pic_host, irq);
  }

static int pmac_pic_host_match(struct irq_domain *h, struct device_node *node,

diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index c63d72f17a3e..4a59ed1d62ce 100644
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -207,7 +207,7 @@ unsigned int cpm2_get_irq(void)

if (irq == 0)

                return(-1);
-       return irq_linear_revmap(cpm2_pic_host, irq);
+       return irq_find_mapping(cpm2_pic_host, irq);
  }

static int cpm2_pic_host_map(struct irq_domain *h, unsigned int virq,

diff --git a/arch/powerpc/sysdev/ehv_pic.c b/arch/powerpc/sysdev/ehv_pic.c
index 4ee8d36ca647..b6f9774038e1 100644
--- a/arch/powerpc/sysdev/ehv_pic.c
+++ b/arch/powerpc/sysdev/ehv_pic.c
@@ -175,7 +175,7 @@ unsigned int ehv_pic_get_irq(void)
         * this will also setup revmap[] in the slow path for the first
         * time, next calls will always use fast path by indexing revmap
         */
-       return irq_linear_revmap(global_ehv_pic->irqhost, irq);
+       return irq_find_mapping(global_ehv_pic->irqhost, irq);
  }

static int ehv_pic_host_match(struct irq_domain *h, struct device_node *node,

diff --git a/arch/powerpc/sysdev/ge/ge_pic.c b/arch/powerpc/sysdev/ge/ge_pic.c
index 5b1f8dc3c960..0bc3f0b36528 100644
--- a/arch/powerpc/sysdev/ge/ge_pic.c
+++ b/arch/powerpc/sysdev/ge/ge_pic.c
@@ -245,7 +245,7 @@ unsigned int gef_pic_get_irq(void)
                        if (active & (0x1 << hwirq))
                                break;
                }
-               virq = irq_linear_revmap(gef_pic_irq_host,
+               virq = irq_find_mapping(gef_pic_irq_host,
                        (irq_hw_number_t)hwirq);
        }

diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c

index f7b415ebb71c..70be2105865d 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -801,7 +801,7 @@ unsigned int ipic_get_irq(void)
        if (irq == 0)    /* 0 --> no irq is pending */
                return 0;

- return irq_linear_revmap(primary_ipic->irqhost, irq);

+       return irq_find_mapping(primary_ipic->irqhost, irq);
  }

#ifdef CONFIG_SUSPEND

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 3de090159a1b..787a88efdb35 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1785,7 +1785,7 @@ static unsigned int _mpic_get_one_irq(struct mpic *mpic, 
int reg)
                return 0;
        }

- return irq_linear_revmap(mpic->irqhost, src);

+       return irq_find_mapping(mpic->irqhost, src);
  }

unsigned int mpic_get_one_irq(struct mpic *mpic)

@@ -1823,7 +1823,7 @@ unsigned int mpic_get_coreint_irq(void)
                return 0;
        }

- return irq_linear_revmap(mpic->irqhost, src);

+       return irq_find_mapping(mpic->irqhost, src);
  #else
        return 0;
  #endif

Re: [PATCH v2 41/57] irqdomain: ppc: Switch to irq_find_mapping()

Reply via email to