Date: Fri, 26 Mar 2010 19:00:17 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r205709 - in stable/7/sys: amd64/acpica i386/acpica Message-ID: <201003261900.o2QJ0HTi032779@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Fri Mar 26 19:00:17 2010 New Revision: 205709 URL: http://svn.freebsd.org/changeset/base/205709 Log: MFC 205332: 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. Modified: stable/7/sys/amd64/acpica/acpi_machdep.c stable/7/sys/i386/acpica/acpi_machdep.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/amd64/acpica/acpi_machdep.c ============================================================================== --- stable/7/sys/amd64/acpica/acpi_machdep.c Fri Mar 26 18:58:22 2010 (r205708) +++ stable/7/sys/amd64/acpica/acpi_machdep.c Fri Mar 26 19:00:17 2010 (r205709) @@ -156,8 +156,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: stable/7/sys/i386/acpica/acpi_machdep.c ============================================================================== --- stable/7/sys/i386/acpica/acpi_machdep.c Fri Mar 26 18:58:22 2010 (r205708) +++ stable/7/sys/i386/acpica/acpi_machdep.c Fri Mar 26 19:00:17 2010 (r205709) @@ -634,8 +634,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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003261900.o2QJ0HTi032779>