ACK: [PATCH 16/30] add MADT specific test, replaces old acpitables-0002 test
ivanhu
ivan.hu at canonical.com
Wed Jun 24 06:53:43 UTC 2015
On 2015年06月18日 16:49, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> The older acpitables-0002 test is now replaced by the MADT test
> after acpitables re-origanisation.
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
> Makefile.am | 4 +--
> fwts-test/acpitables-0002/acpidump-0001.log | 22 ---------------
> fwts-test/acpitables-0002/acpidump-0002.log | 13 ---------
> fwts-test/acpitables-0002/acpitables-0001.log | 25 -----------------
> fwts-test/acpitables-0002/acpitables-0002.log | 40 ---------------------------
> fwts-test/acpitables-0002/test-0001.sh | 17 ------------
> fwts-test/acpitables-0002/test-0002.sh | 17 ------------
> fwts-test/madt-0001/acpidump-0001.log | 22 +++++++++++++++
> fwts-test/madt-0001/acpidump-0002.log | 13 +++++++++
> fwts-test/madt-0001/madt-0001.log | 10 +++++++
> fwts-test/madt-0001/madt-0002.log | 33 ++++++++++++++++++++++
> fwts-test/madt-0001/test-0001.sh | 17 ++++++++++++
> fwts-test/madt-0001/test-0002.sh | 17 ++++++++++++
> 13 files changed, 114 insertions(+), 136 deletions(-)
> delete mode 100644 fwts-test/acpitables-0002/acpidump-0001.log
> delete mode 100644 fwts-test/acpitables-0002/acpidump-0002.log
> delete mode 100644 fwts-test/acpitables-0002/acpitables-0001.log
> delete mode 100644 fwts-test/acpitables-0002/acpitables-0002.log
> delete mode 100755 fwts-test/acpitables-0002/test-0001.sh
> delete mode 100755 fwts-test/acpitables-0002/test-0002.sh
> create mode 100644 fwts-test/madt-0001/acpidump-0001.log
> create mode 100644 fwts-test/madt-0001/acpidump-0002.log
> create mode 100644 fwts-test/madt-0001/madt-0001.log
> create mode 100644 fwts-test/madt-0001/madt-0002.log
> create mode 100755 fwts-test/madt-0001/test-0001.sh
> create mode 100755 fwts-test/madt-0001/test-0002.sh
>
> diff --git a/Makefile.am b/Makefile.am
> index b7c0503..d2bd113 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -10,8 +10,6 @@ TESTS_ENVIRONMENT += export FAILURE_LOG=/tmp/failure.log;
>
> TESTS = fwts-test/acpidump-0001/test-0001.sh \
> fwts-test/acpitables-0001/test-0001.sh \
> - fwts-test/acpitables-0002/test-0001.sh \
> - fwts-test/acpitables-0002/test-0002.sh \
> fwts-test/acpitables-0003/test-0001.sh \
> fwts-test/acpitables-0004/test-0001.sh \
> fwts-test/acpitables-0005/test-0001.sh \
> @@ -67,6 +65,8 @@ TESTS = fwts-test/acpidump-0001/test-0001.sh \
> fwts-test/klog-0002/test-0001.sh \
> fwts-test/klog-0002/test-0002.sh \
> fwts-test/klog-0002/test-0003.sh \
> + fwts-test/madt-0001/test-0001.sh \
> + fwts-test/madt-0001/test-0002.sh \
> fwts-test/method-0001/test-0001.sh \
> fwts-test/oops-0001/test-0001.sh \
> fwts-test/oops-0001/test-0002.sh \
> diff --git a/fwts-test/acpitables-0002/acpidump-0001.log b/fwts-test/acpitables-0002/acpidump-0001.log
> deleted file mode 100644
> index c7707ad..0000000
> --- a/fwts-test/acpitables-0002/acpidump-0001.log
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -APIC @ 0xbf6dfcc6
> - 0000: 41 50 49 43 68 00 00 00 01 cc 49 4e 54 45 4c 20 APICh.....INTEL
> - 0010: 43 52 45 53 54 4c 4e 45 00 00 04 06 4c 4f 48 52 CRESTLNE....LOHR
> - 0020: 5a 00 00 00 00 00 e0 fe 01 00 00 00 00 08 00 00 Z...............
> - 0030: 01 00 00 00 00 08 01 01 01 00 00 00 01 0c 01 00 ................
> - 0040: 00 00 c0 fe 00 00 00 00 02 0a 00 00 02 00 00 00 ................
> - 0050: 00 00 02 0a 00 09 09 00 00 00 0d 00 04 06 00 05 ................
> - 0060: 00 01 04 06 01 05 00 01 ........
> -
> -APIC @ 0xbf6dff70
> - 0000: 41 50 49 43 68 00 00 00 01 13 50 54 4c 54 44 20 APICh.....PTLTD
> - 0010: 09 20 41 50 49 43 20 20 00 00 04 06 20 4c 54 50 . APIC .... LTP
> - 0020: 00 00 00 00 00 00 e0 fe 01 00 00 00 00 08 00 00 ................
> - 0030: 01 00 00 00 00 08 01 01 01 00 00 00 01 0c 02 00 ................
> - 0040: 00 00 c0 fe 00 00 00 00 04 06 00 05 00 01 04 06 ................
> - 0050: 01 05 00 01 02 0a 00 00 02 00 00 00 05 00 02 0a ................
> - 0060: 00 09 09 00 00 00 0d 00 ........
> -
> -RSD PTR @ 0xf7240
> - 0000: 52 53 44 20 50 54 52 20 c5 4c 45 4e 4f 56 4f 02 RSD PTR .LENOVO.
> - 0010: 94 87 6d bf 24 00 00 00 f0 87 6d bf 00 00 00 00 ..m.$.....m.....
> - 0020: 39 00 00 00 9...
> diff --git a/fwts-test/acpitables-0002/acpidump-0002.log b/fwts-test/acpitables-0002/acpidump-0002.log
> deleted file mode 100644
> index 5a006c8..0000000
> --- a/fwts-test/acpitables-0002/acpidump-0002.log
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -APIC @ 0xbf6dfcc6
> - 0000: 41 50 49 43 68 00 00 00 01 cc 49 4e 54 45 4c 20 APICh.....INTEL
> - 0010: 43 52 45 53 54 4c 4e 45 00 00 04 06 4c 4f 48 52 CRESTLNE....LOHR
> - 0020: 5a 00 00 00 00 00 e0 fe 01 00 00 00 00 08 00 00 Z...............
> - 0030: 0f 00 00 00 00 08 01 01 0d 00 00 00 01 0c 03 00 ................
> - 0040: 00 00 00 00 00 00 00 00 02 0a 0f 02 02 00 00 00 ................
> - 0050: ee 00 02 0a 0e 09 09 00 00 00 fd 00 04 06 00 ff ................
> - 0060: 00 01 04 06 01 10 00 01 ........
> -
> -RSD PTR @ 0xf7240
> - 0000: 52 53 44 20 50 54 52 20 c5 4c 45 4e 4f 56 4f 02 RSD PTR .LENOVO.
> - 0010: 94 87 6d bf 24 00 00 00 f0 87 6d bf 00 00 00 00 ..m.$.....m.....
> - 0020: 39 00 00 00 9...
> diff --git a/fwts-test/acpitables-0002/acpitables-0001.log b/fwts-test/acpitables-0002/acpitables-0001.log
> deleted file mode 100644
> index 40418c8..0000000
> --- a/fwts-test/acpitables-0002/acpitables-0001.log
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -acpitables acpitables: ACPI table settings sanity tests.
> -acpitables ----------------------------------------------------------
> -acpitables Test 1 of 2: Test ACPI tables.
> -acpitables Cannot find FACP.
> -acpitables PASSED: Test 1, Table APIC passed.
> -acpitables Table ECDT not present to check.
> -acpitables Table FACP not present to check.
> -acpitables Table GTDT not present to check.
> -acpitables Table HPET not present to check.
> -acpitables Table MCFG not present to check.
> -acpitables Table RSDT not present to check.
> -acpitables Table RSDP not present to check.
> -acpitables Table SBST not present to check.
> -acpitables Table XSDT not present to check.
> -acpitables
> -acpitables Test 2 of 2: Test ACPI headers.
> -acpitables PASSED: Test 2, Table APIC has valid signature and ID
> -acpitables strings.
> -acpitables PASSED: Test 2, Table APIC has valid signature and ID
> -acpitables strings.
> -acpitables
> -acpitables ==========================================================
> -acpitables 3 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
> -acpitables info only.
> -acpitables ==========================================================
> diff --git a/fwts-test/acpitables-0002/acpitables-0002.log b/fwts-test/acpitables-0002/acpitables-0002.log
> deleted file mode 100644
> index c16d257..0000000
> --- a/fwts-test/acpitables-0002/acpitables-0002.log
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -acpitables acpitables: ACPI table settings sanity tests.
> -acpitables ----------------------------------------------------------
> -acpitables Test 1 of 1: Test ACPI tables.
> -acpitables FAILED [MEDIUM] MADTAPICFlagsNonZero: Test 1, MADT Local
> -acpitables APIC flags field, bits 1..31 are reserved and should be
> -acpitables zero, but are set as: f.
> -acpitables FAILED [MEDIUM] MADTAPICFlagsNonZero: Test 1, MADT Local
> -acpitables APIC flags field, bits 1..31 are reserved and should be
> -acpitables zero, but are set as: d.
> -acpitables FAILED [MEDIUM] MADTIOAPICAddrZero: Test 1, MADT IO APIC
> -acpitables address is zero, appears not to be defined.
> -acpitables FAILED [MEDIUM] MADTIRQSrcISA: Test 1, MADT Interrupt
> -acpitables Source Override Bus should be 0 for ISA bus.
> -acpitables FAILED [MEDIUM] MADTIRQSrcFlags: Test 1, MADT Interrupt
> -acpitables Source Override flags, bits 4..31 are reserved and should
> -acpitables be zero, but are set as: ee.
> -acpitables FAILED [MEDIUM] MADTIRQSrcISA: Test 1, MADT Interrupt
> -acpitables Source Override Bus should be 0 for ISA bus.
> -acpitables FAILED [MEDIUM] MADTIRQSrcFlags: Test 1, MADT Interrupt
> -acpitables Source Override flags, bits 4..31 are reserved and should
> -acpitables be zero, but are set as: fd.
> -acpitables FAILED [MEDIUM] MADTLAPICNMIFlags: Test 1, MADT Local APIC
> -acpitables NMI flags, bits 4..31 are reserved and should be zero, but
> -acpitables are set as: ff.
> -acpitables FAILED [MEDIUM] MADTLAPICNMIFlags: Test 1, MADT Local APIC
> -acpitables NMI flags, bits 4..31 are reserved and should be zero, but
> -acpitables are set as: 10.
> -acpitables Table ECDT not present to check.
> -acpitables Table FACP not present to check.
> -acpitables Table HPET not present to check.
> -acpitables Table MCFG not present to check.
> -acpitables PASSED: Test 1, Table RSDT passed.
> -acpitables PASSED: Test 1, Table RSDP passed.
> -acpitables Table SBST not present to check.
> -acpitables PASSED: Test 1, Table XSDT passed.
> -acpitables
> -acpitables ==========================================================
> -acpitables 3 passed, 9 failed, 0 warning, 0 aborted, 0 skipped, 0
> -acpitables info only.
> -acpitables ==========================================================
> diff --git a/fwts-test/acpitables-0002/test-0001.sh b/fwts-test/acpitables-0002/test-0001.sh
> deleted file mode 100755
> index 94432fc..0000000
> --- a/fwts-test/acpitables-0002/test-0001.sh
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -#!/bin/bash
> -#
> -TEST="Test apcitables against known correct ACPI APIC tables"
> -NAME=test-0001.sh
> -TMPLOG=$TMP/acpitables.log.$$
> -
> -$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/acpitables-0002/acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables" | cut -c7- > $TMPLOG
> -diff $TMPLOG $FWTSTESTDIR/acpitables-0002/acpitables-0001.log >> $FAILURE_LOG
> -ret=$?
> -if [ $ret -eq 0 ]; then
> - echo PASSED: $TEST, $NAME
> -else
> - echo FAILED: $TEST, $NAME
> -fi
> -
> -rm $TMPLOG
> -exit $ret
> diff --git a/fwts-test/acpitables-0002/test-0002.sh b/fwts-test/acpitables-0002/test-0002.sh
> deleted file mode 100755
> index dff2ee3..0000000
> --- a/fwts-test/acpitables-0002/test-0002.sh
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -#!/bin/bash
> -#
> -TEST="Test apcitables against incorrect ACPI APIC tables"
> -NAME=test-0002.sh
> -TMPLOG=$TMP/acpitables.log.$$
> -
> -$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/acpitables-0002/acpidump-0001.log acpitables - | grep "^[0-9]*[ ]*acpitables"| cut -c7- > $TMPLOG
> -diff $TMPLOG $FWTSTESTDIR/acpitables-0002/acpitables-0001.log >> $FAILURE_LOG
> -ret=$?
> -if [ $ret -eq 0 ]; then
> - echo PASSED: $TEST, $NAME
> -else
> - echo FAILED: $TEST, $NAME
> -fi
> -
> -rm $TMPLOG
> -exit $ret
> diff --git a/fwts-test/madt-0001/acpidump-0001.log b/fwts-test/madt-0001/acpidump-0001.log
> new file mode 100644
> index 0000000..c7707ad
> --- /dev/null
> +++ b/fwts-test/madt-0001/acpidump-0001.log
> @@ -0,0 +1,22 @@
> +APIC @ 0xbf6dfcc6
> + 0000: 41 50 49 43 68 00 00 00 01 cc 49 4e 54 45 4c 20 APICh.....INTEL
> + 0010: 43 52 45 53 54 4c 4e 45 00 00 04 06 4c 4f 48 52 CRESTLNE....LOHR
> + 0020: 5a 00 00 00 00 00 e0 fe 01 00 00 00 00 08 00 00 Z...............
> + 0030: 01 00 00 00 00 08 01 01 01 00 00 00 01 0c 01 00 ................
> + 0040: 00 00 c0 fe 00 00 00 00 02 0a 00 00 02 00 00 00 ................
> + 0050: 00 00 02 0a 00 09 09 00 00 00 0d 00 04 06 00 05 ................
> + 0060: 00 01 04 06 01 05 00 01 ........
> +
> +APIC @ 0xbf6dff70
> + 0000: 41 50 49 43 68 00 00 00 01 13 50 54 4c 54 44 20 APICh.....PTLTD
> + 0010: 09 20 41 50 49 43 20 20 00 00 04 06 20 4c 54 50 . APIC .... LTP
> + 0020: 00 00 00 00 00 00 e0 fe 01 00 00 00 00 08 00 00 ................
> + 0030: 01 00 00 00 00 08 01 01 01 00 00 00 01 0c 02 00 ................
> + 0040: 00 00 c0 fe 00 00 00 00 04 06 00 05 00 01 04 06 ................
> + 0050: 01 05 00 01 02 0a 00 00 02 00 00 00 05 00 02 0a ................
> + 0060: 00 09 09 00 00 00 0d 00 ........
> +
> +RSD PTR @ 0xf7240
> + 0000: 52 53 44 20 50 54 52 20 c5 4c 45 4e 4f 56 4f 02 RSD PTR .LENOVO.
> + 0010: 94 87 6d bf 24 00 00 00 f0 87 6d bf 00 00 00 00 ..m.$.....m.....
> + 0020: 39 00 00 00 9...
> diff --git a/fwts-test/madt-0001/acpidump-0002.log b/fwts-test/madt-0001/acpidump-0002.log
> new file mode 100644
> index 0000000..5a006c8
> --- /dev/null
> +++ b/fwts-test/madt-0001/acpidump-0002.log
> @@ -0,0 +1,13 @@
> +APIC @ 0xbf6dfcc6
> + 0000: 41 50 49 43 68 00 00 00 01 cc 49 4e 54 45 4c 20 APICh.....INTEL
> + 0010: 43 52 45 53 54 4c 4e 45 00 00 04 06 4c 4f 48 52 CRESTLNE....LOHR
> + 0020: 5a 00 00 00 00 00 e0 fe 01 00 00 00 00 08 00 00 Z...............
> + 0030: 0f 00 00 00 00 08 01 01 0d 00 00 00 01 0c 03 00 ................
> + 0040: 00 00 00 00 00 00 00 00 02 0a 0f 02 02 00 00 00 ................
> + 0050: ee 00 02 0a 0e 09 09 00 00 00 fd 00 04 06 00 ff ................
> + 0060: 00 01 04 06 01 10 00 01 ........
> +
> +RSD PTR @ 0xf7240
> + 0000: 52 53 44 20 50 54 52 20 c5 4c 45 4e 4f 56 4f 02 RSD PTR .LENOVO.
> + 0010: 94 87 6d bf 24 00 00 00 f0 87 6d bf 00 00 00 00 ..m.$.....m.....
> + 0020: 39 00 00 00 9...
> diff --git a/fwts-test/madt-0001/madt-0001.log b/fwts-test/madt-0001/madt-0001.log
> new file mode 100644
> index 0000000..f3ec635
> --- /dev/null
> +++ b/fwts-test/madt-0001/madt-0001.log
> @@ -0,0 +1,10 @@
> +madt madt: MADT Multiple APIC Description Table test.
> +madt ----------------------------------------------------------
> +madt Cannot find FACP.
> +madt Test 1 of 1: MADT Multiple APIC Description Table test.
> +madt PASSED: Test 1, No issues found in MADT table.
> +madt
> +madt ==========================================================
> +madt 1 passed, 0 failed, 0 warning, 0 aborted, 0 skipped, 0
> +madt info only.
> +madt ==========================================================
> diff --git a/fwts-test/madt-0001/madt-0002.log b/fwts-test/madt-0001/madt-0002.log
> new file mode 100644
> index 0000000..0fdabc2
> --- /dev/null
> +++ b/fwts-test/madt-0001/madt-0002.log
> @@ -0,0 +1,33 @@
> +madt madt: MADT Multiple APIC Description Table test.
> +madt ----------------------------------------------------------
> +madt Cannot find FACP.
> +madt Test 1 of 1: MADT Multiple APIC Description Table test.
> +madt FAILED [MEDIUM] MADTAPICFlagsNonZero: Test 1, MADT Local
> +madt APIC flags field, bits 1..31 are reserved and should be
> +madt zero, but are set as: f.
> +madt FAILED [MEDIUM] MADTAPICFlagsNonZero: Test 1, MADT Local
> +madt APIC flags field, bits 1..31 are reserved and should be
> +madt zero, but are set as: d.
> +madt FAILED [MEDIUM] MADTIOAPICAddrZero: Test 1, MADT IO APIC
> +madt address is zero, appears not to be defined.
> +madt FAILED [MEDIUM] MADTIRQSrcISA: Test 1, MADT Interrupt
> +madt Source Override Bus should be 0 for ISA bus.
> +madt FAILED [MEDIUM] MADTIRQSrcFlags: Test 1, MADT Interrupt
> +madt Source Override flags, bits 4..31 are reserved and should
> +madt be zero, but are set as: ee.
> +madt FAILED [MEDIUM] MADTIRQSrcISA: Test 1, MADT Interrupt
> +madt Source Override Bus should be 0 for ISA bus.
> +madt FAILED [MEDIUM] MADTIRQSrcFlags: Test 1, MADT Interrupt
> +madt Source Override flags, bits 4..31 are reserved and should
> +madt be zero, but are set as: fd.
> +madt FAILED [MEDIUM] MADTLAPICNMIFlags: Test 1, MADT Local APIC
> +madt NMI flags, bits 4..31 are reserved and should be zero, but
> +madt are set as: ff.
> +madt FAILED [MEDIUM] MADTLAPICNMIFlags: Test 1, MADT Local APIC
> +madt NMI flags, bits 4..31 are reserved and should be zero, but
> +madt are set as: 10.
> +madt
> +madt ==========================================================
> +madt 0 passed, 9 failed, 0 warning, 0 aborted, 0 skipped, 0
> +madt info only.
> +madt ==========================================================
> diff --git a/fwts-test/madt-0001/test-0001.sh b/fwts-test/madt-0001/test-0001.sh
> new file mode 100755
> index 0000000..fcbaf93
> --- /dev/null
> +++ b/fwts-test/madt-0001/test-0001.sh
> @@ -0,0 +1,17 @@
> +#!/bin/bash
> +#
> +TEST="Test against known correct ACPI APIC tables"
> +NAME=test-0001.sh
> +TMPLOG=$TMP/madt.log.$$
> +
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/madt-0001/acpidump-0001.log madt - | cut -c7- | grep "^madt" > $TMPLOG
> +diff $TMPLOG $FWTSTESTDIR/madt-0001/madt-0001.log >> $FAILURE_LOG
> +ret=$?
> +if [ $ret -eq 0 ]; then
> + echo PASSED: $TEST, $NAME
> +else
> + echo FAILED: $TEST, $NAME
> +fi
> +
> +rm $TMPLOG
> +exit $ret
> diff --git a/fwts-test/madt-0001/test-0002.sh b/fwts-test/madt-0001/test-0002.sh
> new file mode 100755
> index 0000000..05cee54
> --- /dev/null
> +++ b/fwts-test/madt-0001/test-0002.sh
> @@ -0,0 +1,17 @@
> +#!/bin/bash
> +#
> +TEST="Test against known correct ACPI APIC tables"
> +NAME=test-0002.sh
> +TMPLOG=$TMP/madt.log.$$
> +
> +$FWTS --log-format="%line %owner " -w 80 --dumpfile=$FWTSTESTDIR/madt-0001/acpidump-0002.log madt - | cut -c7- | grep "^madt" > $TMPLOG
> +diff $TMPLOG $FWTSTESTDIR/madt-0001/madt-0002.log >> $FAILURE_LOG
> +ret=$?
> +if [ $ret -eq 0 ]; then
> + echo PASSED: $TEST, $NAME
> +else
> + echo FAILED: $TEST, $NAME
> +fi
> +
> +rm $TMPLOG
> +exit $ret
Acked-by: Ivan Hu<ivan.hu at canonical.com>
More information about the fwts-devel
mailing list