[v1] hw/scsi/megasas: Simplify using the ldst API

[PATCH] hw/scsi/megasas: Simplify using the ldst API

Philippe Mathieu-Daudé posted 1 patch 2 years, 4 months ago

Diff against v2
Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20211217231542.1461286-1-philmd@redhat.com

There is a newer version of this series

hw/scsi/megasas.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)

Expand all Fold all

[PATCH] hw/scsi/megasas: Simplify using the ldst API

Posted by Philippe Mathieu-Daudé 2 years, 4 months ago

This code is easier to review using the load/store API.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/scsi/megasas.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 619b66ef0f3..066f30e3f22 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -375,8 +375,7 @@ static int megasas_setup_inquiry(uint8_t *cdb, int pg, int len)
         cdb[1] = 0x1;
         cdb[2] = pg;
     }
-    cdb[3] = (len >> 8) & 0xff;
-    cdb[4] = (len & 0xff);
+    stw_be_p(&cdb[2], len);
     return len;
 }
 
@@ -392,18 +391,8 @@ static void megasas_encode_lba(uint8_t *cdb, uint64_t lba,
     } else {
         cdb[0] = READ_16;
     }
-    cdb[2] = (lba >> 56) & 0xff;
-    cdb[3] = (lba >> 48) & 0xff;
-    cdb[4] = (lba >> 40) & 0xff;
-    cdb[5] = (lba >> 32) & 0xff;
-    cdb[6] = (lba >> 24) & 0xff;
-    cdb[7] = (lba >> 16) & 0xff;
-    cdb[8] = (lba >> 8) & 0xff;
-    cdb[9] = (lba) & 0xff;
-    cdb[10] = (len >> 24) & 0xff;
-    cdb[11] = (len >> 16) & 0xff;
-    cdb[12] = (len >> 8) & 0xff;
-    cdb[13] = (len) & 0xff;
+    stq_be_p(&cdb[2], lba);
+    stl_be_p(&cdb[2 + 8], len);
 }
 
 /*
-- 
2.33.1

Re: [PATCH] hw/scsi/megasas: Simplify using the ldst API

Posted by Richard Henderson 2 years, 4 months ago

On 12/17/21 3:15 PM, Philippe Mathieu-Daudé wrote:
> -    cdb[3] = (len >> 8) & 0xff;
> -    cdb[4] = (len & 0xff);
> +    stw_be_p(&cdb[2], len);

Wrong offset.  Otherwise,

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH] hw/scsi/megasas: Simplify using the ldst API

Posted by Philippe Mathieu-Daudé 2 years, 4 months ago

On 12/18/21 01:36, Richard Henderson wrote:
> On 12/17/21 3:15 PM, Philippe Mathieu-Daudé wrote:
>> -    cdb[3] = (len >> 8) & 0xff;
>> -    cdb[4] = (len & 0xff);
>> +    stw_be_p(&cdb[2], len);
> 
> Wrong offset.  Otherwise,

>_<

> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Thank you.