[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/6] hw/sd/sdcard: Do not use legal address '0' for INVALID_AD
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 3/6] hw/sd/sdcard: Do not use legal address '0' for INVALID_ADDRESS |
Date: |
Thu, 15 Oct 2020 08:38:21 +0200 |
As it is legal to WRITE/ERASE the address/block 0,
change the value of this definition to an illegal
address: UINT32_MAX.
Unfortunately this break the migration stream, so
bump the VMState version number. This affects some
ARM boards and the SDHCI_PCI device (which is only
used for testing).
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: Kevin O'Connor <kevin@koconnor.net>
---
hw/sd/sd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 30ae435d669..4c05152f189 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -53,7 +53,7 @@
#define SDSC_MAX_CAPACITY (2 * GiB)
-#define INVALID_ADDRESS 0
+#define INVALID_ADDRESS UINT32_MAX
typedef enum {
sd_r0 = 0, /* no response */
@@ -666,8 +666,8 @@ static int sd_vmstate_pre_load(void *opaque)
static const VMStateDescription sd_vmstate = {
.name = "sd-card",
- .version_id = 1,
- .minimum_version_id = 1,
+ .version_id = 2,
+ .minimum_version_id = 2,
.pre_load = sd_vmstate_pre_load,
.fields = (VMStateField[]) {
VMSTATE_UINT32(mode, SDState),
--
2.26.2
- [PATCH v2 0/6] hw/sd/sdcard: Do not attempt to erase out of range addresses, Philippe Mathieu-Daudé, 2020/10/15
- [PATCH v2 1/6] hw/sd/sdcard: Add trace event for ERASE command (CMD38), Philippe Mathieu-Daudé, 2020/10/15
- [PATCH v2 2/6] hw/sd/sdcard: Introduce the INVALID_ADDRESS definition, Philippe Mathieu-Daudé, 2020/10/15
- [PATCH v2 3/6] hw/sd/sdcard: Do not use legal address '0' for INVALID_ADDRESS,
Philippe Mathieu-Daudé <=
- [PATCH v2 4/6] hw/sd/sdcard: Reset both start/end addresses on error, Philippe Mathieu-Daudé, 2020/10/15
- [PATCH v2 5/6] hw/sd/sdcard: Do not attempt to erase out of range addresses, Philippe Mathieu-Daudé, 2020/10/15
- [PATCH v2 6/6] hw/sd/sdcard: Assert if accessing an illegal group, Philippe Mathieu-Daudé, 2020/10/15
- Re: [PATCH v2 0/6] hw/sd/sdcard: Do not attempt to erase out of range addresses, Alexander Bulekov, 2020/10/17