Patrick Georgi (patrick@georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1936
-gerrit
commit d1c10cedd717cf2a1c1ca3460b6e707b0fd03132 Author: Patrick Georgi patrick@georgi-clan.de Date: Mon Oct 8 09:33:38 2012 +0200
pirq_route_irqs is private
Change-Id: I120913dac3150a72c2e66c74872ee00074ee0267 Signed-off-by: Patrick Georgi patrick@georgi-clan.de --- src/arch/x86/boot/pirq_routing.c | 36 +++++++++++++++++--------------- src/arch/x86/include/arch/pirq_routing.h | 3 --- 2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/arch/x86/boot/pirq_routing.c b/src/arch/x86/boot/pirq_routing.c index 55deac1..86af63f 100644 --- a/src/arch/x86/boot/pirq_routing.c +++ b/src/arch/x86/boot/pirq_routing.c @@ -98,22 +98,6 @@ static int verify_copy_pirq_routing_table(unsigned long addr, const struct irq_r } #endif
-unsigned long copy_pirq_routing_table(unsigned long addr, const struct irq_routing_table *routing_table) -{ - /* Align the table to be 16 byte aligned. */ - addr = ALIGN(addr, 16); - - /* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Copying Interrupt Routing Table to 0x%08lx... ", addr); - memcpy((void *)addr, routing_table, routing_table->size); - printk(BIOS_INFO, "done.\n"); -#if CONFIG_DEBUG_PIRQ - verify_copy_pirq_routing_table(addr, routing_table); -#endif - pirq_route_irqs(addr); - return addr + routing_table->size; -} - #if CONFIG_PIRQ_ROUTE static u8 pirq_get_next_free_irq(u8* pirq, u16 bitmap) { @@ -145,7 +129,7 @@ static u8 pirq_get_next_free_irq(u8* pirq, u16 bitmap) return irq; }
-void pirq_route_irqs(unsigned long addr) +static void pirq_route_irqs(unsigned long addr) { int i, intx, num_entries; unsigned char irq_slot[MAX_INTX_ENTRIES]; @@ -204,3 +188,21 @@ void pirq_route_irqs(unsigned long addr) pirq_assign_irqs(pirq); } #endif + +unsigned long copy_pirq_routing_table(unsigned long addr, const struct irq_routing_table *routing_table) +{ + /* Align the table to be 16 byte aligned. */ + addr = ALIGN(addr, 16); + + /* This table must be betweeen 0xf0000 & 0x100000 */ + printk(BIOS_INFO, "Copying Interrupt Routing Table to 0x%08lx... ", addr); + memcpy((void *)addr, routing_table, routing_table->size); + printk(BIOS_INFO, "done.\n"); +#if CONFIG_DEBUG_PIRQ + verify_copy_pirq_routing_table(addr, routing_table); +#endif +#if CONFIG_PIRQ_ROUTE + pirq_route_irqs(addr); +#endif + return addr + routing_table->size; +} diff --git a/src/arch/x86/include/arch/pirq_routing.h b/src/arch/x86/include/arch/pirq_routing.h index 9488473..241ec3b 100644 --- a/src/arch/x86/include/arch/pirq_routing.h +++ b/src/arch/x86/include/arch/pirq_routing.h @@ -67,10 +67,7 @@ unsigned long copy_pirq_routing_table(unsigned long addr, const struct irq_routi unsigned long write_pirq_routing_table(unsigned long start);
#if CONFIG_PIRQ_ROUTE -void pirq_route_irqs(unsigned long start); void pirq_assign_irqs(const unsigned char pirq[CONFIG_MAX_PIRQ_LINKS]); -#else -#define pirq_route_irqs(start) {} #endif
#else
-
Patrick Georgi