Re: [Qemu-devel] [PATCH v3 06/18] sdcard: simplify using the ldst API

2018-02-08 Thread Alistair Francis 
On Mon, Jan 22, 2018 at 7:30 PM, Philippe Mathieu-Daudé  wrote:
> the code is easier to review/refactor.
>
> Signed-off-by: Philippe Mathieu-Daudé 

Reviewed-by: Alistair Francis 

Alistair

> ---
>  hw/sd/sd.c | 38 +-
>  1 file changed, 9 insertions(+), 29 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 3c66521862..23f5d47782 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -435,57 +435,39 @@ static int sd_req_crc_validate(SDRequest *req)
>  {
>  uint8_t buffer[5];
>  buffer[0] = 0x40 | req->cmd;
> -buffer[1] = (req->arg >> 24) & 0xff;
> -buffer[2] = (req->arg >> 16) & 0xff;
> -buffer[3] = (req->arg >> 8) & 0xff;
> -buffer[4] = (req->arg >> 0) & 0xff;
> +stl_be_p([1], req->arg);
>  return 0;
>  return sd_crc7(buffer, 5) != req->crc; /* TODO */
>  }
>
>  static void sd_response_r1_make(SDState *sd, uint8_t *response)
>  {
> -uint32_t status = sd->card_status;
> +stl_be_p(response, sd->card_status);
> +
>  /* Clear the "clear on read" status bits */
>  sd->card_status &= ~CARD_STATUS_C;
> -
> -response[0] = (status >> 24) & 0xff;
> -response[1] = (status >> 16) & 0xff;
> -response[2] = (status >> 8) & 0xff;
> -response[3] = (status >> 0) & 0xff;
>  }
>
>  static void sd_response_r3_make(SDState *sd, uint8_t *response)
>  {
> -response[0] = (sd->ocr >> 24) & 0xff;
> -response[1] = (sd->ocr >> 16) & 0xff;
> -response[2] = (sd->ocr >> 8) & 0xff;
> -response[3] = (sd->ocr >> 0) & 0xff;
> +stl_be_p(response, sd->ocr);
>  }
>
>  static void sd_response_r6_make(SDState *sd, uint8_t *response)
>  {
> -uint16_t arg;
>  uint16_t status;
>
> -arg = sd->rca;
>  status = ((sd->card_status >> 8) & 0xc000) |
>   ((sd->card_status >> 6) & 0x2000) |
>(sd->card_status & 0x1fff);
>  sd->card_status &= ~(CARD_STATUS_C & 0xc81fff);
> -
> -response[0] = (arg >> 8) & 0xff;
> -response[1] = arg & 0xff;
> -response[2] = (status >> 8) & 0xff;
> -response[3] = status & 0xff;
> +stw_be_p(response + 0, sd->rca);
> +stw_be_p(response + 2, status);
>  }
>
>  static void sd_response_r7_make(SDState *sd, uint8_t *response)
>  {
> -response[0] = (sd->vhs >> 24) & 0xff;
> -response[1] = (sd->vhs >> 16) & 0xff;
> -response[2] = (sd->vhs >>  8) & 0xff;
> -response[3] = (sd->vhs >>  0) & 0xff;
> +stl_be_p(response, sd->vhs);
>  }
>
>  static inline uint64_t sd_addr_to_wpnum(uint64_t addr)
> @@ -731,7 +713,7 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr)
>
>  static void sd_function_switch(SDState *sd, uint32_t arg)
>  {
> -int i, mode, new_func, crc;
> +int i, mode, new_func;
>  mode = !!(arg & 0x8000);
>
>  sd->data[0] = 0x00;/* Maximum current consumption */
> @@ -755,9 +737,7 @@ static void sd_function_switch(SDState *sd, uint32_t arg)
>  sd->data[14 + (i >> 1)] = new_func << ((i * 4) & 4);
>  }
>  memset(>data[17], 0, 47);
> -crc = sd_crc16(sd->data, 64);
> -sd->data[65] = crc >> 8;
> -sd->data[66] = crc & 0xff;
> +stw_be_p(sd->data + 65, sd_crc16(sd->data, 64));
>  }
>
>  static inline bool sd_wp_addr(SDState *sd, uint64_t addr)
> --
> 2.15.1
>
>

[Qemu-devel] [PATCH v3 06/18] sdcard: simplify using the ldst API

2018-01-22 Thread Philippe Mathieu-Daudé 
the code is easier to review/refactor.

Signed-off-by: Philippe Mathieu-Daudé 
---
 hw/sd/sd.c | 38 +-
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 3c66521862..23f5d47782 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -435,57 +435,39 @@ static int sd_req_crc_validate(SDRequest *req)
 {
 uint8_t buffer[5];
 buffer[0] = 0x40 | req->cmd;
-buffer[1] = (req->arg >> 24) & 0xff;
-buffer[2] = (req->arg >> 16) & 0xff;
-buffer[3] = (req->arg >> 8) & 0xff;
-buffer[4] = (req->arg >> 0) & 0xff;
+stl_be_p([1], req->arg);
 return 0;
 return sd_crc7(buffer, 5) != req->crc; /* TODO */
 }
 
 static void sd_response_r1_make(SDState *sd, uint8_t *response)
 {
-uint32_t status = sd->card_status;
+stl_be_p(response, sd->card_status);
+
 /* Clear the "clear on read" status bits */
 sd->card_status &= ~CARD_STATUS_C;
-
-response[0] = (status >> 24) & 0xff;
-response[1] = (status >> 16) & 0xff;
-response[2] = (status >> 8) & 0xff;
-response[3] = (status >> 0) & 0xff;
 }
 
 static void sd_response_r3_make(SDState *sd, uint8_t *response)
 {
-response[0] = (sd->ocr >> 24) & 0xff;
-response[1] = (sd->ocr >> 16) & 0xff;
-response[2] = (sd->ocr >> 8) & 0xff;
-response[3] = (sd->ocr >> 0) & 0xff;
+stl_be_p(response, sd->ocr);
 }
 
 static void sd_response_r6_make(SDState *sd, uint8_t *response)
 {
-uint16_t arg;
 uint16_t status;
 
-arg = sd->rca;
 status = ((sd->card_status >> 8) & 0xc000) |
  ((sd->card_status >> 6) & 0x2000) |
   (sd->card_status & 0x1fff);
 sd->card_status &= ~(CARD_STATUS_C & 0xc81fff);
-
-response[0] = (arg >> 8) & 0xff;
-response[1] = arg & 0xff;
-response[2] = (status >> 8) & 0xff;
-response[3] = status & 0xff;
+stw_be_p(response + 0, sd->rca);
+stw_be_p(response + 2, status);
 }
 
 static void sd_response_r7_make(SDState *sd, uint8_t *response)
 {
-response[0] = (sd->vhs >> 24) & 0xff;
-response[1] = (sd->vhs >> 16) & 0xff;
-response[2] = (sd->vhs >>  8) & 0xff;
-response[3] = (sd->vhs >>  0) & 0xff;
+stl_be_p(response, sd->vhs);
 }
 
 static inline uint64_t sd_addr_to_wpnum(uint64_t addr)
@@ -731,7 +713,7 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr)
 
 static void sd_function_switch(SDState *sd, uint32_t arg)
 {
-int i, mode, new_func, crc;
+int i, mode, new_func;
 mode = !!(arg & 0x8000);
 
 sd->data[0] = 0x00;/* Maximum current consumption */
@@ -755,9 +737,7 @@ static void sd_function_switch(SDState *sd, uint32_t arg)
 sd->data[14 + (i >> 1)] = new_func << ((i * 4) & 4);
 }
 memset(>data[17], 0, 47);
-crc = sd_crc16(sd->data, 64);
-sd->data[65] = crc >> 8;
-sd->data[66] = crc & 0xff;
+stw_be_p(sd->data + 65, sd_crc16(sd->data, 64));
 }
 
 static inline bool sd_wp_addr(SDState *sd, uint64_t addr)
-- 
2.15.1