Changeset 623b49f1 in mainline for kernel/genarch/src/acpi/madt.c

Timestamp:

2007-01-29T19:22:04Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1004b37

Parents:

7d07bf3

Message:

fix signed/unsigned comparison and integer overflow

File:

• kernel/genarch/src/acpi/madt.c (modified) (5 diffs)

kernel/genarch/src/acpi/madt.c

@@ -70 +70 @@
 
 struct madt_apic_header * * madt_entries_index = NULL;
-int madt_entries_index_cnt = 0;
+unsigned int madt_entries_index_cnt = 0;
 
 char *entry[] = {
@@ -91 +91 @@
 static bool madt_cpu_bootstrap(index_t i);
 static uint8_t madt_cpu_apic_id(index_t i);
-static int madt_irq_to_pin(int irq);
+static int madt_irq_to_pin(unsigned int irq);
 
 struct smp_config_operations madt_config_operations = {
@@ -125 +125 @@
 }
 
-int madt_irq_to_pin(int irq)
+int madt_irq_to_pin(unsigned int irq)
 {
         ASSERT(irq < sizeof(isa_irq_map)/sizeof(int));
@@ -144 +144 @@
         struct madt_apic_header *h;
         
-        l_apic = (uint32_t *) (unative_t) acpi_madt->l_apic_address;
+        l_apic = (uint32_t *) (unative_t) acpi_madt->l_apic_address;
 
         /* calculate madt entries */
@@ -165 +165 @@
         qsort(madt_entries_index, madt_entries_index_cnt, sizeof(uintptr_t), &madt_cmp);
 
-        /* Parse MADT entries */        
-        for (index = 0; index < madt_entries_index_cnt - 1; index++) {
-                h = madt_entries_index[index];
-                switch (h->type) {
-                        case MADT_L_APIC:
-                                madt_l_apic_entry((struct madt_l_apic *) h, index);
-                                break;
-                        case MADT_IO_APIC:
-                                madt_io_apic_entry((struct madt_io_apic *) h, index);
-                                break;
-                        case MADT_INTR_SRC_OVRD:
-                                madt_intr_src_ovrd_entry((struct madt_intr_src_ovrd *) h, index);
-                                break;
-                        case MADT_NMI_SRC:
-                        case MADT_L_APIC_NMI:
-                        case MADT_L_APIC_ADDR_OVRD:
-                        case MADT_IO_SAPIC:
-                        case MADT_L_SAPIC:
-                        case MADT_PLATFORM_INTR_SRC:
-                                printf("MADT: skipping %s entry (type=%zd)\n", entry[h->type], h->type);
-                                break;
-
-                        default:
-                                if (h->type >= MADT_RESERVED_SKIP_BEGIN && h->type <= MADT_RESERVED_SKIP_END) {
-                                        printf("MADT: skipping reserved entry (type=%zd)\n", h->type);
-                                }
-                                if (h->type >= MADT_RESERVED_OEM_BEGIN) {
-                                        printf("MADT: skipping OEM entry (type=%zd)\n", h->type);
-                                }
-                                break;
+        /* Parse MADT entries */
+        if (madt_entries_index_cnt > 0) {       
+                for (index = 0; index < madt_entries_index_cnt - 1; index++) {
+                        h = madt_entries_index[index];
+                        switch (h->type) {
+                                case MADT_L_APIC:
+                                        madt_l_apic_entry((struct madt_l_apic *) h, index);
+                                        break;
+                                case MADT_IO_APIC:
+                                        madt_io_apic_entry((struct madt_io_apic *) h, index);
+                                        break;
+                                case MADT_INTR_SRC_OVRD:
+                                        madt_intr_src_ovrd_entry((struct madt_intr_src_ovrd *) h, index);
+                                        break;
+                                case MADT_NMI_SRC:
+                                case MADT_L_APIC_NMI:
+                                case MADT_L_APIC_ADDR_OVRD:
+                                case MADT_IO_SAPIC:
+                                case MADT_L_SAPIC:
+                                case MADT_PLATFORM_INTR_SRC:
+                                        printf("MADT: skipping %s entry (type=%zd)\n", entry[h->type], h->type);
+                                        break;
+        
+                                default:
+                                        if (h->type >= MADT_RESERVED_SKIP_BEGIN && h->type <= MADT_RESERVED_SKIP_END) {
+                                                printf("MADT: skipping reserved entry (type=%zd)\n", h->type);
+                                        }
+                                        if (h->type >= MADT_RESERVED_OEM_BEGIN) {
+                                                printf("MADT: skipping OEM entry (type=%zd)\n", h->type);
+                                        }
+                                        break;
+                        }
                 }
-        
-        
-        }
-        
+        }
 
         if (cpu_count)