[U-Boot] [PATCH 21/29] dm: scsi: Add a device pointer to scan_exec(), scsi_bus_reset()
Simon Glass
sjg at chromium.org
Mon Jun 5 19:15:08 UTC 2017
With driver model these functions need a device pointer. Add one even
when CONFIG_DM_SCSI is not defined. This avoids having ugly conditional
function prototypes, When CONFIG_DM_SCSI is not defined we can just ignore
the pointer.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
arch/arm/mach-omap2/sata.c | 4 +++-
cmd/scsi.c | 2 +-
drivers/ata/ahci.c | 13 ++++++++++---
drivers/scsi/sandbox_scsi.c | 5 +++--
drivers/scsi/scsi.c | 31 +++++++++++++++++++------------
include/scsi.h | 4 ++--
6 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/arch/arm/mach-omap2/sata.c b/arch/arm/mach-omap2/sata.c
index 0c8268905a..dc68896d1b 100644
--- a/arch/arm/mach-omap2/sata.c
+++ b/arch/arm/mach-omap2/sata.c
@@ -63,8 +63,10 @@ void scsi_init(void)
scsi_scan(1);
}
-void scsi_bus_reset(void)
+int scsi_bus_reset(struct udevice *dev)
{
ahci_reset((void __iomem *)DWC_AHSATA_BASE);
ahci_init((void __iomem *)DWC_AHSATA_BASE);
+
+ return 0;
}
diff --git a/cmd/scsi.c b/cmd/scsi.c
index 4213ec8677..46171e5436 100644
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -36,7 +36,7 @@ static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
case 2:
if (strncmp(argv[1], "res", 3) == 0) {
printf("\nReset SCSI\n");
- scsi_bus_reset();
+ scsi_bus_reset(NULL);
ret = scsi_scan(1);
if (ret)
return CMD_RET_FAILURE;
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index cadf685415..c3b5f2af34 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -928,9 +928,14 @@ static int ata_scsiop_test_unit_ready(struct ahci_uc_priv *uc_priv,
}
-int scsi_exec(struct scsi_cmd *pccb)
+int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb)
{
- struct ahci_uc_priv *uc_priv = probe_ent;
+ struct ahci_uc_priv *uc_priv;
+#ifdef CONFIG_DM_SCSI
+ uc_priv = dev_get_uclass_priv(dev);
+#else
+ uc_priv = probe_ent;
+#endif
int ret;
switch (pccb->cmd[0]) {
@@ -1130,7 +1135,9 @@ static int ata_io_flush(struct ahci_uc_priv *uc_priv, u8 port)
}
-__weak void scsi_bus_reset(void)
+__weak int scsi_bus_reset(struct udevice *dev)
{
/*Not implement*/
+
+ return 0;
}
diff --git a/drivers/scsi/sandbox_scsi.c b/drivers/scsi/sandbox_scsi.c
index d943d1f9da..ac60ae01ca 100644
--- a/drivers/scsi/sandbox_scsi.c
+++ b/drivers/scsi/sandbox_scsi.c
@@ -11,15 +11,16 @@
#include <common.h>
#include <scsi.h>
-void scsi_bus_reset(void)
+int scsi_bus_reset(struct udevice *dev)
{
+ return 0;
}
void scsi_init(void)
{
}
-int scsi_exec(struct scsi_cmd *pccb)
+int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb)
{
return 0;
}
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index e3d169045b..9232f3a824 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -151,6 +151,9 @@ static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
{
#ifdef CONFIG_BLK
struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
+ struct udevice *bdev = dev->parent;
+#else
+ struct udevice *bdev = NULL;
#endif
lbaint_t start, blks;
uintptr_t buf_addr;
@@ -195,7 +198,7 @@ static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
debug("scsi_read_ext: startblk " LBAF
", blccnt %x buffer %" PRIXPTR "\n",
start, smallblks, buf_addr);
- if (scsi_exec(pccb) != true) {
+ if (scsi_exec(bdev, pccb)) {
scsi_print_error(pccb);
blkcnt -= blks;
break;
@@ -224,6 +227,9 @@ static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr,
{
#ifdef CONFIG_BLK
struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
+ struct udevice *bdev = dev->parent;
+#else
+ struct udevice *bdev = NULL;
#endif
lbaint_t start, blks;
uintptr_t buf_addr;
@@ -256,7 +262,7 @@ static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr,
}
debug("%s: startblk " LBAF ", blccnt %x buffer %" PRIXPTR "\n",
__func__, start, smallblks, buf_addr);
- if (scsi_exec(pccb) != true) {
+ if (scsi_exec(bdev, pccb)) {
scsi_print_error(pccb);
blkcnt -= blks;
break;
@@ -350,8 +356,8 @@ static void scsi_ident_cpy(unsigned char *dest, unsigned char *src,
*dest = '\0';
}
-static int scsi_read_capacity(struct scsi_cmd *pccb, lbaint_t *capacity,
- unsigned long *blksz)
+static int scsi_read_capacity(struct udevice *dev, struct scsi_cmd *pccb,
+ lbaint_t *capacity, unsigned long *blksz)
{
*capacity = 0;
@@ -362,7 +368,7 @@ static int scsi_read_capacity(struct scsi_cmd *pccb, lbaint_t *capacity,
pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
pccb->datalen = 8;
- if (scsi_exec(pccb) != true)
+ if (scsi_exec(dev, pccb) != true)
return 1;
*capacity = ((lbaint_t)pccb->pdata[0] << 24) |
@@ -387,7 +393,7 @@ static int scsi_read_capacity(struct scsi_cmd *pccb, lbaint_t *capacity,
pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
pccb->datalen = 16;
- if (scsi_exec(pccb) != true)
+ if (scsi_exec(dev, pccb) != true)
return 1;
*capacity = ((uint64_t)pccb->pdata[0] << 56) |
@@ -480,7 +486,8 @@ static void scsi_init_dev_desc(struct blk_desc *dev_desc, int devnum)
*
* Return: 0 on success, error value otherwise
*/
-static int scsi_detect_dev(int target, int lun, struct blk_desc *dev_desc)
+static int scsi_detect_dev(struct udevice *dev, int target, int lun,
+ struct blk_desc *dev_desc)
{
unsigned char perq, modi;
lbaint_t capacity;
@@ -492,7 +499,7 @@ static int scsi_detect_dev(int target, int lun, struct blk_desc *dev_desc)
pccb->pdata = (unsigned char *)&tempbuff;
pccb->datalen = 512;
scsi_setup_inquiry(pccb);
- if (scsi_exec(pccb) != true) {
+ if (scsi_exec(dev, pccb) != true) {
if (pccb->contr_stat == SCSI_SEL_TIME_OUT) {
/*
* selection timeout => assuming no
@@ -523,7 +530,7 @@ static int scsi_detect_dev(int target, int lun, struct blk_desc *dev_desc)
pccb->datalen = 0;
scsi_setup_test_unit_ready(pccb);
- if (scsi_exec(pccb) != true) {
+ if (scsi_exec(dev, pccb) != true) {
if (dev_desc->removable) {
dev_desc->type = perq;
goto removable;
@@ -531,7 +538,7 @@ static int scsi_detect_dev(int target, int lun, struct blk_desc *dev_desc)
scsi_print_error(pccb);
return -EINVAL;
}
- if (scsi_read_capacity(pccb, &capacity, &blksz)) {
+ if (scsi_read_capacity(dev, pccb, &capacity, &blksz)) {
scsi_print_error(pccb);
return -EINVAL;
}
@@ -561,7 +568,7 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, int mode)
* size, number of blocks) and other parameters (ids, type, ...)
*/
scsi_init_dev_desc_priv(&bd);
- if (scsi_detect_dev(id, lun, &bd))
+ if (scsi_detect_dev(dev, id, lun, &bd))
return -ENODEV;
/*
@@ -642,7 +649,7 @@ int scsi_scan(int mode)
scsi_max_devs = 0;
for (i = 0; i < CONFIG_SYS_SCSI_MAX_SCSI_ID; i++) {
for (lun = 0; lun < CONFIG_SYS_SCSI_MAX_LUN; lun++) {
- ret = scsi_detect_dev(i, lun,
+ ret = scsi_detect_dev(NULL, i, lun,
&scsi_dev_desc[scsi_max_devs]);
if (ret)
continue;
diff --git a/include/scsi.h b/include/scsi.h
index d2fa8a5195..af07dbe6db 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -196,8 +196,8 @@ void scsi_low_level_init(int busdevfunc);
void scsi_init(void);
#endif
-int scsi_exec(struct scsi_cmd *pccb);
-void scsi_bus_reset(void);
+int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb);
+int scsi_bus_reset(struct udevice *dev);
/***************************************************************************
* functions residing inside cmd_scsi.c
--
2.13.0.506.g27d5fe0cd-goog
More information about the U-Boot
mailing list