hw/sd/sd: Introduce sd_cmd_to_receivingdata() / sd_generic_write_byte()
v2 cover hw/sd/sd: Introduce sd_cmd_to_receivingdata() / sd_generic_write_byte()
Consolitate writing bytes on the DAT lines by introducing a pair of helpers to reuse in all commands receiving data.
I'm considering adding some 'process_completed_block' callbacks to handle the different cases in sd_write_byte(), so this function would become:
if (sd_generic_write_byte(sd, value)) {
sd->proto->process_completed_block[sd->current_cmd](sd);
}But I ran out of time...
Full series for testing:
https://gitlab.com/philmd/qemu/-/tags/emmc-v4
Based-on: <[email protected]>
Philippe Mathieu-Daudé (7):
hw/sd/sdcard: Introduce sd_cmd_to_receivingdata /
sd_generic_write_byte
hw/sd/sdcard: Duplicate WRITE_SINGLE_BLOCK / WRITE_MULTIPLE_BLOCK
cases
hw/sd/sdcard: Convert WRITE_SINGLE_BLOCK to generic_write_byte (CMD24) hw/sd/sdcard: Convert PROGRAM_CID to generic_write_byte (CMD26) hw/sd/sdcard: Convert PROGRAM_CSD to generic_write_byte (CMD27) hw/sd/sdcard: Convert LOCK_UNLOCK to generic_write_byte (CMD42) hw/sd/sdcard: Convert GEN_CMD to generic_write_byte (CMD56)
hw/sd/sd.c | 109 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 47 deletions(-)
Signature · 1 line
2.41.0
PATCH v2 1/7 hw/sd/sdcard: Introduce sd_cmd_to_receivingdata / sd_generic_write_byte
All commands switching from TRANSFER state to (receiving)DATA do the same: receive stream of data from the DAT lines. Instead of duplicating the same code many times, introduce 2 helpers:
- sd_cmd_to_receivingdata() on the I/O line setup the data to be received on the data[] buffer,
- sd_generic_write_byte() on the DAT lines to push the data.
--- hw/sd/sd.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
hw/sd/sd.c +29 -0
@@ -1100,6 +1100,22 @@ static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd, SDRequest req)return sd_illegal; } +/* Configure fields for following sd_generic_write_byte() calls */ +__attribute__((unused)) +static sd_rsp_type_t sd_cmd_to_receivingdata (SDState *sd,SDRequest req, +uint64_t start,size_t size) +{ +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } + sd->state = sd_receivingdata_state; + sd->data_start = start; + sd->data_offset =0 ; +/* sd->data[] used as receive buffer */ + sd->data_size = size ?:sizeof (sd->data); +return sd_r1; +} +/* Configure fields for following sd_generic_read_byte() calls */ static sd_rsp_type_t sd_cmd_to_sendingdata(SDState *sd, SDRequest req, uint64_t start,
@@ -1953,6 +1969,19 @@ send_response:return rsplen; } +/* Return true if buffer is consumed. Configured by sd_cmd_to_receivingdata() */ +__attribute__((unused)) +static bool sd_generic_write_byte (SDState *sd,uint8_t value) +{ + sd->data[sd->data_offset] = value; + +if (++sd->data_offset >= sd->data_size) { + sd->state = sd_transfer_state; +return true; + } +return false; +} +/* Return true when buffer is consumed. Configured by sd_cmd_to_sendingdata() */ static bool sd_generic_read_byte (SDState *sd,uint8_t *value) {
Signature · 1 line
2.41.0
PATCH v2 2/7 hw/sd/sdcard: Duplicate WRITE_SINGLE_BLOCK / WRITE_MULTIPLE_BLOCK cases
In reply to Philippe Mathieu-DaudéIn order to modify the WRITE_SINGLE_BLOCK case in the next commit, duplicate it first.
--- hw/sd/sd.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
hw/sd/sd.c +29 -0
@@ -1461,6 +1461,35 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)/* Block write commands (Class 4) */ case 24 :/* CMD24: WRITE_SINGLE_BLOCK */ + addr =sd_req_get_address (sd, req); +switch (sd->state) { +case sd_transfer_state: + +if (!address_in_range (sd,"WRITE_SINGLE_BLOCK" , addr, + sd->blk_len)) { +return sd_r1; + } + + sd->state = sd_receivingdata_state; + sd->data_start = addr; + sd->data_offset =0 ; + +if (sd->size <=SDSC_MAX_CAPACITY ) { +if (sd_wp_addr (sd, sd->data_start)) { + sd->card_status |=WP_VIOLATION ; + } + } +if (sd->csd[14 ] &0x30 ) { + sd->card_status |=WP_VIOLATION ; + } + sd->blk_written =0 ; +return sd_r1; + +default : +break ; + } +break ; +case 25 :/* CMD25: WRITE_MULTIPLE_BLOCK */ addr =sd_req_get_address (sd, req);switch (sd->state) {
Signature · 1 line
2.41.0
PATCH v2 3/7 hw/sd/sdcard: Convert WRITE_SINGLE_BLOCK to generic_write_byte (CMD24)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
hw/sd/sd.c +2 -9
@@ -1101,7 +1101,6 @@ static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd, SDRequest req) }/* Configure fields for following sd_generic_write_byte() calls */ -__attribute__((unused))static sd_rsp_type_t sd_cmd_to_receivingdata (SDState *sd,SDRequest req,uint64_t start,size_t size) {
@@ -1470,10 +1469,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)return sd_r1; } - sd->state = sd_receivingdata_state; - sd->data_start = addr; - sd->data_offset =0 ; -if (sd->size <=SDSC_MAX_CAPACITY ) {if (sd_wp_addr (sd, sd->data_start)) { sd->card_status |=WP_VIOLATION ;
@@ -1483,7 +1478,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) sd->card_status |=WP_VIOLATION ; } sd->blk_written =0 ; -return sd_r1; +return sd_cmd_to_receivingdata (sd, req, addr, sd->blk_len);default :break ;
@@ -1999,7 +1994,6 @@ send_response: }/* Return true if buffer is consumed. Configured by sd_cmd_to_receivingdata() */ -__attribute__((unused))static bool sd_generic_write_byte (SDState *sd,uint8_t value) { sd->data[sd->data_offset] = value;
@@ -2045,8 +2039,7 @@ void sd_write_byte(SDState *sd, uint8_t value) sd->current_cmd, sd->data_offset, value);switch (sd->current_cmd) {case 24 :/* CMD24: WRITE_SINGLE_BLOCK */ - sd->data[sd->data_offset ++] = value; -if (sd->data_offset >= sd->blk_len) { +if (sd_generic_write_byte (sd, value)) {/* TODO: Check CRC before committing */ sd->state = sd_programming_state;sd_blk_write (sd, sd->data_start, sd->data_offset);
Signature · 1 line
2.41.0
PATCH v2 4/7 hw/sd/sdcard: Convert PROGRAM_CID to generic_write_byte (CMD26)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
hw/sd/sd.c +2 -13
@@ -1515,17 +1515,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)break ;case 26 :/* CMD26: PROGRAM_CID */ -switch (sd->state) { -case sd_transfer_state: - sd->state = sd_receivingdata_state; - sd->data_start =0 ; - sd->data_offset =0 ; -return sd_r1; - -default : -break ; - } -break ; +return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid));case 27 :/* CMD27: PROGRAM_CSD */ switch (sd->state) {
@@ -2088,8 +2078,7 @@ void sd_write_byte(SDState *sd, uint8_t value)break ;case 26 :/* CMD26: PROGRAM_CID */ - sd->data[sd->data_offset ++] = value; -if (sd->data_offset >=sizeof (sd->cid)) { +if (sd_generic_write_byte (sd, value)) {/* TODO: Check CRC before committing */ sd->state = sd_programming_state;for (i =0 ; i <sizeof (sd->cid); i ++)
Signature · 1 line
2.41.0
PATCH v2 5/7 hw/sd/sdcard: Convert PROGRAM_CSD to generic_write_byte (CMD27)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
hw/sd/sd.c +2 -13
@@ -1518,17 +1518,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid));case 27 :/* CMD27: PROGRAM_CSD */ -switch (sd->state) { -case sd_transfer_state: - sd->state = sd_receivingdata_state; - sd->data_start =0 ; - sd->data_offset =0 ; -return sd_r1; - -default : -break ; - } -break ; +return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->csd));/* Write protection (Class 6) */ case 28 :/* CMD28: SET_WRITE_PROT */
@@ -2096,8 +2086,7 @@ void sd_write_byte(SDState *sd, uint8_t value)break ;case 27 :/* CMD27: PROGRAM_CSD */ - sd->data[sd->data_offset ++] = value; -if (sd->data_offset >=sizeof (sd->csd)) { +if (sd_generic_write_byte (sd, value)) {/* TODO: Check CRC before committing */ sd->state = sd_programming_state;for (i =0 ; i <sizeof (sd->csd); i ++)
Signature · 1 line
2.41.0
PATCH v2 6/7 hw/sd/sdcard: Convert LOCK_UNLOCK to generic_write_byte (CMD42)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
hw/sd/sd.c +2 -13
@@ -1628,17 +1628,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)/* Lock card commands (Class 7) */ case 42 :/* CMD42: LOCK_UNLOCK */ -switch (sd->state) { -case sd_transfer_state: - sd->state = sd_receivingdata_state; - sd->data_start =0 ; - sd->data_offset =0 ; -return sd_r1; - -default : -break ; - } -break ; +return sd_cmd_to_receivingdata (sd, req,0 ,0 );/* Application specific commands (Class 8) */ case 55 :/* CMD55: APP_CMD */
@@ -2109,8 +2099,7 @@ void sd_write_byte(SDState *sd, uint8_t value)break ;case 42 :/* CMD42: LOCK_UNLOCK */ - sd->data[sd->data_offset ++] = value; -if (sd->data_offset >= sd->blk_len) { +if (sd_generic_write_byte (sd, value)) {/* TODO: Check CRC before committing */ sd->state = sd_programming_state;sd_lock_command (sd);
Signature · 1 line
2.41.0
PATCH v2 7/7 hw/sd/sdcard: Convert GEN_CMD to generic_write_byte (CMD56)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
hw/sd/sd.c +3 -6
@@ -1657,14 +1657,12 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)case 56 :/* CMD56: GEN_CMD */ switch (sd->state) {case sd_transfer_state: - sd->data_offset =0 ;if (req.arg &1 ) {return sd_cmd_to_sendingdata (sd, req,0 , sd->vendor_data,sizeof (sd->vendor_data)); } - sd->state = sd_receivingdata_state; -return sd_r1; +return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->vendor_data));default :break ;
@@ -2109,9 +2107,8 @@ void sd_write_byte(SDState *sd, uint8_t value)break ;case 56 :/* CMD56: GEN_CMD */ - sd->vendor_data[sd->data_offset ++] = value; -if (sd->data_offset >=sizeof (sd->vendor_data)) { - sd->state = sd_transfer_state; +if (sd_generic_write_byte (sd, value)) { +memcpy (sd->vendor_data, sd->data,sizeof (sd->vendor_data)); }break ;
Signature · 1 line
2.41.0