Two hda_verb.h files: Add more comments.

[coreboot.git] / src / arch / i386 / boot / pirq_routing.c

diff --git a/src/arch/i386/boot/pirq_routing.c b/src/arch/i386/boot/pirq_routing.c
index 78e1dd1806d29a33fadd29c5ad92e250314677bd..bb8a7b605ad1f49d908eaf2c14bbf0d8d827c938 100644 (file)
--- a/src/arch/i386/boot/pirq_routing.c
+++ b/src/arch/i386/boot/pirq_routing.c
@@ -3,22 +3,18 @@
 #include <string.h>
 #include <device/pci.h>
 
-#ifndef CONFIG_IRQ_SLOT_COUNT
-#warning "CONFIG_IRQ_SLOT_COUNT is not defined. PIRQ won't work correctly."
-#endif
-
-#if CONFIG_DEBUG
+#if CONFIG_DEBUG_PIRQ
 static void check_pirq_routing_table(struct irq_routing_table *rt)
 {
        uint8_t *addr = (uint8_t *)rt;
        uint8_t sum=0;
        int i;
 
-       printk_info("Checking Interrupt Routing Table consistency...\n");
+       printk(BIOS_INFO, "Checking Interrupt Routing Table consistency...\n");
 
        if (sizeof(struct irq_routing_table) != rt->size) {
-               printk_warning("Inconsistent Interrupt Routing Table size (0x%x/0x%x).\n",
-                              sizeof(struct irq_routing_table),
+               printk(BIOS_WARNING, "Inconsistent Interrupt Routing Table size (0x%x/0x%x).\n",
+                              (unsigned int) sizeof(struct irq_routing_table),
                               rt->size
                        );
                rt->size=sizeof(struct irq_routing_table);
@@ -27,21 +23,21 @@ static void check_pirq_routing_table(struct irq_routing_table *rt)
        for (i = 0; i < rt->size; i++)
                sum += addr[i];
 
-       printk_debug("%s(): Interrupt Routing Table located at %p.\n",
+       printk(BIOS_DEBUG, "%s(): Interrupt Routing Table located at %p.\n",
                     __func__, addr);
 
-       
+
        sum = rt->checksum - sum;
 
        if (sum != rt->checksum) {
-               printk_warning("Interrupt Routing Table checksum is: 0x%02x but should be: 0x%02x.\n",
+               printk(BIOS_WARNING, "Interrupt Routing Table checksum is: 0x%02x but should be: 0x%02x.\n",
                               rt->checksum, sum);
                rt->checksum = sum;
        }
 
        if (rt->signature != PIRQ_SIGNATURE || rt->version != PIRQ_VERSION ||
            rt->size % 16 ) {
-               printk_warning("Interrupt Routing Table not valid.\n");
+               printk(BIOS_WARNING, "Interrupt Routing Table not valid.\n");
                return;
        }
 
@@ -54,11 +50,11 @@ static void check_pirq_routing_table(struct irq_routing_table *rt)
         * function would have bailed out earlier.
         */
        if (sum) {
-               printk_warning("Checksum error in Interrupt Routing Table "
-                               "could not be fixed.\n");
+               printk(BIOS_WARNING, "Checksum error in Interrupt Routing Table "
+                               "could not be fixed.\n");
        }
 
-       printk_info("done.\n");
+       printk(BIOS_INFO, "done.\n");
 }
 
 static int verify_copy_pirq_routing_table(unsigned long addr)
@@ -68,17 +64,17 @@ static int verify_copy_pirq_routing_table(unsigned long addr)
 
        rt_curr = (uint8_t*)addr;
        rt_orig = (uint8_t*)&intel_irq_routing_table;
-       printk_info("Verifing copy of Interrupt Routing Table at 0x%08x... ", addr);
+       printk(BIOS_INFO, "Verifying copy of Interrupt Routing Table at 0x%08lx... ", addr);
        for (i = 0; i < intel_irq_routing_table.size; i++) {
                if (*(rt_curr + i) != *(rt_orig + i)) {
-                       printk_info("failed\n");
+                       printk(BIOS_INFO, "failed\n");
                        return -1;
                }
        }
-       printk_info("done\n");
-       
+       printk(BIOS_INFO, "done\n");
+
        check_pirq_routing_table((struct irq_routing_table *)addr);
-       
+
        return 0;
 }
 #endif
@@ -90,10 +86,12 @@ unsigned long copy_pirq_routing_table(unsigned long addr)
        addr &= ~15;
 
        /* This table must be betweeen 0xf0000 & 0x100000 */
-       printk_info("Copying Interrupt Routing Table to 0x%08lx... ", addr);
+       printk(BIOS_INFO, "Copying Interrupt Routing Table to 0x%08lx... ", addr);
        memcpy((void *)addr, &intel_irq_routing_table, intel_irq_routing_table.size);
-       printk_info("done.\n");
+       printk(BIOS_INFO, "done.\n");
+#if CONFIG_DEBUG_PIRQ
        verify_copy_pirq_routing_table(addr);
+#endif
        pirq_routing_irqs(addr);
        return addr + intel_irq_routing_table.size;
 }
@@ -105,7 +103,6 @@ void pirq_routing_irqs(unsigned long addr)
        unsigned char irq_slot[4];
        unsigned char pirq[4] = {0, 0, 0, 0};
        struct irq_routing_table *pirq_tbl;
-       device_t pdev;
 
        pirq_tbl = (struct irq_routing_table *)(addr);
        num_entries = (pirq_tbl->size - 32) / 16;
@@ -113,7 +110,7 @@ void pirq_routing_irqs(unsigned long addr)
        /* Set PCI IRQs. */
        for (i = 0; i < num_entries; i++) {
 
-               printk_debug("PIRQ Entry %d Dev/Fn: %X Slot: %d\n", i,
+               printk(BIOS_DEBUG, "PIRQ Entry %d Dev/Fn: %X Slot: %d\n", i,
                        pirq_tbl->slots[i].devfn >> 3, pirq_tbl->slots[i].slot);
 
                for (j = 0; j < 4; j++) {
@@ -122,12 +119,12 @@ void pirq_routing_irqs(unsigned long addr)
                        int bitmap = pirq_tbl->slots[i].irq[j].bitmap;
                        int irq = 0;
 
-                       printk_debug("INT: %c link: %x bitmap: %x  ",
+                       printk(BIOS_DEBUG, "INT: %c link: %x bitmap: %x  ",
                                'A' + j, link, bitmap);
 
                        if (!bitmap|| !link || link > 4) {
 
-                               printk_debug("not routed\n");
+                               printk(BIOS_DEBUG, "not routed\n");
                                irq_slot[j] = irq;
                                continue;
                        }
@@ -153,7 +150,7 @@ void pirq_routing_irqs(unsigned long addr)
                        else
                                irq = pirq[link - 1];
 
-                       printk_debug("IRQ: %d\n", irq);
+                       printk(BIOS_DEBUG, "IRQ: %d\n", irq);
                        irq_slot[j] = irq;
                }
 
@@ -162,10 +159,10 @@ void pirq_routing_irqs(unsigned long addr)
                        pirq_tbl->slots[i].devfn >> 3, irq_slot);
        }
 
-       printk_debug("PIRQ1: %d\n", pirq[0]);
-       printk_debug("PIRQ2: %d\n", pirq[1]);
-       printk_debug("PIRQ3: %d\n", pirq[2]);
-       printk_debug("PIRQ4: %d\n", pirq[3]);
+       printk(BIOS_DEBUG, "PIRQ1: %d\n", pirq[0]);
+       printk(BIOS_DEBUG, "PIRQ2: %d\n", pirq[1]);
+       printk(BIOS_DEBUG, "PIRQ3: %d\n", pirq[2]);
+       printk(BIOS_DEBUG, "PIRQ4: %d\n", pirq[3]);
 
        pirq_assign_irqs(pirq);
 }