diff options
| author | Bin Meng <bin.meng@windriver.com> | 2021-02-16 23:02:24 +0800 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-02-20 00:17:09 +0100 |
| commit | 19fa6c9e9bc2061be39b0337a9eee859563e272a (patch) | |
| tree | 5235e7ec6f1245f3291525d2058cefd5bc801d43 /hw/sd | |
| parent | 2473dc4022458dcc05ec367ce97edbef29d7e50c (diff) | |
| download | qemu-19fa6c9e9bc2061be39b0337a9eee859563e272a.zip | |
hw/sd: sd: Skip write protect groups check in CMD24/25 for high capacity cards
High capacity cards don't support write protection hence we should
not perform the write protect groups check in CMD24/25 for them.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210216150225.27996-8-bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw/sd')
| -rw-r--r-- | hw/sd/sd.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 883c04de02..3a515a5365 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1268,8 +1268,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; @@ -1821,9 +1823,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; |