From patchwork Fri Jul 14 09:16:47 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: ivanhu <ivan.hu@canonical.com>
X-Patchwork-Id: 1807689
Return-Path: <fwts-devel-bounces@lists.ubuntu.com>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@legolas.ozlabs.org
Authentication-Results: legolas.ozlabs.org;
 spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com
 (client-ip=91.189.94.19; helo=huckleberry.canonical.com;
 envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=<UNKNOWN>)
Authentication-Results: legolas.ozlabs.org;
	dkim=fail reason="signature verification failed" (2048-bit key;
 unprotected) header.d=canonical.com header.i=@canonical.com
 header.a=rsa-sha256 header.s=20210705 header.b=dUqPWDva;
	dkim-atps=neutral
Received: from huckleberry.canonical.com (huckleberry.canonical.com
 [91.189.94.19])
	(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by legolas.ozlabs.org (Postfix) with ESMTPS id 4R2Qpl4pHhz20bt
	for <incoming@patchwork.ozlabs.org>; Fri, 14 Jul 2023 19:17:01 +1000 (AEST)
Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com)
	by huckleberry.canonical.com with esmtp (Exim 4.86_2)
	(envelope-from <fwts-devel-bounces@lists.ubuntu.com>)
	id 1qKEv0-0000d8-2s; Fri, 14 Jul 2023 09:16:54 +0000
Received: from smtp-relay-canonical-0.internal ([10.131.114.83]
 helo=smtp-relay-canonical-0.canonical.com)
 by huckleberry.canonical.com with esmtps
 (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2)
 (envelope-from <ivan.hu@canonical.com>) id 1qKEuy-0000cz-Bw
 for fwts-devel@lists.ubuntu.com; Fri, 14 Jul 2023 09:16:52 +0000
Received: from canonical.com (unknown [106.104.136.95])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest
 SHA256) (No client certificate requested)
 by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 9C7A7400F9
 for <fwts-devel@lists.ubuntu.com>; Fri, 14 Jul 2023 09:16:51 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;
 s=20210705; t=1689326212;
 bh=D3XtDRP+9DES6QCPjVb5sY4IIUU/sS2IMqg6t71Az+c=;
 h=From:To:Subject:Date:Message-Id:MIME-Version;
 b=dUqPWDvaByXkzRXPh0yNP/OwHpb/pZWSAJm1W0A4pvSHs6MiAwSMATiFlusgzuoMo
 +T4fbT+CA1/O0cpe+/PUiZaCFY4QCyMRwcJoSu7Z1oae6Vo5HECkZBy/2ueU69z4Jb
 XdEAI/OBHGyfmFScK6C4RAcuBdnftK657Li2y9SpdmgfAS4AeXXovrnq2EN+ovk9Hb
 O1JKCwtMfXnNtVicui8CCAfZzv5jRz6mTxlafWpiNtG4IbMQtlh9sOR0OthHmYo/j+
 tRA6hmwbqyE0oO0noVlyMz1oHYLKI8PiHAVcfbV+3n4ZU6KxvCR3Qaxhv8A/9oI/5X
 9lV3U6G0b+jWQ==
From: Ivan Hu <ivan.hu@canonical.com>
To: fwts-devel@lists.ubuntu.com
Subject: [PATCH] fwts-test: sync up with phat fix the device path for the
 health data record
Date: Fri, 14 Jul 2023 17:16:47 +0800
Message-Id: <20230714091647.54186-1-ivan.hu@canonical.com>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
X-BeenThere: fwts-devel@lists.ubuntu.com
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Firmware Test Suite Development <fwts-devel.lists.ubuntu.com>
List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/fwts-devel>,
 <mailto:fwts-devel-request@lists.ubuntu.com?subject=unsubscribe>
List-Archive: <https://lists.ubuntu.com/archives/fwts-devel>
List-Post: <mailto:fwts-devel@lists.ubuntu.com>
List-Help: <mailto:fwts-devel-request@lists.ubuntu.com?subject=help>
List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/fwts-devel>,
 <mailto:fwts-devel-request@lists.ubuntu.com?subject=subscribe>
Errors-To: fwts-devel-bounces@lists.ubuntu.com
Sender: "fwts-devel" <fwts-devel-bounces@lists.ubuntu.com>

Signed-off-by: Ivan Hu <ivan.hu@canonical.com>
---
 fwts-test/phat-0001/acpidump-0001.log | 18 ++++++++++--------
 fwts-test/phat-0001/acpidump-0002.log | 19 +++++++++++--------
 fwts-test/phat-0001/acpidump-0003.log | 19 +++++++++++--------
 fwts-test/phat-0001/phat-0001.log     |  8 ++++----
 fwts-test/phat-0001/phat-0002.log     |  4 ++--
 fwts-test/phat-0001/phat-0003.log     |  6 +++---
 6 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/fwts-test/phat-0001/acpidump-0001.log b/fwts-test/phat-0001/acpidump-0001.log
index 1a4a1f4a..c926774d 100644
--- a/fwts-test/phat-0001/acpidump-0001.log
+++ b/fwts-test/phat-0001/acpidump-0001.log
@@ -24,19 +24,21 @@ FACP @ 0x00000000
   00f0: 00 00 00 00                                      ....
 
 PHAT @ 0x0000000000000000
-  0000: 50 48 41 54 DA 00 00 00 01 20 49 4E 54 45 4C 20  PHAT..... INTEL 
+  0000: 50 48 41 54 FC 00 00 00 01 20 49 4E 54 45 4C 20  PHAT..... INTEL 
   0010: 54 65 6D 70 6C 61 74 65 01 00 00 00 49 4E 54 4C  Template....INTL
   0020: 31 03 21 20 00 00 28 00 00 00 00 00 01 00 00 00  1.! ..(.........
   0030: 30 05 AF 91 86 5D 0E 47 A6 B0 0A 2D B9 40 82 49  0....].G...-.@.I
   0040: 08 07 06 05 04 03 02 01 0C 0B 0A 09 00 00 28 00  ..............(.
   0050: 00 00 00 00 01 00 00 00 3C 73 2E 1E 0D 79 44 46  ........<s...yDF
   0060: B2 8B E6 AA F1 C7 35 2E 08 09 0A 0B 0C 0D 0E 0F  ......5.........
-  0070: 06 05 04 03 01 00 2F 00 00 00 00 00 30 05 AF 91  ....../.....0...
-  0080: 86 5D 0E 47 A6 B0 0A 2D B9 40 82 49 2B 00 00 00  .].G...-.@.I+...
-  0090: 5C 5F 53 42 2E 50 43 49 30 2E 41 42 43 44 00 FF  \_SB.PCI0.ABCD..
-  00A0: 11 55 AA 01 00 37 00 00 00 00 00 11 DD D5 18 12  .U...7..........
-  00B0: BA 24 49 A7 5A 46 D2 51 EC B5 93 2F 00 00 00 5C  .$I.ZF.Q.../...\
-  00C0: 5F 53 42 2E 50 43 49 30 2E 47 46 58 30 2E 58 59  _SB.PCI0.GFX0.XY
-  00D0: 5A 00 12 34 56 78 90 AB CD EF                    Z..4Vx....
+  0070: 06 05 04 03 01 00 3E 00 00 00 00 00 30 05 AF 91  ....../.....0...
+  0080: 86 5D 0E 47 A6 B0 0A 2D B9 40 82 49 3A 00 00 00  .].G...-.@.I+...
+  0090: 5C 00 5F 00 53 00 42 00 2E 00 50 00 43 00 49 00  \._.S.B...P.C.I.
+  00A0: 30 00 2E 00 41 00 42 00 43 00 44 00 00 00 FF 11  0...A.B.C.D.....
+  00B0: 55 AA 01 00 4A 00 00 00 00 00 11 DD D5 18 12 BA  U...7...........
+  00C0: 24 49 A7 5A 46 D2 51 EC B5 93 42 00 00 00 5C 00  $I.ZF.Q.../...\.
+  00D0: 5F 00 53 00 42 00 2E 00 50 00 43 00 49 00 30 00  _.S.B...P.C.I.0.
+  00E0: 2E 00 47 00 46 00 58 00 30 00 2E 00 58 00 59 00  ..G.F.X.0...X.Y.
+  00F0: 5A 00 00 00 12 34 56 78 90 AB CD EF              Z...4Vx....
 
 
diff --git a/fwts-test/phat-0001/acpidump-0002.log b/fwts-test/phat-0001/acpidump-0002.log
index 39e69310..7891e224 100644
--- a/fwts-test/phat-0001/acpidump-0002.log
+++ b/fwts-test/phat-0001/acpidump-0002.log
@@ -24,18 +24,21 @@ FACP @ 0x00000000
   00f0: 00 00 00 00                                      ....
 
 PHAT @ 0x0000000000000000
-  0000: 50 48 41 54 DA 00 00 00 01 20 49 4E 54 45 4C 20  PHAT..... INTEL 
+  0000: 50 48 41 54 FC 00 00 00 01 20 49 4E 54 45 4C 20  PHAT..... INTEL 
   0010: 54 65 6D 70 6C 61 74 65 01 00 00 00 49 4E 54 4C  Template....INTL
   0020: 31 03 21 20 00 00 28 00 00 00 00 00 01 00 00 00  1.! ..(.........
   0030: 30 05 AF 91 86 5D 0E 47 A6 B0 0A 2D B9 40 82 49  0....].G...-.@.I
   0040: 08 07 06 05 04 03 02 01 0C 0B 0A 09 00 00 28 00  ..............(.
   0050: 00 00 00 00 01 00 00 00 3C 73 2E 1E 0D 79 44 46  ........<s...yDF
   0060: B2 8B E6 AA F1 C7 35 2E 08 09 0A 0B 0C 0D 0E 0F  ......5.........
-  0070: 06 05 04 03 01 00 2F 00 00 00 00 00 30 05 AF 91  ....../.....0...
-  0080: 86 5D 0E 47 A6 B0 0A 2D B9 40 82 49 2B 00 00 00  .].G...-.@.I+...
-  0090: 5C 5F 53 42 2E 50 43 49 30 2E 41 42 43 44 00 FF  \_SB.PCI0.ABCD..
-  00A0: 11 55 AA 02 00 37 00 00 00 00 00 11 DD D5 18 12  .U...7..........
-  00B0: BA 24 49 A7 5A 46 D2 51 EC B5 93 2F 00 00 00 5C  .$I.ZF.Q.../...\
-  00C0: 5F 53 42 2E 50 43 49 30 2E 47 46 58 30 2E 58 59  _SB.PCI0.GFX0.XY
-  00D0: 5A 00 12 34 56 78 90 AB CD EF                    Z..4Vx....
+  0070: 06 05 04 03 01 00 3E 00 00 00 00 00 30 05 AF 91  ....../.....0...
+  0080: 86 5D 0E 47 A6 B0 0A 2D B9 40 82 49 3A 00 00 00  .].G...-.@.I+...
+  0090: 5C 00 5F 00 53 00 42 00 2E 00 50 00 43 00 49 00  \._.S.B...P.C.I.
+  00A0: 30 00 2E 00 41 00 42 00 43 00 44 00 00 00 FF 11  0...A.B.C.D.....
+  00B0: 55 AA 02 00 4A 00 00 00 00 00 11 DD D5 18 12 BA  U...7...........
+  00C0: 24 49 A7 5A 46 D2 51 EC B5 93 42 00 00 00 5C 00  $I.ZF.Q.../...\.
+  00D0: 5F 00 53 00 42 00 2E 00 50 00 43 00 49 00 30 00  _.S.B...P.C.I.0.
+  00E0: 2E 00 47 00 46 00 58 00 30 00 2E 00 58 00 59 00  ..G.F.X.0...X.Y.
+  00F0: 5A 00 00 00 12 34 56 78 90 AB CD EF              Z...4Vx....
+
 
diff --git a/fwts-test/phat-0001/acpidump-0003.log b/fwts-test/phat-0001/acpidump-0003.log
index d0b713c7..db9802f9 100644
--- a/fwts-test/phat-0001/acpidump-0003.log
+++ b/fwts-test/phat-0001/acpidump-0003.log
@@ -24,18 +24,21 @@ FACP @ 0x00000000
   00f0: 00 00 00 00                                      ....
 
 PHAT @ 0x0000000000000000
-  0000: 50 48 41 54 DA 00 00 00 01 20 49 4E 54 45 4C 20  PHAT..... INTEL 
+  0000: 50 48 41 54 FC 00 00 00 01 20 49 4E 54 45 4C 20  PHAT..... INTEL 
   0010: 54 65 6D 70 6C 61 74 65 01 00 00 00 49 4E 54 4C  Template....INTL
   0020: 31 03 21 20 00 00 28 00 00 00 00 00 01 00 00 00  1.! ..(.........
   0030: 30 05 AF 91 86 5D 0E 47 A6 B0 0A 2D B9 40 82 49  0....].G...-.@.I
   0040: 08 07 06 05 04 03 02 01 0C 0B 0A 09 00 00 28 00  ..............(.
   0050: 00 56 34 12 01 00 00 00 3C 73 2E 1E 0D 79 44 46  ........<s...yDF
   0060: B2 8B E6 AA F1 C7 35 2E 08 09 0A 0B 0C 0D 0E 0F  ......5.........
-  0070: 06 05 04 03 01 00 2F 00 00 CD AB 00 30 05 AF 91  ....../.....0...
-  0080: 86 5D 0E 47 A6 B0 0A 2D B9 40 82 49 2B 00 00 00  .].G...-.@.I+...
-  0090: 5C 5F 53 42 2E 50 43 49 30 2E 41 42 43 44 00 FF  \_SB.PCI0.ABCD..
-  00A0: 11 55 AA 01 00 37 00 00 00 00 00 11 DD D5 18 12  .U...7..........
-  00B0: BA 24 49 A7 5A 46 D2 51 EC B5 93 55 00 00 00 5C  .$I.ZF.Q.../...\
-  00C0: 5F 53 42 2E 50 43 49 30 2E 47 46 58 30 2E 58 59  _SB.PCI0.GFX0.XY
-  00D0: 5A 00 12 34 56 78 90 AB CD EF                    Z..4Vx....
+  0070: 06 05 04 03 01 00 3E 00 00 CD AB 00 30 05 AF 91  ....../.....0...
+  0080: 86 5D 0E 47 A6 B0 0A 2D B9 40 82 49 3A 00 00 00  .].G...-.@.I+...
+  0090: 5C 00 5F 00 53 00 42 00 2E 00 50 00 43 00 49 00  \._.S.B...P.C.I.
+  00A0: 30 00 2E 00 41 00 42 00 43 00 44 00 00 00 FF 11  0...A.B.C.D.....
+  00B0: 55 AA 01 00 4A 00 00 00 00 00 11 DD D5 18 12 BA  U...7...........
+  00C0: 24 49 A7 5A 46 D2 51 EC B5 93 55 00 00 00 5C 00  $I.ZF.Q.../...\.
+  00D0: 5F 00 53 00 42 00 2E 00 50 00 43 00 49 00 30 00  _.S.B...P.C.I.0.
+  00E0: 2E 00 47 00 46 00 58 00 30 00 2E 00 58 00 59 00  ..G.F.X.0...X.Y.
+  00F0: 5A 00 00 00 12 34 56 78 90 AB CD EF              Z...4Vx....
+
 
diff --git a/fwts-test/phat-0001/phat-0001.log b/fwts-test/phat-0001/phat-0001.log
index 7aa086a3..9ccf3774 100644
--- a/fwts-test/phat-0001/phat-0001.log
+++ b/fwts-test/phat-0001/phat-0001.log
@@ -24,12 +24,12 @@ phat                Producer ID:                    0x03040506
 phat            
 phat             Firmware Health Data Record (Type 1):
 phat                Type:                           0x0001
-phat                Record Length:                  0x002f
+phat                Record Length:                  0x003e
 phat                Revision:                       0x00
 phat                Reserved:                       0x0000
 phat                AmHealthy:                      0x00
 phat                Device Signature:               91AF0530-5D86-470E-A6B0-0A2DB9408249
-phat                Device-specific Data Offset:    0x0000002b
+phat                Device-specific Data Offset:    0x0000003a
 phat                Device Path:                    \_SB.PCI0.ABCD
 phat                Vendor Data:                    0xff
 phat                Vendor Data:                    0x11
@@ -38,12 +38,12 @@ phat                Vendor Data:                    0xaa
 phat            
 phat             Firmware Health Data Record (Type 1):
 phat                Type:                           0x0001
-phat                Record Length:                  0x0037
+phat                Record Length:                  0x004a
 phat                Revision:                       0x00
 phat                Reserved:                       0x0000
 phat                AmHealthy:                      0x00
 phat                Device Signature:               18D5DD11-BA12-4924-A75A-46D251ECB593
-phat                Device-specific Data Offset:    0x0000002f
+phat                Device-specific Data Offset:    0x00000042
 phat                Device Path:                    \_SB.PCI0.GFX0.XYZ
 phat                Vendor Data:                    0x12
 phat                Vendor Data:                    0x34
diff --git a/fwts-test/phat-0001/phat-0002.log b/fwts-test/phat-0001/phat-0002.log
index 7dd6c95c..a8ba37f6 100644
--- a/fwts-test/phat-0001/phat-0002.log
+++ b/fwts-test/phat-0001/phat-0002.log
@@ -24,12 +24,12 @@ phat                Producer ID:                    0x03040506
 phat            
 phat             Firmware Health Data Record (Type 1):
 phat                Type:                           0x0001
-phat                Record Length:                  0x002f
+phat                Record Length:                  0x003e
 phat                Revision:                       0x00
 phat                Reserved:                       0x0000
 phat                AmHealthy:                      0x00
 phat                Device Signature:               91AF0530-5D86-470E-A6B0-0A2DB9408249
-phat                Device-specific Data Offset:    0x0000002b
+phat                Device-specific Data Offset:    0x0000003a
 phat                Device Path:                    \_SB.PCI0.ABCD
 phat                Vendor Data:                    0xff
 phat                Vendor Data:                    0x11
diff --git a/fwts-test/phat-0001/phat-0003.log b/fwts-test/phat-0001/phat-0003.log
index c0aae003..617729c3 100644
--- a/fwts-test/phat-0001/phat-0003.log
+++ b/fwts-test/phat-0001/phat-0003.log
@@ -26,12 +26,12 @@ phat            field must be zero, got 0x00123456 instead
 phat            
 phat             Firmware Health Data Record (Type 1):
 phat                Type:                           0x0001
-phat                Record Length:                  0x002f
+phat                Record Length:                  0x003e
 phat                Revision:                       0x00
 phat                Reserved:                       0xabcd
 phat                AmHealthy:                      0x00
 phat                Device Signature:               91AF0530-5D86-470E-A6B0-0A2DB9408249
-phat                Device-specific Data Offset:    0x0000002b
+phat                Device-specific Data Offset:    0x0000003a
 phat                Device Path:                    \_SB.PCI0.ABCD
 phat                Vendor Data:                    0xff
 phat                Vendor Data:                    0x11
@@ -42,7 +42,7 @@ phat            field must be zero, got 0xabcd instead
 phat            
 phat             Firmware Health Data Record (Type 1):
 phat                Type:                           0x0001
-phat                Record Length:                  0x0037
+phat                Record Length:                  0x004a
 phat                Revision:                       0x00
 phat                Reserved:                       0x0000
 phat                AmHealthy:                      0x00