[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/23] hw/sd/sdcard: Generate random RCA value
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 09/23] hw/sd/sdcard: Generate random RCA value |
Date: |
Fri, 21 Jun 2024 10:05:40 +0200 |
Rather than using the obscure 0x4567 magic value,
use a real random one.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sd/sd.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 30239b28bc..e1f13e316a 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -46,6 +46,7 @@
#include "qemu/error-report.h"
#include "qemu/timer.h"
#include "qemu/log.h"
+#include "qemu/guest-random.h"
#include "qemu/module.h"
#include "sdmmc-internal.h"
#include "trace.h"
@@ -469,11 +470,6 @@ static void sd_set_csd(SDState *sd, uint64_t size)
sd->csd[15] = (sd_crc7(sd->csd, 15) << 1) | 1;
}
-static void sd_set_rca(SDState *sd)
-{
- sd->rca += 0x4567;
-}
-
FIELD(CSR, AKE_SEQ_ERROR, 3, 1)
FIELD(CSR, APP_CMD, 5, 1)
FIELD(CSR, FX_EVENT, 6, 1)
@@ -1055,7 +1051,7 @@ static sd_rsp_type_t sd_cmd_SEND_RELATIVE_ADDR(SDState
*sd, SDRequest req)
case sd_identification_state:
case sd_standby_state:
sd->state = sd_standby_state;
- sd_set_rca(sd);
+ qemu_guest_getrandom_nofail(&sd->rca, sizeof(sd->rca));
return sd_r6;
default:
--
2.41.0
- [PATCH 04/23] hw/sd/sdcard: Use HWBLOCK_SHIFT definition instead of magic values, (continued)
- [PATCH 04/23] hw/sd/sdcard: Use HWBLOCK_SHIFT definition instead of magic values, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 05/23] hw/sd/sdcard: Use registerfield CSR::CURRENT_STATE definition, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 06/23] hw/sd/sdcard: Use Load/Store API to fill some CID/CSD registers, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 07/23] hw/sd/sdcard: Remove ACMD6 handler for SPI mode, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 08/23] hw/sd/sdcard: Remove explicit entries for illegal commands, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 09/23] hw/sd/sdcard: Generate random RCA value,
Philippe Mathieu-Daudé <=
- [PATCH 10/23] hw/sd/sdcard: Track last command used to help logging, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 11/23] hw/sd/sdcard: Trace update of block count (CMD23), Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 12/23] hw/sd/sdcard: Trace block offset in READ/WRITE data accesses, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 13/23] hw/sd/sdcard: Have cmd_valid_while_locked() return a boolean value, Philippe Mathieu-Daudé, 2024/06/21
- [PATCH 14/23] hw/sd/sdcard: Factor sd_req_get_rca() method out, Philippe Mathieu-Daudé, 2024/06/21