diff options
| author | Robert Mustacchi <rm@joyent.com> | 2016-07-27 17:09:29 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2016-09-09 14:10:52 -0700 |
| commit | e2af1b53c69207cf8b36451b3a8c8f800ee9855e (patch) | |
| tree | d1654c84ca2df59ca6f7c1f4a7a61bfad0a650c0 | |
| parent | 1c207ae9a87e9b2ff04aa0cdad948fee76ac5dd7 (diff) | |
| download | illumos-joyent-e2af1b53c69207cf8b36451b3a8c8f800ee9855e.tar.gz | |
6679 Useless assert in acpidev_cpu_query_MAT()
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Joshua M. Clulow <jmc@joyent.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/uts/i86pc/io/acpi/acpidev/acpidev_cpu.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/mp_platform_common.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/usr/src/uts/i86pc/io/acpi/acpidev/acpidev_cpu.c b/usr/src/uts/i86pc/io/acpi/acpidev/acpidev_cpu.c index a108015bbb..ebfc0fcd86 100644 --- a/usr/src/uts/i86pc/io/acpi/acpidev/acpidev_cpu.c +++ b/usr/src/uts/i86pc/io/acpi/acpidev/acpidev_cpu.c @@ -256,11 +256,11 @@ acpidev_cpu_query_MAT(ACPI_SUBTABLE_HEADER *ap, void *context) switch (ap->Type) { case ACPI_MADT_TYPE_LOCAL_APIC: mpa = (ACPI_MADT_LOCAL_APIC *)ap; - ASSERT(mpa->Id != 255); rp->found = B_TRUE; rp->proc_id = mpa->ProcessorId; rp->apic_id = mpa->Id; if (mpa->LapicFlags & ACPI_MADT_ENABLED) { + ASSERT(mpa->Id != 255); rp->enabled = B_TRUE; } else { rp->enabled = B_FALSE; diff --git a/usr/src/uts/i86pc/io/mp_platform_common.c b/usr/src/uts/i86pc/io/mp_platform_common.c index 51ddd5b17b..36ebd180ca 100644 --- a/usr/src/uts/i86pc/io/mp_platform_common.c +++ b/usr/src/uts/i86pc/io/mp_platform_common.c @@ -643,6 +643,12 @@ acpi_probe(char *modname) case ACPI_MADT_TYPE_LOCAL_APIC: mpa = (ACPI_MADT_LOCAL_APIC *) ap; if (mpa->LapicFlags & ACPI_MADT_ENABLED) { + if (mpa->Id == 255) { + cmn_err(CE_WARN, "!%s: encountered " + "invalid entry in MADT: CPU %d " + "has Local APIC Id equal to 255 ", + psm_name, mpa->ProcessorId); + } if (mpa->Id == local_ids[0]) { ASSERT(index == 1); proc_ids[0] = mpa->ProcessorId; |