Patchwork hw/sd.c: Add missing state change for SD_STATUS, SEND_NUM_WR_BLOCKS

login
register
mail settings
Submitter Peter Maydell
Date Feb. 18, 2011, 1:39 p.m.
Message ID <1298036340-11363-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/83594/
State New
Headers show

Comments

Peter Maydell - Feb. 18, 2011, 1:39 p.m.
The SD_STATUS and SEND_NUM_WR_BLOCKS commands are supposed to cause
the card to send data back to the host. However sd.c was missing the
state change to sd_sendingdata_state for these commands, with the effect
that the Linux driver would either hang indefinitely waiting for
nonexistent data (pl181) or read zeroes and provoke a qemu warning
message (omap).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/sd.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Aurelien Jarno - Feb. 24, 2011, 8:03 a.m.
On Fri, Feb 18, 2011 at 01:39:00PM +0000, Peter Maydell wrote:
> The SD_STATUS and SEND_NUM_WR_BLOCKS commands are supposed to cause
> the card to send data back to the host. However sd.c was missing the
> state change to sd_sendingdata_state for these commands, with the effect
> that the Linux driver would either hang indefinitely waiting for
> nonexistent data (pl181) or read zeroes and provoke a qemu warning
> message (omap).
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/sd.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)

Thanks, applied.

> diff --git a/hw/sd.c b/hw/sd.c
> index 789ca84..5e29752 100644
> --- a/hw/sd.c
> +++ b/hw/sd.c
> @@ -1168,6 +1168,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
>      case 13:	/* ACMD13: SD_STATUS */
>          switch (sd->state) {
>          case sd_transfer_state:
> +            sd->state = sd_sendingdata_state;
>              sd->data_start = 0;
>              sd->data_offset = 0;
>              return sd_r1;
> @@ -1182,6 +1183,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
>          case sd_transfer_state:
>              *(uint32_t *) sd->data = sd->blk_written;
>  
> +            sd->state = sd_sendingdata_state;
>              sd->data_start = 0;
>              sd->data_offset = 0;
>              return sd_r1;
> -- 
> 1.7.1
> 
> 
>

Patch

diff --git a/hw/sd.c b/hw/sd.c
index 789ca84..5e29752 100644
--- a/hw/sd.c
+++ b/hw/sd.c
@@ -1168,6 +1168,7 @@  static sd_rsp_type_t sd_app_command(SDState *sd,
     case 13:	/* ACMD13: SD_STATUS */
         switch (sd->state) {
         case sd_transfer_state:
+            sd->state = sd_sendingdata_state;
             sd->data_start = 0;
             sd->data_offset = 0;
             return sd_r1;
@@ -1182,6 +1183,7 @@  static sd_rsp_type_t sd_app_command(SDState *sd,
         case sd_transfer_state:
             *(uint32_t *) sd->data = sd->blk_written;
 
+            sd->state = sd_sendingdata_state;
             sd->data_start = 0;
             sd->data_offset = 0;
             return sd_r1;