diff options
author | Stefan Reinauer <reinauer@chromium.org> | 2012-11-15 15:15:15 -0800 |
---|---|---|
committer | Ronald G. Minnich <rminnich@gmail.com> | 2012-11-16 05:07:28 +0100 |
commit | a47bd91ccaf14626cab51a74b998d93f3d8af18c (patch) | |
tree | df00189f77d9c48dcb6ed918093c11a7a69b4f29 /src/mainboard/intel | |
parent | 56cd70bba2906cb99b84d593d90f7653b0ce1e0b (diff) | |
download | coreboot-a47bd91ccaf14626cab51a74b998d93f3d8af18c.tar.xz |
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 <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1862
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/mainboard/intel')
-rw-r--r-- | src/mainboard/intel/d810e2cb/irq_tables.c | 4 | ||||
-rw-r--r-- | src/mainboard/intel/d945gclf/irq_tables.c | 4 | ||||
-rw-r--r-- | src/mainboard/intel/eagleheights/irq_tables.c | 4 | ||||
-rw-r--r-- | src/mainboard/intel/jarrell/irq_tables.c | 4 | ||||
-rw-r--r-- | src/mainboard/intel/mtarvon/irq_tables.c | 4 | ||||
-rw-r--r-- | src/mainboard/intel/truxton/irq_tables.c | 4 | ||||
-rw-r--r-- | src/mainboard/intel/xe7501devkit/irq_tables.c | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/mainboard/intel/d810e2cb/irq_tables.c b/src/mainboard/intel/d810e2cb/irq_tables.c index c7c0d7b1ad..97881433fe 100644 --- a/src/mainboard/intel/d810e2cb/irq_tables.c +++ b/src/mainboard/intel/d810e2cb/irq_tables.c @@ -20,7 +20,7 @@ #include <arch/pirq_routing.h> -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 (7)*/ @@ -49,5 +49,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/intel/d945gclf/irq_tables.c b/src/mainboard/intel/d945gclf/irq_tables.c index 7af114f54d..ce2a14a147 100644 --- a/src/mainboard/intel/d945gclf/irq_tables.c +++ b/src/mainboard/intel/d945gclf/irq_tables.c @@ -19,7 +19,7 @@ #include <arch/pirq_routing.h> -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*18, /* There can be total 18 devices on the bus */ @@ -56,6 +56,6 @@ 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/intel/eagleheights/irq_tables.c b/src/mainboard/intel/eagleheights/irq_tables.c index 9942b8e9ec..662ad2037f 100644 --- a/src/mainboard/intel/eagleheights/irq_tables.c +++ b/src/mainboard/intel/eagleheights/irq_tables.c @@ -20,7 +20,7 @@ #include <arch/pirq_routing.h> -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 */ @@ -51,5 +51,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/intel/jarrell/irq_tables.c b/src/mainboard/intel/jarrell/irq_tables.c index 70e3f3b0f0..6e88d48ee7 100644 --- a/src/mainboard/intel/jarrell/irq_tables.c +++ b/src/mainboard/intel/jarrell/irq_tables.c @@ -2,7 +2,7 @@ #include <arch/pirq_routing.h> -const struct irq_routing_table intel_irq_routing_table = { +static const struct irq_routing_table intel_irq_routing_table = { 0x52495024, /* u32 signature */ 0x0100, /* u16 version */ 32 + 16 * CONFIG_IRQ_SLOT_COUNT, /* u16 Table size 32+(16*devices) */ @@ -38,6 +38,6 @@ 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/intel/mtarvon/irq_tables.c b/src/mainboard/intel/mtarvon/irq_tables.c index ddf5d9f795..723e0dd2e6 100644 --- a/src/mainboard/intel/mtarvon/irq_tables.c +++ b/src/mainboard/intel/mtarvon/irq_tables.c @@ -20,7 +20,7 @@ #include <arch/pirq_routing.h> -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, /* u16 Table size 32+(16*devices) */ @@ -39,6 +39,6 @@ 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/intel/truxton/irq_tables.c b/src/mainboard/intel/truxton/irq_tables.c index f7ed1c59e9..59ebf51f67 100644 --- a/src/mainboard/intel/truxton/irq_tables.c +++ b/src/mainboard/intel/truxton/irq_tables.c @@ -20,7 +20,7 @@ #include <arch/pirq_routing.h> -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, /* u16 Table size 32+(16*devices) */ @@ -39,6 +39,6 @@ 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/intel/xe7501devkit/irq_tables.c b/src/mainboard/intel/xe7501devkit/irq_tables.c index f3c1c8ef2a..7af7a9f4f0 100644 --- a/src/mainboard/intel/xe7501devkit/irq_tables.c +++ b/src/mainboard/intel/xe7501devkit/irq_tables.c @@ -17,7 +17,7 @@ #define PIRQ_G 0x6A #define PIRQ_H 0x6B -const struct irq_routing_table intel_irq_routing_table = { +static const struct irq_routing_table intel_irq_routing_table = { PIRQ_SIGNATURE, PIRQ_VERSION, 32 + 16 * CONFIG_IRQ_SLOT_COUNT, // Size of this struct in bytes @@ -70,5 +70,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); } |