Re: [PATCH v42 31/98] hw/sd/sdcard: Convert WRITE_SINGLE_BLOCK to generic_write_byte (CMD24)

[Cédric Le Goater]

On 6/28/24 9:01 AM, Philippe Mathieu-Daudé wrote:

From: Philippe Mathieu-Daudé <f4...@amsat.org>

Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>

Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

---
  hw/sd/sd.c | 11 ++---------
  1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 5dbfc8000b..4a03f41086 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -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);