irqchip/loongson-pch-pic: Adjust irqchip driver for 32BIT/64BIT

irq_domain_alloc_fwnode() takes a parameter with the phys_addr_t type.
Currently we pass acpi_pchpic->address to it. This can only work on
64BIT platform because its type is u64, so cast it to phys_addr_t and
then the driver works on both 32BIT and 64BIT platforms.

Also use readl() to read vec_count because readq() is only available on
64BIT platform.

[ tglx: Make the cast explicit and use the casted address as argument for
  	pch_pic_init() which takes a phys_addr_t as well. Fixup coding
  	style. More sigh... ]

Co-developed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260113085940.3344837-7-chenhuacai@loongson.cn

diff --git a/drivers/irqchip/irq-loongson-pch-pic.c b/drivers/irqchip/irq-loongson-pch-pic.c
index c6b369a974a7d69b823783307ae8e80f3d9abb5e..f2acaf93f5525814c315190a824993faa5b22fad 100644 (file)
--- a/drivers/irqchip/irq-loongson-pch-pic.c
+++ b/drivers/irqchip/irq-loongson-pch-pic.c
@@ -343,7 +343,7 @@ static int pch_pic_init(phys_addr_t addr, unsigned long size, int vec_base,
                priv->table[i] = PIC_UNDEF_VECTOR;
 
        priv->ht_vec_base = vec_base;
-       priv->vec_count = ((readq(priv->base) >> 48) & 0xff) + 1;
+       priv->vec_count = ((readl(priv->base + 4) >> 16) & 0xff) + 1;
        priv->gsi_base = gsi_base;
 
        priv->pic_domain = irq_domain_create_hierarchy(parent_domain, 0,
@@ -446,23 +446,23 @@ static int __init acpi_cascade_irqdomain_init(void)
        return 0;
 }
 
-int __init pch_pic_acpi_init(struct irq_domain *parent,
-                                       struct acpi_madt_bio_pic *acpi_pchpic)
+int __init pch_pic_acpi_init(struct irq_domain *parent, struct acpi_madt_bio_pic *acpi_pchpic)
 {
-       int ret;
+       phys_addr_t addr = (phys_addr_t)acpi_pchpic->address;
        struct fwnode_handle *domain_handle;
+       int ret;
 
        if (find_pch_pic(acpi_pchpic->gsi_base) >= 0)
                return 0;
 
-       domain_handle = irq_domain_alloc_fwnode(&acpi_pchpic->address);
+       domain_handle = irq_domain_alloc_fwnode(&addr);
        if (!domain_handle) {
                pr_err("Unable to allocate domain handle\n");
                return -ENOMEM;
        }
 
-       ret = pch_pic_init(acpi_pchpic->address, acpi_pchpic->size,
-                               0, parent, domain_handle, acpi_pchpic->gsi_base);
+       ret = pch_pic_init(addr, acpi_pchpic->size, 0, parent,
+                          domain_handle, acpi_pchpic->gsi_base);
 
        if (ret < 0) {
                irq_domain_free_fwnode(domain_handle);