Merge git://git.denx.de/u-boot-dm

[platform/kernel/u-boot.git] / drivers / scsi / scsi.c

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 9232f3a..7ec7ecc 100644 (file)
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -29,7 +29,8 @@
 # endif
 #endif
 
-#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)
+#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) && \
+       !defined(CONFIG_DM_SCSI)
 const struct pci_device_id scsi_device_list[] = { SCSI_DEV_LIST };
 #endif
 static struct scsi_cmd tempccb;        /* temporary scsi command buffer */
@@ -274,7 +275,8 @@ static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr,
        return blkcnt;
 }
 
-#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)
+#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) && \
+       !defined(CONFIG_DM_SCSI)
 void scsi_init(void)
 {
        int busdevfunc = -1;
@@ -326,7 +328,7 @@ void scsi_init(void)
 #endif
        bootstage_start(BOOTSTAGE_ID_ACCUM_SCSI, "ahci");
        scsi_low_level_init(busdevfunc);
-       scsi_scan(1);
+       scsi_scan(true);
        bootstage_accum(BOOTSTAGE_ID_ACCUM_SCSI);
 }
 #endif
@@ -368,7 +370,7 @@ static int scsi_read_capacity(struct udevice *dev, struct scsi_cmd *pccb,
        pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
 
        pccb->datalen = 8;
-       if (scsi_exec(dev, pccb) != true)
+       if (scsi_exec(dev, pccb))
                return 1;
 
        *capacity = ((lbaint_t)pccb->pdata[0] << 24) |
@@ -393,7 +395,7 @@ static int scsi_read_capacity(struct udevice *dev, struct scsi_cmd *pccb,
        pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
 
        pccb->datalen = 16;
-       if (scsi_exec(dev, pccb) != true)
+       if (scsi_exec(dev, pccb))
                return 1;
 
        *capacity = ((uint64_t)pccb->pdata[0] << 56) |
@@ -499,7 +501,7 @@ static int scsi_detect_dev(struct udevice *dev, int target, int lun,
        pccb->pdata = (unsigned char *)&tempbuff;
        pccb->datalen = 512;
        scsi_setup_inquiry(pccb);
-       if (scsi_exec(dev, pccb) != true) {
+       if (scsi_exec(dev, pccb)) {
                if (pccb->contr_stat == SCSI_SEL_TIME_OUT) {
                        /*
                          * selection timeout => assuming no
@@ -530,7 +532,7 @@ static int scsi_detect_dev(struct udevice *dev, int target, int lun,
 
        pccb->datalen = 0;
        scsi_setup_test_unit_ready(pccb);
-       if (scsi_exec(dev, pccb) != true) {
+       if (scsi_exec(dev, pccb)) {
                if (dev_desc->removable) {
                        dev_desc->type = perq;
                        goto removable;
@@ -555,7 +557,7 @@ removable:
  * to the user if mode = 1
  */
 #if defined(CONFIG_DM_SCSI)
-static int do_scsi_scan_one(struct udevice *dev, int id, int lun, int mode)
+static int do_scsi_scan_one(struct udevice *dev, int id, int lun, bool verbose)
 {
        int ret;
        struct udevice *bdev;
@@ -594,21 +596,42 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, int mode)
        memcpy(&bdesc->revision, &bd.revision,  sizeof(bd.revision));
        part_init(bdesc);
 
-       if (mode == 1) {
+       if (verbose) {
                printf("  Device %d: ", 0);
                dev_print(bdesc);
        }
        return 0;
 }
 
-int scsi_scan(int mode)
+int scsi_scan_dev(struct udevice *dev, bool verbose)
+{
+       struct scsi_platdata *uc_plat; /* scsi controller platdata */
+       int ret;
+       int i;
+       int lun;
+
+       /* probe SCSI controller driver */
+       ret = device_probe(dev);
+       if (ret)
+               return ret;
+
+       /* Get controller platdata */
+       uc_plat = dev_get_uclass_platdata(dev);
+
+       for (i = 0; i < uc_plat->max_id; i++)
+               for (lun = 0; lun < uc_plat->max_lun; lun++)
+                       do_scsi_scan_one(dev, i, lun, verbose);
+
+       return 0;
+}
+
+int scsi_scan(bool verbose)
 {
-       unsigned char i, lun;
        struct uclass *uc;
        struct udevice *dev; /* SCSI controller */
        int ret;
 
-       if (mode == 1)
+       if (verbose)
                printf("scanning bus for devices...\n");
 
        blk_unbind_all(IF_TYPE_SCSI);
@@ -618,30 +641,20 @@ int scsi_scan(int mode)
                return ret;
 
        uclass_foreach_dev(dev, uc) {
-               struct scsi_platdata *plat; /* scsi controller platdata */
-
-               /* probe SCSI controller driver */
-               ret = device_probe(dev);
+               ret = scsi_scan_dev(dev, verbose);
                if (ret)
                        return ret;
-
-               /* Get controller platdata */
-               plat = dev_get_uclass_platdata(dev);
-
-               for (i = 0; i < plat->max_id; i++)
-                       for (lun = 0; lun < plat->max_lun; lun++)
-                               do_scsi_scan_one(dev, i, lun, mode);
        }
 
        return 0;
 }
 #else
-int scsi_scan(int mode)
+int scsi_scan(bool verbose)
 {
        unsigned char i, lun;
        int ret;
 
-       if (mode == 1)
+       if (verbose)
                printf("scanning bus for devices...\n");
        for (i = 0; i < CONFIG_SYS_SCSI_MAX_DEVICE; i++)
                scsi_init_dev_desc(&scsi_dev_desc[i], i);
@@ -655,10 +668,10 @@ int scsi_scan(int mode)
                                continue;
                        part_init(&scsi_dev_desc[scsi_max_devs]);
 
-                       if (mode == 1) {
+                       if (verbose) {
                                printf("  Device %d: ", 0);
                                dev_print(&scsi_dev_desc[scsi_max_devs]);
-                       } /* if mode */
+                       }
                        scsi_max_devs++;
                } /* next LUN */
        }