Skip to contentSkip to conversation

tests/avocado: Truncate M2S-FG484 SOM SPI flash to 16MiB

PATCH Superseded Philippe Mathieu-Daudé 2 participants 5 messages Jan 20, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover tests/avocado: Truncate M2S-FG484 SOM SPI flash to 16MiB

The M2S-FG484 SOM SPI flash is 16MiB. Truncate the file provided with the Avocado test to avoid:

qemu-system-arm: device requires 16777216 bytes, block backend provides 67108864 bytes

before merging the "m25p80: Improve error when the backend file size does not match the device" patch:
https://lore.kernel.org/qemu-devel/[email protected]/

Philippe Mathieu-Daudé (2):
tests/avocado: Factor file_truncate() helper out tests/avocado: Truncate M2S-FG484 SOM SPI flash to 16MiB

 hw/arm/msf2-som.c                   |  5 ++++-
 tests/avocado/boot_linux_console.py | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)
Signature · 1 line
2.38.1
#1 lore raw

PATCH 1/2 tests/avocado: Factor file_truncate() helper out

Factor file_truncate() helper out of image_pow2ceil_expand() for reuse.

---
 tests/avocado/boot_linux_console.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
tests/avocado/boot_linux_console.py +9 -5
index 8c1d981586..49a4b22fe1 100644
@@ -30,15 +30,19 @@
 def pow2ceil(x):
     return 1 if x == 0 else 2**(x - 1).bit_length()
 
+"""
+Truncate file
+"""
+def file_truncate(path, size):
+    if size != os.path.getsize(path):
+        with open(path, 'ab+') as fd:
+            fd.truncate(size)
+
 """
 Expand file size to next power of 2
 """
 def image_pow2ceil_expand(path):
-        size = os.path.getsize(path)
-        size_aligned = pow2ceil(size)
-        if size != size_aligned:
-            with open(path, 'ab+') as fd:
-                fd.truncate(size_aligned)
+    file_truncate(path, pow2ceil(size))
 
 class LinuxKernelTest(QemuSystemTest):
     KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
Signature · 1 line
2.38.1
#2 lore raw

Re: [PATCH 1/2] tests/avocado: Factor file_truncate() helper out

Quoted 24 lines · Philippe Mathieu-Daudé

Factor file_truncate() helper out of image_pow2ceil_expand() for reuse.

---
  tests/avocado/boot_linux_console.py | 14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
tests/avocado/boot_linux_console.py +8 -0
index 8c1d981586..49a4b22fe1 100644
@@ -30,15 +30,19 @@
  def pow2ceil(x):
      return 1 if x == 0 else 2**(x - 1).bit_length()
 
+"""
+Truncate file
+"""
+def file_truncate(path, size):
+    if size != os.path.getsize(path):
+        with open(path, 'ab+') as fd:
+            fd.truncate(size)
+

tests/avocado/boot_linux_console.py line 45

Quoted 10 lines
tests/avocado/boot_linux_console.py +1 -5
  """
  Expand file size to next power of 2
  """
  def image_pow2ceil_expand(path):
-        size = os.path.getsize(path)
-        size_aligned = pow2ceil(size)
-        if size != size_aligned:
-            with open(path, 'ab+') as fd:
-                fd.truncate(size_aligned)
+    file_truncate(path, pow2ceil(size))

size is required ^

C.

Quoted 3 lines
tests/avocado/boot_linux_console.py +0 -0
  class LinuxKernelTest(QemuSystemTest):
      KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
#3 lore raw

PATCH 2/2 tests/avocado: Truncate M2S-FG484 SOM SPI flash to 16MiB

In reply to Philippe Mathieu-Daudé

The M2S-FG484 SOM uses a 16 MiB SPI flash (Spansion S25FL128SDPBHICO). Since the test asset is bigger, truncate it to the correct size to avoid when running the test_arm_emcraft_sf2 test:

qemu-system-arm: device requires 16777216 bytes, block backend provides 67108864 bytes

Add comment regarding the M2S-FG484 SOM hardware in hw/arm/msf2-som.c.

---
 hw/arm/msf2-som.c                   | 5 ++++-
 tests/avocado/boot_linux_console.py | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)
hw/arm/msf2-som.c +4 -1
index a6df473ec9..7b3106c790 100644
@@ -1,6 +1,9 @@
 /*
  * SmartFusion2 SOM starter kit(from Emcraft) emulation.
  *
+ * M2S-FG484 SOM hardware architecture specification:
+ *   https://www.emcraft.com/jdownloads/som/m2s/m2s-som-ha.pdf
+ *
  * Copyright (c) 2017 Subbaraya Sundeep <[email protected]>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -87,7 +90,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine)
 
     /* Attach SPI flash to SPI0 controller */
     spi_bus = qdev_get_child_bus(dev, "spi0");
-    spi_flash = qdev_new("s25sl12801");
+    spi_flash = qdev_new("s25sl12801"); /* Spansion S25FL128SDPBHICO */
     qdev_prop_set_uint8(spi_flash, "spansion-cr2nv", 1);
     if (dinfo) {
         qdev_prop_set_drive_err(spi_flash, "drive",
tests/avocado/boot_linux_console.py +2 -0
index 49a4b22fe1..37600be4a2 100644
@@ -399,6 +399,8 @@ def test_arm_emcraft_sf2(self):
         spi_hash = '65523a1835949b6f4553be96dec1b6a38fb05501'
         spi_path = self.fetch_asset(spi_url, asset_hash=spi_hash)
 
+        file_truncate(spi_path, 16 << 20) # Spansion S25FL128SDPBHICO is 16 MiB
+
         self.vm.set_console()
         kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE
         self.vm.add_args('-kernel', uboot_path,
Signature · 1 line
2.38.1
Reviewed-by Tested-by on v1 2/2
#4 lore raw
Quoted 5 lines · Philippe Mathieu-Daudé

The M2S-FG484 SOM uses a 16 MiB SPI flash (Spansion S25FL128SDPBHICO). Since the test asset is bigger, truncate it to the correct size to avoid when running the test_arm_emcraft_sf2 test:

Quoted 7 lines

qemu-system-arm: device requires 16777216 bytes, block backend provides 67108864 bytes

Add comment regarding the M2S-FG484 SOM hardware in hw/arm/msf2-som.c.

Thanks,

C.

Quoted 41 lines
---
  hw/arm/msf2-som.c                   | 5 ++++-
  tests/avocado/boot_linux_console.py | 2 ++
  2 files changed, 6 insertions(+), 1 deletion(-)
hw/arm/msf2-som.c +4 -1
index a6df473ec9..7b3106c790 100644
@@ -1,6 +1,9 @@
  /*
   * SmartFusion2 SOM starter kit(from Emcraft) emulation.
   *
+ * M2S-FG484 SOM hardware architecture specification:
+ *   https://www.emcraft.com/jdownloads/som/m2s/m2s-som-ha.pdf
+ *
   * Copyright (c) 2017 Subbaraya Sundeep <[email protected]>
   *
   * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -87,7 +90,7 @@ static void emcraft_sf2_s2s010_init(MachineState *machine)
 
      /* Attach SPI flash to SPI0 controller */
      spi_bus = qdev_get_child_bus(dev, "spi0");
-    spi_flash = qdev_new("s25sl12801");
+    spi_flash = qdev_new("s25sl12801"); /* Spansion S25FL128SDPBHICO */
      qdev_prop_set_uint8(spi_flash, "spansion-cr2nv", 1);
      if (dinfo) {
          qdev_prop_set_drive_err(spi_flash, "drive",
tests/avocado/boot_linux_console.py +2 -0
index 49a4b22fe1..37600be4a2 100644
@@ -399,6 +399,8 @@ def test_arm_emcraft_sf2(self):
          spi_hash = '65523a1835949b6f4553be96dec1b6a38fb05501'
          spi_path = self.fetch_asset(spi_url, asset_hash=spi_hash)
 
+        file_truncate(spi_path, 16 << 20) # Spansion S25FL128SDPBHICO is 16 MiB
+
          self.vm.set_console()
          kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE
          self.vm.add_args('-kernel', uboot_path,