[PATCH] ppc/spapr: Cleanup MSI IRQ number handling

[PATCH] ppc/spapr: Cleanup MSI IRQ number handling

[Yoges Vyas]

Now that spapr_irq_nr_msis() returns a constant value,
lets replace it with a macro.
Ref: https://lore.kernel.org/qemu-devel/bf149815-9782-4964-953d-73658b1043c9@linux.ibm.com/

Suggested-by: Chinmay Rath <rathc@linux.ibm.com>
Signed-off-by: Yogesh Vyas <yvyas1991@gmail.com>
---
 hw/ppc/spapr_irq.c         | 7 +------
 hw/ppc/spapr_pci.c         | 2 +-
 include/hw/ppc/spapr_irq.h | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index 2ce323457b..fc45a5d5d6 100644
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -33,7 +33,7 @@ static const TypeInfo spapr_intc_info = {
 
 static void spapr_irq_msi_init(SpaprMachineState *spapr)
 {
-    spapr->irq_map_nr = spapr_irq_nr_msis(spapr);
+    spapr->irq_map_nr = SPAPR_IRQ_NR_MSIS;
     spapr->irq_map = bitmap_new(spapr->irq_map_nr);
 }
 
@@ -277,11 +277,6 @@ void spapr_irq_dt(SpaprMachineState *spapr, uint32_t nr_servers,
     sicc->dt(spapr->active_intc, nr_servers, fdt, phandle);
 }
 
-uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr)
-{
-    return SPAPR_NR_XIRQS + SPAPR_XIRQ_BASE - SPAPR_IRQ_MSI;
-}
-
 void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
 {
     if (kvm_enabled() && kvm_kernel_irqchip_split()) {
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index bdec8f0728..d596a9e38e 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -2279,7 +2279,7 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbState *phb,
     _FDT(fdt_setprop(fdt, bus_off, "reg", &bus_reg, sizeof(bus_reg)));
     _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pci-config-space-type", 0x1));
     _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi",
-                          spapr_irq_nr_msis(spapr)));
+                          SPAPR_IRQ_NR_MSIS));
 
     /* Dynamic DMA window */
     if (phb->ddw_enabled) {
diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
index 5ddd1107c3..265d43e06b 100644
--- a/include/hw/ppc/spapr_irq.h
+++ b/include/hw/ppc/spapr_irq.h
@@ -40,6 +40,7 @@
 #define SPAPR_IRQ_MSI        (SPAPR_XIRQ_BASE + 0x0300)
 
 #define SPAPR_NR_XIRQS       0x1000
+#define SPAPR_IRQ_NR_MSIS    (SPAPR_XIRQ_BASE + SPAPR_NR_XIRQS - SPAPR_IRQ_MSI)
 
 struct SpaprMachineState;
 
@@ -89,7 +90,6 @@ void spapr_irq_print_info(struct SpaprMachineState *spapr, GString *buf);
 void spapr_irq_dt(struct SpaprMachineState *spapr, uint32_t nr_servers,
                   void *fdt, uint32_t phandle);
 
-uint32_t spapr_irq_nr_msis(struct SpaprMachineState *spapr);
 int spapr_irq_msi_alloc(struct SpaprMachineState *spapr, uint32_t num, bool align,
                         Error **errp);
 void spapr_irq_msi_free(struct SpaprMachineState *spapr, int irq, uint32_t num);
-- 
2.51.0

Re: [PATCH] ppc/spapr: Cleanup MSI IRQ number handling

[Chinmay Rath]

On 10/26/25 13:18, Yoges Vyas wrote:
> Now that spapr_irq_nr_msis() returns a constant value,
> lets replace it with a macro.
> Ref: https://lore.kernel.org/qemu-devel/bf149815-9782-4964-953d-73658b1043c9@linux.ibm.com/
>
> Suggested-by: Chinmay Rath <rathc@linux.ibm.com>
> Signed-off-by: Yogesh Vyas <yvyas1991@gmail.com>
Reviewed-by: Chinmay Rath <rathc@linux.ibm.com>
> ---
>   hw/ppc/spapr_irq.c         | 7 +------
>   hw/ppc/spapr_pci.c         | 2 +-
>   include/hw/ppc/spapr_irq.h | 2 +-
>   3 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index 2ce323457b..fc45a5d5d6 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -33,7 +33,7 @@ static const TypeInfo spapr_intc_info = {
>   
>   static void spapr_irq_msi_init(SpaprMachineState *spapr)
>   {
> -    spapr->irq_map_nr = spapr_irq_nr_msis(spapr);
> +    spapr->irq_map_nr = SPAPR_IRQ_NR_MSIS;
>       spapr->irq_map = bitmap_new(spapr->irq_map_nr);
>   }
>   
> @@ -277,11 +277,6 @@ void spapr_irq_dt(SpaprMachineState *spapr, uint32_t nr_servers,
>       sicc->dt(spapr->active_intc, nr_servers, fdt, phandle);
>   }
>   
> -uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr)
> -{
> -    return SPAPR_NR_XIRQS + SPAPR_XIRQ_BASE - SPAPR_IRQ_MSI;
> -}
> -
>   void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
>   {
>       if (kvm_enabled() && kvm_kernel_irqchip_split()) {
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index bdec8f0728..d596a9e38e 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -2279,7 +2279,7 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbState *phb,
>       _FDT(fdt_setprop(fdt, bus_off, "reg", &bus_reg, sizeof(bus_reg)));
>       _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pci-config-space-type", 0x1));
>       _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi",
> -                          spapr_irq_nr_msis(spapr)));
> +                          SPAPR_IRQ_NR_MSIS));
>   
>       /* Dynamic DMA window */
>       if (phb->ddw_enabled) {
> diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> index 5ddd1107c3..265d43e06b 100644
> --- a/include/hw/ppc/spapr_irq.h
> +++ b/include/hw/ppc/spapr_irq.h
> @@ -40,6 +40,7 @@
>   #define SPAPR_IRQ_MSI        (SPAPR_XIRQ_BASE + 0x0300)
>   
>   #define SPAPR_NR_XIRQS       0x1000
> +#define SPAPR_IRQ_NR_MSIS    (SPAPR_XIRQ_BASE + SPAPR_NR_XIRQS - SPAPR_IRQ_MSI)
>   
>   struct SpaprMachineState;
>   
> @@ -89,7 +90,6 @@ void spapr_irq_print_info(struct SpaprMachineState *spapr, GString *buf);
>   void spapr_irq_dt(struct SpaprMachineState *spapr, uint32_t nr_servers,
>                     void *fdt, uint32_t phandle);
>   
> -uint32_t spapr_irq_nr_msis(struct SpaprMachineState *spapr);
>   int spapr_irq_msi_alloc(struct SpaprMachineState *spapr, uint32_t num, bool align,
>                           Error **errp);
>   void spapr_irq_msi_free(struct SpaprMachineState *spapr, int irq, uint32_t num);