* [PATCH v3] hw/sd: sd: Actually perform the erase operation
@ 2021-02-20 8:58 Bin Meng
2021-03-10 7:16 ` Bin Meng
0 siblings, 1 reply; 3+ messages in thread
From: Bin Meng @ 2021-02-20 8:58 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-block, qemu-devel; +Cc: Bin Meng
From: Bin Meng <bin.meng@windriver.com>
At present the sd_erase() does not erase the requested range of card
data to 0xFFs. Let's make the erase operation actually happen.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
---
Changes in v3:
- fix the skip erase logic for SDSC cards
Changes in v2:
- honor the write protection bits for SDSC cards
hw/sd/sd.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 8b397ef..f52028c 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -762,10 +762,12 @@ static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
static void sd_erase(SDState *sd)
{
- int i;
uint64_t erase_start = sd->erase_start;
uint64_t erase_end = sd->erase_end;
bool sdsc = true;
+ uint64_t wpnum;
+ uint64_t erase_addr;
+ int erase_len = 1 << HWBLOCK_SHIFT;
trace_sdcard_erase(sd->erase_start, sd->erase_end);
if (sd->erase_start == INVALID_ADDRESS
@@ -794,17 +796,19 @@ static void sd_erase(SDState *sd)
sd->erase_end = INVALID_ADDRESS;
sd->csd[14] |= 0x40;
- /* Only SDSC cards support write protect groups */
- if (sdsc) {
- erase_start = sd_addr_to_wpnum(erase_start);
- erase_end = sd_addr_to_wpnum(erase_end);
-
- for (i = erase_start; i <= erase_end; i++) {
- assert(i < sd->wpgrps_size);
- if (test_bit(i, sd->wp_groups)) {
+ memset(sd->data, 0xff, erase_len);
+ for (erase_addr = erase_start; erase_addr <= erase_end;
+ erase_addr += erase_len) {
+ if (sdsc) {
+ /* Only SDSC cards support write protect groups */
+ wpnum = sd_addr_to_wpnum(erase_addr);
+ assert(wpnum < sd->wpgrps_size);
+ if (test_bit(wpnum, sd->wp_groups)) {
sd->card_status |= WP_ERASE_SKIP;
+ continue;
}
}
+ BLK_WRITE_BLOCK(erase_addr, erase_len);
}
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] hw/sd: sd: Actually perform the erase operation
2021-02-20 8:58 [PATCH v3] hw/sd: sd: Actually perform the erase operation Bin Meng
@ 2021-03-10 7:16 ` Bin Meng
2021-03-22 14:31 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 3+ messages in thread
From: Bin Meng @ 2021-03-10 7:16 UTC (permalink / raw)
To: Philippe Mathieu-Daudé,
Qemu-block, qemu-devel@nongnu.org Developers
Cc: Bin Meng
Hi Philippe,
On Sat, Feb 20, 2021 at 4:58 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> From: Bin Meng <bin.meng@windriver.com>
>
> At present the sd_erase() does not erase the requested range of card
> data to 0xFFs. Let's make the erase operation actually happen.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
>
> ---
>
> Changes in v3:
> - fix the skip erase logic for SDSC cards
>
Any comments for v3?
Regards,
Bin
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] hw/sd: sd: Actually perform the erase operation
2021-03-10 7:16 ` Bin Meng
@ 2021-03-22 14:31 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-03-22 14:31 UTC (permalink / raw)
To: Bin Meng, Qemu-block, qemu-devel@nongnu.org Developers; +Cc: Bin Meng
On 3/10/21 8:16 AM, Bin Meng wrote:
> Hi Philippe,
>
> On Sat, Feb 20, 2021 at 4:58 PM Bin Meng <bmeng.cn@gmail.com> wrote:
>>
>> From: Bin Meng <bin.meng@windriver.com>
>>
>> At present the sd_erase() does not erase the requested range of card
>> data to 0xFFs. Let's make the erase operation actually happen.
>>
>> Signed-off-by: Bin Meng <bin.meng@windriver.com>
>>
>> ---
>>
>> Changes in v3:
>> - fix the skip erase logic for SDSC cards
>>
>
> Any comments for v3?
None :)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Patch applied to sdmmc-fixes.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-22 15:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-20 8:58 [PATCH v3] hw/sd: sd: Actually perform the erase operation Bin Meng
2021-03-10 7:16 ` Bin Meng
2021-03-22 14:31 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).