From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, "Simon Wörner" <contact@simon-woerner.de>,
"Bin Meng" <bin.meng@windriver.com>,
"Muhammad Alifa Ramdhan" <info@starlabs.sg>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Cornelius Aschermann" <cornelius.aschermann@rub.de>,
"Sergej Schumilo" <sergej@schumilo.de>
Subject: [PULL 2/7] hw/sd: sd: Actually perform the erase operation
Date: Mon, 22 Mar 2021 18:16:05 +0100 [thread overview]
Message-ID: <20210322171610.4183696-3-f4bug@amsat.org> (raw)
In-Reply-To: <20210322171610.4183696-1-f4bug@amsat.org>
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>
Message-Id: <1613811493-58815-1-git-send-email-bmeng.cn@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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 7b09ce9c2ef..282d39a7042 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -763,10 +763,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
@@ -795,17 +797,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.26.2
next prev parent reply other threads:[~2021-03-22 17:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 17:16 [PULL 0/7] SD/MMC patches for 2021-03-21 Philippe Mathieu-Daudé
2021-03-22 17:16 ` [PULL 1/7] hw/sd: sd: Fix build error when DEBUG_SD is on Philippe Mathieu-Daudé
2021-03-22 17:16 ` Philippe Mathieu-Daudé [this message]
2021-03-22 17:16 ` [PULL 3/7] hw/sd: sdhci: Don't transfer any data when command time out Philippe Mathieu-Daudé
2021-03-22 17:16 ` [PULL 4/7] hw/sd: sdhci: Don't write to SDHC_SYSAD register when transfer is in progress Philippe Mathieu-Daudé
2021-03-22 17:16 ` [PULL 5/7] hw/sd: sdhci: Correctly set the controller status for ADMA Philippe Mathieu-Daudé
2021-03-22 17:16 ` [PULL 6/7] hw/sd: sdhci: Limit block size only when SDHC_BLKSIZE register is writable Philippe Mathieu-Daudé
2021-03-22 17:16 ` [PULL 7/7] hw/sd: sdhci: Reset the data pointer of s->fifo_buffer[] when a different block size is programmed Philippe Mathieu-Daudé
2021-03-23 10:48 ` [PULL 0/7] SD/MMC patches for 2021-03-21 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210322171610.4183696-3-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=bin.meng@windriver.com \
--cc=contact@simon-woerner.de \
--cc=cornelius.aschermann@rub.de \
--cc=info@starlabs.sg \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sergej@schumilo.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).