x86: irq: Change LINK_V2N and LINK_N2V to inline functions

[u-boot] / arch / x86 / cpu / irq.c

diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index df3cd0abc7771bef450f70c458ad13613d2162e4..ec556d3bd2c304230f5abd0ef5227bbd10c08b27 100644 (file)
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -17,8 +16,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static struct irq_routing_table *pirq_routing_table;
-
 bool pirq_check_irq_routed(struct udevice *dev, int link, u8 irq)
 {
        struct irq_router *priv = dev_get_priv(dev);
@@ -26,9 +23,11 @@ bool pirq_check_irq_routed(struct udevice *dev, int link, u8 irq)
        int base = priv->link_base;
 
        if (priv->config == PIRQ_VIA_PCI)
-               dm_pci_read_config8(dev->parent, LINK_N2V(link, base), &pirq);
+               dm_pci_read_config8(dev->parent,
+                                   pirq_linkno_to_reg(link, base), &pirq);
        else
-               pirq = readb(priv->ibase + LINK_N2V(link, base));
+               pirq = readb((uintptr_t)priv->ibase +
+                            pirq_linkno_to_reg(link, base));
 
        pirq &= 0xf;
 
@@ -43,7 +42,7 @@ int pirq_translate_link(struct udevice *dev, int link)
 {
        struct irq_router *priv = dev_get_priv(dev);
 
-       return LINK_V2N(link, priv->link_base);
+       return pirq_reg_to_linkno(link, priv->link_base);
 }
 
 void pirq_assign_irq(struct udevice *dev, int link, u8 irq)
@@ -56,9 +55,11 @@ void pirq_assign_irq(struct udevice *dev, int link, u8 irq)
                return;
 
        if (priv->config == PIRQ_VIA_PCI)
-               dm_pci_write_config8(dev->parent, LINK_N2V(link, base), irq);
+               dm_pci_write_config8(dev->parent,
+                                    pirq_linkno_to_reg(link, base), irq);
        else
-               writeb(irq, priv->ibase + LINK_N2V(link, base));
+               writeb(irq, (uintptr_t)priv->ibase +
+                      pirq_linkno_to_reg(link, base));
 }
 
 static struct irq_info *check_dup_entry(struct irq_info *slot_base,
@@ -81,7 +82,7 @@ static inline void fill_irq_info(struct irq_router *priv, struct irq_info *slot,
 {
        slot->bus = bus;
        slot->devfn = (device << 3) | 0;
-       slot->irq[pin - 1].link = LINK_N2V(pirq, priv->link_base);
+       slot->irq[pin - 1].link = pirq_linkno_to_reg(pirq, priv->link_base);
        slot->irq[pin - 1].bitmap = priv->irq_mask;
 }
 
@@ -98,16 +99,17 @@ static int create_pirq_routing_table(struct udevice *dev)
        int i;
        int ret;
 
-       node = dev->of_offset;
+       node = dev_of_offset(dev);
 
        /* extract the bdf from fdt_pci_addr */
        priv->bdf = dm_pci_get_bdf(dev->parent);
 
-       ret = fdt_find_string(blob, node, "intel,pirq-config", "pci");
+       ret = fdt_stringlist_search(blob, node, "intel,pirq-config", "pci");
        if (!ret) {
                priv->config = PIRQ_VIA_PCI;
        } else {
-               ret = fdt_find_string(blob, node, "intel,pirq-config", "ibase");
+               ret = fdt_stringlist_search(blob, node, "intel,pirq-config",
+                                           "ibase");
                if (!ret)
                        priv->config = PIRQ_VIA_IBASE;
                else
@@ -201,7 +203,7 @@ static int create_pirq_routing_table(struct udevice *dev)
                                 * routing information in the device tree.
                                 */
                                if (slot->irq[pr.pin - 1].link !=
-                                       LINK_N2V(pr.pirq, priv->link_base))
+                                   pirq_linkno_to_reg(pr.pirq, priv->link_base))
                                        debug("WARNING: Inconsistent PIRQ routing information\n");
                                continue;
                        }
@@ -218,7 +220,7 @@ static int create_pirq_routing_table(struct udevice *dev)
        /* Fix up the table checksum */
        rt->checksum = table_compute_checksum(rt, rt->size);
 
-       pirq_routing_table = rt;
+       gd->arch.pirq_routing_table = rt;
 
        return 0;
 }
@@ -235,11 +237,11 @@ static void irq_enable_sci(struct udevice *dev)
                if (priv->config == PIRQ_VIA_PCI)
                        dm_pci_write_config32(dev->parent, priv->actl_addr, 0);
                else
-                       writel(0, priv->ibase + priv->actl_addr);
+                       writel(0, (uintptr_t)priv->ibase + priv->actl_addr);
        }
 }
 
-int irq_router_common_init(struct udevice *dev)
+int irq_router_probe(struct udevice *dev)
 {
        int ret;
 
@@ -249,8 +251,8 @@ int irq_router_common_init(struct udevice *dev)
                return ret;
        }
        /* Route PIRQ */
-       pirq_route_irqs(dev, pirq_routing_table->slots,
-                       get_irq_slot_count(pirq_routing_table));
+       pirq_route_irqs(dev, gd->arch.pirq_routing_table->slots,
+                       get_irq_slot_count(gd->arch.pirq_routing_table));
 
        if (IS_ENABLED(CONFIG_GENERATE_ACPI_TABLE))
                irq_enable_sci(dev);
@@ -258,17 +260,12 @@ int irq_router_common_init(struct udevice *dev)
        return 0;
 }
 
-int irq_router_probe(struct udevice *dev)
-{
-       return irq_router_common_init(dev);
-}
-
-u32 write_pirq_routing_table(u32 addr)
+ulong write_pirq_routing_table(ulong addr)
 {
-       if (!pirq_routing_table)
+       if (!gd->arch.pirq_routing_table)
                return addr;
 
-       return copy_pirq_routing_table(addr, pirq_routing_table);
+       return copy_pirq_routing_table(addr, gd->arch.pirq_routing_table);
 }
 
 static const struct udevice_id irq_router_ids[] = {