hw/sd/sdcard: Support boot area in emmc image
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 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,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> Message-Id: <20240712162719.88165-12-philmd@linaro.org>
This commit is contained in:
parent
8f25b74a32
commit
c8cb19876d
42
hw/sd/sd.c
42
hw/sd/sd.c
@ -137,6 +137,7 @@ struct SDState {
|
|||||||
uint8_t spec_version;
|
uint8_t spec_version;
|
||||||
uint64_t boot_part_size;
|
uint64_t boot_part_size;
|
||||||
BlockBackend *blk;
|
BlockBackend *blk;
|
||||||
|
uint8_t boot_config;
|
||||||
|
|
||||||
const SDProto *proto;
|
const SDProto *proto;
|
||||||
|
|
||||||
@ -513,6 +514,9 @@ static void emmc_set_ext_csd(SDState *sd, uint64_t size)
|
|||||||
sd->ext_csd[EXT_CSD_CARD_TYPE] = 0b11;
|
sd->ext_csd[EXT_CSD_CARD_TYPE] = 0b11;
|
||||||
sd->ext_csd[EXT_CSD_STRUCTURE] = 2;
|
sd->ext_csd[EXT_CSD_STRUCTURE] = 2;
|
||||||
sd->ext_csd[EXT_CSD_REV] = 3;
|
sd->ext_csd[EXT_CSD_REV] = 3;
|
||||||
|
|
||||||
|
/* Mode segment (RW) */
|
||||||
|
sd->ext_csd[EXT_CSD_PART_CONFIG] = sd->boot_config;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void emmc_set_csd(SDState *sd, uint64_t size)
|
static void emmc_set_csd(SDState *sd, uint64_t size)
|
||||||
@ -763,6 +767,40 @@ static uint32_t sd_blk_len(SDState *sd)
|
|||||||
return sd->blk_len;
|
return sd->blk_len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This requires a disk image that has two boot partitions inserted at the
|
||||||
|
* beginning of it. The size of the boot partitions is the "boot-size"
|
||||||
|
* property.
|
||||||
|
*/
|
||||||
|
static uint32_t sd_bootpart_offset(SDState *sd)
|
||||||
|
{
|
||||||
|
bool partitions_enabled;
|
||||||
|
unsigned partition_access;
|
||||||
|
|
||||||
|
if (!sd->boot_part_size || !sd_is_emmc(sd)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
partitions_enabled = sd->ext_csd[EXT_CSD_PART_CONFIG]
|
||||||
|
& EXT_CSD_PART_CONFIG_EN_MASK;
|
||||||
|
if (!partitions_enabled) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
partition_access = sd->ext_csd[EXT_CSD_PART_CONFIG]
|
||||||
|
& EXT_CSD_PART_CONFIG_ACC_MASK;
|
||||||
|
switch (partition_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 uint64_t sd_req_get_address(SDState *sd, SDRequest req)
|
static uint64_t sd_req_get_address(SDState *sd, SDRequest req)
|
||||||
{
|
{
|
||||||
uint64_t addr;
|
uint64_t addr;
|
||||||
@ -795,6 +833,7 @@ static void sd_reset(DeviceState *dev)
|
|||||||
sect = 0;
|
sect = 0;
|
||||||
}
|
}
|
||||||
size = sect << HWBLOCK_SHIFT;
|
size = sect << HWBLOCK_SHIFT;
|
||||||
|
size -= sd_bootpart_offset(sd);
|
||||||
|
|
||||||
sect = sd_addr_to_wpnum(size) + 1;
|
sect = sd_addr_to_wpnum(size) + 1;
|
||||||
|
|
||||||
@ -1003,6 +1042,7 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)
|
|||||||
static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
|
static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
|
||||||
{
|
{
|
||||||
trace_sdcard_read_block(addr, 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) {
|
if (!sd->blk || blk_pread(sd->blk, addr, len, sd->data, 0) < 0) {
|
||||||
fprintf(stderr, "sd_blk_read: read error on host side\n");
|
fprintf(stderr, "sd_blk_read: read error on host side\n");
|
||||||
}
|
}
|
||||||
@ -1011,6 +1051,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)
|
static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
|
||||||
{
|
{
|
||||||
trace_sdcard_write_block(addr, 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) {
|
if (!sd->blk || blk_pwrite(sd->blk, addr, len, sd->data, 0) < 0) {
|
||||||
fprintf(stderr, "sd_blk_write: write error on host side\n");
|
fprintf(stderr, "sd_blk_write: write error on host side\n");
|
||||||
}
|
}
|
||||||
@ -2763,6 +2804,7 @@ static Property sd_properties[] = {
|
|||||||
|
|
||||||
static Property emmc_properties[] = {
|
static Property emmc_properties[] = {
|
||||||
DEFINE_PROP_UINT64("boot-partition-size", SDState, boot_part_size, 0),
|
DEFINE_PROP_UINT64("boot-partition-size", SDState, boot_part_size, 0),
|
||||||
|
DEFINE_PROP_UINT8("boot-config", SDState, boot_config, 0x0),
|
||||||
DEFINE_PROP_END_OF_LIST()
|
DEFINE_PROP_END_OF_LIST()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user