| Message ID | 20240628070216.92609-97-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/sd/sdcard: Add eMMC support | expand |
Hi Joel, Cédric, On 28/6/24 09:02, 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 I'm not keen on imposing that layout to use the model (besides so far we use 1MiB as constant). I'd rather use 3 BlockBackends for eMMC (boot[01], user). This would scale for multiple sizes. > 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 (AFAICT we don't need that mtd anymore, correct?) > 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> > --- > include/hw/sd/sd.h | 1 + > hw/sd/sd.c | 39 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+)
On 7/8/24 6:58 PM, Philippe Mathieu-Daudé wrote: > Hi Joel, Cédric, > > On 28/6/24 09:02, 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 > > I'm not keen on imposing that layout to use the model (besides > so far we use 1MiB as constant). I'd rather use 3 BlockBackends > for eMMC (boot[01], user). This would scale for multiple sizes. This is the same device with multiple partitions. Why would you want to have 3 backends ? The sizes are defined in an EXT_CSD register AFAIR. >> 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 > > (AFAICT we don't need that mtd anymore, correct?) we don't. Thanks, C. > >> 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> >> --- >> include/hw/sd/sd.h | 1 + >> hw/sd/sd.c | 39 +++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 40 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 e7d8b9c0fb..2d49be61f6 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -783,6 +783,12 @@ static inline uint64_t sd_addr_to_wpnum(uint64_t addr) return addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT); } + +static unsigned sd_boot_capacity_bytes(SDState *sd) +{ + return sd->ext_csd[EXT_CSD_BOOT_MULT] << 17; +} + static void sd_reset(DeviceState *dev) { SDState *sd = SD_CARD(dev); @@ -984,9 +990,40 @@ 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 sd_emmc_bootpart_offset(SDState *sd) +{ + unsigned int access = sd->ext_csd[EXT_CSD_PART_CONFIG] & + EXT_CSD_PART_CONFIG_ACC_MASK; + unsigned int boot_capacity = sd_boot_capacity_bytes(sd); + + switch (access) { + case EXT_CSD_PART_CONFIG_ACC_DEFAULT: + return boot_capacity * 2; + case EXT_CSD_PART_CONFIG_ACC_BOOT0: + return 0; + case EXT_CSD_PART_CONFIG_ACC_BOOT0 + 1: + return boot_capacity * 1; + default: + g_assert_not_reached(); + } +} + +static uint32_t sd_bootpart_offset(SDState *sd) +{ + SDCardClass *sc = SD_CARD_GET_CLASS(sd); + return sc->bootpart_offset ? sc->bootpart_offset(sd) : 0; +} + 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"); } @@ -995,6 +1032,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"); } @@ -2833,6 +2871,7 @@ static void emmc_class_init(ObjectClass *klass, void *data) dc->realize = emmc_realize; sc->proto = &sd_proto_emmc; sc->set_csd = sd_emmc_set_csd; + sc->bootpart_offset = sd_emmc_bootpart_offset; } static const TypeInfo sd_types[] = {