ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/sd/sdcard: Only call sd_req_get_address() where address is used 

It will be useful later to assert only ADTC commands
(Addressed point-to-point Data Transfer Commands, defined
as the 'sd_adtc' enum) extract the address value from the
command argument.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240621080554.18986-18-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-20 14:29:46 +02:00
parent 8b91a5613c
commit 6a226b2cab
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/sd/sd.c
View File

@ -1114,7 +1114,7 @@ static sd_rsp_type_t sd_cmd_SET_BLOCK_COUNT(SDState *sd, SDRequest req)
static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
{ {
uint16_t rca; uint16_t rca;
uint64_t addr = sd_req_get_address(sd, req); uint64_t addr;
/* CMD55 precedes an ACMD, so we are not interested in tracing it. /* CMD55 precedes an ACMD, so we are not interested in tracing it.
* However there is no ACMD55, so we want to trace this particular case. * However there is no ACMD55, so we want to trace this particular case.
@ -1239,7 +1239,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
} }
sd->state = sd_sendingdata_state; sd->state = sd_sendingdata_state;
memcpy(sd->data, sd->csd, 16); memcpy(sd->data, sd->csd, 16);
sd->data_start = addr; sd->data_start = sd_req_get_address(sd, req);
sd->data_offset = 0; sd->data_offset = 0;
return sd_r1; return sd_r1;
@ -1263,7 +1263,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
} }
sd->state = sd_sendingdata_state; sd->state = sd_sendingdata_state;
memcpy(sd->data, sd->cid, 16); memcpy(sd->data, sd->cid, 16);
sd->data_start = addr; sd->data_start = sd_req_get_address(sd, req);
sd->data_offset = 0; sd->data_offset = 0;
return sd_r1; return sd_r1;
@ -1339,6 +1339,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
case 17: /* CMD17: READ_SINGLE_BLOCK */ case 17: /* CMD17: READ_SINGLE_BLOCK */
case 18: /* CMD18: READ_MULTIPLE_BLOCK */ case 18: /* CMD18: READ_MULTIPLE_BLOCK */
addr = sd_req_get_address(sd, req);
switch (sd->state) { switch (sd->state) {
case sd_transfer_state: case sd_transfer_state:
@ -1359,6 +1360,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
/* Block write commands (Class 4) */ /* Block write commands (Class 4) */
case 24: /* CMD24: WRITE_SINGLE_BLOCK */ case 24: /* CMD24: WRITE_SINGLE_BLOCK */
case 25: /* CMD25: WRITE_MULTIPLE_BLOCK */ case 25: /* CMD25: WRITE_MULTIPLE_BLOCK */
addr = sd_req_get_address(sd, req);
switch (sd->state) { switch (sd->state) {
case sd_transfer_state: case sd_transfer_state:
@ -1417,7 +1419,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
if (sd->size > SDSC_MAX_CAPACITY) { if (sd->size > SDSC_MAX_CAPACITY) {
return sd_illegal; return sd_illegal;
} }
addr = sd_req_get_address(sd, req);
switch (sd->state) { switch (sd->state) {
case sd_transfer_state: case sd_transfer_state:
if (!address_in_range(sd, "SET_WRITE_PROT", addr, 1)) { if (!address_in_range(sd, "SET_WRITE_PROT", addr, 1)) {
@ -1439,7 +1441,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
if (sd->size > SDSC_MAX_CAPACITY) { if (sd->size > SDSC_MAX_CAPACITY) {
return sd_illegal; return sd_illegal;
} }
addr = sd_req_get_address(sd, req);
switch (sd->state) { switch (sd->state) {
case sd_transfer_state: case sd_transfer_state:
if (!address_in_range(sd, "CLR_WRITE_PROT", addr, 1)) { if (!address_in_range(sd, "CLR_WRITE_PROT", addr, 1)) {
@ -1461,7 +1463,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
if (sd->size > SDSC_MAX_CAPACITY) { if (sd->size > SDSC_MAX_CAPACITY) {
return sd_illegal; return sd_illegal;
} }
addr = sd_req_get_address(sd, req);
switch (sd->state) { switch (sd->state) {
case sd_transfer_state: case sd_transfer_state:
if (!address_in_range(sd, "SEND_WRITE_PROT", if (!address_in_range(sd, "SEND_WRITE_PROT",