SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/sd/sdcard: Generate random RCA value

Browse Source 
Rather than using the obscure 0x4567 magic value,
use a real random one.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Message-Id: <20240702140842.54242-5-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-17 17:57:54 +02:00
parent 3baae28150
commit 6d0dc86070
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/sd/sd.c
View File

@ -46,6 +46,7 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/guest-random.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "sdmmc-internal.h" #include "sdmmc-internal.h"
#include "trace.h" #include "trace.h"
@ -515,9 +516,10 @@ static void sd_set_csd(SDState *sd, uint64_t size)
/* Relative Card Address register */ /* Relative Card Address register */
static void sd_set_rca(SDState *sd) static void sd_set_rca(SDState *sd, uint16_t value)
{ {
sd->rca += 0x4567; trace_sdcard_set_rca(value);
sd->rca = value;
} }
static uint16_t sd_req_get_rca(SDState *s, SDRequest req) static uint16_t sd_req_get_rca(SDState *s, SDRequest req)
@ -1212,11 +1214,14 @@ static sd_rsp_type_t sd_cmd_ALL_SEND_CID(SDState *sd, SDRequest req)
/* CMD3 */ /* CMD3 */
static sd_rsp_type_t sd_cmd_SEND_RELATIVE_ADDR(SDState *sd, SDRequest req) static sd_rsp_type_t sd_cmd_SEND_RELATIVE_ADDR(SDState *sd, SDRequest req)
{ {
uint16_t random_rca;
switch (sd->state) { switch (sd->state) {
case sd_identification_state: case sd_identification_state:
case sd_standby_state: case sd_standby_state:
sd->state = sd_standby_state; sd->state = sd_standby_state;
sd_set_rca(sd); qemu_guest_getrandom_nofail(&random_rca, sizeof(random_rca));
sd_set_rca(sd, random_rca);
return sd_r6; return sd_r6;
default: default:

1
hw/sd/trace-events
View File

@ -43,6 +43,7 @@ sdcard_response(const char *rspdesc, int rsplen) "%s (sz:%d)"
sdcard_powerup(void) "" sdcard_powerup(void) ""
sdcard_inquiry_cmd41(void) "" sdcard_inquiry_cmd41(void) ""
sdcard_reset(void) "" sdcard_reset(void) ""
sdcard_set_rca(uint16_t value) "new RCA: 0x%04x"
sdcard_set_blocklen(uint16_t length) "block len 0x%03x" sdcard_set_blocklen(uint16_t length) "block len 0x%03x"
sdcard_set_block_count(uint32_t cnt) "block cnt 0x%"PRIx32 sdcard_set_block_count(uint32_t cnt) "block cnt 0x%"PRIx32
sdcard_inserted(bool readonly) "read_only: %u" sdcard_inserted(bool readonly) "read_only: %u"