60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
|
From 84bd6e7a41773a4cc1ae7cfe73ea5910415cd022 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 20 Nov 2024 13:35:23 +0800
|
||
|
|
Subject: [PATCH] hw/scsi/megasas: Simplify using the ldst API
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cherry picked from commit 2a0c51366985890e3bf6f41a48f3cb2dfe2f153e
|
||
|
|
|
||
|
|
This code is easier to review using the load/store API.
|
||
|
|
|
||
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
Message-Id: <20211218111912.1499377-1-philmd@redhat.com>
|
||
|
|
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
||
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.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 dc9bbdb740..83c321ec20 100644
|
||
|
|
--- a/hw/scsi/megasas.c
|
||
|
|
+++ b/hw/scsi/megasas.c
|
||
|
|
@@ -383,8 +383,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[3], len);
|
||
|
|
return len;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -400,18 +399,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.41.0.windows.1
|
||
|
|
|