GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: irq: Change LINK_V2N and LINK_N2V to inline functions

Browse source 
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>
This commit is contained in:
Bin Meng 2018-06-03 19:04:23 -07:00
parent bc728b1bc0
commit 594d089c8a
2 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/x86/cpu/irq.c
View file

@ -23,9 +23,11 @@ bool pirq_check_irq_routed(struct udevice *dev, int link, u8 irq)
int base = priv->link_base; int base = priv->link_base;
if (priv->config == PIRQ_VIA_PCI) 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 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; pirq &= 0xf;
@ -40,7 +42,7 @@ int pirq_translate_link(struct udevice *dev, int link)
{ {
struct irq_router *priv = dev_get_priv(dev); 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) 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; return;
if (priv->config == PIRQ_VIA_PCI) 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 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, 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->bus = bus;
slot->devfn = (device << 3) | 0; 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; 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. * routing information in the device tree.
*/ */
if (slot->irq[pr.pin - 1].link != 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"); debug("WARNING: Inconsistent PIRQ routing information\n");
continue; continue;
} }

26
arch/x86/include/asm/irq.h
View file

@ -52,9 +52,29 @@ struct pirq_routing {
int pirq; int pirq;
}; };
/* PIRQ link number and value conversion */ /**
#define LINK_V2N(link, base) (link - base) * pirq_reg_to_linkno() - Convert a PIRQ routing register offset to link number
#define LINK_N2V(link, base) (link + base) *
* @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 #define PIRQ_BITMAP 0xdef8