Message ID | 20210216150225.27996-8-bmeng.cn@gmail.com |
---|---|
State | New |
Headers | show |
Series | hw/sd: sd: Erase operation and other fixes | expand |
On 2/16/21 4:02 PM, Bin Meng wrote: > From: Bin Meng <bin.meng@windriver.com> > > High capacity cards don't support write protection hence we should > not preform the write protect groups check in CMD24/25 for them. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > > --- > > Changes in v2: > - new patch: sd: Skip write protect groups check in CMD24/25 for high capacity cards > > hw/sd/sd.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index b386f16fcb..75dc57bf0e 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1274,8 +1274,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) sd->data_offset = 0; sd->blk_written = 0; - if (sd_wp_addr(sd, sd->data_start)) { - sd->card_status |= WP_VIOLATION; + if (sd->size <= SDSC_MAX_CAPACITY) { + if (sd_wp_addr(sd, sd->data_start)) { + sd->card_status |= WP_VIOLATION; + } } if (sd->csd[14] & 0x30) { sd->card_status |= WP_VIOLATION; @@ -1827,9 +1829,11 @@ void sd_write_byte(SDState *sd, uint8_t value) sd->card_status |= ADDRESS_ERROR; break; } - if (sd_wp_addr(sd, sd->data_start)) { - sd->card_status |= WP_VIOLATION; - break; + if (sd->size <= SDSC_MAX_CAPACITY) { + if (sd_wp_addr(sd, sd->data_start)) { + sd->card_status |= WP_VIOLATION; + break; + } } } sd->data[sd->data_offset++] = value;