diff mbox series

[1/1] tests/avocado: update firmware to enable sbsa-ref/neoverse-v1

Message ID 20230915113519.269290-1-marcin.juszkiewicz@linaro.org
State New
Headers show
Series [1/1] tests/avocado: update firmware to enable sbsa-ref/neoverse-v1 | expand

Commit Message

Marcin Juszkiewicz Sept. 15, 2023, 11:35 a.m. UTC
Update prebuilt firmware images to have TF-A with Neoverse V1 support enabled.
This allowed us to enable test for this cpu in sbsa-ref machine.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 tests/avocado/machine_aarch64_sbsaref.py | 25 ++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

Comments

Leif Lindholm Sept. 15, 2023, 11:55 a.m. UTC | #1
On Fri, Sep 15, 2023 at 13:35:19 +0200, Marcin Juszkiewicz wrote:
> Update prebuilt firmware images to have TF-A with Neoverse V1 support enabled.
> This allowed us to enable test for this cpu in sbsa-ref machine.
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Acked-by: Leif Lindholm <quic_llindhol@quicinc.com>


> ---
>  tests/avocado/machine_aarch64_sbsaref.py | 25 ++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
> index a794245e7e..b39f5566d7 100644
> --- a/tests/avocado/machine_aarch64_sbsaref.py
> +++ b/tests/avocado/machine_aarch64_sbsaref.py
> @@ -28,33 +28,32 @@ def fetch_firmware(self):
>          """
>          Flash volumes generated using:
>  
> -        - Fedora GNU Toolchain version 13.1.1 20230511 (Red Hat 13.1.1-2)
> +        - Fedora GNU Toolchain version 13.2.1 20230728 (Red Hat 13.2.1-1)
>  
>          - Trusted Firmware-A
> -          https://github.com/ARM-software/arm-trusted-firmware/tree/c0d8ee38
> +          https://github.com/ARM-software/arm-trusted-firmware/tree/cc933e1d
>  
>          - Tianocore EDK II
> -          https://github.com/tianocore/edk2/tree/0f9283429dd4
> -          https://github.com/tianocore/edk2-non-osi/tree/f0bb00937ad6
> -          https://github.com/tianocore/edk2-platforms/tree/7880b92e2a04
> +          https://github.com/tianocore/edk2/tree/29cce3356aec
> +          https://github.com/tianocore/edk2-platforms/tree/fc22c0e69709
>          """
>  
>          # Secure BootRom (TF-A code)
>          fs0_xz_url = (
> -            "https://fileserver.linaro.org/s/HrYMCjP7MEccjRP/"
> +            "https://fileserver.linaro.org/s/g4C3WzJzNBES2p2/"
>              "download/SBSA_FLASH0.fd.xz"
>          )
> -        fs0_xz_hash = "447eff64a90b84ce47703c6ec41fbfc25befaaea"
> +        fs0_xz_hash = "374738599f7ba38c22924b2075ec5355c2b24a47"
>          tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash)
>          archive.extract(tar_xz_path, self.workdir)
>          fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd")
>  
>          # Non-secure rom (UEFI and EFI variables)
>          fs1_xz_url = (
> -            "https://fileserver.linaro.org/s/t8foNnMPz74DZZy/"
> +            "https://fileserver.linaro.org/s/scJRninsAFTwEct/"
>              "download/SBSA_FLASH1.fd.xz"
>          )
> -        fs1_xz_hash = "13a9a262953787c7fc5a9155dfaa26e703631e02"
> +        fs1_xz_hash = "5d3f156ebd6c6374da2121e15c7c8f4ed0351dcc"
>          tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash)
>          archive.extract(tar_xz_path, self.workdir)
>          fs1_path = os.path.join(self.workdir, "SBSA_FLASH1.fd")
> @@ -144,10 +143,16 @@ def test_sbsaref_alpine_linux_cortex_a57(self):
>  
>      def test_sbsaref_alpine_linux_neoverse_n1(self):
>          """
> -        :avocado: tags=cpu:max
> +        :avocado: tags=cpu:neoverse-n1
>          """
>          self.boot_alpine_linux("neoverse-n1")
>  
> +    def test_sbsaref_alpine_linux_neoverse_v1(self):
> +        """
> +        :avocado: tags=cpu:neoverse-v1
> +        """
> +        self.boot_alpine_linux("neoverse-v1,pauth-impdef=on")
> +
>      def test_sbsaref_alpine_linux_max(self):
>          """
>          :avocado: tags=cpu:max
> -- 
> 2.41.0
>
Richard Henderson Sept. 15, 2023, 12:50 p.m. UTC | #2
On 9/15/23 04:35, Marcin Juszkiewicz wrote:
>       def test_sbsaref_alpine_linux_neoverse_n1(self):
>           """
> -        :avocado: tags=cpu:max
> +        :avocado: tags=cpu:neoverse-n1
>           """
>           self.boot_alpine_linux("neoverse-n1")
>   
> +    def test_sbsaref_alpine_linux_neoverse_v1(self):
> +        """
> +        :avocado: tags=cpu:neoverse-v1
> +        """
> +        self.boot_alpine_linux("neoverse-v1,pauth-impdef=on")
> +

Second function shadows the first?


r~
Richard Henderson Sept. 15, 2023, 12:51 p.m. UTC | #3
On 9/15/23 05:50, Richard Henderson wrote:
> On 9/15/23 04:35, Marcin Juszkiewicz wrote:
>>       def test_sbsaref_alpine_linux_neoverse_n1(self):
>>           """
>> -        :avocado: tags=cpu:max
>> +        :avocado: tags=cpu:neoverse-n1
>>           """
>>           self.boot_alpine_linux("neoverse-n1")
>> +    def test_sbsaref_alpine_linux_neoverse_v1(self):
>> +        """
>> +        :avocado: tags=cpu:neoverse-v1
>> +        """
>> +        self.boot_alpine_linux("neoverse-v1,pauth-impdef=on")
>> +
> 
> Second function shadows the first?

Bah.  -ENOCOFFEE.  n1/v1.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
Philippe Mathieu-Daudé Sept. 15, 2023, 1:01 p.m. UTC | #4
On 15/9/23 13:35, Marcin Juszkiewicz wrote:
> Update prebuilt firmware images to have TF-A with Neoverse V1 support enabled.
> This allowed us to enable test for this cpu in sbsa-ref machine.
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>   tests/avocado/machine_aarch64_sbsaref.py | 25 ++++++++++++++----------
>   1 file changed, 15 insertions(+), 10 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff mbox series

Patch

diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index a794245e7e..b39f5566d7 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -28,33 +28,32 @@  def fetch_firmware(self):
         """
         Flash volumes generated using:
 
-        - Fedora GNU Toolchain version 13.1.1 20230511 (Red Hat 13.1.1-2)
+        - Fedora GNU Toolchain version 13.2.1 20230728 (Red Hat 13.2.1-1)
 
         - Trusted Firmware-A
-          https://github.com/ARM-software/arm-trusted-firmware/tree/c0d8ee38
+          https://github.com/ARM-software/arm-trusted-firmware/tree/cc933e1d
 
         - Tianocore EDK II
-          https://github.com/tianocore/edk2/tree/0f9283429dd4
-          https://github.com/tianocore/edk2-non-osi/tree/f0bb00937ad6
-          https://github.com/tianocore/edk2-platforms/tree/7880b92e2a04
+          https://github.com/tianocore/edk2/tree/29cce3356aec
+          https://github.com/tianocore/edk2-platforms/tree/fc22c0e69709
         """
 
         # Secure BootRom (TF-A code)
         fs0_xz_url = (
-            "https://fileserver.linaro.org/s/HrYMCjP7MEccjRP/"
+            "https://fileserver.linaro.org/s/g4C3WzJzNBES2p2/"
             "download/SBSA_FLASH0.fd.xz"
         )
-        fs0_xz_hash = "447eff64a90b84ce47703c6ec41fbfc25befaaea"
+        fs0_xz_hash = "374738599f7ba38c22924b2075ec5355c2b24a47"
         tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash)
         archive.extract(tar_xz_path, self.workdir)
         fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd")
 
         # Non-secure rom (UEFI and EFI variables)
         fs1_xz_url = (
-            "https://fileserver.linaro.org/s/t8foNnMPz74DZZy/"
+            "https://fileserver.linaro.org/s/scJRninsAFTwEct/"
             "download/SBSA_FLASH1.fd.xz"
         )
-        fs1_xz_hash = "13a9a262953787c7fc5a9155dfaa26e703631e02"
+        fs1_xz_hash = "5d3f156ebd6c6374da2121e15c7c8f4ed0351dcc"
         tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash)
         archive.extract(tar_xz_path, self.workdir)
         fs1_path = os.path.join(self.workdir, "SBSA_FLASH1.fd")
@@ -144,10 +143,16 @@  def test_sbsaref_alpine_linux_cortex_a57(self):
 
     def test_sbsaref_alpine_linux_neoverse_n1(self):
         """
-        :avocado: tags=cpu:max
+        :avocado: tags=cpu:neoverse-n1
         """
         self.boot_alpine_linux("neoverse-n1")
 
+    def test_sbsaref_alpine_linux_neoverse_v1(self):
+        """
+        :avocado: tags=cpu:neoverse-v1
+        """
+        self.boot_alpine_linux("neoverse-v1,pauth-impdef=on")
+
     def test_sbsaref_alpine_linux_max(self):
         """
         :avocado: tags=cpu:max