diff mbox series

fwts-test: sync up nfit fix for NFITBadLineOffsetAlignment

Message ID 1531884846-31439-1-git-send-email-alex.hung@canonical.com
State Accepted
Headers show
Series fwts-test: sync up nfit fix for NFITBadLineOffsetAlignment | expand

Commit Message

Alex Hung July 18, 2018, 3:34 a.m. UTC
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 fwts-test/nfit-0001/nfit-0001.log | 15 ++++++++++-----
 fwts-test/nfit-0001/nfit-0002.log | 38 +++++++++++++++++---------------------
 2 files changed, 27 insertions(+), 26 deletions(-)

Comments

Elliott, Robert (Servers) July 18, 2018, 3:17 p.m. UTC | #1
> -----Original Message-----
> From: fwts-devel [mailto:fwts-devel-bounces@lists.ubuntu.com] On Behalf Of Alex Hung
> Sent: Tuesday, July 17, 2018 10:34 PM
> To: fwts-devel@lists.ubuntu.com
> Subject: [PATCH] fwts-test: sync up nfit fix for NFITBadLineOffsetAlignment
> 
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  fwts-test/nfit-0001/nfit-0001.log | 15 ++++++++++-----
>  fwts-test/nfit-0001/nfit-0002.log | 38 +++++++++++++++++---------------------
>  2 files changed, 27 insertions(+), 26 deletions(-)
> 

Thanks, I didn't notice there were self-tests.  I was just running on real machines.


---
Robert Elliott, HPE Persistent Memory
Ivan Hu July 23, 2018, 9:58 a.m. UTC | #2
On 07/18/2018 11:34 AM, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  fwts-test/nfit-0001/nfit-0001.log | 15 ++++++++++-----
>  fwts-test/nfit-0001/nfit-0002.log | 38 +++++++++++++++++---------------------
>  2 files changed, 27 insertions(+), 26 deletions(-)
>
> diff --git a/fwts-test/nfit-0001/nfit-0001.log b/fwts-test/nfit-0001/nfit-0001.log
> index 9470917..6daff15 100644
> --- a/fwts-test/nfit-0001/nfit-0001.log
> +++ b/fwts-test/nfit-0001/nfit-0001.log
> @@ -39,20 +39,24 @@ nfit                Interleave Structure Index:             0x0001
>  nfit                Reserved:                               0x0000
>  nfit                Number of Lines Described:              0x00000004
>  nfit                Line Size:                              0x00000100
> -nfit                Line Offset:                            0x00000000
> -nfit                Line Offset:                            0x00000200
> -nfit                Line Offset:                            0x00000500
> -nfit                Line Offset:                            0x00001000
> +nfit                Line Offset:                            0x00000000, SPA 0x0000000000000000
> +nfit                Line Offset:                            0x00000200, SPA 0x0000000000020000
> +nfit                Line Offset:                            0x00000500, SPA 0x0000000000050000
> +nfit                Line Offset:                            0x00001000, SPA 0x0000000000100000
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0003
>  nfit                Length:                                 0x0028
>  nfit                Reserved:                               0x00000000
> +nfit              NFIT SMBIOS Entry 0:
> +nfit                Type:                                   0xb4
> +nfit                Length:                                 0x13
> +nfit                Handle:                                 0x405d
> +nfit                Strings:                                11 bytes
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0004
>  nfit                Length:                                 0x0050
> -nfit                NVDIMM Control Region Structure Index:  0x0001
>  nfit                Vendor ID:                              0x8086
>  nfit                Device ID:                              0x2017
>  nfit                Revision ID:                            0x0001
> @@ -73,6 +77,7 @@ nfit                Status RegisterOffset:                  0x0000000000801000
>  nfit                Size of Status Register:                0x0000000000000004
>  nfit                NVDIMM Control Region Flag:             0x0000
>  nfit                Reserved:                               0x0000000000000000
> +nfit                NVDIMM Control Region Structure Index:  0x0001
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0005
> diff --git a/fwts-test/nfit-0001/nfit-0002.log b/fwts-test/nfit-0001/nfit-0002.log
> index e5572e3..15d7514 100644
> --- a/fwts-test/nfit-0001/nfit-0002.log
> +++ b/fwts-test/nfit-0001/nfit-0002.log
> @@ -52,29 +52,24 @@ nfit                Interleave Structure Index:             0x0001
>  nfit                Reserved:                               0x0000
>  nfit                Number of Lines Described:              0x00000004
>  nfit                Line Size:                              0x00000100
> -nfit                Line Offset:                            0x00000000
> -nfit                Line Offset:                            0x00000210
> -nfit            FAILED [HIGH] NFITBadLineOffsetAlignment: Test 1, NFIT
> -nfit            Line Offset must be aligned nfit_struct->line_size, got
> -nfit            0x00000210 instead
> -nfit                Line Offset:                            0x00000520
> -nfit            FAILED [HIGH] NFITBadLineOffsetAlignment: Test 1, NFIT
> -nfit            Line Offset must be aligned nfit_struct->line_size, got
> -nfit            0x00000520 instead
> -nfit                Line Offset:                            0x00001030
> -nfit            FAILED [HIGH] NFITBadLineOffsetAlignment: Test 1, NFIT
> -nfit            Line Offset must be aligned nfit_struct->line_size, got
> -nfit            0x00001030 instead
> +nfit                Line Offset:                            0x00000000, SPA 0x0000000000000000
> +nfit                Line Offset:                            0x00000210, SPA 0x0000000000021000
> +nfit                Line Offset:                            0x00000520, SPA 0x0000000000052000
> +nfit                Line Offset:                            0x00001030, SPA 0x0000000000103000
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0003
>  nfit                Length:                                 0x0028
>  nfit                Reserved:                               0x00000000
> +nfit              NFIT SMBIOS Entry 0:
> +nfit                Type:                                   0xb4
> +nfit                Length:                                 0x13
> +nfit                Handle:                                 0x405d
> +nfit                Strings:                                11 bytes
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0004
>  nfit                Length:                                 0x0050
> -nfit                NVDIMM Control Region Structure Index:  0x0001
>  nfit                Vendor ID:                              0x8086
>  nfit                Device ID:                              0x2017
>  nfit                Revision ID:                            0x5501
> @@ -88,6 +83,12 @@ nfit                Reserved:                               0x0f00
>  nfit                Serial Number:                          0x76540089
>  nfit                Region Format Interface Code:           0x0301
>  nfit                Number of Block Control Windows:        0x0100
> +nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Revision
> +nfit            ID's BYTE 1 must be zero, got 0x5501 instead
> +nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Subsystem
> +nfit            Revision ID's BYTE 1 must be zero, got 0xaa01 instead
> +nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT Valid
> +nfit            Bits [7..1] must be zero, got 0x03 instead
>  nfit                Size of Block Control Window:           0x0000000000002000
>  nfit                Command Register Offset:                0x0000000000800000
>  nfit                Size of Command Register:               0x0000000000000008
> @@ -95,15 +96,10 @@ nfit                Status RegisterOffset:                  0x0000000000801000
>  nfit                Size of Status Register:                0x0000000000000004
>  nfit                NVDIMM Control Region Flag:             0x0003
>  nfit                Reserved:                               0x0000000000000000
> -nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Revision
> -nfit            ID's BYTE 1 must be zero, got 0x5501 instead
> -nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Subsystem
> -nfit            Revision ID's BYTE 1 must be zero, got 0xaa01 instead
> -nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT Valid
> -nfit            Bits [7..1] must be zero, got 0x03 instead
>  nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT NVDIMM
>  nfit            Control Region Flags Bits [15..1] must be zero, got 0x0003
>  nfit            instead
> +nfit                NVDIMM Control Region Structure Index:  0x0001
>  nfit            FAILED [MEDIUM] NFITReservedNonZero: Test 1, NFIT Reserved
>  nfit            field must be zero, got 0x0000000000000f00 instead
>  nfit            
> @@ -132,6 +128,6 @@ nfit            field must be zero, got 0x00000000000000f0 instead
>  nfit            
>  nfit            
>  nfit            ==========================================================
> -nfit            0 passed, 16 failed, 0 warning, 0 aborted, 0 skipped, 0
> +nfit            0 passed, 13 failed, 0 warning, 0 aborted, 0 skipped, 0
>  nfit            info only.
>  nfit            ==========================================================
Acked-by: Ivan Hu <ivan.hu@canonical.com>
Colin Ian King July 30, 2018, 8:32 a.m. UTC | #3
On 18/07/18 04:34, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  fwts-test/nfit-0001/nfit-0001.log | 15 ++++++++++-----
>  fwts-test/nfit-0001/nfit-0002.log | 38 +++++++++++++++++---------------------
>  2 files changed, 27 insertions(+), 26 deletions(-)
> 
> diff --git a/fwts-test/nfit-0001/nfit-0001.log b/fwts-test/nfit-0001/nfit-0001.log
> index 9470917..6daff15 100644
> --- a/fwts-test/nfit-0001/nfit-0001.log
> +++ b/fwts-test/nfit-0001/nfit-0001.log
> @@ -39,20 +39,24 @@ nfit                Interleave Structure Index:             0x0001
>  nfit                Reserved:                               0x0000
>  nfit                Number of Lines Described:              0x00000004
>  nfit                Line Size:                              0x00000100
> -nfit                Line Offset:                            0x00000000
> -nfit                Line Offset:                            0x00000200
> -nfit                Line Offset:                            0x00000500
> -nfit                Line Offset:                            0x00001000
> +nfit                Line Offset:                            0x00000000, SPA 0x0000000000000000
> +nfit                Line Offset:                            0x00000200, SPA 0x0000000000020000
> +nfit                Line Offset:                            0x00000500, SPA 0x0000000000050000
> +nfit                Line Offset:                            0x00001000, SPA 0x0000000000100000
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0003
>  nfit                Length:                                 0x0028
>  nfit                Reserved:                               0x00000000
> +nfit              NFIT SMBIOS Entry 0:
> +nfit                Type:                                   0xb4
> +nfit                Length:                                 0x13
> +nfit                Handle:                                 0x405d
> +nfit                Strings:                                11 bytes
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0004
>  nfit                Length:                                 0x0050
> -nfit                NVDIMM Control Region Structure Index:  0x0001
>  nfit                Vendor ID:                              0x8086
>  nfit                Device ID:                              0x2017
>  nfit                Revision ID:                            0x0001
> @@ -73,6 +77,7 @@ nfit                Status RegisterOffset:                  0x0000000000801000
>  nfit                Size of Status Register:                0x0000000000000004
>  nfit                NVDIMM Control Region Flag:             0x0000
>  nfit                Reserved:                               0x0000000000000000
> +nfit                NVDIMM Control Region Structure Index:  0x0001
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0005
> diff --git a/fwts-test/nfit-0001/nfit-0002.log b/fwts-test/nfit-0001/nfit-0002.log
> index e5572e3..15d7514 100644
> --- a/fwts-test/nfit-0001/nfit-0002.log
> +++ b/fwts-test/nfit-0001/nfit-0002.log
> @@ -52,29 +52,24 @@ nfit                Interleave Structure Index:             0x0001
>  nfit                Reserved:                               0x0000
>  nfit                Number of Lines Described:              0x00000004
>  nfit                Line Size:                              0x00000100
> -nfit                Line Offset:                            0x00000000
> -nfit                Line Offset:                            0x00000210
> -nfit            FAILED [HIGH] NFITBadLineOffsetAlignment: Test 1, NFIT
> -nfit            Line Offset must be aligned nfit_struct->line_size, got
> -nfit            0x00000210 instead
> -nfit                Line Offset:                            0x00000520
> -nfit            FAILED [HIGH] NFITBadLineOffsetAlignment: Test 1, NFIT
> -nfit            Line Offset must be aligned nfit_struct->line_size, got
> -nfit            0x00000520 instead
> -nfit                Line Offset:                            0x00001030
> -nfit            FAILED [HIGH] NFITBadLineOffsetAlignment: Test 1, NFIT
> -nfit            Line Offset must be aligned nfit_struct->line_size, got
> -nfit            0x00001030 instead
> +nfit                Line Offset:                            0x00000000, SPA 0x0000000000000000
> +nfit                Line Offset:                            0x00000210, SPA 0x0000000000021000
> +nfit                Line Offset:                            0x00000520, SPA 0x0000000000052000
> +nfit                Line Offset:                            0x00001030, SPA 0x0000000000103000
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0003
>  nfit                Length:                                 0x0028
>  nfit                Reserved:                               0x00000000
> +nfit              NFIT SMBIOS Entry 0:
> +nfit                Type:                                   0xb4
> +nfit                Length:                                 0x13
> +nfit                Handle:                                 0x405d
> +nfit                Strings:                                11 bytes
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0004
>  nfit                Length:                                 0x0050
> -nfit                NVDIMM Control Region Structure Index:  0x0001
>  nfit                Vendor ID:                              0x8086
>  nfit                Device ID:                              0x2017
>  nfit                Revision ID:                            0x5501
> @@ -88,6 +83,12 @@ nfit                Reserved:                               0x0f00
>  nfit                Serial Number:                          0x76540089
>  nfit                Region Format Interface Code:           0x0301
>  nfit                Number of Block Control Windows:        0x0100
> +nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Revision
> +nfit            ID's BYTE 1 must be zero, got 0x5501 instead
> +nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Subsystem
> +nfit            Revision ID's BYTE 1 must be zero, got 0xaa01 instead
> +nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT Valid
> +nfit            Bits [7..1] must be zero, got 0x03 instead
>  nfit                Size of Block Control Window:           0x0000000000002000
>  nfit                Command Register Offset:                0x0000000000800000
>  nfit                Size of Command Register:               0x0000000000000008
> @@ -95,15 +96,10 @@ nfit                Status RegisterOffset:                  0x0000000000801000
>  nfit                Size of Status Register:                0x0000000000000004
>  nfit                NVDIMM Control Region Flag:             0x0003
>  nfit                Reserved:                               0x0000000000000000
> -nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Revision
> -nfit            ID's BYTE 1 must be zero, got 0x5501 instead
> -nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Subsystem
> -nfit            Revision ID's BYTE 1 must be zero, got 0xaa01 instead
> -nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT Valid
> -nfit            Bits [7..1] must be zero, got 0x03 instead
>  nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT NVDIMM
>  nfit            Control Region Flags Bits [15..1] must be zero, got 0x0003
>  nfit            instead
> +nfit                NVDIMM Control Region Structure Index:  0x0001
>  nfit            FAILED [MEDIUM] NFITReservedNonZero: Test 1, NFIT Reserved
>  nfit            field must be zero, got 0x0000000000000f00 instead
>  nfit            
> @@ -132,6 +128,6 @@ nfit            field must be zero, got 0x00000000000000f0 instead
>  nfit            
>  nfit            
>  nfit            ==========================================================
> -nfit            0 passed, 16 failed, 0 warning, 0 aborted, 0 skipped, 0
> +nfit            0 passed, 13 failed, 0 warning, 0 aborted, 0 skipped, 0
>  nfit            info only.
>  nfit            ==========================================================
> 


Acked-by: Colin Ian King <colin.king@canonical.com>
diff mbox series

Patch

diff --git a/fwts-test/nfit-0001/nfit-0001.log b/fwts-test/nfit-0001/nfit-0001.log
index 9470917..6daff15 100644
--- a/fwts-test/nfit-0001/nfit-0001.log
+++ b/fwts-test/nfit-0001/nfit-0001.log
@@ -39,20 +39,24 @@  nfit                Interleave Structure Index:             0x0001
 nfit                Reserved:                               0x0000
 nfit                Number of Lines Described:              0x00000004
 nfit                Line Size:                              0x00000100
-nfit                Line Offset:                            0x00000000
-nfit                Line Offset:                            0x00000200
-nfit                Line Offset:                            0x00000500
-nfit                Line Offset:                            0x00001000
+nfit                Line Offset:                            0x00000000, SPA 0x0000000000000000
+nfit                Line Offset:                            0x00000200, SPA 0x0000000000020000
+nfit                Line Offset:                            0x00000500, SPA 0x0000000000050000
+nfit                Line Offset:                            0x00001000, SPA 0x0000000000100000
 nfit            
 nfit              NFIT Subtable:
 nfit                Type:                                   0x0003
 nfit                Length:                                 0x0028
 nfit                Reserved:                               0x00000000
+nfit              NFIT SMBIOS Entry 0:
+nfit                Type:                                   0xb4
+nfit                Length:                                 0x13
+nfit                Handle:                                 0x405d
+nfit                Strings:                                11 bytes
 nfit            
 nfit              NFIT Subtable:
 nfit                Type:                                   0x0004
 nfit                Length:                                 0x0050
-nfit                NVDIMM Control Region Structure Index:  0x0001
 nfit                Vendor ID:                              0x8086
 nfit                Device ID:                              0x2017
 nfit                Revision ID:                            0x0001
@@ -73,6 +77,7 @@  nfit                Status RegisterOffset:                  0x0000000000801000
 nfit                Size of Status Register:                0x0000000000000004
 nfit                NVDIMM Control Region Flag:             0x0000
 nfit                Reserved:                               0x0000000000000000
+nfit                NVDIMM Control Region Structure Index:  0x0001
 nfit            
 nfit              NFIT Subtable:
 nfit                Type:                                   0x0005
diff --git a/fwts-test/nfit-0001/nfit-0002.log b/fwts-test/nfit-0001/nfit-0002.log
index e5572e3..15d7514 100644
--- a/fwts-test/nfit-0001/nfit-0002.log
+++ b/fwts-test/nfit-0001/nfit-0002.log
@@ -52,29 +52,24 @@  nfit                Interleave Structure Index:             0x0001
 nfit                Reserved:                               0x0000
 nfit                Number of Lines Described:              0x00000004
 nfit                Line Size:                              0x00000100
-nfit                Line Offset:                            0x00000000
-nfit                Line Offset:                            0x00000210
-nfit            FAILED [HIGH] NFITBadLineOffsetAlignment: Test 1, NFIT
-nfit            Line Offset must be aligned nfit_struct->line_size, got
-nfit            0x00000210 instead
-nfit                Line Offset:                            0x00000520
-nfit            FAILED [HIGH] NFITBadLineOffsetAlignment: Test 1, NFIT
-nfit            Line Offset must be aligned nfit_struct->line_size, got
-nfit            0x00000520 instead
-nfit                Line Offset:                            0x00001030
-nfit            FAILED [HIGH] NFITBadLineOffsetAlignment: Test 1, NFIT
-nfit            Line Offset must be aligned nfit_struct->line_size, got
-nfit            0x00001030 instead
+nfit                Line Offset:                            0x00000000, SPA 0x0000000000000000
+nfit                Line Offset:                            0x00000210, SPA 0x0000000000021000
+nfit                Line Offset:                            0x00000520, SPA 0x0000000000052000
+nfit                Line Offset:                            0x00001030, SPA 0x0000000000103000
 nfit            
 nfit              NFIT Subtable:
 nfit                Type:                                   0x0003
 nfit                Length:                                 0x0028
 nfit                Reserved:                               0x00000000
+nfit              NFIT SMBIOS Entry 0:
+nfit                Type:                                   0xb4
+nfit                Length:                                 0x13
+nfit                Handle:                                 0x405d
+nfit                Strings:                                11 bytes
 nfit            
 nfit              NFIT Subtable:
 nfit                Type:                                   0x0004
 nfit                Length:                                 0x0050
-nfit                NVDIMM Control Region Structure Index:  0x0001
 nfit                Vendor ID:                              0x8086
 nfit                Device ID:                              0x2017
 nfit                Revision ID:                            0x5501
@@ -88,6 +83,12 @@  nfit                Reserved:                               0x0f00
 nfit                Serial Number:                          0x76540089
 nfit                Region Format Interface Code:           0x0301
 nfit                Number of Block Control Windows:        0x0100
+nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Revision
+nfit            ID's BYTE 1 must be zero, got 0x5501 instead
+nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Subsystem
+nfit            Revision ID's BYTE 1 must be zero, got 0xaa01 instead
+nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT Valid
+nfit            Bits [7..1] must be zero, got 0x03 instead
 nfit                Size of Block Control Window:           0x0000000000002000
 nfit                Command Register Offset:                0x0000000000800000
 nfit                Size of Command Register:               0x0000000000000008
@@ -95,15 +96,10 @@  nfit                Status RegisterOffset:                  0x0000000000801000
 nfit                Size of Status Register:                0x0000000000000004
 nfit                NVDIMM Control Region Flag:             0x0003
 nfit                Reserved:                               0x0000000000000000
-nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Revision
-nfit            ID's BYTE 1 must be zero, got 0x5501 instead
-nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Subsystem
-nfit            Revision ID's BYTE 1 must be zero, got 0xaa01 instead
-nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT Valid
-nfit            Bits [7..1] must be zero, got 0x03 instead
 nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT NVDIMM
 nfit            Control Region Flags Bits [15..1] must be zero, got 0x0003
 nfit            instead
+nfit                NVDIMM Control Region Structure Index:  0x0001
 nfit            FAILED [MEDIUM] NFITReservedNonZero: Test 1, NFIT Reserved
 nfit            field must be zero, got 0x0000000000000f00 instead
 nfit            
@@ -132,6 +128,6 @@  nfit            field must be zero, got 0x00000000000000f0 instead
 nfit            
 nfit            
 nfit            ==========================================================
-nfit            0 passed, 16 failed, 0 warning, 0 aborted, 0 skipped, 0
+nfit            0 passed, 13 failed, 0 warning, 0 aborted, 0 skipped, 0
 nfit            info only.
 nfit            ==========================================================