summaryrefslogtreecommitdiff
path: root/src/mainboard/kontron
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-01-19 21:15:37 +0000
committerStefan Reinauer <stepan@openbios.org>2010-01-19 21:15:37 +0000
commit762a230dc0cda0242befd74e282f5d4c0f4f94e4 (patch)
tree0f9d5a32d2b1ccf551b1911189d5bc4995c714db /src/mainboard/kontron
parentc6f2bd0d69d52b3ace287e6c3418109e2ac49957 (diff)
downloadcoreboot-762a230dc0cda0242befd74e282f5d4c0f4f94e4.tar.xz
Kontron 986LCD-M MP table:
When any of the onboard network cards are disabled, the bus numbers change and thus PCI devices in the riser wouldn't get their interrupts right if a kernel without ACPI support is booted. This patch dynamically creates the correct bus numbers for the firewire and riser card entries Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5043 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/kontron')
-rw-r--r--src/mainboard/kontron/986lcd-m/mptable.c57
1 files changed, 40 insertions, 17 deletions
diff --git a/src/mainboard/kontron/986lcd-m/mptable.c b/src/mainboard/kontron/986lcd-m/mptable.c
index a3e989127f..8f5acb8b59 100644
--- a/src/mainboard/kontron/986lcd-m/mptable.c
+++ b/src/mainboard/kontron/986lcd-m/mptable.c
@@ -33,8 +33,9 @@ void *smp_write_config_table(void *v)
static const char oem[8] = "COREBOOT";
static const char productid[12] = "986LCD-M ";
struct mp_config_table *mc;
+ struct device *riser = NULL, *firewire = NULL;
int i;
- int max_pci_bus, isa_bus;
+ int max_pci_bus, firewire_bus = 0, riser_bus = 0, isa_bus;
mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
memset(mc, 0, sizeof(*mc));
@@ -54,8 +55,26 @@ void *smp_write_config_table(void *v)
mc->reserved = 0;
smp_write_processors(mc);
-
- max_pci_bus = 5; // XXX read me from bridges.
+ max_pci_bus=0;
+
+ firewire = dev_find_device(0x104c, 0x8023, 0);
+ if (firewire) {
+ firewire_bus = firewire->bus->secondary;
+ printk_spew("Firewire device is on bus %x\n",
+ firewire_bus);
+ max_pci_bus = firewire_bus;
+ }
+
+ // If a riser card is used, this riser is detected on bus 4, so its secondary bus is the
+ // highest bus number on the pci bus.
+ riser = dev_find_device(0x3388, 0x0021, 0);
+ if (!riser)
+ riser = dev_find_device(0x3388, 0x0022, 0);
+ if (riser) {
+ riser_bus = riser->link[0].secondary;
+ printk_spew("Riser bus is %x\n", riser_bus);
+ max_pci_bus = riser_bus;
+ }
/* ISA bus follows */
isa_bus = max_pci_bus + 1;
@@ -98,20 +117,24 @@ void *smp_write_config_table(void *v)
smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x0, 0x71, 0x2, 0x11);
/* Firewire 4:0.0 */
- smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x4, 0x0, 0x2, 0x10);
-
- /* Old riser card */
- // riser slot top 5:8.0
- smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x5, 0x20, 0x2, 0x14);
- // riser slot middle 5:9.0
- smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x5, 0x24, 0x2, 0x15);
- // riser slot bottom 5:a.0
- smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x5, 0x28, 0x2, 0x16);
-
- /* New Riser Card */
- smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x5, 0x30, 0x2, 0x14);
- smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x5, 0x34, 0x2, 0x15);
- smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x5, 0x38, 0x2, 0x16);
+ if (firewire) {
+ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, firewire_bus, 0x0, 0x2, 0x10);
+ }
+
+ if (riser) {
+ /* Old riser card */
+ // riser slot top 5:8.0
+ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, riser_bus, 0x20, 0x2, 0x14);
+ // riser slot middle 5:9.0
+ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, riser_bus, 0x24, 0x2, 0x15);
+ // riser slot bottom 5:a.0
+ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, riser_bus, 0x28, 0x2, 0x16);
+
+ /* New Riser Card */
+ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, riser_bus, 0x30, 0x2, 0x14);
+ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, riser_bus, 0x34, 0x2, 0x15);
+ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, riser_bus, 0x38, 0x2, 0x16);
+ }
/* Onboard Ethernet */
smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x1, 0x0, 0x2, 0x10);