diff mbox series

[v42,19/98] hw/sd/sdcard: Convert SWITCH_FUNCTION to generic_read_byte (CMD6)

Message ID 20240628070216.92609-20-philmd@linaro.org
State Superseded
Headers show
Series hw/sd/sdcard: Add eMMC support | expand

Commit Message

Philippe Mathieu-Daudé June 28, 2024, 7 a.m. UTC 
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/sd/sd.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

Comments

Cédric Le Goater June 28, 2024, 7:45 a.m. UTC | #1 
On 6/28/24 9:00 AM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


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

Thanks,

C.


> ---
>   hw/sd/sd.c | 12 ++----------
>   1 file changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 1a8d06804d..f7735c39a8 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -1086,7 +1086,6 @@ static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd, SDRequest req)
>   }
>   
>   /* Configure fields for following sd_generic_read_byte() calls */
> -__attribute__((unused))
>   static sd_rsp_type_t sd_cmd_to_sendingdata(SDState *sd, SDRequest req,
>                                              uint64_t start,
>                                              const void *data, size_t size)
> @@ -1243,10 +1242,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
>           }
>   
>           sd_function_switch(sd, req.arg);
> -        sd->state = sd_sendingdata_state;
> -        sd->data_start = 0;
> -        sd->data_offset = 0;
> -        return sd_r1;
> +        return sd_cmd_to_sendingdata(sd, req, 0, NULL, 64);
>   
>       case 7:  /* CMD7:   SELECT/DESELECT_CARD */
>           rca = sd_req_get_rca(sd, req);
> @@ -1946,7 +1942,6 @@ send_response:
>   }
>   
>   /* Return true when buffer is consumed. Configured by sd_cmd_to_sendingdata() */
> -__attribute__((unused))
>   static bool sd_generic_read_byte(SDState *sd, uint8_t *value)
>   {
>       *value = sd->data[sd->data_offset];
> @@ -2135,10 +2130,7 @@ uint8_t sd_read_byte(SDState *sd)
>                              sd->current_cmd, sd->data_offset, io_len);
>       switch (sd->current_cmd) {
>       case 6:  /* CMD6:   SWITCH_FUNCTION */
> -        ret = sd->data[sd->data_offset ++];
> -
> -        if (sd->data_offset >= 64)
> -            sd->state = sd_transfer_state;
> +        sd_generic_read_byte(sd, &ret);
>           break;
>   
>       case 9:  /* CMD9:   SEND_CSD */
Cédric Le Goater June 28, 2024, 7:45 a.m. UTC | #2 
On 6/28/24 9:00 AM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>


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

Thanks,

C.


> ---
>   hw/sd/sd.c | 12 ++----------
>   1 file changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 1a8d06804d..f7735c39a8 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -1086,7 +1086,6 @@ static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd, SDRequest req)
>   }
>   
>   /* Configure fields for following sd_generic_read_byte() calls */
> -__attribute__((unused))
>   static sd_rsp_type_t sd_cmd_to_sendingdata(SDState *sd, SDRequest req,
>                                              uint64_t start,
>                                              const void *data, size_t size)
> @@ -1243,10 +1242,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
>           }
>   
>           sd_function_switch(sd, req.arg);
> -        sd->state = sd_sendingdata_state;
> -        sd->data_start = 0;
> -        sd->data_offset = 0;
> -        return sd_r1;
> +        return sd_cmd_to_sendingdata(sd, req, 0, NULL, 64);
>   
>       case 7:  /* CMD7:   SELECT/DESELECT_CARD */
>           rca = sd_req_get_rca(sd, req);
> @@ -1946,7 +1942,6 @@ send_response:
>   }
>   
>   /* Return true when buffer is consumed. Configured by sd_cmd_to_sendingdata() */
> -__attribute__((unused))
>   static bool sd_generic_read_byte(SDState *sd, uint8_t *value)
>   {
>       *value = sd->data[sd->data_offset];
> @@ -2135,10 +2130,7 @@ uint8_t sd_read_byte(SDState *sd)
>                              sd->current_cmd, sd->data_offset, io_len);
>       switch (sd->current_cmd) {
>       case 6:  /* CMD6:   SWITCH_FUNCTION */
> -        ret = sd->data[sd->data_offset ++];
> -
> -        if (sd->data_offset >= 64)
> -            sd->state = sd_transfer_state;
> +        sd_generic_read_byte(sd, &ret);
>           break;
>   
>       case 9:  /* CMD9:   SEND_CSD */
diff mbox series

Patch

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 1a8d06804d..f7735c39a8 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1086,7 +1086,6 @@  static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd, SDRequest req)
 }
 
 /* Configure fields for following sd_generic_read_byte() calls */
-__attribute__((unused))
 static sd_rsp_type_t sd_cmd_to_sendingdata(SDState *sd, SDRequest req,
                                            uint64_t start,
                                            const void *data, size_t size)
@@ -1243,10 +1242,7 @@  static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
         }
 
         sd_function_switch(sd, req.arg);
-        sd->state = sd_sendingdata_state;
-        sd->data_start = 0;
-        sd->data_offset = 0;
-        return sd_r1;
+        return sd_cmd_to_sendingdata(sd, req, 0, NULL, 64);
 
     case 7:  /* CMD7:   SELECT/DESELECT_CARD */
         rca = sd_req_get_rca(sd, req);
@@ -1946,7 +1942,6 @@  send_response:
 }
 
 /* Return true when buffer is consumed. Configured by sd_cmd_to_sendingdata() */
-__attribute__((unused))
 static bool sd_generic_read_byte(SDState *sd, uint8_t *value)
 {
     *value = sd->data[sd->data_offset];
@@ -2135,10 +2130,7 @@  uint8_t sd_read_byte(SDState *sd)
                            sd->current_cmd, sd->data_offset, io_len);
     switch (sd->current_cmd) {
     case 6:  /* CMD6:   SWITCH_FUNCTION */
-        ret = sd->data[sd->data_offset ++];
-
-        if (sd->data_offset >= 64)
-            sd->state = sd_transfer_state;
+        sd_generic_read_byte(sd, &ret);
         break;
 
     case 9:  /* CMD9:   SEND_CSD */