diff options
Diffstat (limited to 'src/mainboard/msi')
-rw-r--r-- | src/mainboard/msi/ms7135/irq_tables.c | 24 | ||||
-rw-r--r-- | src/mainboard/msi/ms9185/irq_tables.c | 118 | ||||
-rw-r--r-- | src/mainboard/msi/ms9282/irq_tables.c | 59 | ||||
-rw-r--r-- | src/mainboard/msi/ms9652_fam10/irq_tables.c | 74 |
4 files changed, 145 insertions, 130 deletions
diff --git a/src/mainboard/msi/ms7135/irq_tables.c b/src/mainboard/msi/ms7135/irq_tables.c index eea5eddde6..e40794ef3c 100644 --- a/src/mainboard/msi/ms7135/irq_tables.c +++ b/src/mainboard/msi/ms7135/irq_tables.c @@ -33,7 +33,6 @@ extern unsigned char bus_ck804[6]; - /** * Add one line to IRQ table. */ @@ -204,50 +203,49 @@ unsigned long write_pirq_routing_table(unsigned long addr) /* Bus, device, slots IRQs for {A,B,C,D}. */ - irq[0] = 10; /* SMBus */ /* test me */ + irq[0] = 10; /* SMBus *//* test me */ pci_assign_irqs(bus_ck804[0], 1, irq); - irq[0] = 10; /* USB */ + irq[0] = 10; /* USB */ irq[1] = 10; pci_assign_irqs(bus_ck804[0], 2, irq); - irq[0] = 10; /* AC97 */ + irq[0] = 10; /* AC97 */ irq[1] = 0; pci_assign_irqs(bus_ck804[0], 4, irq); - irq[0] = 11; /* SATA */ + irq[0] = 11; /* SATA */ pci_assign_irqs(bus_ck804[0], 7, irq); - irq[0] = 5; /* SATA */ + irq[0] = 5; /* SATA */ pci_assign_irqs(bus_ck804[0], 8, irq); - irq[0] = 10; /* Ethernet */ + irq[0] = 10; /* Ethernet */ pci_assign_irqs(bus_ck804[0], 10, irq); - /* physical slots */ - irq[0] = 5; /* PCI E1 - x1 */ + irq[0] = 5; /* PCI E1 - x1 */ pci_assign_irqs(bus_ck804[2], 0, irq); - irq[0] = 11; /* PCI E2 - x16 */ + irq[0] = 11; /* PCI E2 - x16 */ pci_assign_irqs(bus_ck804[3], 0, irq); /* AGP-on-PCI "AGR" ignored */ - irq[0] = 10; /* PCI1 */ + irq[0] = 10; /* PCI1 */ irq[1] = 11; irq[2] = 5; irq[3] = 0; pci_assign_irqs(bus_ck804[1], 7, irq); - irq[0] = 11; /* PCI2 */ + irq[0] = 11; /* PCI2 */ irq[1] = 10; irq[2] = 5; irq[3] = 0; pci_assign_irqs(bus_ck804[1], 8, irq); - irq[0] = 5; /* PCI3 */ + irq[0] = 5; /* PCI3 */ irq[1] = 10; irq[2] = 11; irq[3] = 0; diff --git a/src/mainboard/msi/ms9185/irq_tables.c b/src/mainboard/msi/ms9185/irq_tables.c index 992dc5ac28..65f82a2823 100644 --- a/src/mainboard/msi/ms9185/irq_tables.c +++ b/src/mainboard/msi/ms9185/irq_tables.c @@ -27,90 +27,92 @@ #include "mb_sysconf.h" - -static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t devfn, uint8_t link0, uint16_t bitmap0, - uint8_t link1, uint16_t bitmap1, uint8_t link2, uint16_t bitmap2,uint8_t link3, uint16_t bitmap3, - uint8_t slot, uint8_t rfu) +static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, + uint8_t devfn, uint8_t link0, uint16_t bitmap0, + uint8_t link1, uint16_t bitmap1, uint8_t link2, + uint16_t bitmap2, uint8_t link3, uint16_t bitmap3, + uint8_t slot, uint8_t rfu) { - pirq_info->bus = bus; - pirq_info->devfn = devfn; - - pirq_info->irq[0].link = link0; - pirq_info->irq[0].bitmap = bitmap0; - pirq_info->irq[1].link = link1; - pirq_info->irq[1].bitmap = bitmap1; - pirq_info->irq[2].link = link2; - pirq_info->irq[2].bitmap = bitmap2; - pirq_info->irq[3].link = link3; - pirq_info->irq[3].bitmap = bitmap3; - - pirq_info->slot = slot; - pirq_info->rfu = rfu; + pirq_info->bus = bus; + pirq_info->devfn = devfn; + + pirq_info->irq[0].link = link0; + pirq_info->irq[0].bitmap = bitmap0; + pirq_info->irq[1].link = link1; + pirq_info->irq[1].bitmap = bitmap1; + pirq_info->irq[2].link = link2; + pirq_info->irq[2].bitmap = bitmap2; + pirq_info->irq[3].link = link3; + pirq_info->irq[3].bitmap = bitmap3; + + pirq_info->slot = slot; + pirq_info->rfu = rfu; } - - unsigned long write_pirq_routing_table(unsigned long addr) { - struct irq_routing_table *pirq; - struct irq_info *pirq_info; - unsigned slot_num; - uint8_t *v; + struct irq_routing_table *pirq; + struct irq_info *pirq_info; + unsigned slot_num; + uint8_t *v; - uint8_t sum=0; - int i; + uint8_t sum = 0; + int i; - struct mb_sysconf_t *m; + struct mb_sysconf_t *m; - get_bus_conf(); + get_bus_conf(); - m = sysconf.mb; + m = sysconf.mb; - /* Align the table to be 16 byte aligned. */ - addr += 15; - addr &= ~15; + /* Align the table to be 16 byte aligned. */ + addr += 15; + addr &= ~15; - /* This table must be between 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr); + /* This table must be between 0xf0000 & 0x100000 */ + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr); - pirq = (void *)(addr); - v = (uint8_t *)(addr); + pirq = (void *)(addr); + v = (uint8_t *) (addr); - pirq->signature = PIRQ_SIGNATURE; - pirq->version = PIRQ_VERSION; + pirq->signature = PIRQ_SIGNATURE; + pirq->version = PIRQ_VERSION; - pirq->rtr_bus = m->bus_bcm5785_0; - pirq->rtr_devfn = (sysconf.sbdn<<3)|0; + pirq->rtr_bus = m->bus_bcm5785_0; + pirq->rtr_devfn = (sysconf.sbdn << 3) | 0; - pirq->exclusive_irqs = 0; + pirq->exclusive_irqs = 0; - pirq->rtr_vendor = 0x1166; - pirq->rtr_device = 0x0036; + pirq->rtr_vendor = 0x1166; + pirq->rtr_device = 0x0036; - pirq->miniport_data = 0; + pirq->miniport_data = 0; - memset(pirq->rfu, 0, sizeof(pirq->rfu)); + memset(pirq->rfu, 0, sizeof(pirq->rfu)); - pirq_info = (void *) ( &pirq->checksum + 1); - slot_num = 0; + pirq_info = (void *)(&pirq->checksum + 1); + slot_num = 0; //pci bridge - write_pirq_info(pirq_info, m->bus_bcm5785_0, (sysconf.sbdn<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); - pirq_info++; slot_num++; + write_pirq_info(pirq_info, m->bus_bcm5785_0, (sysconf.sbdn << 3) | 0, + 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, + 0); + pirq_info++; + slot_num++; - pirq->size = 32 + 16 * slot_num; + pirq->size = 32 + 16 * slot_num; - for (i = 0; i < pirq->size; i++) - sum += v[i]; + for (i = 0; i < pirq->size; i++) + sum += v[i]; - sum = pirq->checksum - sum; + sum = pirq->checksum - sum; - if (sum != pirq->checksum) { - pirq->checksum = sum; - } + if (sum != pirq->checksum) { + pirq->checksum = sum; + } - printk(BIOS_INFO, "done.\n"); + printk(BIOS_INFO, "done.\n"); - return (unsigned long) pirq_info; + return (unsigned long)pirq_info; } diff --git a/src/mainboard/msi/ms9282/irq_tables.c b/src/mainboard/msi/ms9282/irq_tables.c index 5891512da6..cbb621a906 100644 --- a/src/mainboard/msi/ms9282/irq_tables.c +++ b/src/mainboard/msi/ms9282/irq_tables.c @@ -27,26 +27,26 @@ #include <cpu/amd/amdk8_sysconf.h> #include "mb_sysconf.h" -static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t devfn, uint8_t link0, uint16_t bitmap0, - uint8_t link1, uint16_t bitmap1, uint8_t link2, uint16_t bitmap2,uint8_t link3, uint16_t bitmap3, - uint8_t slot, uint8_t rfu) +static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, + uint8_t devfn, uint8_t link0, uint16_t bitmap0, + uint8_t link1, uint16_t bitmap1, uint8_t link2, + uint16_t bitmap2, uint8_t link3, uint16_t bitmap3, + uint8_t slot, uint8_t rfu) { pirq_info->bus = bus; pirq_info->devfn = devfn; - pirq_info->irq[0].link = link0; - pirq_info->irq[0].bitmap = bitmap0; - pirq_info->irq[1].link = link1; - pirq_info->irq[1].bitmap = bitmap1; - pirq_info->irq[2].link = link2; - pirq_info->irq[2].bitmap = bitmap2; - pirq_info->irq[3].link = link3; - pirq_info->irq[3].bitmap = bitmap3; + pirq_info->irq[0].link = link0; + pirq_info->irq[0].bitmap = bitmap0; + pirq_info->irq[1].link = link1; + pirq_info->irq[1].bitmap = bitmap1; + pirq_info->irq[2].link = link2; + pirq_info->irq[2].bitmap = bitmap2; + pirq_info->irq[3].link = link3; + pirq_info->irq[3].bitmap = bitmap3; pirq_info->slot = slot; pirq_info->rfu = rfu; } - - unsigned long write_pirq_routing_table(unsigned long addr) { @@ -57,10 +57,10 @@ unsigned long write_pirq_routing_table(unsigned long addr) struct mb_sysconf_t *m; unsigned sbdn; - uint8_t sum=0; + uint8_t sum = 0; int i; - get_bus_conf(); // it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c + get_bus_conf(); // it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c sbdn = sysconf.sbdn; m = sysconf.mb; @@ -72,13 +72,13 @@ unsigned long write_pirq_routing_table(unsigned long addr) printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr); pirq = (void *)(addr); - v = (uint8_t *)(addr); + v = (uint8_t *) (addr); pirq->signature = PIRQ_SIGNATURE; - pirq->version = PIRQ_VERSION; + pirq->version = PIRQ_VERSION; pirq->rtr_bus = m->bus_mcp55[0]; - pirq->rtr_devfn = ((sbdn+6)<<3)|0; + pirq->rtr_devfn = ((sbdn + 6) << 3) | 0; pirq->exclusive_irqs = 0; @@ -89,19 +89,24 @@ unsigned long write_pirq_routing_table(unsigned long addr) memset(pirq->rfu, 0, sizeof(pirq->rfu)); - pirq_info = (void *) ( &pirq->checksum + 1); + pirq_info = (void *)(&pirq->checksum + 1); slot_num = 0; //pci bridge - write_pirq_info(pirq_info, m->bus_mcp55[0], ((sbdn+6)<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); - pirq_info++; slot_num++; - - for(i=1; i< sysconf.hc_possible_num; i++) { - if(!(sysconf.pci1234[i] & 0x1) ) continue; + write_pirq_info(pirq_info, m->bus_mcp55[0], ((sbdn + 6) << 3) | 0, 0x1, + 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); + pirq_info++; + slot_num++; + + for (i = 1; i < sysconf.hc_possible_num; i++) { + if (!(sysconf.pci1234[i] & 0x1)) + continue; unsigned busn = (sysconf.pci1234[i] >> 16) & 0xff; unsigned devn = sysconf.hcdn[i] & 0xff; - write_pirq_info(pirq_info, busn, (devn<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); - pirq_info++; slot_num++; + write_pirq_info(pirq_info, busn, (devn << 3) | 0, 0x1, 0xdef8, + 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); + pirq_info++; + slot_num++; } pirq->size = 32 + 16 * slot_num; @@ -117,6 +122,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) printk(BIOS_INFO, "done.\n"); - return (unsigned long) pirq_info; + return (unsigned long)pirq_info; } diff --git a/src/mainboard/msi/ms9652_fam10/irq_tables.c b/src/mainboard/msi/ms9652_fam10/irq_tables.c index c11707d79a..513fd57c58 100644 --- a/src/mainboard/msi/ms9652_fam10/irq_tables.c +++ b/src/mainboard/msi/ms9652_fam10/irq_tables.c @@ -24,26 +24,26 @@ #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" -static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t devfn, uint8_t link0, uint16_t bitmap0, - uint8_t link1, uint16_t bitmap1, uint8_t link2, uint16_t bitmap2,uint8_t link3, uint16_t bitmap3, - uint8_t slot, uint8_t rfu) +static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, + uint8_t devfn, uint8_t link0, uint16_t bitmap0, + uint8_t link1, uint16_t bitmap1, uint8_t link2, + uint16_t bitmap2, uint8_t link3, uint16_t bitmap3, + uint8_t slot, uint8_t rfu) { pirq_info->bus = bus; pirq_info->devfn = devfn; - pirq_info->irq[0].link = link0; - pirq_info->irq[0].bitmap = bitmap0; - pirq_info->irq[1].link = link1; - pirq_info->irq[1].bitmap = bitmap1; - pirq_info->irq[2].link = link2; - pirq_info->irq[2].bitmap = bitmap2; - pirq_info->irq[3].link = link3; - pirq_info->irq[3].bitmap = bitmap3; + pirq_info->irq[0].link = link0; + pirq_info->irq[0].bitmap = bitmap0; + pirq_info->irq[1].link = link1; + pirq_info->irq[1].bitmap = bitmap1; + pirq_info->irq[2].link = link2; + pirq_info->irq[2].bitmap = bitmap2; + pirq_info->irq[3].link = link3; + pirq_info->irq[3].bitmap = bitmap3; pirq_info->slot = slot; pirq_info->rfu = rfu; } - - unsigned long write_pirq_routing_table(unsigned long addr) { @@ -54,10 +54,10 @@ unsigned long write_pirq_routing_table(unsigned long addr) struct mb_sysconf_t *m; unsigned sbdn; - uint8_t sum=0; + uint8_t sum = 0; int i; - get_bus_conf(); // it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c + get_bus_conf(); // it will find out all bus num and apic that share with mptable.c and mptable.c and acpi_tables.c sbdn = sysconf.sbdn; m = sysconf.mb; @@ -69,13 +69,13 @@ unsigned long write_pirq_routing_table(unsigned long addr) printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr); pirq = (void *)(addr); - v = (uint8_t *)(addr); + v = (uint8_t *) (addr); pirq->signature = PIRQ_SIGNATURE; - pirq->version = PIRQ_VERSION; + pirq->version = PIRQ_VERSION; pirq->rtr_bus = m->bus_mcp55[0]; - pirq->rtr_devfn = ((sbdn+6)<<3)|0; + pirq->rtr_devfn = ((sbdn + 6) << 3) | 0; pirq->exclusive_irqs = 0; @@ -86,27 +86,37 @@ unsigned long write_pirq_routing_table(unsigned long addr) memset(pirq->rfu, 0, sizeof(pirq->rfu)); - pirq_info = (void *) ( &pirq->checksum + 1); + pirq_info = (void *)(&pirq->checksum + 1); slot_num = 0; //pci bridge - write_pirq_info(pirq_info, m->bus_mcp55[0], ((sbdn+6)<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); - pirq_info++; slot_num++; - - for(i=1; i< sysconf.hc_possible_num; i++) { - if(!(sysconf.pci1234[i] & 0x1) ) continue; + write_pirq_info(pirq_info, m->bus_mcp55[0], ((sbdn + 6) << 3) | 0, 0x1, + 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); + pirq_info++; + slot_num++; + + for (i = 1; i < sysconf.hc_possible_num; i++) { + if (!(sysconf.pci1234[i] & 0x1)) + continue; unsigned busn = (sysconf.pci1234[i] >> 12) & 0xff; unsigned devn = sysconf.hcdn[i] & 0xff; - write_pirq_info(pirq_info, busn, (devn<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); - pirq_info++; slot_num++; + write_pirq_info(pirq_info, busn, (devn << 3) | 0, 0x1, 0xdef8, + 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); + pirq_info++; + slot_num++; } #if CONFIG_CBB - write_pirq_info(pirq_info, CONFIG_CBB, (0<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); - pirq_info++; slot_num++; - if(sysconf.nodes>32) { - write_pirq_info(pirq_info, CONFIG_CBB-1, (0<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); - pirq_info++; slot_num++; + write_pirq_info(pirq_info, CONFIG_CBB, (0 << 3) | 0, 0x1, 0xdef8, 0x2, + 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); + pirq_info++; + slot_num++; + if (sysconf.nodes > 32) { + write_pirq_info(pirq_info, CONFIG_CBB - 1, (0 << 3) | 0, 0x1, + 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, + 0, 0); + pirq_info++; + slot_num++; } #endif @@ -123,6 +133,6 @@ unsigned long write_pirq_routing_table(unsigned long addr) printk(BIOS_INFO, "done.\n"); - return (unsigned long) pirq_info; + return (unsigned long)pirq_info; } |