summaryrefslogtreecommitdiff
path: root/src/mainboard/via
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2012-11-15 15:15:15 -0800
committerRonald G. Minnich <rminnich@gmail.com>2012-11-16 05:07:28 +0100
commita47bd91ccaf14626cab51a74b998d93f3d8af18c (patch)
treedf00189f77d9c48dcb6ed918093c11a7a69b4f29 /src/mainboard/via
parent56cd70bba2906cb99b84d593d90f7653b0ce1e0b (diff)
downloadcoreboot-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/via')
-rw-r--r--src/mainboard/via/epia-cn/irq_tables.c4
-rw-r--r--src/mainboard/via/epia-m/irq_tables.c4
-rw-r--r--src/mainboard/via/epia-m700/irq_tables.c4
-rw-r--r--src/mainboard/via/epia-n/irq_tables.c4
-rw-r--r--src/mainboard/via/epia/irq_tables.c4
-rw-r--r--src/mainboard/via/pc2500e/irq_tables.c4
-rw-r--r--src/mainboard/via/vt8454c/irq_tables.c4
7 files changed, 14 insertions, 14 deletions
diff --git a/src/mainboard/via/epia-cn/irq_tables.c b/src/mainboard/via/epia-cn/irq_tables.c
index 1d2161366c..fa765aa836 100644
--- a/src/mainboard/via/epia-cn/irq_tables.c
+++ b/src/mainboard/via/epia-cn/irq_tables.c
@@ -21,7 +21,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,
PIRQ_VERSION,
32 + 16 * CONFIG_IRQ_SLOT_COUNT,/* Max. number of devices on the bus */
@@ -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/via/epia-m/irq_tables.c b/src/mainboard/via/epia-m/irq_tables.c
index ac21b0646d..1f2634e967 100644
--- a/src/mainboard/via/epia-m/irq_tables.c
+++ b/src/mainboard/via/epia-m/irq_tables.c
@@ -7,7 +7,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, /* there can be total CONFIG_IRQ_SLOT_COUNT devices on the bus */
@@ -30,5 +30,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/via/epia-m700/irq_tables.c b/src/mainboard/via/epia-m700/irq_tables.c
index 3e4b47ebe3..147319dfb4 100644
--- a/src/mainboard/via/epia-m700/irq_tables.c
+++ b/src/mainboard/via/epia-m700/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 */
@@ -52,5 +52,5 @@ const struct irq_routing_table intel_irq_routing_table = {
inline 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/via/epia-n/irq_tables.c b/src/mainboard/via/epia-n/irq_tables.c
index 39dcbada29..9c1ee4e0b5 100644
--- a/src/mainboard/via/epia-n/irq_tables.c
+++ b/src/mainboard/via/epia-n/irq_tables.c
@@ -13,7 +13,7 @@
#include <arch/pirq_routing.h>
#endif
-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 */
@@ -42,6 +42,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);
}
#endif
diff --git a/src/mainboard/via/epia/irq_tables.c b/src/mainboard/via/epia/irq_tables.c
index 03b25007ab..94adba1e87 100644
--- a/src/mainboard/via/epia/irq_tables.c
+++ b/src/mainboard/via/epia/irq_tables.c
@@ -7,7 +7,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, /* there can be total CONFIG_IRQ_SLOT_COUNT devices on the bus */
@@ -32,5 +32,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/via/pc2500e/irq_tables.c b/src/mainboard/via/pc2500e/irq_tables.c
index 702ebb0ccb..72a86994a9 100644
--- a/src/mainboard/via/pc2500e/irq_tables.c
+++ b/src/mainboard/via/pc2500e/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,
PIRQ_VERSION,
32 + 16 * CONFIG_IRQ_SLOT_COUNT,/* Max. number of devices on the bus */
@@ -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/via/vt8454c/irq_tables.c b/src/mainboard/via/vt8454c/irq_tables.c
index fbd71ddd34..a4cb0b1975 100644
--- a/src/mainboard/via/vt8454c/irq_tables.c
+++ b/src/mainboard/via/vt8454c/irq_tables.c
@@ -21,7 +21,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, /* There can be total CONFIG_IRQ_SLOT_COUNT devices on the bus */
@@ -57,5 +57,5 @@ const struct irq_routing_table intel_irq_routing_table = {
inline 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);
}