Author: andrew
Date: Mon Apr 24 16:49:30 2017
New Revision: 317377
URL: https://svnweb.freebsd.org/changeset/base/317377
Log:
MFC r302788, r303026, r305471
r302788:
Fix the type used to hold the value returned from getopt. On arm64 char is
unsigned so will never be -1.
r303026:
Add missing flags from acpidump. These are defined in the header, but not
printed. The HW_REDUCED flag is useful as it should be set on arm64 to
comply with the ARM Server Base Boot Requirements.
r305471:
Teach acpidump how to parse ACPI 5.1 tables found on the development
ThunderX units in the netperf cluster.
Modified:
stable/11/usr.sbin/acpi/acpidump/acpi.c
stable/11/usr.sbin/acpi/acpidump/acpidump.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/acpi/acpidump/acpi.c
==============================================================================
--- stable/11/usr.sbin/acpi/acpidump/acpi.c Mon Apr 24 16:37:25 2017
(r317376)
+++ stable/11/usr.sbin/acpi/acpidump/acpi.c Mon Apr 24 16:49:30 2017
(r317377)
@@ -356,6 +356,23 @@ acpi_print_mps_flags(uint16_t flags)
}
static void
+acpi_print_gicc_flags(uint32_t flags)
+{
+
+ printf("\tFlags={Performance intr=");
+ if (flags & ACPI_MADT_PERFORMANCE_IRQ_MODE)
+ printf("edge");
+ else
+ printf("level");
+ printf(", VGIC intr=");
+ if (flags & ACPI_MADT_VGIC_IRQ_MODE)
+ printf("edge");
+ else
+ printf("level");
+ printf("}\n");
+}
+
+static void
acpi_print_intr(uint32_t intr, uint16_t mps_flags)
{
@@ -375,7 +392,12 @@ static const char *apic_types[] = { "Loc
"NMI", "Local APIC NMI",
"Local APIC Override", "IO SAPIC",
"Local SAPIC", "Platform Interrupt",
- "Local X2APIC", "Local X2APIC NMI" };
+ "Local X2APIC", "Local X2APIC NMI",
+ "GIC CPU Interface Structure",
+ "GIC Distributor Structure",
+ "GICv2m MSI Frame",
+ "GIC Redistributor Structure",
+ "GIC ITS Structure" };
static const char *platform_int_types[] = { "0 (unknown)", "PMI", "INIT",
"Corrected Platform Error" };
@@ -393,6 +415,10 @@ acpi_print_madt(ACPI_SUBTABLE_HEADER *mp
ACPI_MADT_INTERRUPT_SOURCE *isrc;
ACPI_MADT_LOCAL_X2APIC *x2apic;
ACPI_MADT_LOCAL_X2APIC_NMI *x2apic_nmi;
+ ACPI_MADT_GENERIC_INTERRUPT *gicc;
+ ACPI_MADT_GENERIC_DISTRIBUTOR *gicd;
+ ACPI_MADT_GENERIC_REDISTRIBUTOR *gicr;
+ ACPI_MADT_GENERIC_TRANSLATOR *gict;
if (mp->Type < nitems(apic_types))
printf("\tType=%s\n", apic_types[mp->Type]);
@@ -463,6 +489,41 @@ acpi_print_madt(ACPI_SUBTABLE_HEADER *mp
acpi_print_cpu_uid(x2apic_nmi->Uid, NULL);
acpi_print_local_nmi(x2apic_nmi->Lint, x2apic_nmi->IntiFlags);
break;
+ case ACPI_MADT_TYPE_GENERIC_INTERRUPT:
+ gicc = (ACPI_MADT_GENERIC_INTERRUPT *)mp;
+ acpi_print_cpu_uid(gicc->Uid, NULL);
+ printf("\tCPU INTERFACE=%x\n", gicc->CpuInterfaceNumber);
+ acpi_print_gicc_flags(gicc->Flags);
+ printf("\tParking Protocol Version=%x\n", gicc->ParkingVersion);
+ printf("\tPERF INTR=%d\n", gicc->PerformanceInterrupt);
+ printf("\tParked ADDR=%016jx\n",
+ (uintmax_t)gicc->ParkedAddress);
+ printf("\tBase ADDR=%016jx\n", (uintmax_t)gicc->BaseAddress);
+ printf("\tGICV=%016jx\n", (uintmax_t)gicc->GicvBaseAddress);
+ printf("\tGICH=%016jx\n", (uintmax_t)gicc->GichBaseAddress);
+ printf("\tVGIC INTR=%d\n", gicc->VgicInterrupt);
+ printf("\tGICR ADDR=%016jx\n",
+ (uintmax_t)gicc->GicrBaseAddress);
+ printf("\tMPIDR=%jx\n", (uintmax_t)gicc->ArmMpidr);
+ printf("\tEfficency Class=%d\n", (u_int)gicc->EfficiencyClass);
+ break;
+ case ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR:
+ gicd = (ACPI_MADT_GENERIC_DISTRIBUTOR *)mp;
+ printf("\tGIC ID=%d\n", (u_int)gicd->GicId);
+ printf("\tBase ADDR=%016jx\n", (uintmax_t)gicd->BaseAddress);
+ printf("\tVector Base=%d\n", gicd->GlobalIrqBase);
+ printf("\tGIC VERSION=%d\n", (u_int)gicd->Version);
+ break;
+ case ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR:
+ gicr = (ACPI_MADT_GENERIC_REDISTRIBUTOR *)mp;
+ printf("\tBase ADDR=%016jx\n", (uintmax_t)gicr->BaseAddress);
+ printf("\tLength=%08x\n", gicr->Length);
+ break;
+ case ACPI_MADT_TYPE_GENERIC_TRANSLATOR:
+ gict = (ACPI_MADT_GENERIC_TRANSLATOR *)mp;
+ printf("\tGIC ITS ID=%d\n", gict->TranslationId);
+ printf("\tBase ADDR=%016jx\n", (uintmax_t)gict->BaseAddress);
+ break;
}
}
@@ -1011,13 +1072,14 @@ acpi_print_srat_memory(ACPI_SRAT_MEM_AFF
printf("\tProximity Domain=%d\n", mp->ProximityDomain);
}
-static const char *srat_types[] = { "CPU", "Memory", "X2APIC" };
+static const char *srat_types[] = { "CPU", "Memory", "X2APIC", "GICC" };
static void
acpi_print_srat(ACPI_SUBTABLE_HEADER *srat)
{
ACPI_SRAT_CPU_AFFINITY *cpu;
ACPI_SRAT_X2APIC_CPU_AFFINITY *x2apic;
+ ACPI_SRAT_GICC_AFFINITY *gic;
if (srat->Type < nitems(srat_types))
printf("\tType=%s\n", srat_types[srat->Type]);
@@ -1040,6 +1102,11 @@ acpi_print_srat(ACPI_SUBTABLE_HEADER *sr
acpi_print_srat_cpu(x2apic->ApicId, x2apic->ProximityDomain,
x2apic->Flags);
break;
+ case ACPI_SRAT_TYPE_GICC_AFFINITY:
+ gic = (ACPI_SRAT_GICC_AFFINITY *)srat;
+ acpi_print_srat_cpu(gic->AcpiProcessorUid, gic->ProximityDomain,
+ gic->Flags);
+ break;
}
}
@@ -1176,6 +1243,7 @@ acpi_print_fadt(ACPI_TABLE_HEADER *sdp)
PRINTFLAG(fadt->BootFlags, NO_VGA);
PRINTFLAG(fadt->BootFlags, NO_MSI);
PRINTFLAG(fadt->BootFlags, NO_ASPM);
+ PRINTFLAG(fadt->BootFlags, NO_CMOS_RTC);
PRINTFLAG_END();
printf("\tFlags=");
@@ -1199,6 +1267,8 @@ acpi_print_fadt(ACPI_TABLE_HEADER *sdp)
PRINTFLAG(fadt->Flags, REMOTE_POWER_ON);
PRINTFLAG(fadt->Flags, APIC_CLUSTER);
PRINTFLAG(fadt->Flags, APIC_PHYSICAL);
+ PRINTFLAG(fadt->Flags, HW_REDUCED);
+ PRINTFLAG(fadt->Flags, LOW_POWER_S0);
PRINTFLAG_END();
#undef PRINTFLAG
Modified: stable/11/usr.sbin/acpi/acpidump/acpidump.c
==============================================================================
--- stable/11/usr.sbin/acpi/acpidump/acpidump.c Mon Apr 24 16:37:25 2017
(r317376)
+++ stable/11/usr.sbin/acpi/acpidump/acpidump.c Mon Apr 24 16:49:30 2017
(r317377)
@@ -55,7 +55,8 @@ int
main(int argc, char *argv[])
{
ACPI_TABLE_HEADER *rsdt, *sdt;
- char c, *progname;
+ int c;
+ char *progname;
char *dsdt_input_file, *dsdt_output_file;
dsdt_input_file = dsdt_output_file = NULL;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
