Commit b3141c06 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

sdcard: Use the ldst API 



The load/store API will ease further code movement.

Per the Physical Layer Simplified Spec. "3.6 Bus Protocol":

  "In the CMD line the Most Significant Bit (MSB) is transmitted
   first, the Least Significant Bit (LSB) is the last."

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 13606b99

hw/sd/bcm2835_sdhost.c

+5 −8
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ static void bcm2835_sdhost_send_command(BCM2835SDHostState *s) 
        goto error;

    }

    if (!(s->cmd & SDCMD_NO_RESPONSE)) {

#define RWORD(n) (((uint32_t)rsp[n] << 24) | (rsp[n + 1] << 16) \

                  | (rsp[n + 2] << 8) | rsp[n + 3])

        if (rlen == 0 || (rlen == 4 && (s->cmd & SDCMD_LONG_RESPONSE))) {

            goto error;

        }
@@ -127,15 +125,14 @@ static void bcm2835_sdhost_send_command(BCM2835SDHostState *s) 
            goto error;

        }

        if (rlen == 4) {

            s->rsp[0] = RWORD(0);

            s->rsp[0] = ldl_be_p(&rsp[0]);

            s->rsp[1] = s->rsp[2] = s->rsp[3] = 0;

        } else {

            s->rsp[0] = RWORD(12);

            s->rsp[1] = RWORD(8);

            s->rsp[2] = RWORD(4);

            s->rsp[3] = RWORD(0);

            s->rsp[0] = ldl_be_p(&rsp[12]);

            s->rsp[1] = ldl_be_p(&rsp[8]);

            s->rsp[2] = ldl_be_p(&rsp[4]);

            s->rsp[3] = ldl_be_p(&rsp[0]);

        }

#undef RWORD

    }

    /* We never really delay commands, so if this was a 'busywait' command

     * then we've completed it now and can raise the interrupt.

hw/sd/milkymist-memcard.c

+1 −2
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ static void memcard_sd_command(MilkymistMemcardState *s) 
    SDRequest req;



    req.cmd = s->command[0] & 0x3f;

    req.arg = (s->command[1] << 24) | (s->command[2] << 16)

              | (s->command[3] << 8) | s->command[4];

    req.arg = ldl_be_p(s->command + 1);

    req.crc = s->command[5];



    s->response[0] = req.cmd;

hw/sd/omap_mmc.c

+2 −4
Original line number Diff line number Diff line
@@ -163,8 +163,7 @@ static void omap_mmc_command(struct omap_mmc_s *host, int cmd, int dir, 
                CID_CSD_OVERWRITE;

        if (host->sdio & (1 << 13))

            mask |= AKE_SEQ_ERROR;

        rspstatus = (response[0] << 24) | (response[1] << 16) |

                (response[2] << 8) | (response[3] << 0);

        rspstatus = ldl_be_p(response);

        break;



    case sd_r2:
@@ -182,8 +181,7 @@ static void omap_mmc_command(struct omap_mmc_s *host, int cmd, int dir, 
        }

        rsplen = 4;



        rspstatus = (response[0] << 24) | (response[1] << 16) |

                (response[2] << 8) | (response[3] << 0);

        rspstatus = ldl_be_p(response);

        if (rspstatus & 0x80000000)

            host->status &= 0xe000;

        else

hw/sd/pl181.c

+4 −7
Original line number Diff line number Diff line
@@ -182,23 +182,20 @@ static void pl181_send_command(PL181State *s) 
    if (rlen < 0)

        goto error;

    if (s->cmd & PL181_CMD_RESPONSE) {

#define RWORD(n) (((uint32_t)response[n] << 24) | (response[n + 1] << 16) \

                  | (response[n + 2] << 8) | response[n + 3])

        if (rlen == 0 || (rlen == 4 && (s->cmd & PL181_CMD_LONGRESP)))

            goto error;

        if (rlen != 4 && rlen != 16)

            goto error;

        s->response[0] = RWORD(0);

        s->response[0] = ldl_be_p(&response[0]);

        if (rlen == 4) {

            s->response[1] = s->response[2] = s->response[3] = 0;

        } else {

            s->response[1] = RWORD(4);

            s->response[2] = RWORD(8);

            s->response[3] = RWORD(12) & ~1;

            s->response[1] = ldl_be_p(&response[4]);

            s->response[2] = ldl_be_p(&response[8]);

            s->response[3] = ldl_be_p(&response[12]) & ~1;

        }

        DPRINTF("Response received\n");

        s->status |= PL181_STATUS_CMDRESPEND;

#undef RWORD

    } else {

        DPRINTF("Command sent\n");

        s->status |= PL181_STATUS_CMDSENT;

hw/sd/sdhci.c

+5 −10
Original line number Diff line number Diff line
@@ -342,17 +342,13 @@ static void sdhci_send_command(SDHCIState *s) 


    if (s->cmdreg & SDHC_CMD_RESPONSE) {

        if (rlen == 4) {

            s->rspreg[0] = (response[0] << 24) | (response[1] << 16) |

                           (response[2] << 8)  |  response[3];

            s->rspreg[0] = ldl_be_p(response);

            s->rspreg[1] = s->rspreg[2] = s->rspreg[3] = 0;

            trace_sdhci_response4(s->rspreg[0]);

        } else if (rlen == 16) {

            s->rspreg[0] = (response[11] << 24) | (response[12] << 16) |

                           (response[13] << 8) |  response[14];

            s->rspreg[1] = (response[7] << 24) | (response[8] << 16) |

                           (response[9] << 8)  |  response[10];

            s->rspreg[2] = (response[3] << 24) | (response[4] << 16) |

                           (response[5] << 8)  |  response[6];

            s->rspreg[0] = ldl_be_p(&response[11]);

            s->rspreg[1] = ldl_be_p(&response[7]);

            s->rspreg[2] = ldl_be_p(&response[3]);

            s->rspreg[3] = (response[0] << 16) | (response[1] << 8) |

                            response[2];

            trace_sdhci_response16(s->rspreg[3], s->rspreg[2],
@@ -396,8 +392,7 @@ static void sdhci_end_transfer(SDHCIState *s) 
        trace_sdhci_end_transfer(request.cmd, request.arg);

        sdbus_do_command(&s->sdbus, &request, response);

        /* Auto CMD12 response goes to the upper Response register */

        s->rspreg[3] = (response[0] << 24) | (response[1] << 16) |

                (response[2] << 8) | response[3];

        s->rspreg[3] = ldl_be_p(response);

    }



    s->prnsts &= ~(SDHC_DOING_READ | SDHC_DOING_WRITE |