| Message ID | 20240709152556.52896-13-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v47,01/19] hw/sd/sdcard: Basis for eMMC support | expand |
On 7/9/24 5:25 PM, Philippe Mathieu-Daudé wrote: > - Set some keys to not defined / implemented: > . EXT_CSD_HPI_FEATURES > . EXT_CSD_BKOPS_SUPPORT > . EXT_CSD_SEC_FEATURE_SUPPORT > . EXT_CSD_ERASE_TIMEOUT_MULT > . EXT_CSD_PART_SWITCH_TIME > . EXT_CSD_OUT_OF_INTERRUPT_TIME > > - Simplify: > . EXT_CSD_ACC_SIZE (6 -> 1) > 16KB of super_page_size -> 512B (BDRV_SECTOR_SIZE) > . EXT_CSD_HC_ERASE_GRP_SIZE (4 -> 1) > . EXT_CSD_HC_WP_GRP_SIZE (4 -> 1) > . EXT_CSD_S_C_VCC[Q] (8 -> 1) > . EXT_CSD_S_A_TIMEOUT (17 -> 1) > . EXT_CSD_CARD_TYPE (7 -> 3) > Dual data rate -> High-Speed mode > > - Update: > . EXT_CSD_CARD_TYPE (7 -> 3) > High-Speed MultiMediaCard @ 26MHz & 52MHz > . Performances (0xa -> 0x46) > Class B at 3MB/s. -> Class J at 21MB/s > . EXT_CSD_REV (5 -> 3) > Rev 1.5 (spec v4.41) -> Rev 1.3 (spec v4.3) > > - Use load/store API to set EXT_CSD_SEC_CNT > > - Remove R/W keys, normally zeroed at reset > . EXT_CSD_BOOT_INFO > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> This should be merged in patch 10. Thanks, C. > --- > hw/sd/sd.c | 50 ++++++++++++++++++-------------------------------- > 1 file changed, 18 insertions(+), 32 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index df0e2345c0..2a687977d1 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -484,43 +484,29 @@ static void mmc_set_ext_csd(SDState *sd, uint64_t size) > > memset(sd->ext_csd, 0, sizeof(sd->ext_csd)); > > + /* Properties segment (RO) */ > sd->ext_csd[EXT_CSD_S_CMD_SET] = 0b1; /* supported command sets */ > - sd->ext_csd[EXT_CSD_HPI_FEATURES] = 0x3; /* HPI features */ > - sd->ext_csd[EXT_CSD_BKOPS_SUPPORT] = 0x1; /* Background operations */ > - sd->ext_csd[241] = 0xA; /* 1st initialization time after partitioning */ > - sd->ext_csd[EXT_CSD_TRIM_MULT] = 0x1; /* Trim multiplier */ > - sd->ext_csd[EXT_CSD_SEC_FEATURE_SUPPORT] = 0x15; /* Secure feature */ > - sd->ext_csd[EXT_CSD_BOOT_INFO] = 0x7; /* Boot information */ > + sd->ext_csd[EXT_CSD_BOOT_INFO] = 0x0; /* Boot information */ > /* Boot partition size. 128KB unit */ > sd->ext_csd[EXT_CSD_BOOT_MULT] = sd->boot_part_size / (128 * KiB); > - sd->ext_csd[EXT_CSD_ACC_SIZE] = 0x6; /* Access size */ > - sd->ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] = 0x4; /* HC Erase unit size */ > + sd->ext_csd[EXT_CSD_ACC_SIZE] = 0x1; /* Access size */ > + sd->ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] = 0x01; /* HC Erase unit size */ > sd->ext_csd[EXT_CSD_ERASE_TIMEOUT_MULT] = 0x01; /* HC erase timeout */ > sd->ext_csd[EXT_CSD_REL_WR_SEC_C] = 0x1; /* Reliable write sector count */ > - sd->ext_csd[EXT_CSD_HC_WP_GRP_SIZE] = 0x4; /* HC write protect group size */ > - sd->ext_csd[EXT_CSD_S_C_VCC] = 0x8; /* Sleep current VCC */ > - sd->ext_csd[EXT_CSD_S_C_VCCQ] = 0x7; /* Sleep current VCCQ */ > - sd->ext_csd[EXT_CSD_S_A_TIMEOUT] = 0x11; /* Sleep/Awake timeout */ > - sd->ext_csd[215] = (sectcount >> 24) & 0xff; /* Sector count */ > - sd->ext_csd[214] = (sectcount >> 16) & 0xff; /* ... */ > - sd->ext_csd[213] = (sectcount >> 8) & 0xff; /* ... */ > - sd->ext_csd[EXT_CSD_SEC_CNT] = (sectcount & 0xff); /* ... */ > - sd->ext_csd[210] = 0xa; /* Min write perf for 8bit@52Mhz */ > - sd->ext_csd[209] = 0xa; /* Min read perf for 8bit@52Mhz */ > - sd->ext_csd[208] = 0xa; /* Min write perf for 4bit@52Mhz */ > - sd->ext_csd[207] = 0xa; /* Min read perf for 4bit@52Mhz */ > - sd->ext_csd[206] = 0xa; /* Min write perf for 4bit@26Mhz */ > - sd->ext_csd[205] = 0xa; /* Min read perf for 4bit@26Mhz */ > - sd->ext_csd[EXT_CSD_PART_SWITCH_TIME] = 0x1; > - sd->ext_csd[EXT_CSD_OUT_OF_INTERRUPT_TIME] = 0x1; > - sd->ext_csd[EXT_CSD_CARD_TYPE] = 0x7; > - sd->ext_csd[EXT_CSD_STRUCTURE] = 0x2; > - sd->ext_csd[EXT_CSD_REV] = 0x5; > - sd->ext_csd[EXT_CSD_RPMB_MULT] = 0x1; /* RPMB size */ > - sd->ext_csd[EXT_CSD_PARTITION_SUPPORT] = 0x3; > - sd->ext_csd[159] = 0x00; /* Max enhanced area size */ > - sd->ext_csd[158] = 0x00; /* ... */ > - sd->ext_csd[157] = 0xEC; /* ... */ > + sd->ext_csd[EXT_CSD_HC_WP_GRP_SIZE] = 0x01; /* HC write protect group size */ > + sd->ext_csd[EXT_CSD_S_C_VCC] = 0x01; /* Sleep current VCC */ > + sd->ext_csd[EXT_CSD_S_C_VCCQ] = 0x01; /* Sleep current VCCQ */ > + sd->ext_csd[EXT_CSD_S_A_TIMEOUT] = 0x01; /* Sleep/Awake timeout */ > + stl_le_p(&sd->ext_csd[EXT_CSD_SEC_CNT], sectcount); /* Sector count */ > + sd->ext_csd[210] = 0x46; /* Min write perf for 8bit@52Mhz */ > + sd->ext_csd[209] = 0x46; /* Min read perf for 8bit@52Mhz */ > + sd->ext_csd[208] = 0x46; /* Min write perf for 4bit@52Mhz */ > + sd->ext_csd[207] = 0x46; /* Min read perf for 4bit@52Mhz */ > + sd->ext_csd[206] = 0x46; /* Min write perf for 4bit@26Mhz */ > + sd->ext_csd[205] = 0x46; /* Min read perf for 4bit@26Mhz */ > + sd->ext_csd[EXT_CSD_CARD_TYPE] = 0b11; > + sd->ext_csd[EXT_CSD_STRUCTURE] = 2; > + sd->ext_csd[EXT_CSD_REV] = 3; > } > > static void emmc_set_csd(SDState *sd, uint64_t size)
On 9/7/24 17:43, Cédric Le Goater wrote: > On 7/9/24 5:25 PM, Philippe Mathieu-Daudé wrote: >> - Set some keys to not defined / implemented: >> . EXT_CSD_HPI_FEATURES >> . EXT_CSD_BKOPS_SUPPORT >> . EXT_CSD_SEC_FEATURE_SUPPORT >> . EXT_CSD_ERASE_TIMEOUT_MULT >> . EXT_CSD_PART_SWITCH_TIME >> . EXT_CSD_OUT_OF_INTERRUPT_TIME >> >> - Simplify: >> . EXT_CSD_ACC_SIZE (6 -> 1) >> 16KB of super_page_size -> 512B (BDRV_SECTOR_SIZE) >> . EXT_CSD_HC_ERASE_GRP_SIZE (4 -> 1) >> . EXT_CSD_HC_WP_GRP_SIZE (4 -> 1) >> . EXT_CSD_S_C_VCC[Q] (8 -> 1) >> . EXT_CSD_S_A_TIMEOUT (17 -> 1) >> . EXT_CSD_CARD_TYPE (7 -> 3) >> Dual data rate -> High-Speed mode >> >> - Update: >> . EXT_CSD_CARD_TYPE (7 -> 3) >> High-Speed MultiMediaCard @ 26MHz & 52MHz >> . Performances (0xa -> 0x46) >> Class B at 3MB/s. -> Class J at 21MB/s >> . EXT_CSD_REV (5 -> 3) >> Rev 1.5 (spec v4.41) -> Rev 1.3 (spec v4.3) >> >> - Use load/store API to set EXT_CSD_SEC_CNT >> >> - Remove R/W keys, normally zeroed at reset >> . EXT_CSD_BOOT_INFO >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > > This should be merged in patch 10. OK.
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index df0e2345c0..2a687977d1 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -484,43 +484,29 @@ static void mmc_set_ext_csd(SDState *sd, uint64_t size) memset(sd->ext_csd, 0, sizeof(sd->ext_csd)); + /* Properties segment (RO) */ sd->ext_csd[EXT_CSD_S_CMD_SET] = 0b1; /* supported command sets */ - sd->ext_csd[EXT_CSD_HPI_FEATURES] = 0x3; /* HPI features */ - sd->ext_csd[EXT_CSD_BKOPS_SUPPORT] = 0x1; /* Background operations */ - sd->ext_csd[241] = 0xA; /* 1st initialization time after partitioning */ - sd->ext_csd[EXT_CSD_TRIM_MULT] = 0x1; /* Trim multiplier */ - sd->ext_csd[EXT_CSD_SEC_FEATURE_SUPPORT] = 0x15; /* Secure feature */ - sd->ext_csd[EXT_CSD_BOOT_INFO] = 0x7; /* Boot information */ + sd->ext_csd[EXT_CSD_BOOT_INFO] = 0x0; /* Boot information */ /* Boot partition size. 128KB unit */ sd->ext_csd[EXT_CSD_BOOT_MULT] = sd->boot_part_size / (128 * KiB); - sd->ext_csd[EXT_CSD_ACC_SIZE] = 0x6; /* Access size */ - sd->ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] = 0x4; /* HC Erase unit size */ + sd->ext_csd[EXT_CSD_ACC_SIZE] = 0x1; /* Access size */ + sd->ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE] = 0x01; /* HC Erase unit size */ sd->ext_csd[EXT_CSD_ERASE_TIMEOUT_MULT] = 0x01; /* HC erase timeout */ sd->ext_csd[EXT_CSD_REL_WR_SEC_C] = 0x1; /* Reliable write sector count */ - sd->ext_csd[EXT_CSD_HC_WP_GRP_SIZE] = 0x4; /* HC write protect group size */ - sd->ext_csd[EXT_CSD_S_C_VCC] = 0x8; /* Sleep current VCC */ - sd->ext_csd[EXT_CSD_S_C_VCCQ] = 0x7; /* Sleep current VCCQ */ - sd->ext_csd[EXT_CSD_S_A_TIMEOUT] = 0x11; /* Sleep/Awake timeout */ - sd->ext_csd[215] = (sectcount >> 24) & 0xff; /* Sector count */ - sd->ext_csd[214] = (sectcount >> 16) & 0xff; /* ... */ - sd->ext_csd[213] = (sectcount >> 8) & 0xff; /* ... */ - sd->ext_csd[EXT_CSD_SEC_CNT] = (sectcount & 0xff); /* ... */ - sd->ext_csd[210] = 0xa; /* Min write perf for 8bit@52Mhz */ - sd->ext_csd[209] = 0xa; /* Min read perf for 8bit@52Mhz */ - sd->ext_csd[208] = 0xa; /* Min write perf for 4bit@52Mhz */ - sd->ext_csd[207] = 0xa; /* Min read perf for 4bit@52Mhz */ - sd->ext_csd[206] = 0xa; /* Min write perf for 4bit@26Mhz */ - sd->ext_csd[205] = 0xa; /* Min read perf for 4bit@26Mhz */ - sd->ext_csd[EXT_CSD_PART_SWITCH_TIME] = 0x1; - sd->ext_csd[EXT_CSD_OUT_OF_INTERRUPT_TIME] = 0x1; - sd->ext_csd[EXT_CSD_CARD_TYPE] = 0x7; - sd->ext_csd[EXT_CSD_STRUCTURE] = 0x2; - sd->ext_csd[EXT_CSD_REV] = 0x5; - sd->ext_csd[EXT_CSD_RPMB_MULT] = 0x1; /* RPMB size */ - sd->ext_csd[EXT_CSD_PARTITION_SUPPORT] = 0x3; - sd->ext_csd[159] = 0x00; /* Max enhanced area size */ - sd->ext_csd[158] = 0x00; /* ... */ - sd->ext_csd[157] = 0xEC; /* ... */ + sd->ext_csd[EXT_CSD_HC_WP_GRP_SIZE] = 0x01; /* HC write protect group size */ + sd->ext_csd[EXT_CSD_S_C_VCC] = 0x01; /* Sleep current VCC */ + sd->ext_csd[EXT_CSD_S_C_VCCQ] = 0x01; /* Sleep current VCCQ */ + sd->ext_csd[EXT_CSD_S_A_TIMEOUT] = 0x01; /* Sleep/Awake timeout */ + stl_le_p(&sd->ext_csd[EXT_CSD_SEC_CNT], sectcount); /* Sector count */ + sd->ext_csd[210] = 0x46; /* Min write perf for 8bit@52Mhz */ + sd->ext_csd[209] = 0x46; /* Min read perf for 8bit@52Mhz */ + sd->ext_csd[208] = 0x46; /* Min write perf for 4bit@52Mhz */ + sd->ext_csd[207] = 0x46; /* Min read perf for 4bit@52Mhz */ + sd->ext_csd[206] = 0x46; /* Min write perf for 4bit@26Mhz */ + sd->ext_csd[205] = 0x46; /* Min read perf for 4bit@26Mhz */ + sd->ext_csd[EXT_CSD_CARD_TYPE] = 0b11; + sd->ext_csd[EXT_CSD_STRUCTURE] = 2; + sd->ext_csd[EXT_CSD_REV] = 3; } static void emmc_set_csd(SDState *sd, uint64_t size)
- Set some keys to not defined / implemented: . EXT_CSD_HPI_FEATURES . EXT_CSD_BKOPS_SUPPORT . EXT_CSD_SEC_FEATURE_SUPPORT . EXT_CSD_ERASE_TIMEOUT_MULT . EXT_CSD_PART_SWITCH_TIME . EXT_CSD_OUT_OF_INTERRUPT_TIME - Simplify: . EXT_CSD_ACC_SIZE (6 -> 1) 16KB of super_page_size -> 512B (BDRV_SECTOR_SIZE) . EXT_CSD_HC_ERASE_GRP_SIZE (4 -> 1) . EXT_CSD_HC_WP_GRP_SIZE (4 -> 1) . EXT_CSD_S_C_VCC[Q] (8 -> 1) . EXT_CSD_S_A_TIMEOUT (17 -> 1) . EXT_CSD_CARD_TYPE (7 -> 3) Dual data rate -> High-Speed mode - Update: . EXT_CSD_CARD_TYPE (7 -> 3) High-Speed MultiMediaCard @ 26MHz & 52MHz . Performances (0xa -> 0x46) Class B at 3MB/s. -> Class J at 21MB/s . EXT_CSD_REV (5 -> 3) Rev 1.5 (spec v4.41) -> Rev 1.3 (spec v4.3) - Use load/store API to set EXT_CSD_SEC_CNT - Remove R/W keys, normally zeroed at reset . EXT_CSD_BOOT_INFO Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/sd/sd.c | 50 ++++++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 32 deletions(-)