diff options
author | Simon Glass <sjg@chromium.org> | 2017-01-16 14:04:18 (GMT) |
---|---|---|
committer | Bin Meng <bmeng.cn@gmail.com> | 2017-02-07 05:07:30 (GMT) |
commit | 337705833c8f73560af8f4c163ed6b0d9e5440af (patch) | |
tree | d8324bc3d758f83eb553d85165e5edfbf2300a27 | |
parent | a0c75f9080f0dac35f7190c673b64b243c9c6469 (diff) | |
download | u-boot-337705833c8f73560af8f4c163ed6b0d9e5440af.tar.xz |
x86: Change irq_already_routed to a local variable
This avoids using BSS before SDRAM is set up in SPL.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r-- | arch/x86/lib/pirq_routing.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c index c98526d..5df3cab 100644 --- a/arch/x86/lib/pirq_routing.c +++ b/arch/x86/lib/pirq_routing.c @@ -11,9 +11,8 @@ #include <asm/pci.h> #include <asm/pirq_routing.h> -static bool irq_already_routed[16]; - -static u8 pirq_get_next_free_irq(struct udevice *dev, u8 *pirq, u16 bitmap) +static u8 pirq_get_next_free_irq(struct udevice *dev, u8 *pirq, u16 bitmap, + bool irq_already_routed[]) { int i, link; u8 irq = 0; @@ -55,9 +54,11 @@ void pirq_route_irqs(struct udevice *dev, struct irq_info *irq, int num) { unsigned char irq_slot[MAX_INTX_ENTRIES]; unsigned char pirq[CONFIG_MAX_PIRQ_LINKS]; + bool irq_already_routed[16]; int i, intx; memset(pirq, 0, CONFIG_MAX_PIRQ_LINKS); + memset(irq_already_routed, '\0', sizeof(irq_already_routed)); /* Set PCI IRQs */ for (i = 0; i < num; i++) { @@ -83,7 +84,8 @@ void pirq_route_irqs(struct udevice *dev, struct irq_info *irq, int num) /* yet not routed */ if (!pirq[link]) { - irq = pirq_get_next_free_irq(dev, pirq, bitmap); + irq = pirq_get_next_free_irq(dev, pirq, bitmap, + irq_already_routed); pirq[link] = irq; } else { irq = pirq[link]; |