diff mbox series

[Aspeed,v47,16/19] hw/sd/sdcard: Support boot area in emmc image

Message ID 20240709152556.52896-17-philmd@linaro.org
State New
Headers show
Series [v47,01/19] hw/sd/sdcard: Basis for eMMC support | expand

Commit Message

Philippe Mathieu-Daudé July 9, 2024, 3:25 p.m. UTC 
From: Joel Stanley <joel@jms.id.au>

This assumes a specially constructed image:

  dd if=/dev/zero of=mmc-bootarea.img count=2 bs=1M
  dd if=u-boot-spl.bin of=mmc-bootarea.img conv=notrunc
  dd if=u-boot.bin of=mmc-bootarea.img conv=notrunc count=64 bs=1K
  cat mmc-bootarea.img obmc-phosphor-image.wic > mmc.img
  truncate --size 16GB mmc.img
  truncate --size 128MB mmc-bootarea.img

For now this still requires a mtd image to load the SPL:

  qemu-system-arm -M tacoma-bmc -nographic \
   -global driver=sd-card,property=emmc,value=true \
   -drive file=mmc.img,if=sd,index=2 \
   -drive file=mmc-bootarea.img,if=mtd,format=raw

Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
TODO: Update QEMU command in description
---
 include/hw/sd/sd.h |  1 +
 hw/sd/sd.c         | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

Comments

Cédric Le Goater July 9, 2024, 3:51 p.m. UTC | #1 
On 7/9/24 5:25 PM, Philippe Mathieu-Daudé wrote:
> From: Joel Stanley <joel@jms.id.au>
> 
> This assumes a specially constructed image:
> 
>    dd if=/dev/zero of=mmc-bootarea.img count=2 bs=1M
>    dd if=u-boot-spl.bin of=mmc-bootarea.img conv=notrunc
>    dd if=u-boot.bin of=mmc-bootarea.img conv=notrunc count=64 bs=1K
>    cat mmc-bootarea.img obmc-phosphor-image.wic > mmc.img
>    truncate --size 16GB mmc.img
>    truncate --size 128MB mmc-bootarea.img
> 
> For now this still requires a mtd image to load the SPL:
> 
>    qemu-system-arm -M tacoma-bmc -nographic \
>     -global driver=sd-card,property=emmc,value=true \
>     -drive file=mmc.img,if=sd,index=2 \
>     -drive file=mmc-bootarea.img,if=mtd,format=raw
> 
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> Signed-off-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> TODO: Update QEMU command in description

hmm, this patch was also modified since last sent.


Thanks,

C.




> ---
>   include/hw/sd/sd.h |  1 +
>   hw/sd/sd.c         | 33 +++++++++++++++++++++++++++++++++
>   2 files changed, 34 insertions(+)
> 
> diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
> index d35a839f5e..07435d2e17 100644
> --- a/include/hw/sd/sd.h
> +++ b/include/hw/sd/sd.h
> @@ -132,6 +132,7 @@ struct SDCardClass {
>       bool (*get_readonly)(SDState *sd);
>       void (*set_cid)(SDState *sd);
>       void (*set_csd)(SDState *sd, uint64_t size);
> +    uint32_t (*bootpart_offset)(SDState *sd);
>   
>       const struct SDProto *proto;
>   };
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index c7f8ea11c1..5830725629 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -774,6 +774,13 @@ static uint32_t sd_blk_len(SDState *sd)
>       return sd->blk_len;
>   }
>   
> +static uint32_t sd_bootpart_offset(SDState *sd)
> +{
> +    SDCardClass *sc = SDMMC_COMMON_GET_CLASS(sd);
> +
> +    return sc->bootpart_offset ? sc->bootpart_offset(sd) : 0;
> +}
> +
>   static uint64_t sd_req_get_address(SDState *sd, SDRequest req)
>   {
>       uint64_t addr;
> @@ -1026,9 +1033,33 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)
>       qemu_set_irq(insert, sd->blk ? blk_is_inserted(sd->blk) : 0);
>   }
>   
> +/*
> + * This requires a disk image that has two boot partitions inserted at the
> + * beginning of it. The size of the boot partitions are configured in the
> + * ext_csd structure, which is hardcoded in qemu. They are currently set to
> + * 1MB each.
> + */
> +static uint32_t emmc_bootpart_offset(SDState *sd)
> +{
> +    unsigned int access = sd->ext_csd[EXT_CSD_PART_CONFIG]
> +                          & EXT_CSD_PART_CONFIG_ACC_MASK;
> +
> +    switch (access) {
> +    case EXT_CSD_PART_CONFIG_ACC_DEFAULT:
> +        return sd->boot_part_size * 2;
> +    case EXT_CSD_PART_CONFIG_ACC_BOOT0:
> +        return 0;
> +    case EXT_CSD_PART_CONFIG_ACC_BOOT0 + 1:
> +        return sd->boot_part_size * 1;
> +    default:
> +         g_assert_not_reached();
> +    }
> +}
> +
>   static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
>   {
>       trace_sdcard_read_block(addr, len);
> +    addr += sd_bootpart_offset(sd);
>       if (!sd->blk || blk_pread(sd->blk, addr, len, sd->data, 0) < 0) {
>           fprintf(stderr, "sd_blk_read: read error on host side\n");
>       }
> @@ -1037,6 +1068,7 @@ static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
>   static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
>   {
>       trace_sdcard_write_block(addr, len);
> +    addr += sd_bootpart_offset(sd);
>       if (!sd->blk || blk_pwrite(sd->blk, addr, len, sd->data, 0) < 0) {
>           fprintf(stderr, "sd_blk_write: write error on host side\n");
>       }
> @@ -2871,6 +2903,7 @@ static void emmc_class_init(ObjectClass *klass, void *data)
>   
>       sc->set_cid = emmc_set_cid;
>       sc->set_csd = emmc_set_csd;
> +    sc->bootpart_offset = emmc_bootpart_offset;
>   }
>   
>   static const TypeInfo sd_types[] = {
diff mbox series

Patch

diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index d35a839f5e..07435d2e17 100644
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -132,6 +132,7 @@  struct SDCardClass {
     bool (*get_readonly)(SDState *sd);
     void (*set_cid)(SDState *sd);
     void (*set_csd)(SDState *sd, uint64_t size);
+    uint32_t (*bootpart_offset)(SDState *sd);
 
     const struct SDProto *proto;
 };
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index c7f8ea11c1..5830725629 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -774,6 +774,13 @@  static uint32_t sd_blk_len(SDState *sd)
     return sd->blk_len;
 }
 
+static uint32_t sd_bootpart_offset(SDState *sd)
+{
+    SDCardClass *sc = SDMMC_COMMON_GET_CLASS(sd);
+
+    return sc->bootpart_offset ? sc->bootpart_offset(sd) : 0;
+}
+
 static uint64_t sd_req_get_address(SDState *sd, SDRequest req)
 {
     uint64_t addr;
@@ -1026,9 +1033,33 @@  void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)
     qemu_set_irq(insert, sd->blk ? blk_is_inserted(sd->blk) : 0);
 }
 
+/*
+ * This requires a disk image that has two boot partitions inserted at the
+ * beginning of it. The size of the boot partitions are configured in the
+ * ext_csd structure, which is hardcoded in qemu. They are currently set to
+ * 1MB each.
+ */
+static uint32_t emmc_bootpart_offset(SDState *sd)
+{
+    unsigned int access = sd->ext_csd[EXT_CSD_PART_CONFIG]
+                          & EXT_CSD_PART_CONFIG_ACC_MASK;
+
+    switch (access) {
+    case EXT_CSD_PART_CONFIG_ACC_DEFAULT:
+        return sd->boot_part_size * 2;
+    case EXT_CSD_PART_CONFIG_ACC_BOOT0:
+        return 0;
+    case EXT_CSD_PART_CONFIG_ACC_BOOT0 + 1:
+        return sd->boot_part_size * 1;
+    default:
+         g_assert_not_reached();
+    }
+}
+
 static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
 {
     trace_sdcard_read_block(addr, len);
+    addr += sd_bootpart_offset(sd);
     if (!sd->blk || blk_pread(sd->blk, addr, len, sd->data, 0) < 0) {
         fprintf(stderr, "sd_blk_read: read error on host side\n");
     }
@@ -1037,6 +1068,7 @@  static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
 static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
 {
     trace_sdcard_write_block(addr, len);
+    addr += sd_bootpart_offset(sd);
     if (!sd->blk || blk_pwrite(sd->blk, addr, len, sd->data, 0) < 0) {
         fprintf(stderr, "sd_blk_write: write error on host side\n");
     }
@@ -2871,6 +2903,7 @@  static void emmc_class_init(ObjectClass *klass, void *data)
 
     sc->set_cid = emmc_set_cid;
     sc->set_csd = emmc_set_csd;
+    sc->bootpart_offset = emmc_bootpart_offset;
 }
 
 static const TypeInfo sd_types[] = {