X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Farch%2Fi386%2Fboot%2Fpirq_routing.c;h=62ba1a474e3e791f1658b877555a9243d1267165;hb=e30042da3ec36dc1b105c5c082dc098131456b78;hp=3f17bd1aab5040ceb49e5dcf083e1ea31bfb43a9;hpb=40cba39e34ccbba6fd6ea7a3183b133f094a2466;p=coreboot.git

diff --git a/src/arch/i386/boot/pirq_routing.c b/src/arch/i386/boot/pirq_routing.c
index 3f17bd1aa..62ba1a474 100644
--- a/src/arch/i386/boot/pirq_routing.c
+++ b/src/arch/i386/boot/pirq_routing.c
@@ -2,51 +2,46 @@
 #include <arch/pirq_routing.h>
 #include <string.h>
 
-#if DEBUG==1
-void check_pirq_routing_table(void)
+#if (DEBUG==1 && HAVE_PIRQ_TABLE==1)
+static void check_pirq_routing_table(struct irq_routing_table *rt)
 {
-	const uint8_t *addr;
-	const struct irq_routing_table *rt;
+	uint8_t *addr = (uint8_t *)rt;
+	uint8_t sum=0;
 	int i;
-	uint8_t sum;
 
-	printk_info("Checking IRQ routing tables...\n");
+	printk_info("Checking IRQ routing table consistency...\n");
 
 #if defined(IRQ_SLOT_COUNT)
-	if (sizeof(intel_irq_routing_table) != intel_irq_routing_table.size) {
+	if (sizeof(struct irq_routing_table) != rt->size) {
 		printk_warning("Inconsistent IRQ routing table size (0x%x/0x%x)\n",
-				sizeof(intel_irq_routing_table),
-				intel_irq_routing_table.size
-				);
-		intel_irq_routing_table.size=sizeof(intel_irq_routing_table);
+			       sizeof(struct irq_routing_table),
+			       rt->size
+			);
+		rt->size=sizeof(struct irq_routing_table);
 	}
 #endif
 
-	rt = &intel_irq_routing_table;
-	addr = (uint8_t *)rt;
-
-	sum = 0;
 	for (i = 0; i < rt->size; i++)
 		sum += addr[i];
 
-	printk_debug("%s:%6d:%s() - irq_routing_table located at: 0x%p\n",
-	    __FILE__, __LINE__, __FUNCTION__, addr);
+	printk_debug("%s() - irq_routing_table located at: 0x%p\n",
+		     __FUNCTION__, addr);
 
 	
 	sum = rt->checksum - sum;
 
 	if (sum != rt->checksum) {
 		printk_warning("%s:%6d:%s() - "
-		       "checksum is: 0x%02x but should be: 0x%02x\n",
-		       __FILE__, __LINE__, __FUNCTION__, rt->checksum, sum);
+			       "checksum is: 0x%02x but should be: 0x%02x\n",
+			       __FILE__, __LINE__, __FUNCTION__, rt->checksum, sum);
 		rt->checksum = sum;
 	}
 
 	if (rt->signature != PIRQ_SIGNATURE || rt->version != PIRQ_VERSION ||
-	    rt->size % 16 || rt->size < sizeof(struct irq_routing_table)) {
+	    rt->size % 16 ) {
 		printk_warning("%s:%6d:%s() - "
-		       "Interrupt Routing Table not valid\n",
-		       __FILE__, __LINE__, __FUNCTION__);
+			       "Interrupt Routing Table not valid\n",
+			       __FILE__, __LINE__, __FUNCTION__);
 		return;
 	}
 
@@ -56,34 +51,38 @@ void check_pirq_routing_table(void)
 
 	if (sum) {
 		printk_warning("%s:%6d:%s() - "
-		       "checksum error in irq routing table\n",
-		       __FILE__, __LINE__, __FUNCTION__);
+			       "checksum error in irq routing table\n",
+			       __FILE__, __LINE__, __FUNCTION__);
 	}
 
 	printk_info("done.\n");
 }
 
-int verify_copy_pirq_routing_table(unsigned long addr)
+static int verify_copy_pirq_routing_table(unsigned long addr)
 {
 	int i;
 	uint8_t *rt_orig, *rt_curr;
 
 	rt_curr = (uint8_t*)addr;
 	rt_orig = (uint8_t*)&intel_irq_routing_table;
-	printk_info("Verifing priq routing tables copy at 0x%x...", addr);
+	printk_info("Verifing copy of IRQ routing tables at 0x%x...", addr);
 	for (i = 0; i < intel_irq_routing_table.size; i++) {
 		if (*(rt_curr + i) != *(rt_orig + i)) {
 			printk_info("failed\n");
 			return -1;
 		}
 	}
-	printk_info("succeed\n");
+	printk_info("done\n");
+	
+	check_pirq_routing_table((struct irq_routing_table *)addr);
+	
 	return 0;
 }
 #else
 #define verify_copy_pirq_routing_table(addr)
 #endif
 
+#if HAVE_PIRQ_TABLE==1
 unsigned long copy_pirq_routing_table(unsigned long addr)
 {
 	/* Align the table to be 16 byte aligned. */
@@ -97,3 +96,4 @@ unsigned long copy_pirq_routing_table(unsigned long addr)
 	verify_copy_pirq_routing_table(addr);
 	return addr + intel_irq_routing_table.size;
 }
+#endif