x86: irq: Change LINK_V2N and LINK_N2V to inline functions

LINK_V2N and LINK_N2V are currently defines, so they cannot handle
complex logics. Change to inline functions for future extension.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c
index a1d6a84ff27dcd9f91ba4b53eaddab811b6d3219..ec556d3bd2c304230f5abd0ef5227bbd10c08b27 100644 (file)
--- a/arch/x86/cpu/irq.c
+++ b/arch/x86/cpu/irq.c
@@ -23,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((uintptr_t)priv->ibase + LINK_N2V(link, base));
+               pirq = readb((uintptr_t)priv->ibase +
+                            pirq_linkno_to_reg(link, base));
 
        pirq &= 0xf;
 
@@ -40,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)
@@ -53,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, (uintptr_t)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,
@@ -78,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;
 }
 
@@ -199,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;
                        }

diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index ad95bb49275e9063cec9151280e572a01f473c89..bfa58cf589a4eede81d298086ab72cffee750f34 100644 (file)
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -52,9 +52,29 @@ struct pirq_routing {
        int pirq;
 };
 
-/* PIRQ link number and value conversion */
-#define LINK_V2N(link, base)   (link - base)
-#define LINK_N2V(link, base)   (link + base)
+/**
+ * pirq_reg_to_linkno() - Convert a PIRQ routing register offset to link number
+ *
+ * @reg:       PIRQ routing register offset from the base address
+ * @base:      PIRQ routing register block base address
+ * @return:    PIRQ link number (0 for PIRQA, 1 for PIRQB, etc)
+ */
+static inline int pirq_reg_to_linkno(int reg, int base)
+{
+       return reg - base;
+}
+
+/**
+ * pirq_linkno_to_reg() - Convert a PIRQ link number to routing register offset
+ *
+ * @linkno:    PIRQ link number (0 for PIRQA, 1 for PIRQB, etc)
+ * @base:      PIRQ routing register block base address
+ * @return:    PIRQ routing register offset from the base address
+ */
+static inline int pirq_linkno_to_reg(int linkno, int base)
+{
+       return linkno + base;
+}
 
 #define PIRQ_BITMAP            0xdef8