[v42] hw/sd/sdcard: Add eMMC support

[PATCH v42 30/98] hw/sd/sdcard: Duplicate WRITE_SINGLE_BLOCK / WRITE_MULTIPLE_BLOCK cases

Posted by Philippe Mathieu-Daudé 6 months ago

In order to modify the WRITE_SINGLE_BLOCK case in the
next commit, duplicate it first.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/sd/sd.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 690a3f275e..5dbfc8000b 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -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) {
-- 
2.41.0

Re: [PATCH v42 30/98] hw/sd/sdcard: Duplicate WRITE_SINGLE_BLOCK / WRITE_MULTIPLE_BLOCK cases

Posted by Cédric Le Goater 6 months ago

On 6/28/24 9:01 AM, Philippe Mathieu-Daudé wrote:
> In order to modify the WRITE_SINGLE_BLOCK case in the
> next commit, duplicate it first.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


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

Thanks,

C.


> ---
>   hw/sd/sd.c | 29 +++++++++++++++++++++++++++++
>   1 file changed, 29 insertions(+)
> 
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 690a3f275e..5dbfc8000b 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -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) {