Skip to contentSkip to conversation

tests/functional/arm/test_aspeed: Update ASPEED SDK v11.03

PATCH In review Jamin Lin 2 participants 10 messages Aug 4 – Aug 6 Arm/Aspeed machine support

lore
Share & tools
lore

Jamin Lin

author
#0 lore raw

cover tests/functional/arm/test_aspeed: Update ASPEED SDK v11.03

v1:
1. Update ASPEED SDK v11.03 to AST2500/AST2600/AST2700.
2. Update ASPEED Zephyr SDK v03.08 to AST1030.
3. Update ASPEED Zephyr Project v03.07 to AST1060.
4. Support the I2C master buffer mode to AST2700.

Jamin Lin (8):
hw/i2c/aspeed_i2c: Support the AST2700 master buffer mode tests/functional/aarch64/test_aspeed_ast2700a2: Update ASPEED SDK

    v11.03
  tests/functional/aarch64/test_aspeed_ast2700a1: Update ASPEED SDK
    v11.03
  tests/functional/aarch64/test_aspeed_ast2700fc: Update ASPEED SDK
    v11.03
  tests/functional/arm/test_aspeed_ast2600_sdk: Update ASPEED SDK v11.03
  tests/functional/arm/test_aspeed_ast2500_sdk: Update ASPEED SDK v11.03
  tests/functional/arm/test_aspeed_ast1030: Update ASPEED Zephyr SDK
    v03.08
  tests/functional/arm/test_aspeed_ast1060: Update ASPEED ZEPHYR PROJECT
    v03.07
 include/hw/i2c/aspeed_i2c.h                   |  2 +
 hw/i2c/aspeed_i2c.c                           | 79 +++++++++++++++++++
 .../aarch64/test_aspeed_ast2700a1.py          | 27 ++++---
 .../aarch64/test_aspeed_ast2700a2.py          | 27 ++++---
 .../aarch64/test_aspeed_ast2700fc.py          | 21 ++---
 tests/functional/arm/test_aspeed_ast1030.py   | 12 +--
 tests/functional/arm/test_aspeed_ast1060.py   | 14 ++--
 .../functional/arm/test_aspeed_ast2500_sdk.py |  8 +-
 .../arm/test_aspeed_ast2500_sdk_515.py        |  8 +-
 .../functional/arm/test_aspeed_ast2600_sdk.py |  8 +-
 .../arm/test_aspeed_ast2600_sdk_515.py        |  8 +-
 .../arm/test_aspeed_ast2600_sdk_otp.py        |  8 +-
 12 files changed, 153 insertions(+), 69 deletions(-)
Signature · 1 line
2.43.0
author
#6 lore raw

PATCH 6/8 tests/functional/arm/test_aspeed_ast2500_sdk: Update ASPEED SDK v11.03

---
 tests/functional/arm/test_aspeed_ast2500_sdk.py     | 8 ++++----
 tests/functional/arm/test_aspeed_ast2500_sdk_515.py | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
tests/functional/arm/test_aspeed_ast2500_sdk.py +4 -4
index 6ab498b3ff..95df32b84f 100755
@@ -10,14 +10,14 @@
 
 class AST2500Machine(AspeedTest):
 
-    ASSET_SDK_V1101_AST2500 = Asset(
-        'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.01/ast2500-default-obmc.tar.gz',
-        '3faa1188198da2216837be4b53861c483a58c3ad63784089720bf8421e157da1')
+    ASSET_SDK_V1103_AST2500 = Asset(
+        'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.03/ast2500-default-obmc.tar.gz',
+        '8e20cafddca04d73b799918d6f35b08c83c9f024e223a317b0ad71b97b84842f')
 
     def test_arm_ast2500_evb_sdk(self):
         self.set_machine('ast2500-evb')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2500)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2500)
 
         self.do_test_arm_aspeed_sdk_start(
             self.scratch_file("ast2500-default", "image-bmc"))
tests/functional/arm/test_aspeed_ast2500_sdk_515.py +4 -4
index 8d39dc65da..516e96e52d 100755
@@ -10,14 +10,14 @@
 
 class AST2500Machine(AspeedTest):
 
-    ASSET_SDK_V1101_AST2500_515 = Asset(
-        'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.01/ast2500-default-515-obmc.tar.gz',
-        'b848ff620d2e9c83e2fb4736b4d1c39b82fdb041058cd42be42c3b177bf38eb9')
+    ASSET_SDK_V1103_AST2500_515 = Asset(
+        'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.03/ast2500-default-515-obmc.tar.gz',
+        'f17d3b0a5157bcf73c21c4981f838ea0b76c6406cc4a6409267d57d61758ebb6')
 
     def test_arm_ast2500_evb_sdk_515(self):
         self.set_machine('ast2500-evb')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2500_515)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2500_515)
 
         self.do_test_arm_aspeed_sdk_start(
             self.scratch_file("ast2500-default-515", "image-bmc"))
Signature · 1 line
2.43.0
author
#1 lore raw

PATCH 1/8 hw/i2c/aspeed_i2c: Support the AST2700 master buffer mode

In reply to Jamin Lin

The AST2700 I2C controller can move master DMA payloads through its internal SRAM pool rather than DRAM. The Linux driver calls this "buffer mode" and selects it by default. Buffer mode reuses the master DMA command bits (TX/RX_DMA_EN) and the DMA length registers, so the only difference from a DRAM transfer is where the data comes from and goes
to: an offset into the pool programmed in I2CM_DMA_TX/RX_ADDR. The I2CC_VERSION_CTRL FUNC_CFG_DMA_EN bit selects between the two.

Implement I2CC_VERSION_CTRL and, when FUNC_CFG_DMA_EN is clear, move the payload through the pool buffer instead of DRAM.

I2CC_VERSION_CTRL resets to all ones, so guests that never program it keep targeting DRAM and behave as before. The register sits above the register window of the earlier SoCs, which are therefore unaffected.

---
 include/hw/i2c/aspeed_i2c.h |  2 +
 hw/i2c/aspeed_i2c.c         | 79 +++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
include/hw/i2c/aspeed_i2c.h +2 -0
index 156998e7c1..05937a7a0b 100644
@@ -231,6 +231,8 @@ REG32(I2CS_DMA_TX_ADDR_HI, 0x68)
     FIELD(I2CS_DMA_TX_ADDR_HI, ADDR_HI, 0, 7)
 REG32(I2CS_DMA_RX_ADDR_HI, 0x6c)
     FIELD(I2CS_DMA_RX_ADDR_HI, ADDR_HI, 0, 7)
+REG32(I2CC_VERSION_CTRL, 0x94)
+    FIELD(I2CC_VERSION_CTRL, FUNC_CFG_DMA_EN, 2, 1)
 
 struct AspeedI2CState;
 
hw/i2c/aspeed_i2c.c +79 -0

115 lines not on this page · raw message

Signature · 1 line
2.43.0
author
#3 lore raw

PATCH 3/8 tests/functional/aarch64/test_aspeed_ast2700a1: Update ASPEED SDK v11.03

In reply to Jamin Lin
---
 .../aarch64/test_aspeed_ast2700a1.py          | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)
tests/functional/aarch64/test_aspeed_ast2700a1.py +14 -13
index ddddd2d47a..adc8af30dc 100755
@@ -85,13 +85,13 @@ def verify_openbmc_boot_and_login(self, name, enable_pcie=True):
         exec_command_and_wait_for_pattern(self, 'root', 'Password:')
         exec_command_and_wait_for_pattern(self, '0penBmc', f'root@{name}:~#')
 
-    ASSET_SDK_V1101_AST2700A1 = Asset(
-            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.01/ast2700-a1-image.tar.gz',
-            '859808828531a51931aad3b4e70b28143eebb3cde1838ba7d8e7a2b844c8a1ab')
+    ASSET_SDK_V1103_AST2700A1 = Asset(
+            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.03/ast2700-a1-image.tar.gz',
+            '540961dc380709d852e957c5817cd7ee0dbb0a66f3aa17413eac7b67518afbfe')
 
-    ASSET_SDK_V1101_AST2700A1_DCSCM = Asset(
-            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.01/ast2700-a1-dcscm-image.tar.gz',
-            '4654eabad75da3fd33635cd6d29b7635181daefee7294b68feb124b9d4c24116')
+    ASSET_SDK_V1103_AST2700A1_DCSCM = Asset(
+            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.03/ast2700-a1-dcscm-image.tar.gz',
+            '5f7c139330fcefa6025bc7565a20fd5ea42cacebf810d56dc9a76b07cf69b3e1')
 
     def do_ast2700_i2c_test(self, bus_id):
         bus_str = str(bus_id)
@@ -127,7 +127,8 @@ def start_ast2700_test(self, name, bus_id):
             },
             {
                 'addr': '0x430000000',
-                'file': self.scratch_file(name, 'bl31.bin')
+                'file': self.scratch_file(name, 'trusted-firmware-a',
+                                          'bl31.bin')
             },
             {
                 'addr': '0x430080000',
@@ -154,11 +155,11 @@ def start_ast2700_test_vbootrom(self, name, bus_id):
         self.do_test_aarch64_aspeed_sdk_start(
                 self.scratch_file(name, 'image-bmc'), bus_id)
 
-    def test_aarch64_ast2700a1_evb_sdk_v11_01(self):
+    def test_aarch64_ast2700a1_evb_sdk_v11_03(self):
         self.set_machine('ast2700a1-evb')
         self.require_netdev('user')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2700A1)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2700A1)
         self.vm.add_args('-device', 'e1000e,netdev=net1,bus=pcie.2')
         self.vm.add_args('-netdev', 'user,id=net1')
         self.start_ast2700_test('ast2700-a1-image', 1)
@@ -166,22 +167,22 @@ def test_aarch64_ast2700a1_evb_sdk_v11_01(self):
         self.do_ast2700_i2c_test(1)
         self.do_ast2700_pcie_test()
 
-    def test_aarch64_ast2700a1_evb_sdk_vbootrom_v11_01(self):
+    def test_aarch64_ast2700a1_evb_sdk_vbootrom_v11_03(self):
         self.set_machine('ast2700a1-evb')
         self.require_netdev('user')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2700A1)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2700A1)
         self.vm.add_args('-device', 'e1000e,netdev=net1,bus=pcie.2')
         self.vm.add_args('-netdev', 'user,id=net1')
         self.start_ast2700_test_vbootrom('ast2700-a1-image', 1)
         self.verify_vbootrom_firmware_flow()
         self.verify_openbmc_boot_start()
 
-    def test_aarch64_ast2700a1_evb_ioexp_v11_01(self):
+    def test_aarch64_ast2700a1_evb_ioexp_v11_03(self):
         self.set_machine('ast2700a1-evb')
         self.require_netdev('user')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2700A1_DCSCM)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2700A1_DCSCM)
         self.vm.set_machine('ast2700a1-evb,fmc-model=w25q512jv')
         self.vm.add_args('-device',
                          'tmp105,bus=ioexp0.0,address=0x4d,id=tmp-test-16')
Signature · 1 line
2.43.0
author
#8 lore raw

PATCH 8/8 tests/functional/arm/test_aspeed_ast1060: Update ASPEED ZEPHYR PROJECT v03.07

In reply to Jamin Lin
---
 tests/functional/arm/test_aspeed_ast1060.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
tests/functional/arm/test_aspeed_ast1060.py +7 -7
index 833cfb8272..d7158259e6 100755
@@ -11,18 +11,18 @@
 
 
 class AST1060Machine(AspeedTest):
-    ASSET_ASPEED_AST1060_PROT_3_05 = Asset(
+    ASSET_ASPEED_AST1060_PROT_3_07 = Asset(
         ('https://github.com/AspeedTech-BMC'
-         '/aspeed-zephyr-project/releases/download/v03.05'
-         '/ast1060_prot_v03.05.tgz'),
-         '63b36d7420290726ca80477de254474b7cb79539a42819bb1fe2665d598dadb5')
+         '/aspeed-zephyr-project/releases/download/v03.07'
+         '/ast1060_prot_v03.07.tgz'),
+         '55a7f51f0b77051a0ef2ada993a16c5033768e1b8e8be3babfc52c303eecd07f')
 
-    def test_arm_ast1060_prot_3_05(self):
+    def test_arm_ast1060_prot_3_07(self):
         self.set_machine('ast1060-evb')
 
         kernel_name = "ast1060_prot/zephyr.bin"
         kernel_file = self.archive_extract(
-            self.ASSET_ASPEED_AST1060_PROT_3_05, member=kernel_name)
+            self.ASSET_ASPEED_AST1060_PROT_3_07, member=kernel_name)
 
         self.vm.set_console()
         self.vm.add_args('-kernel', kernel_file, '-nographic')
@@ -35,7 +35,7 @@ def test_arm_ast1060_otp_blockdev_device(self):
         self.vm.set_machine("ast1060-evb")
 
         kernel_name = "ast1060_prot/zephyr.bin"
-        kernel_file = self.archive_extract(self.ASSET_ASPEED_AST1060_PROT_3_05,
+        kernel_file = self.archive_extract(self.ASSET_ASPEED_AST1060_PROT_3_07,
                                            member=kernel_name)
         otp_img = self.generate_otpmem_image()
 
Signature · 1 line
2.43.0
author
#5 lore raw

PATCH 5/8 tests/functional/arm/test_aspeed_ast2600_sdk: Update ASPEED SDK v11.03

In reply to Jamin Lin
---
 tests/functional/arm/test_aspeed_ast2600_sdk.py     | 8 ++++----
 tests/functional/arm/test_aspeed_ast2600_sdk_515.py | 8 ++++----
 tests/functional/arm/test_aspeed_ast2600_sdk_otp.py | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)
tests/functional/arm/test_aspeed_ast2600_sdk.py +4 -4
index cabbe230c4..4fc594dfd5 100755
@@ -14,9 +14,9 @@
 
 class AST2600Machine(AspeedTest):
 
-    ASSET_SDK_V1101_AST2600 = Asset(
-        'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.01/ast2600-default-image.tar.gz',
-        '3c5b4d4ccf27b0d208a073f98426db54cd751b96143180cd15df1a83978f832c')
+    ASSET_SDK_V1103_AST2600 = Asset(
+        'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.03/ast2600-default-image.tar.gz',
+        '47e3656a14bf7a4de28d3dfbf48bc2325443bc42d270f3bc82646f92f6dea165')
 
     def do_ast2600_pcie_test(self):
         exec_command_and_wait_for_pattern(self,
@@ -49,7 +49,7 @@ def test_arm_ast2600_evb_sdk(self):
         self.set_machine('ast2600-evb')
         self.require_netdev('user')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2600)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2600)
 
         self.vm.add_args('-device',
             'tmp105,bus=aspeed.i2c.bus.5,address=0x4d,id=tmp-test')
tests/functional/arm/test_aspeed_ast2600_sdk_515.py +4 -4
index a8e7faff48..f5b14de083 100755
@@ -10,14 +10,14 @@
 
 class AST2600Machine(AspeedTest):
 
-    ASSET_SDK_V1101_AST2600_515 = Asset(
-        'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.01/ast2600-default-515-image.tar.gz',
-        'f3ccf1c08db71cf891637fc73131b80b2c0c0e005c06d5dcae0cf74fc458b43c')
+    ASSET_SDK_V1103_AST2600_515 = Asset(
+        'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.03/ast2600-default-515-image.tar.gz',
+        'c79d0197106f146476e82bb878e5438f6569bd30f3b53fbb520b59bc54f6b7dc')
 
     def test_arm_ast2600_evb_sdk_515(self):
         self.set_machine('ast2600-evb')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2600_515)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2600_515)
 
         self.do_test_arm_aspeed_sdk_start(
             self.scratch_file("ast2600-default-515-image", "image-bmc"))
tests/functional/arm/test_aspeed_ast2600_sdk_otp.py +4 -4
index f24dea1e8f..5813c59bd6 100755
@@ -12,15 +12,15 @@
 
 class AST2600Machine(AspeedTest):
 
-    ASSET_SDK_V1101_AST2600 = Asset(
-        'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.01/ast2600-default-image.tar.gz',
-        '3c5b4d4ccf27b0d208a073f98426db54cd751b96143180cd15df1a83978f832c')
+    ASSET_SDK_V1103_AST2600 = Asset(
+        'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.03/ast2600-default-image.tar.gz',
+        '47e3656a14bf7a4de28d3dfbf48bc2325443bc42d270f3bc82646f92f6dea165')
 
     def test_arm_ast2600_otp_blockdev_device(self):
         self.vm.set_machine("ast2600-evb")
         self.require_netdev('user')
 
-        image_path = self.archive_extract(self.ASSET_SDK_V1101_AST2600)
+        image_path = self.archive_extract(self.ASSET_SDK_V1103_AST2600)
         otp_img = self.generate_otpmem_image()
 
         self.vm.set_console()
Signature · 1 line
2.43.0
author
#4 lore raw

PATCH 4/8 tests/functional/aarch64/test_aspeed_ast2700fc: Update ASPEED SDK v11.03

In reply to Jamin Lin
---
 .../aarch64/test_aspeed_ast2700fc.py          | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)
tests/functional/aarch64/test_aspeed_ast2700fc.py +11 -10
index 86270e6111..704477d7c5 100755
@@ -66,9 +66,9 @@ def load_ast2700fc_coprocessor(self, name):
             self.vm.add_args('-device',
                              f'loader,file={file},cpu-num={cpu_num}')
 
-    ASSET_SDK_V1101_AST2700 = Asset(
-            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.01/ast2700-default-image.tar.gz',
-            'ce89dcd995cf284d41a6a4bd17a1b97d59939f0277bfe54fdaaf30e741ce7487')
+    ASSET_SDK_V1103_AST2700 = Asset(
+            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.03/ast2700-default-image.tar.gz',
+            'b91450d53da234591060cfb926fa30f7534ce20eaab766cb0f80ec332f8f0adb')
 
     def do_ast2700_i2c_test(self):
         exec_command_and_wait_for_pattern(self,
@@ -101,7 +101,7 @@ def do_ast2700fc_ssp_test(self):
 
         exec_command_and_wait_for_pattern(self, '\012', 'ssp_tsp:~$')
         exec_command_and_wait_for_pattern(self, 'version',
-                                          'Zephyr version 3.7.1')
+                                          'Zephyr version 3.7.2')
         exec_command_and_wait_for_pattern(self, 'md 72c02000 1',
                                           '[72c02000] 06020103')
 
@@ -112,7 +112,7 @@ def do_ast2700fc_tsp_test(self):
 
         exec_command_and_wait_for_pattern(self, '\012', 'tsp:~$')
         exec_command_and_wait_for_pattern(self, 'version',
-                                          'Zephyr version 3.7.1')
+                                          'Zephyr version 3.7.2')
         exec_command_and_wait_for_pattern(self, 'md 72c02000 1',
                                           '[72c02000] 06020103')
 
@@ -125,7 +125,8 @@ def start_ast2700fc_test(self, name):
             },
             {
                 'addr': '0x430000000',
-                'file': self.scratch_file(name, 'bl31.bin')
+                'file': self.scratch_file(name, 'trusted-firmware-a',
+                                          'bl31.bin')
             },
             {
                 'addr': '0x430080000',
@@ -153,11 +154,11 @@ def start_ast2700fc_test_vbootrom(self, name):
         self.do_test_aarch64_aspeed_sdk_start(
                 self.scratch_file(name, 'image-bmc'))
 
-    def test_aarch64_ast2700fc_sdk_v11_01(self):
+    def test_aarch64_ast2700fc_sdk_v11_03(self):
         self.set_machine('ast2700fc')
         self.require_netdev('user')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2700)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2700)
         self.start_ast2700fc_test('ast2700-default-image')
         self.verify_openbmc_boot_and_login('ast2700-default')
         self.do_ast2700_i2c_test()
@@ -165,10 +166,10 @@ def test_aarch64_ast2700fc_sdk_v11_01(self):
         self.do_ast2700fc_ssp_test()
         self.do_ast2700fc_tsp_test()
 
-    def test_aarch64_ast2700fc_sdk_vbootrom_v11_01(self):
+    def test_aarch64_ast2700fc_sdk_vbootrom_v11_03(self):
         self.set_machine('ast2700fc')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2700)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2700)
         self.start_ast2700fc_test_vbootrom('ast2700-default-image')
         self.verify_openbmc_boot_and_login('ast2700-default')
         self.do_ast2700fc_ssp_test()
Signature · 1 line
2.43.0
author
#7 lore raw

PATCH 7/8 tests/functional/arm/test_aspeed_ast1030: Update ASPEED Zephyr SDK v03.08

In reply to Jamin Lin
---
 tests/functional/arm/test_aspeed_ast1030.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
tests/functional/arm/test_aspeed_ast1030.py +6 -6
index 03fee55b5f..83a96ec322 100755
@@ -12,17 +12,17 @@
 
 class AST1030Machine(AspeedTest):
 
-    ASSET_ZEPHYR_3_06 = Asset(
+    ASSET_ZEPHYR_3_08 = Asset(
         ('https://github.com/AspeedTech-BMC'
-         '/zephyr/releases/download/v00.03.06/ast1030-evb-demo.zip'),
-         '056f37fcd9f165308cedca3a08f2bed37ed40c0a1402c4fa515613b80a369f38')
+         '/zephyr/releases/download/v00.03.08/ast1030-evb-demo.zip'),
+         '9eac3691bc7bce1b912bbe2ae4e36608a6532ff8d607f4d1e44b88407a48d4e5')
 
-    def test_arm_ast1030_zephyros_3_06(self):
+    def test_arm_ast1030_zephyros_3_08(self):
         self.set_machine('ast1030-evb')
 
         kernel_name = "ast1030-evb-demo/zephyr.elf"
         kernel_file = self.archive_extract(
-            self.ASSET_ZEPHYR_3_06, member=kernel_name)
+            self.ASSET_ZEPHYR_3_08, member=kernel_name)
 
         self.vm.set_console()
         self.vm.add_args('-kernel', kernel_file, '-nographic')
@@ -72,7 +72,7 @@ def test_arm_ast1030_otp_blockdev_device(self):
         self.vm.set_machine("ast1030-evb")
 
         kernel_name = "ast1030-evb-demo/zephyr.elf"
-        kernel_file = self.archive_extract(self.ASSET_ZEPHYR_3_06,
+        kernel_file = self.archive_extract(self.ASSET_ZEPHYR_3_08,
                                            member=kernel_name)
         otp_img = self.generate_otpmem_image()
 
Signature · 1 line
2.43.0
author
#2 lore raw

PATCH 2/8 tests/functional/aarch64/test_aspeed_ast2700a2: Update ASPEED SDK v11.03

In reply to Jamin Lin
---
 .../aarch64/test_aspeed_ast2700a2.py          | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)
tests/functional/aarch64/test_aspeed_ast2700a2.py +14 -13
index 0fe04a6eca..52450a9d39 100755
@@ -85,13 +85,13 @@ def verify_openbmc_boot_and_login(self, name, enable_pcie=True):
         exec_command_and_wait_for_pattern(self, 'root', 'Password:')
         exec_command_and_wait_for_pattern(self, '0penBmc', f'root@{name}:~#')
 
-    ASSET_SDK_V1101_AST2700A2 = Asset(
-            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.01/ast2700-default-image.tar.gz',
-            'ce89dcd995cf284d41a6a4bd17a1b97d59939f0277bfe54fdaaf30e741ce7487')
+    ASSET_SDK_V1103_AST2700A2 = Asset(
+            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.03/ast2700-default-image.tar.gz',
+            'b91450d53da234591060cfb926fa30f7534ce20eaab766cb0f80ec332f8f0adb')
 
-    ASSET_SDK_V1101_AST2700A2_DCSCM = Asset(
-            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.01/ast2700-dcscm-image.tar.gz',
-            'b92ece9ca733dfd7a20193a12582f743b77f1898116b6d6f1abe57ac8db01c56')
+    ASSET_SDK_V1103_AST2700A2_DCSCM = Asset(
+            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v11.03/ast2700-dcscm-image.tar.gz',
+            '7afd8323fc95097c14872b90d68c5cae5d078530c704591b192b74bd892c1dbf')
 
     def do_ast2700_i2c_test(self, bus_id):
         bus_str = str(bus_id)
@@ -130,7 +130,8 @@ def start_ast2700_test(self, name, bus_id):
             },
             {
                 'addr': '0x430000000',
-                'file': self.scratch_file(name, 'bl31.bin')
+                'file': self.scratch_file(name, 'trusted-firmware-a',
+                                          'bl31.bin')
             },
             {
                 'addr': '0x430080000',
@@ -157,11 +158,11 @@ def start_ast2700_test_vbootrom(self, name, bus_id):
         self.do_test_aarch64_aspeed_sdk_start(
                 self.scratch_file(name, 'image-bmc'), bus_id)
 
-    def test_aarch64_ast2700a2_evb_sdk_v11_01(self):
+    def test_aarch64_ast2700a2_evb_sdk_v11_03(self):
         self.set_machine('ast2700a2-evb')
         self.require_netdev('user')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2700A2)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2700A2)
         self.vm.add_args('-device', 'e1000e,netdev=net1,bus=pcie.2')
         self.vm.add_args('-netdev', 'user,id=net1')
         self.start_ast2700_test('ast2700-default-image', 1)
@@ -169,22 +170,22 @@ def test_aarch64_ast2700a2_evb_sdk_v11_01(self):
         self.do_ast2700_i2c_test(1)
         self.do_ast2700_pcie_test()
 
-    def test_aarch64_ast2700a2_evb_sdk_vbootrom_v11_01(self):
+    def test_aarch64_ast2700a2_evb_sdk_vbootrom_v11_03(self):
         self.set_machine('ast2700a2-evb')
         self.require_netdev('user')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2700A2)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2700A2)
         self.vm.add_args('-device', 'e1000e,netdev=net1,bus=pcie.2')
         self.vm.add_args('-netdev', 'user,id=net1')
         self.start_ast2700_test_vbootrom('ast2700-default-image', 1)
         self.verify_vbootrom_firmware_flow()
         self.verify_openbmc_boot_start()
 
-    def test_aarch64_ast2700a2_evb_ioexp_v11_01(self):
+    def test_aarch64_ast2700a2_evb_ioexp_v11_03(self):
         self.set_machine('ast2700a2-evb')
         self.require_netdev('user')
 
-        self.archive_extract(self.ASSET_SDK_V1101_AST2700A2_DCSCM)
+        self.archive_extract(self.ASSET_SDK_V1103_AST2700A2_DCSCM)
         self.vm.set_machine('ast2700a2-evb,fmc-model=w25q512jv')
         self.vm.add_args('-device',
                          'tmp105,bus=ioexp0.0,address=0x4d,id=tmp-test-16')
Signature · 1 line
2.43.0
Reviewed-by on the v1 series
#9 lore raw
In reply to Jamin Lin
Quoted 21 lines · Jamin Lin

v1:
1. Update ASPEED SDK v11.03 to AST2500/AST2600/AST2700.
2. Update ASPEED Zephyr SDK v03.08 to AST1030.
3. Update ASPEED Zephyr Project v03.07 to AST1060.
4. Support the I2C master buffer mode to AST2700.

Jamin Lin (8):
hw/i2c/aspeed_i2c: Support the AST2700 master buffer mode tests/functional/aarch64/test_aspeed_ast2700a2: Update ASPEED SDK

     v11.03
   tests/functional/aarch64/test_aspeed_ast2700a1: Update ASPEED SDK
     v11.03
   tests/functional/aarch64/test_aspeed_ast2700fc: Update ASPEED SDK
     v11.03
   tests/functional/arm/test_aspeed_ast2600_sdk: Update ASPEED SDK v11.03
   tests/functional/arm/test_aspeed_ast2500_sdk: Update ASPEED SDK v11.03
   tests/functional/arm/test_aspeed_ast1030: Update ASPEED Zephyr SDK
     v03.08
   tests/functional/arm/test_aspeed_ast1060: Update ASPEED ZEPHYR PROJECT
     v03.07
Quoted 14 lines
  include/hw/i2c/aspeed_i2c.h                   |  2 +
  hw/i2c/aspeed_i2c.c                           | 79 +++++++++++++++++++
  .../aarch64/test_aspeed_ast2700a1.py          | 27 ++++---
  .../aarch64/test_aspeed_ast2700a2.py          | 27 ++++---
  .../aarch64/test_aspeed_ast2700fc.py          | 21 ++---
  tests/functional/arm/test_aspeed_ast1030.py   | 12 +--
  tests/functional/arm/test_aspeed_ast1060.py   | 14 ++--
  .../functional/arm/test_aspeed_ast2500_sdk.py |  8 +-
  .../arm/test_aspeed_ast2500_sdk_515.py        |  8 +-
  .../functional/arm/test_aspeed_ast2600_sdk.py |  8 +-
  .../arm/test_aspeed_ast2600_sdk_515.py        |  8 +-
  .../arm/test_aspeed_ast2600_sdk_otp.py        |  8 +-
  12 files changed, 153 insertions(+), 69 deletions(-)

Thanks,

C.