From a47bd91ccaf14626cab51a74b998d93f3d8af18c Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 15 Nov 2012 15:15:15 -0800 Subject: Fix PIRQ routing abstraction intel_irq_routing_table is a local structure that should not be used globally, because it might not be there on all mainboards. Instead, the API has to be corrected to allow passing a PIRQ table in where needed. Change-Id: Icf08928b67727a366639b648bf6aac8e1a87e765 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/1862 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/mainboard/iei/juki-511p/irq_tables.c | 4 ++-- src/mainboard/iei/nova4899r/irq_tables.c | 4 ++-- src/mainboard/iei/pcisa-lx-800-r10/irq_tables.c | 4 ++-- src/mainboard/iei/pm-lx-800-r11/irq_tables.c | 4 ++-- src/mainboard/iei/pm-lx2-800-r10/irq_tables.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/mainboard/iei') diff --git a/src/mainboard/iei/juki-511p/irq_tables.c b/src/mainboard/iei/juki-511p/irq_tables.c index 03244e9670..d193853334 100644 --- a/src/mainboard/iei/juki-511p/irq_tables.c +++ b/src/mainboard/iei/juki-511p/irq_tables.c @@ -25,7 +25,7 @@ #define IRQ_BITMAP_LINK2 0x0000 /* chipset's INTC# input should be routed to nothing (disabled) */ #define IRQ_BITMAP_LINK3 0x0000 /* chipset's INTD# input should be routed to nothing (disabled) */ -const struct irq_routing_table intel_irq_routing_table = { +static const struct irq_routing_table intel_irq_routing_table = { PIRQ_SIGNATURE, /* u32 signature */ PIRQ_VERSION, /* u16 version */ 32+16*CONFIG_IRQ_SLOT_COUNT, /* There can be a total of CONFIG_IRQ_SLOT_COUNT devices on the bus */ @@ -99,5 +99,5 @@ const struct irq_routing_table intel_irq_routing_table = { */ unsigned long write_pirq_routing_table(unsigned long addr) { - return copy_pirq_routing_table(addr); + return copy_pirq_routing_table(addr, &intel_irq_routing_table); } diff --git a/src/mainboard/iei/nova4899r/irq_tables.c b/src/mainboard/iei/nova4899r/irq_tables.c index f3126b7058..72733411bb 100644 --- a/src/mainboard/iei/nova4899r/irq_tables.c +++ b/src/mainboard/iei/nova4899r/irq_tables.c @@ -48,7 +48,7 @@ /* Bit 11 means IRQ11 is available for this cs5530 INT input. */ #define IRQ_BITMAP_LINK3 0x0800 -const struct irq_routing_table intel_irq_routing_table = { +static const struct irq_routing_table intel_irq_routing_table = { .signature = PIRQ_SIGNATURE, /* u32 signature */ .version = PIRQ_VERSION, /* u16 version */ .size = 32+16*CONFIG_IRQ_SLOT_COUNT, /* There can be total 4 devices on the bus */ @@ -210,5 +210,5 @@ const struct irq_routing_table intel_irq_routing_table = { **/ unsigned long write_pirq_routing_table(unsigned long addr) { - return copy_pirq_routing_table(addr); + return copy_pirq_routing_table(addr, &intel_irq_routing_table); } diff --git a/src/mainboard/iei/pcisa-lx-800-r10/irq_tables.c b/src/mainboard/iei/pcisa-lx-800-r10/irq_tables.c index 641b188628..e58923f920 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/irq_tables.c +++ b/src/mainboard/iei/pcisa-lx-800-r10/irq_tables.c @@ -44,7 +44,7 @@ #define EXCLUSIVE_PCI_IRQS (IRQ_BITMAP_LINKA | IRQ_BITMAP_LINKB | IRQ_BITMAP_LINKC | IRQ_BITMAP_LINKD) -const struct irq_routing_table intel_irq_routing_table = { +static const struct irq_routing_table intel_irq_routing_table = { PIRQ_SIGNATURE, /* u32 signature */ PIRQ_VERSION, /* u16 version */ 32 + 16 * CONFIG_IRQ_SLOT_COUNT,/* there can be total CONFIG_IRQ_SLOT_COUNT devices on the bus */ @@ -292,5 +292,5 @@ const struct irq_routing_table intel_irq_routing_table = { unsigned long write_pirq_routing_table(unsigned long addr) { /* Put the PIR table in memory and checksum. */ - return copy_pirq_routing_table(addr); + return copy_pirq_routing_table(addr, &intel_irq_routing_table); } diff --git a/src/mainboard/iei/pm-lx-800-r11/irq_tables.c b/src/mainboard/iei/pm-lx-800-r11/irq_tables.c index e3c9f18ecc..5670ddf85e 100644 --- a/src/mainboard/iei/pm-lx-800-r11/irq_tables.c +++ b/src/mainboard/iei/pm-lx-800-r11/irq_tables.c @@ -39,7 +39,7 @@ #define B_LINK2 (1 << PIRQC) #define B_LINK3 (1 << PIRQD) -const struct irq_routing_table intel_irq_routing_table = { +static const struct irq_routing_table intel_irq_routing_table = { PIRQ_SIGNATURE, /* u32 signature */ PIRQ_VERSION, /* u16 version */ 32 + 16 * CONFIG_IRQ_SLOT_COUNT, /* Max. number of devices on the bus */ @@ -224,5 +224,5 @@ const struct irq_routing_table intel_irq_routing_table = { unsigned long write_pirq_routing_table(unsigned long addr) { - return copy_pirq_routing_table(addr); + return copy_pirq_routing_table(addr, &intel_irq_routing_table); } diff --git a/src/mainboard/iei/pm-lx2-800-r10/irq_tables.c b/src/mainboard/iei/pm-lx2-800-r10/irq_tables.c index 2bbf2180e8..8d061a6d1f 100644 --- a/src/mainboard/iei/pm-lx2-800-r10/irq_tables.c +++ b/src/mainboard/iei/pm-lx2-800-r10/irq_tables.c @@ -41,7 +41,7 @@ #define B_LINK2 (1 << PIRQC) #define B_LINK3 (1 << PIRQD) -const struct irq_routing_table intel_irq_routing_table = { +static const struct irq_routing_table intel_irq_routing_table = { PIRQ_SIGNATURE, /* u32 signature */ PIRQ_VERSION, /* u16 version */ 32 + 16 * CONFIG_IRQ_SLOT_COUNT, /* Max. number of devices on the bus */ @@ -130,5 +130,5 @@ const struct irq_routing_table intel_irq_routing_table = { unsigned long write_pirq_routing_table(unsigned long addr) { - return copy_pirq_routing_table(addr); + return copy_pirq_routing_table(addr, &intel_irq_routing_table); } -- cgit v1.2.3