Author: jhb
Date: Fri Mar 19 12:43:18 2010
New Revision: 205332
URL: http://svn.freebsd.org/changeset/base/205332

Log:
  Use the same policy for rejecting / not-reject ACPI tables with incorrect
  checksums as the base acpi(4) driver.  This fixes a problem where the MADT
  parser would reject the MADT table during early boot causing the MP Table
  to be, but then the acpi(4) driver would attach and use non-SMP interrupt
  routing.
  
  Tested by:    Alastair Hogge  agh of coolrhaug com
  MFC after:    1 week

Modified:
  head/sys/amd64/acpica/acpi_machdep.c
  head/sys/i386/acpica/acpi_machdep.c

Modified: head/sys/amd64/acpica/acpi_machdep.c
==============================================================================
--- head/sys/amd64/acpica/acpi_machdep.c        Fri Mar 19 12:07:28 2010        
(r205331)
+++ head/sys/amd64/acpica/acpi_machdep.c        Fri Mar 19 12:43:18 2010        
(r205332)
@@ -627,8 +627,10 @@ map_table(vm_paddr_t pa, int offset, con
        if (ACPI_FAILURE(AcpiTbChecksum(table, length))) {
                if (bootverbose)
                        printf("ACPI: Failed checksum for table %s\n", sig);
+#if (ACPI_CHECKSUM_ABORT)
                table_unmap(table, length);
                return (NULL);
+#endif
        }
        return (table);
 }

Modified: head/sys/i386/acpica/acpi_machdep.c
==============================================================================
--- head/sys/i386/acpica/acpi_machdep.c Fri Mar 19 12:07:28 2010        
(r205331)
+++ head/sys/i386/acpica/acpi_machdep.c Fri Mar 19 12:43:18 2010        
(r205332)
@@ -641,8 +641,10 @@ map_table(vm_paddr_t pa, int offset, con
        if (ACPI_FAILURE(AcpiTbChecksum(table, length))) {
                if (bootverbose)
                        printf("ACPI: Failed checksum for table %s\n", sig);
+#if (ACPI_CHECKSUM_ABORT)
                table_unmap(table, length);
                return (NULL);
+#endif
        }
        return (table);
 }
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to