At present sandbox is producing a warning about SCSI migration. Drop the
legacy code and replace it with a new implementation.
Also drop the SATA command, which does not work with driver model.
Signed-off-by: Simon Glass <s...@chromium.org>
---
(no changes since v1)
arch/Kconfig | 1 -
configs/sandbox64_defconfig | 1 +
configs/sandbox_defconfig | 1 +
configs/sandbox_flattree_defconfig | 1 +
configs/sandbox_noinst_defconfig | 1 +
configs/sandbox_spl_defconfig | 1 +
configs/sandbox_vpl_defconfig | 1 +
drivers/scsi/sandbox_scsi.c | 132 ++++++++++++++++++++++++++++-
8 files changed, 135 insertions(+), 4 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 994fd3b7f86..1ffd77c0f4f 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -166,7 +166,6 @@ config SANDBOX
imply CMD_IO
imply CMD_IOTRACE
imply CMD_LZMADEC
- imply CMD_SATA
imply CMD_SF
imply CMD_SF_TEST
imply CRC32_VERIFY
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index b18e0fe0353..b8ea854c013 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -205,6 +205,7 @@ CONFIG_SANDBOX_RESET=y
CONFIG_DM_RTC=y
CONFIG_RTC_RV8803=y
CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
CONFIG_SCSI_AHCI_PLAT=y
CONFIG_SYS_SCSI_MAX_SCSI_ID=8
CONFIG_SYS_SCSI_MAX_LUN=4
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index caecb50ad96..dab7f6eeb11 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -264,6 +264,7 @@ CONFIG_RESET_SCMI=y
CONFIG_DM_RTC=y
CONFIG_RTC_RV8803=y
CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
CONFIG_SCSI_AHCI_PLAT=y
CONFIG_SYS_SCSI_MAX_SCSI_ID=8
CONFIG_SYS_SCSI_MAX_LUN=4
diff --git a/configs/sandbox_flattree_defconfig
b/configs/sandbox_flattree_defconfig
index a8344029f47..d27b253556b 100644
--- a/configs/sandbox_flattree_defconfig
+++ b/configs/sandbox_flattree_defconfig
@@ -175,6 +175,7 @@ CONFIG_DM_RESET=y
CONFIG_SANDBOX_RESET=y
CONFIG_DM_RTC=y
CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
CONFIG_SCSI_AHCI_PLAT=y
CONFIG_SYS_SCSI_MAX_SCSI_ID=8
CONFIG_SYS_SCSI_MAX_LUN=4
diff --git a/configs/sandbox_noinst_defconfig b/configs/sandbox_noinst_defconfig
index da83165a4d7..1a8f609e6e9 100644
--- a/configs/sandbox_noinst_defconfig
+++ b/configs/sandbox_noinst_defconfig
@@ -201,6 +201,7 @@ CONFIG_SANDBOX_RESET=y
CONFIG_DM_RTC=y
CONFIG_SPL_DM_RTC=y
CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
CONFIG_SCSI_AHCI_PLAT=y
CONFIG_SYS_SCSI_MAX_SCSI_ID=8
CONFIG_SYS_SCSI_MAX_LUN=4
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index 0d7c5972d83..5e5a56c00f3 100644
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -204,6 +204,7 @@ CONFIG_SANDBOX_RESET=y
CONFIG_DM_RTC=y
CONFIG_SPL_DM_RTC=y
CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
CONFIG_SCSI_AHCI_PLAT=y
CONFIG_SYS_SCSI_MAX_SCSI_ID=8
CONFIG_SYS_SCSI_MAX_LUN=4
diff --git a/configs/sandbox_vpl_defconfig b/configs/sandbox_vpl_defconfig
index 7bddac61987..5a781bbfd87 100644
--- a/configs/sandbox_vpl_defconfig
+++ b/configs/sandbox_vpl_defconfig
@@ -210,6 +210,7 @@ CONFIG_DM_RTC=y
CONFIG_SPL_DM_RTC=y
CONFIG_TPL_DM_RTC=y
CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
CONFIG_SCSI_AHCI_PLAT=y
CONFIG_SYS_SCSI_MAX_SCSI_ID=8
CONFIG_SYS_SCSI_MAX_LUN=4
diff --git a/drivers/scsi/sandbox_scsi.c b/drivers/scsi/sandbox_scsi.c
index 39b969a4b2f..a7ac33cb1c4 100644
--- a/drivers/scsi/sandbox_scsi.c
+++ b/drivers/scsi/sandbox_scsi.c
@@ -7,19 +7,145 @@
* that CONFIG_SCSI can be enabled for sandbox.
*/
+#define LOG_CATEGORY UCLASS_SCSI
+
#include <common.h>
+#include <dm.h>
+#include <os.h>
+#include <malloc.h>
#include <scsi.h>
+#include <scsi_emul.h>
+
+enum {
+ SANDBOX_SCSI_BLOCK_LEN = 512,
+ SANDBOX_SCSI_BUF_SIZE = 512,
+};
+
+/**
+ * struct sandbox_scsi_priv
+ *
+ * @eminfo: emulator state
+ * @pathanme: Path to the backing file, e.g. 'scsi.img'
+ * @fd: File descriptor of backing file
+ */
+struct sandbox_scsi_priv {
+ struct scsi_emul_info eminfo;
+ const char *pathname;
+ int fd;
+};
-int scsi_bus_reset(struct udevice *dev)
+static int sandbox_scsi_exec(struct udevice *dev, struct scsi_cmd *req)
{
+ struct sandbox_scsi_priv *priv = dev_get_priv(dev);
+ struct scsi_emul_info *info = &priv->eminfo;
+ int ret;
+
+ if (req->lun || req->target)
+ return -EIO;
+ ret = sb_scsi_emul_command(info, req, req->cmdlen);
+ if (ret < 0) {
+ log_debug("SCSI command 0x%02x ret errno %d\n", req->cmd[0],
+ ret);
+ return ret;
+ } else if (ret == SCSI_EMUL_DO_READ && priv->fd != -1) {
+ long bytes_read;
+
+ log_debug("read %x %x\n", info->seek_block, info->read_len);
+ os_lseek(priv->fd, info->seek_block * info->block_size,
+ OS_SEEK_SET);
+ bytes_read = os_read(priv->fd, req->pdata, info->buff_used);
+ if (bytes_read < 0)
+ return bytes_read;
+ if (bytes_read != info->buff_used)
+ return -EIO;
+ } else if (!ret) {
+ req->pdata = info->buff;
+ info->phase = SCSIPH_STATUS;
+ log_debug("sending buf\n");
+ } else {
+ log_debug("error\n");
+ return -EIO;
+ }
+
return 0;
}
-void scsi_init(void)
+static int sandbox_scsi_bus_reset(struct udevice *dev)
{
+ /* Not implemented */
+
+ return 0;
}
-int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb)
+static int sandbox_scsi_of_to_plat(struct udevice *dev)
{
+ struct sandbox_scsi_priv *priv = dev_get_priv(dev);
+
+ priv->pathname = dev_read_string(dev, "sandbox,filepath");
+
return 0;
}
+
+static int sandbox_scsi_probe(struct udevice *dev)
+{
+ struct scsi_plat *scsi_plat = dev_get_uclass_plat(dev);
+ struct sandbox_scsi_priv *priv = dev_get_priv(dev);
+ struct scsi_emul_info *info = &priv->eminfo;
+ int ret;
+
+ scsi_plat->max_id = 2;
+ scsi_plat->max_lun = 3;
+ scsi_plat->max_bytes_per_req = 1 << 20;
+
+ info->vendor = "SANDBOX";
+ info->product = "FAKE DISK";
+ info->buff = malloc(SANDBOX_SCSI_BUF_SIZE);
+ if (!info->buff)
+ return log_ret(-ENOMEM);
+ info->block_size = SANDBOX_SCSI_BLOCK_LEN;
+
+ if (priv->pathname) {
+ priv->fd = os_open(priv->pathname, OS_O_RDONLY);
+ if (priv->fd != -1) {
+ ret = os_get_filesize(priv->pathname, &info->file_size);
+ if (ret)
+ return log_msg_ret("sz", ret);
+ }
+ } else {
+ priv->fd = -1;
+ }
+ log_debug("filename: %s, fd %d\n", priv->pathname, priv->fd);
+
+ return 0;
+}
+
+static int sandbox_scsi_remove(struct udevice *dev)
+{
+ struct sandbox_scsi_priv *priv = dev_get_priv(dev);
+ struct scsi_emul_info *info = &priv->eminfo;
+
+ free(info->buff);
+
+ return 0;
+}
+
+struct scsi_ops sandbox_scsi_ops = {
+ .exec = sandbox_scsi_exec,
+ .bus_reset = sandbox_scsi_bus_reset,
+};
+
+static const struct udevice_id sanbox_scsi_ids[] = {
+ { .compatible = "sandbox,scsi" },
+ { }
+};
+
+U_BOOT_DRIVER(sandbox_scsi) = {
+ .name = "sandbox_scsi",
+ .id = UCLASS_SCSI,
+ .ops = &sandbox_scsi_ops,
+ .of_match = sanbox_scsi_ids,
+ .of_to_plat = sandbox_scsi_of_to_plat,
+ .probe = sandbox_scsi_probe,
+ .remove = sandbox_scsi_remove,
+ .priv_auto = sizeof(struct sandbox_scsi_priv),
+};
--
2.37.3.968.ga6b4b080e4-goog
