]> git.sur5r.net Git - u-boot/commitdiff
scsi: Move drivers into new drivers/scsi directory
authorSimon Glass <sjg@chromium.org>
Thu, 15 Jun 2017 03:28:27 +0000 (21:28 -0600)
committerSimon Glass <sjg@chromium.org>
Tue, 11 Jul 2017 16:08:19 +0000 (10:08 -0600)
At present we have the SCSI drivers in the drivers/block and common/
directories. It is better to split them out into their own place. Use
drivers/scsi which is what Linux does.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
13 files changed:
common/Makefile
common/scsi.c [deleted file]
drivers/Kconfig
drivers/Makefile
drivers/block/Kconfig
drivers/block/Makefile
drivers/block/sandbox_scsi.c [deleted file]
drivers/block/scsi-uclass.c [deleted file]
drivers/scsi/Kconfig [new file with mode: 0644]
drivers/scsi/Makefile [new file with mode: 0644]
drivers/scsi/sandbox_scsi.c [new file with mode: 0644]
drivers/scsi/scsi-uclass.c [new file with mode: 0644]
drivers/scsi/scsi.c [new file with mode: 0644]

index f04ddc8352128a2e8293177c576c4c044b1d5366..17a92ea2d7504262cebd2a15812994298186113d 100644 (file)
@@ -79,7 +79,6 @@ obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o
 obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o
 obj-$(CONFIG_LYNXKDI) += lynxkdi.o
 obj-$(CONFIG_MENU) += menu.o
-obj-$(CONFIG_SCSI) += scsi.o
 obj-$(CONFIG_UPDATE_TFTP) += update.o
 obj-$(CONFIG_DFU_TFTP) += update.o
 obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o
@@ -121,9 +120,6 @@ obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
 endif
-ifdef CONFIG_SPL_SATA_SUPPORT
-obj-$(CONFIG_SCSI) += scsi.o
-endif
 endif
 #environment
 obj-y += env_common.o
diff --git a/common/scsi.c b/common/scsi.c
deleted file mode 100644 (file)
index 6175e50..0000000
+++ /dev/null
@@ -1,688 +0,0 @@
-/*
- * (C) Copyright 2001
- * Denis Peter, MPL AG Switzerland
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <inttypes.h>
-#include <pci.h>
-#include <scsi.h>
-#include <dm/device-internal.h>
-#include <dm/uclass-internal.h>
-
-#if !defined(CONFIG_DM_SCSI)
-#ifdef CONFIG_SCSI_DEV_LIST
-#define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST
-#else
-#ifdef CONFIG_SATA_ULI5288
-
-#define SCSI_VEND_ID 0x10b9
-#define SCSI_DEV_ID  0x5288
-
-#elif !defined(CONFIG_SCSI_AHCI_PLAT)
-#error no scsi device defined
-#endif
-#define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
-#endif
-#endif
-
-#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)
-const struct pci_device_id scsi_device_list[] = { SCSI_DEV_LIST };
-#endif
-static ccb tempccb;    /* temporary scsi command buffer */
-
-static unsigned char tempbuff[512]; /* temporary data buffer */
-
-#if !defined(CONFIG_DM_SCSI)
-static int scsi_max_devs; /* number of highest available scsi device */
-
-static int scsi_curr_dev; /* current device */
-
-static struct blk_desc scsi_dev_desc[CONFIG_SYS_SCSI_MAX_DEVICE];
-#endif
-
-/* almost the maximum amount of the scsi_ext command.. */
-#define SCSI_MAX_READ_BLK 0xFFFF
-#define SCSI_LBA48_READ        0xFFFFFFF
-
-static void scsi_print_error(ccb *pccb)
-{
-       /* Dummy function that could print an error for debugging */
-}
-
-#ifdef CONFIG_SYS_64BIT_LBA
-void scsi_setup_read16(ccb *pccb, lbaint_t start, unsigned long blocks)
-{
-       pccb->cmd[0] = SCSI_READ16;
-       pccb->cmd[1] = pccb->lun << 5;
-       pccb->cmd[2] = (unsigned char)(start >> 56) & 0xff;
-       pccb->cmd[3] = (unsigned char)(start >> 48) & 0xff;
-       pccb->cmd[4] = (unsigned char)(start >> 40) & 0xff;
-       pccb->cmd[5] = (unsigned char)(start >> 32) & 0xff;
-       pccb->cmd[6] = (unsigned char)(start >> 24) & 0xff;
-       pccb->cmd[7] = (unsigned char)(start >> 16) & 0xff;
-       pccb->cmd[8] = (unsigned char)(start >> 8) & 0xff;
-       pccb->cmd[9] = (unsigned char)start & 0xff;
-       pccb->cmd[10] = 0;
-       pccb->cmd[11] = (unsigned char)(blocks >> 24) & 0xff;
-       pccb->cmd[12] = (unsigned char)(blocks >> 16) & 0xff;
-       pccb->cmd[13] = (unsigned char)(blocks >> 8) & 0xff;
-       pccb->cmd[14] = (unsigned char)blocks & 0xff;
-       pccb->cmd[15] = 0;
-       pccb->cmdlen = 16;
-       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
-       debug("scsi_setup_read16: cmd: %02X %02X startblk %02X%02X%02X%02X%02X%02X%02X%02X blccnt %02X%02X%02X%02X\n",
-             pccb->cmd[0], pccb->cmd[1],
-             pccb->cmd[2], pccb->cmd[3], pccb->cmd[4], pccb->cmd[5],
-             pccb->cmd[6], pccb->cmd[7], pccb->cmd[8], pccb->cmd[9],
-             pccb->cmd[11], pccb->cmd[12], pccb->cmd[13], pccb->cmd[14]);
-}
-#endif
-
-static void scsi_setup_read_ext(ccb *pccb, lbaint_t start,
-                               unsigned short blocks)
-{
-       pccb->cmd[0] = SCSI_READ10;
-       pccb->cmd[1] = pccb->lun << 5;
-       pccb->cmd[2] = (unsigned char)(start >> 24) & 0xff;
-       pccb->cmd[3] = (unsigned char)(start >> 16) & 0xff;
-       pccb->cmd[4] = (unsigned char)(start >> 8) & 0xff;
-       pccb->cmd[5] = (unsigned char)start & 0xff;
-       pccb->cmd[6] = 0;
-       pccb->cmd[7] = (unsigned char)(blocks >> 8) & 0xff;
-       pccb->cmd[8] = (unsigned char)blocks & 0xff;
-       pccb->cmd[6] = 0;
-       pccb->cmdlen = 10;
-       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
-       debug("scsi_setup_read_ext: cmd: %02X %02X startblk %02X%02X%02X%02X blccnt %02X%02X\n",
-             pccb->cmd[0], pccb->cmd[1],
-             pccb->cmd[2], pccb->cmd[3], pccb->cmd[4], pccb->cmd[5],
-             pccb->cmd[7], pccb->cmd[8]);
-}
-
-static void scsi_setup_write_ext(ccb *pccb, lbaint_t start,
-                                unsigned short blocks)
-{
-       pccb->cmd[0] = SCSI_WRITE10;
-       pccb->cmd[1] = pccb->lun << 5;
-       pccb->cmd[2] = (unsigned char)(start >> 24) & 0xff;
-       pccb->cmd[3] = (unsigned char)(start >> 16) & 0xff;
-       pccb->cmd[4] = (unsigned char)(start >> 8) & 0xff;
-       pccb->cmd[5] = (unsigned char)start & 0xff;
-       pccb->cmd[6] = 0;
-       pccb->cmd[7] = ((unsigned char)(blocks >> 8)) & 0xff;
-       pccb->cmd[8] = (unsigned char)blocks & 0xff;
-       pccb->cmd[9] = 0;
-       pccb->cmdlen = 10;
-       pccb->msgout[0] = SCSI_IDENTIFY;  /* NOT USED */
-       debug("%s: cmd: %02X %02X startblk %02X%02X%02X%02X blccnt %02X%02X\n",
-             __func__,
-             pccb->cmd[0], pccb->cmd[1],
-             pccb->cmd[2], pccb->cmd[3], pccb->cmd[4], pccb->cmd[5],
-             pccb->cmd[7], pccb->cmd[8]);
-}
-
-static void scsi_setup_inquiry(ccb *pccb)
-{
-       pccb->cmd[0] = SCSI_INQUIRY;
-       pccb->cmd[1] = pccb->lun << 5;
-       pccb->cmd[2] = 0;
-       pccb->cmd[3] = 0;
-       if (pccb->datalen > 255)
-               pccb->cmd[4] = 255;
-       else
-               pccb->cmd[4] = (unsigned char)pccb->datalen;
-       pccb->cmd[5] = 0;
-       pccb->cmdlen = 6;
-       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
-}
-
-#ifdef CONFIG_BLK
-static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
-                      void *buffer)
-#else
-static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
-                      lbaint_t blkcnt, void *buffer)
-#endif
-{
-#ifdef CONFIG_BLK
-       struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
-#endif
-       lbaint_t start, blks;
-       uintptr_t buf_addr;
-       unsigned short smallblks = 0;
-       ccb *pccb = (ccb *)&tempccb;
-
-       /* Setup device */
-       pccb->target = block_dev->target;
-       pccb->lun = block_dev->lun;
-       buf_addr = (unsigned long)buffer;
-       start = blknr;
-       blks = blkcnt;
-       debug("\nscsi_read: dev %d startblk " LBAF
-             ", blccnt " LBAF " buffer %lx\n",
-             block_dev->devnum, start, blks, (unsigned long)buffer);
-       do {
-               pccb->pdata = (unsigned char *)buf_addr;
-#ifdef CONFIG_SYS_64BIT_LBA
-               if (start > SCSI_LBA48_READ) {
-                       unsigned long blocks;
-                       blocks = min_t(lbaint_t, blks, SCSI_MAX_READ_BLK);
-                       pccb->datalen = block_dev->blksz * blocks;
-                       scsi_setup_read16(pccb, start, blocks);
-                       start += blocks;
-                       blks -= blocks;
-               } else
-#endif
-               if (blks > SCSI_MAX_READ_BLK) {
-                       pccb->datalen = block_dev->blksz *
-                               SCSI_MAX_READ_BLK;
-                       smallblks = SCSI_MAX_READ_BLK;
-                       scsi_setup_read_ext(pccb, start, smallblks);
-                       start += SCSI_MAX_READ_BLK;
-                       blks -= SCSI_MAX_READ_BLK;
-               } else {
-                       pccb->datalen = block_dev->blksz * blks;
-                       smallblks = (unsigned short)blks;
-                       scsi_setup_read_ext(pccb, start, smallblks);
-                       start += blks;
-                       blks = 0;
-               }
-               debug("scsi_read_ext: startblk " LBAF
-                     ", blccnt %x buffer %" PRIXPTR "\n",
-                     start, smallblks, buf_addr);
-               if (scsi_exec(pccb) != true) {
-                       scsi_print_error(pccb);
-                       blkcnt -= blks;
-                       break;
-               }
-               buf_addr += pccb->datalen;
-       } while (blks != 0);
-       debug("scsi_read_ext: end startblk " LBAF
-             ", blccnt %x buffer %" PRIXPTR "\n", start, smallblks, buf_addr);
-       return blkcnt;
-}
-
-/*******************************************************************************
- * scsi_write
- */
-
-/* Almost the maximum amount of the scsi_ext command.. */
-#define SCSI_MAX_WRITE_BLK 0xFFFF
-
-#ifdef CONFIG_BLK
-static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
-                       const void *buffer)
-#else
-static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr,
-                       lbaint_t blkcnt, const void *buffer)
-#endif
-{
-#ifdef CONFIG_BLK
-       struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
-#endif
-       lbaint_t start, blks;
-       uintptr_t buf_addr;
-       unsigned short smallblks;
-       ccb *pccb = (ccb *)&tempccb;
-
-       /* Setup device */
-       pccb->target = block_dev->target;
-       pccb->lun = block_dev->lun;
-       buf_addr = (unsigned long)buffer;
-       start = blknr;
-       blks = blkcnt;
-       debug("\n%s: dev %d startblk " LBAF ", blccnt " LBAF " buffer %lx\n",
-             __func__, block_dev->devnum, start, blks, (unsigned long)buffer);
-       do {
-               pccb->pdata = (unsigned char *)buf_addr;
-               if (blks > SCSI_MAX_WRITE_BLK) {
-                       pccb->datalen = (block_dev->blksz *
-                                        SCSI_MAX_WRITE_BLK);
-                       smallblks = SCSI_MAX_WRITE_BLK;
-                       scsi_setup_write_ext(pccb, start, smallblks);
-                       start += SCSI_MAX_WRITE_BLK;
-                       blks -= SCSI_MAX_WRITE_BLK;
-               } else {
-                       pccb->datalen = block_dev->blksz * blks;
-                       smallblks = (unsigned short)blks;
-                       scsi_setup_write_ext(pccb, start, smallblks);
-                       start += blks;
-                       blks = 0;
-               }
-               debug("%s: startblk " LBAF ", blccnt %x buffer %" PRIXPTR "\n",
-                     __func__, start, smallblks, buf_addr);
-               if (scsi_exec(pccb) != true) {
-                       scsi_print_error(pccb);
-                       blkcnt -= blks;
-                       break;
-               }
-               buf_addr += pccb->datalen;
-       } while (blks != 0);
-       debug("%s: end startblk " LBAF ", blccnt %x buffer %" PRIXPTR "\n",
-             __func__, start, smallblks, buf_addr);
-       return blkcnt;
-}
-
-#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)
-void scsi_init(void)
-{
-       int busdevfunc = -1;
-       int i;
-       /*
-        * Find a device from the list, this driver will support a single
-        * controller.
-        */
-       for (i = 0; i < ARRAY_SIZE(scsi_device_list); i++) {
-               /* get PCI Device ID */
-#ifdef CONFIG_DM_PCI
-               struct udevice *dev;
-               int ret;
-
-               ret = dm_pci_find_device(scsi_device_list[i].vendor,
-                                        scsi_device_list[i].device, 0, &dev);
-               if (!ret) {
-                       busdevfunc = dm_pci_get_bdf(dev);
-                       break;
-               }
-#else
-               busdevfunc = pci_find_device(scsi_device_list[i].vendor,
-                                            scsi_device_list[i].device,
-                                            0);
-#endif
-               if (busdevfunc != -1)
-                       break;
-       }
-
-       if (busdevfunc == -1) {
-               printf("Error: SCSI Controller(s) ");
-               for (i = 0; i < ARRAY_SIZE(scsi_device_list); i++) {
-                       printf("%04X:%04X ",
-                              scsi_device_list[i].vendor,
-                              scsi_device_list[i].device);
-               }
-               printf("not found\n");
-               return;
-       }
-#ifdef DEBUG
-       else {
-               printf("SCSI Controller (%04X,%04X) found (%d:%d:%d)\n",
-                      scsi_device_list[i].vendor,
-                      scsi_device_list[i].device,
-                      (busdevfunc >> 16) & 0xFF,
-                      (busdevfunc >> 11) & 0x1F,
-                      (busdevfunc >> 8) & 0x7);
-       }
-#endif
-       bootstage_start(BOOTSTAGE_ID_ACCUM_SCSI, "ahci");
-       scsi_low_level_init(busdevfunc);
-       scsi_scan(1);
-       bootstage_accum(BOOTSTAGE_ID_ACCUM_SCSI);
-}
-#endif
-
-/* copy src to dest, skipping leading and trailing blanks
- * and null terminate the string
- */
-static void scsi_ident_cpy(unsigned char *dest, unsigned char *src,
-                          unsigned int len)
-{
-       int start, end;
-
-       start = 0;
-       while (start < len) {
-               if (src[start] != ' ')
-                       break;
-               start++;
-       }
-       end = len-1;
-       while (end > start) {
-               if (src[end] != ' ')
-                       break;
-               end--;
-       }
-       for (; start <= end; start++)
-               *dest ++= src[start];
-       *dest = '\0';
-}
-
-static int scsi_read_capacity(ccb *pccb, lbaint_t *capacity,
-                             unsigned long *blksz)
-{
-       *capacity = 0;
-
-       memset(pccb->cmd, '\0', sizeof(pccb->cmd));
-       pccb->cmd[0] = SCSI_RD_CAPAC10;
-       pccb->cmd[1] = pccb->lun << 5;
-       pccb->cmdlen = 10;
-       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
-
-       pccb->datalen = 8;
-       if (scsi_exec(pccb) != true)
-               return 1;
-
-       *capacity = ((lbaint_t)pccb->pdata[0] << 24) |
-                   ((lbaint_t)pccb->pdata[1] << 16) |
-                   ((lbaint_t)pccb->pdata[2] << 8)  |
-                   ((lbaint_t)pccb->pdata[3]);
-
-       if (*capacity != 0xffffffff) {
-               /* Read capacity (10) was sufficient for this drive. */
-               *blksz = ((unsigned long)pccb->pdata[4] << 24) |
-                        ((unsigned long)pccb->pdata[5] << 16) |
-                        ((unsigned long)pccb->pdata[6] << 8)  |
-                        ((unsigned long)pccb->pdata[7]);
-               return 0;
-       }
-
-       /* Read capacity (10) was insufficient. Use read capacity (16). */
-       memset(pccb->cmd, '\0', sizeof(pccb->cmd));
-       pccb->cmd[0] = SCSI_RD_CAPAC16;
-       pccb->cmd[1] = 0x10;
-       pccb->cmdlen = 16;
-       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
-
-       pccb->datalen = 16;
-       if (scsi_exec(pccb) != true)
-               return 1;
-
-       *capacity = ((uint64_t)pccb->pdata[0] << 56) |
-                   ((uint64_t)pccb->pdata[1] << 48) |
-                   ((uint64_t)pccb->pdata[2] << 40) |
-                   ((uint64_t)pccb->pdata[3] << 32) |
-                   ((uint64_t)pccb->pdata[4] << 24) |
-                   ((uint64_t)pccb->pdata[5] << 16) |
-                   ((uint64_t)pccb->pdata[6] << 8)  |
-                   ((uint64_t)pccb->pdata[7]);
-
-       *blksz = ((uint64_t)pccb->pdata[8]  << 56) |
-                ((uint64_t)pccb->pdata[9]  << 48) |
-                ((uint64_t)pccb->pdata[10] << 40) |
-                ((uint64_t)pccb->pdata[11] << 32) |
-                ((uint64_t)pccb->pdata[12] << 24) |
-                ((uint64_t)pccb->pdata[13] << 16) |
-                ((uint64_t)pccb->pdata[14] << 8)  |
-                ((uint64_t)pccb->pdata[15]);
-
-       return 0;
-}
-
-
-/*
- * Some setup (fill-in) routines
- */
-static void scsi_setup_test_unit_ready(ccb *pccb)
-{
-       pccb->cmd[0] = SCSI_TST_U_RDY;
-       pccb->cmd[1] = pccb->lun << 5;
-       pccb->cmd[2] = 0;
-       pccb->cmd[3] = 0;
-       pccb->cmd[4] = 0;
-       pccb->cmd[5] = 0;
-       pccb->cmdlen = 6;
-       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
-}
-
-/**
- * scsi_init_dev_desc_priv - initialize only SCSI specific blk_desc properties
- *
- * @dev_desc: Block device description pointer
- */
-static void scsi_init_dev_desc_priv(struct blk_desc *dev_desc)
-{
-       dev_desc->target = 0xff;
-       dev_desc->lun = 0xff;
-       dev_desc->log2blksz =
-               LOG2_INVALID(typeof(dev_desc->log2blksz));
-       dev_desc->type = DEV_TYPE_UNKNOWN;
-       dev_desc->vendor[0] = 0;
-       dev_desc->product[0] = 0;
-       dev_desc->revision[0] = 0;
-       dev_desc->removable = false;
-#ifndef CONFIG_BLK
-       dev_desc->block_read = scsi_read;
-       dev_desc->block_write = scsi_write;
-#endif
-}
-
-#if !defined(CONFIG_DM_SCSI)
-/**
- * scsi_init_dev_desc - initialize all SCSI specific blk_desc properties
- *
- * @dev_desc: Block device description pointer
- * @devnum: Device number
- */
-static void scsi_init_dev_desc(struct blk_desc *dev_desc, int devnum)
-{
-       dev_desc->lba = 0;
-       dev_desc->blksz = 0;
-       dev_desc->if_type = IF_TYPE_SCSI;
-       dev_desc->devnum = devnum;
-       dev_desc->part_type = PART_TYPE_UNKNOWN;
-
-       scsi_init_dev_desc_priv(dev_desc);
-}
-#endif
-
-/**
- * scsi_detect_dev - Detect scsi device
- *
- * @target: target id
- * @lun: target lun
- * @dev_desc: block device description
- *
- * The scsi_detect_dev detects and fills a dev_desc structure when the device is
- * detected.
- *
- * Return: 0 on success, error value otherwise
- */
-static int scsi_detect_dev(int target, int lun, struct blk_desc *dev_desc)
-{
-       unsigned char perq, modi;
-       lbaint_t capacity;
-       unsigned long blksz;
-       ccb *pccb = (ccb *)&tempccb;
-
-       pccb->target = target;
-       pccb->lun = lun;
-       pccb->pdata = (unsigned char *)&tempbuff;
-       pccb->datalen = 512;
-       scsi_setup_inquiry(pccb);
-       if (scsi_exec(pccb) != true) {
-               if (pccb->contr_stat == SCSI_SEL_TIME_OUT) {
-                       /*
-                         * selection timeout => assuming no
-                         * device present
-                         */
-                       debug("Selection timeout ID %d\n",
-                             pccb->target);
-                       return -ETIMEDOUT;
-               }
-               scsi_print_error(pccb);
-               return -ENODEV;
-       }
-       perq = tempbuff[0];
-       modi = tempbuff[1];
-       if ((perq & 0x1f) == 0x1f)
-               return -ENODEV; /* skip unknown devices */
-       if ((modi & 0x80) == 0x80) /* drive is removable */
-               dev_desc->removable = true;
-       /* get info for this device */
-       scsi_ident_cpy((unsigned char *)dev_desc->vendor,
-                      &tempbuff[8], 8);
-       scsi_ident_cpy((unsigned char *)dev_desc->product,
-                      &tempbuff[16], 16);
-       scsi_ident_cpy((unsigned char *)dev_desc->revision,
-                      &tempbuff[32], 4);
-       dev_desc->target = pccb->target;
-       dev_desc->lun = pccb->lun;
-
-       pccb->datalen = 0;
-       scsi_setup_test_unit_ready(pccb);
-       if (scsi_exec(pccb) != true) {
-               if (dev_desc->removable) {
-                       dev_desc->type = perq;
-                       goto removable;
-               }
-               scsi_print_error(pccb);
-               return -EINVAL;
-       }
-       if (scsi_read_capacity(pccb, &capacity, &blksz)) {
-               scsi_print_error(pccb);
-               return -EINVAL;
-       }
-       dev_desc->lba = capacity;
-       dev_desc->blksz = blksz;
-       dev_desc->log2blksz = LOG2(dev_desc->blksz);
-       dev_desc->type = perq;
-removable:
-       return 0;
-}
-
-/*
- * (re)-scan the scsi bus and reports scsi device info
- * 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)
-{
-       int ret;
-       struct udevice *bdev;
-       struct blk_desc bd;
-       struct blk_desc *bdesc;
-       char str[10];
-
-       /*
-        * detect the scsi driver to get information about its geometry (block
-        * size, number of blocks) and other parameters (ids, type, ...)
-        */
-       scsi_init_dev_desc_priv(&bd);
-       if (scsi_detect_dev(id, lun, &bd))
-               return -ENODEV;
-
-       /*
-       * Create only one block device and do detection
-       * to make sure that there won't be a lot of
-       * block devices created
-       */
-       snprintf(str, sizeof(str), "id%dlun%d", id, lun);
-       ret = blk_create_devicef(dev, "scsi_blk", str, IF_TYPE_SCSI, -1,
-                       bd.blksz, bd.blksz * bd.lba, &bdev);
-       if (ret) {
-               debug("Can't create device\n");
-               return ret;
-       }
-
-       bdesc = dev_get_uclass_platdata(bdev);
-       bdesc->target = id;
-       bdesc->lun = lun;
-       bdesc->removable = bd.removable;
-       bdesc->type = bd.type;
-       memcpy(&bdesc->vendor, &bd.vendor, sizeof(bd.vendor));
-       memcpy(&bdesc->product, &bd.product, sizeof(bd.product));
-       memcpy(&bdesc->revision, &bd.revision,  sizeof(bd.revision));
-       part_init(bdesc);
-
-       if (mode == 1) {
-               printf("  Device %d: ", 0);
-               dev_print(bdesc);
-       }
-       return 0;
-}
-
-int scsi_scan(int mode)
-{
-       unsigned char i, lun;
-       struct uclass *uc;
-       struct udevice *dev; /* SCSI controller */
-       int ret;
-
-       if (mode == 1)
-               printf("scanning bus for devices...\n");
-
-       blk_unbind_all(IF_TYPE_SCSI);
-
-       ret = uclass_get(UCLASS_SCSI, &uc);
-       if (ret)
-               return ret;
-
-       uclass_foreach_dev(dev, uc) {
-               struct scsi_platdata *plat; /* scsi controller platdata */
-
-               /* probe SCSI controller driver */
-               ret = device_probe(dev);
-               if (ret)
-                       return ret;
-
-               /* Get controller platdata */
-               plat = dev_get_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)
-{
-       unsigned char i, lun;
-       int ret;
-
-       if (mode == 1)
-               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);
-
-       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,
-                                             &scsi_dev_desc[scsi_max_devs]);
-                       if (ret)
-                               continue;
-                       part_init(&scsi_dev_desc[scsi_max_devs]);
-
-                       if (mode == 1) {
-                               printf("  Device %d: ", 0);
-                               dev_print(&scsi_dev_desc[scsi_max_devs]);
-                       } /* if mode */
-                       scsi_max_devs++;
-               } /* next LUN */
-       }
-       if (scsi_max_devs > 0)
-               scsi_curr_dev = 0;
-       else
-               scsi_curr_dev = -1;
-
-       printf("Found %d device(s).\n", scsi_max_devs);
-#ifndef CONFIG_SPL_BUILD
-       setenv_ulong("scsidevs", scsi_max_devs);
-#endif
-       return 0;
-}
-#endif
-
-#ifdef CONFIG_BLK
-static const struct blk_ops scsi_blk_ops = {
-       .read   = scsi_read,
-       .write  = scsi_write,
-};
-
-U_BOOT_DRIVER(scsi_blk) = {
-       .name           = "scsi_blk",
-       .id             = UCLASS_BLK,
-       .ops            = &scsi_blk_ops,
-};
-#else
-U_BOOT_LEGACY_BLK(scsi) = {
-       .if_typename    = "scsi",
-       .if_type        = IF_TYPE_SCSI,
-       .max_devs       = CONFIG_SYS_SCSI_MAX_DEVICE,
-       .desc           = scsi_dev_desc,
-};
-#endif
index 63e4034c5653b34dd53bd0c080ebc22a6b3edaaf..2e03133c4364c31e4d44ec1b99a2de6f887e3865 100644 (file)
@@ -72,6 +72,8 @@ source "drivers/reset/Kconfig"
 
 source "drivers/rtc/Kconfig"
 
+source "drivers/scsi/Kconfig"
+
 source "drivers/serial/Kconfig"
 
 source "drivers/sound/Kconfig"
index 9bbcc7bf9c9cbb7704fa6f898817dc8cf689f38f..8624bd86f1c654eb392f47f4bfd73aa2e8d6d7e8 100644 (file)
@@ -45,7 +45,7 @@ obj-$(CONFIG_SPL_DFU_SUPPORT) += dfu/
 obj-$(CONFIG_SPL_WATCHDOG_SUPPORT) += watchdog/
 obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += usb/host/
 obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/
-obj-$(CONFIG_SPL_SATA_SUPPORT) += ata/
+obj-$(CONFIG_SPL_SATA_SUPPORT) += ata/ scsi/
 obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += block/
 obj-$(CONFIG_SPL_MMC_SUPPORT) += block/
 endif
@@ -82,6 +82,7 @@ obj-y += dfu/
 obj-$(CONFIG_X86) += pch/
 obj-y += phy/marvell/
 obj-y += rtc/
+obj-y += scsi/
 obj-y += sound/
 obj-y += spmi/
 obj-y += sysreset/
index 1ddd6508e40da4ed347c4cb010c2eb42bea03ece..ca7692d8a5d054a7d33d3dd3ecdacf187ddfaae8 100644 (file)
@@ -10,24 +10,6 @@ config BLK
          be partitioned into several areas, called 'partitions' in U-Boot.
          A filesystem can be placed in each partition.
 
-config SCSI
-       bool "Support SCSI controllers"
-       help
-         This enables support for SCSI (Small Computer System Interface),
-         a parallel interface widely used with storage peripherals such as
-         hard drives and optical drives. The SCSI standards define physical
-         interfaces as well as protocols for controlling devices and
-         tranferring data.
-
-config DM_SCSI
-       bool "Support SCSI controllers with driver model"
-       depends on BLK
-       help
-         This option enables the SCSI (Small Computer System Interface) uclass
-         which supports SCSI and SATA HDDs. For every device configuration
-         (IDs/LUNs) a block device is created with RAW read/write and
-         filesystem support.
-
 config BLOCK_CACHE
        bool "Use block device cache"
        default n
index 064c76fc98a9f9a7efefece8c12e80681cd91ad6..a5e7307c976b6180c5be2916f391c4d1f40ba7d2 100644 (file)
@@ -13,6 +13,6 @@ endif
 
 obj-$(CONFIG_IDE) += ide.o
 obj-$(CONFIG_IDE_FTIDE020) += ftide020.o
-obj-$(CONFIG_SANDBOX) += sandbox.o sandbox_scsi.o
+obj-$(CONFIG_SANDBOX) += sandbox.o
 obj-$(CONFIG_SYSTEMACE) += systemace.o
 obj-$(CONFIG_BLOCK_CACHE) += blkcache.o
diff --git a/drivers/block/sandbox_scsi.c b/drivers/block/sandbox_scsi.c
deleted file mode 100644 (file)
index f4004a3..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2015 Google, Inc
- * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- *
- * This file contains dummy implementations of SCSI functions requried so
- * that CONFIG_SCSI can be enabled for sandbox.
- */
-
-#include <common.h>
-#include <scsi.h>
-
-void scsi_bus_reset(void)
-{
-}
-
-void scsi_init(void)
-{
-}
-
-int scsi_exec(ccb *pccb)
-{
-       return 0;
-}
diff --git a/drivers/block/scsi-uclass.c b/drivers/block/scsi-uclass.c
deleted file mode 100644 (file)
index 05da6cd..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2015 Google, Inc
- * Written by Simon Glass <sjg@chromium.org>
- * Copyright (c) 2016 Xilinx, Inc
- * Written by Michal Simek
- *
- * Based on ahci-uclass.c
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <scsi.h>
-
-static int scsi_post_probe(struct udevice *dev)
-{
-       debug("%s: device %p\n", __func__, dev);
-       scsi_low_level_init(0, dev);
-       return 0;
-}
-
-UCLASS_DRIVER(scsi) = {
-       .id             = UCLASS_SCSI,
-       .name           = "scsi",
-       .post_probe      = scsi_post_probe,
-};
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
new file mode 100644 (file)
index 0000000..db1606e
--- /dev/null
@@ -0,0 +1,17 @@
+config SCSI
+       bool "Support SCSI controllers"
+       help
+         This enables support for SCSI (Small Computer System Interface),
+         a parallel interface widely used with storage peripherals such as
+         hard drives and optical drives. The SCSI standards define physical
+         interfaces as well as protocols for controlling devices and
+         tranferring data.
+
+config DM_SCSI
+       bool "Support SCSI controllers with driver model"
+       depends on BLK
+       help
+         This option enables the SCSI (Small Computer System Interface) uclass
+         which supports SCSI and SATA HDDs. For every device configuration
+         (IDs/LUNs) a block device is created with RAW read/write and
+         filesystem support.
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
new file mode 100644 (file)
index 0000000..9e23699
--- /dev/null
@@ -0,0 +1,20 @@
+#
+# (C) Copyright 2000-2007
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+ifndef CONFIG_SPL_BUILD
+obj-$(CONFIG_DM_SCSI) += scsi-uclass.o
+obj-$(CONFIG_SCSI) += scsi.o
+endif
+
+ifdef CONFIG_SPL_BUILD
+ifdef CONFIG_SPL_SATA_SUPPORT
+obj-$(CONFIG_DM_SCSI) += scsi-uclass.o
+obj-$(CONFIG_SCSI) += scsi.o
+endif
+endif
+
+obj-$(CONFIG_SANDBOX) += sandbox_scsi.o
diff --git a/drivers/scsi/sandbox_scsi.c b/drivers/scsi/sandbox_scsi.c
new file mode 100644 (file)
index 0000000..f4004a3
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2015 Google, Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ *
+ * This file contains dummy implementations of SCSI functions requried so
+ * that CONFIG_SCSI can be enabled for sandbox.
+ */
+
+#include <common.h>
+#include <scsi.h>
+
+void scsi_bus_reset(void)
+{
+}
+
+void scsi_init(void)
+{
+}
+
+int scsi_exec(ccb *pccb)
+{
+       return 0;
+}
diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c
new file mode 100644 (file)
index 0000000..05da6cd
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2015 Google, Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ * Copyright (c) 2016 Xilinx, Inc
+ * Written by Michal Simek
+ *
+ * Based on ahci-uclass.c
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <scsi.h>
+
+static int scsi_post_probe(struct udevice *dev)
+{
+       debug("%s: device %p\n", __func__, dev);
+       scsi_low_level_init(0, dev);
+       return 0;
+}
+
+UCLASS_DRIVER(scsi) = {
+       .id             = UCLASS_SCSI,
+       .name           = "scsi",
+       .post_probe      = scsi_post_probe,
+};
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
new file mode 100644 (file)
index 0000000..6175e50
--- /dev/null
@@ -0,0 +1,688 @@
+/*
+ * (C) Copyright 2001
+ * Denis Peter, MPL AG Switzerland
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <inttypes.h>
+#include <pci.h>
+#include <scsi.h>
+#include <dm/device-internal.h>
+#include <dm/uclass-internal.h>
+
+#if !defined(CONFIG_DM_SCSI)
+#ifdef CONFIG_SCSI_DEV_LIST
+#define SCSI_DEV_LIST CONFIG_SCSI_DEV_LIST
+#else
+#ifdef CONFIG_SATA_ULI5288
+
+#define SCSI_VEND_ID 0x10b9
+#define SCSI_DEV_ID  0x5288
+
+#elif !defined(CONFIG_SCSI_AHCI_PLAT)
+#error no scsi device defined
+#endif
+#define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
+#endif
+#endif
+
+#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)
+const struct pci_device_id scsi_device_list[] = { SCSI_DEV_LIST };
+#endif
+static ccb tempccb;    /* temporary scsi command buffer */
+
+static unsigned char tempbuff[512]; /* temporary data buffer */
+
+#if !defined(CONFIG_DM_SCSI)
+static int scsi_max_devs; /* number of highest available scsi device */
+
+static int scsi_curr_dev; /* current device */
+
+static struct blk_desc scsi_dev_desc[CONFIG_SYS_SCSI_MAX_DEVICE];
+#endif
+
+/* almost the maximum amount of the scsi_ext command.. */
+#define SCSI_MAX_READ_BLK 0xFFFF
+#define SCSI_LBA48_READ        0xFFFFFFF
+
+static void scsi_print_error(ccb *pccb)
+{
+       /* Dummy function that could print an error for debugging */
+}
+
+#ifdef CONFIG_SYS_64BIT_LBA
+void scsi_setup_read16(ccb *pccb, lbaint_t start, unsigned long blocks)
+{
+       pccb->cmd[0] = SCSI_READ16;
+       pccb->cmd[1] = pccb->lun << 5;
+       pccb->cmd[2] = (unsigned char)(start >> 56) & 0xff;
+       pccb->cmd[3] = (unsigned char)(start >> 48) & 0xff;
+       pccb->cmd[4] = (unsigned char)(start >> 40) & 0xff;
+       pccb->cmd[5] = (unsigned char)(start >> 32) & 0xff;
+       pccb->cmd[6] = (unsigned char)(start >> 24) & 0xff;
+       pccb->cmd[7] = (unsigned char)(start >> 16) & 0xff;
+       pccb->cmd[8] = (unsigned char)(start >> 8) & 0xff;
+       pccb->cmd[9] = (unsigned char)start & 0xff;
+       pccb->cmd[10] = 0;
+       pccb->cmd[11] = (unsigned char)(blocks >> 24) & 0xff;
+       pccb->cmd[12] = (unsigned char)(blocks >> 16) & 0xff;
+       pccb->cmd[13] = (unsigned char)(blocks >> 8) & 0xff;
+       pccb->cmd[14] = (unsigned char)blocks & 0xff;
+       pccb->cmd[15] = 0;
+       pccb->cmdlen = 16;
+       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
+       debug("scsi_setup_read16: cmd: %02X %02X startblk %02X%02X%02X%02X%02X%02X%02X%02X blccnt %02X%02X%02X%02X\n",
+             pccb->cmd[0], pccb->cmd[1],
+             pccb->cmd[2], pccb->cmd[3], pccb->cmd[4], pccb->cmd[5],
+             pccb->cmd[6], pccb->cmd[7], pccb->cmd[8], pccb->cmd[9],
+             pccb->cmd[11], pccb->cmd[12], pccb->cmd[13], pccb->cmd[14]);
+}
+#endif
+
+static void scsi_setup_read_ext(ccb *pccb, lbaint_t start,
+                               unsigned short blocks)
+{
+       pccb->cmd[0] = SCSI_READ10;
+       pccb->cmd[1] = pccb->lun << 5;
+       pccb->cmd[2] = (unsigned char)(start >> 24) & 0xff;
+       pccb->cmd[3] = (unsigned char)(start >> 16) & 0xff;
+       pccb->cmd[4] = (unsigned char)(start >> 8) & 0xff;
+       pccb->cmd[5] = (unsigned char)start & 0xff;
+       pccb->cmd[6] = 0;
+       pccb->cmd[7] = (unsigned char)(blocks >> 8) & 0xff;
+       pccb->cmd[8] = (unsigned char)blocks & 0xff;
+       pccb->cmd[6] = 0;
+       pccb->cmdlen = 10;
+       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
+       debug("scsi_setup_read_ext: cmd: %02X %02X startblk %02X%02X%02X%02X blccnt %02X%02X\n",
+             pccb->cmd[0], pccb->cmd[1],
+             pccb->cmd[2], pccb->cmd[3], pccb->cmd[4], pccb->cmd[5],
+             pccb->cmd[7], pccb->cmd[8]);
+}
+
+static void scsi_setup_write_ext(ccb *pccb, lbaint_t start,
+                                unsigned short blocks)
+{
+       pccb->cmd[0] = SCSI_WRITE10;
+       pccb->cmd[1] = pccb->lun << 5;
+       pccb->cmd[2] = (unsigned char)(start >> 24) & 0xff;
+       pccb->cmd[3] = (unsigned char)(start >> 16) & 0xff;
+       pccb->cmd[4] = (unsigned char)(start >> 8) & 0xff;
+       pccb->cmd[5] = (unsigned char)start & 0xff;
+       pccb->cmd[6] = 0;
+       pccb->cmd[7] = ((unsigned char)(blocks >> 8)) & 0xff;
+       pccb->cmd[8] = (unsigned char)blocks & 0xff;
+       pccb->cmd[9] = 0;
+       pccb->cmdlen = 10;
+       pccb->msgout[0] = SCSI_IDENTIFY;  /* NOT USED */
+       debug("%s: cmd: %02X %02X startblk %02X%02X%02X%02X blccnt %02X%02X\n",
+             __func__,
+             pccb->cmd[0], pccb->cmd[1],
+             pccb->cmd[2], pccb->cmd[3], pccb->cmd[4], pccb->cmd[5],
+             pccb->cmd[7], pccb->cmd[8]);
+}
+
+static void scsi_setup_inquiry(ccb *pccb)
+{
+       pccb->cmd[0] = SCSI_INQUIRY;
+       pccb->cmd[1] = pccb->lun << 5;
+       pccb->cmd[2] = 0;
+       pccb->cmd[3] = 0;
+       if (pccb->datalen > 255)
+               pccb->cmd[4] = 255;
+       else
+               pccb->cmd[4] = (unsigned char)pccb->datalen;
+       pccb->cmd[5] = 0;
+       pccb->cmdlen = 6;
+       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
+}
+
+#ifdef CONFIG_BLK
+static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
+                      void *buffer)
+#else
+static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
+                      lbaint_t blkcnt, void *buffer)
+#endif
+{
+#ifdef CONFIG_BLK
+       struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
+#endif
+       lbaint_t start, blks;
+       uintptr_t buf_addr;
+       unsigned short smallblks = 0;
+       ccb *pccb = (ccb *)&tempccb;
+
+       /* Setup device */
+       pccb->target = block_dev->target;
+       pccb->lun = block_dev->lun;
+       buf_addr = (unsigned long)buffer;
+       start = blknr;
+       blks = blkcnt;
+       debug("\nscsi_read: dev %d startblk " LBAF
+             ", blccnt " LBAF " buffer %lx\n",
+             block_dev->devnum, start, blks, (unsigned long)buffer);
+       do {
+               pccb->pdata = (unsigned char *)buf_addr;
+#ifdef CONFIG_SYS_64BIT_LBA
+               if (start > SCSI_LBA48_READ) {
+                       unsigned long blocks;
+                       blocks = min_t(lbaint_t, blks, SCSI_MAX_READ_BLK);
+                       pccb->datalen = block_dev->blksz * blocks;
+                       scsi_setup_read16(pccb, start, blocks);
+                       start += blocks;
+                       blks -= blocks;
+               } else
+#endif
+               if (blks > SCSI_MAX_READ_BLK) {
+                       pccb->datalen = block_dev->blksz *
+                               SCSI_MAX_READ_BLK;
+                       smallblks = SCSI_MAX_READ_BLK;
+                       scsi_setup_read_ext(pccb, start, smallblks);
+                       start += SCSI_MAX_READ_BLK;
+                       blks -= SCSI_MAX_READ_BLK;
+               } else {
+                       pccb->datalen = block_dev->blksz * blks;
+                       smallblks = (unsigned short)blks;
+                       scsi_setup_read_ext(pccb, start, smallblks);
+                       start += blks;
+                       blks = 0;
+               }
+               debug("scsi_read_ext: startblk " LBAF
+                     ", blccnt %x buffer %" PRIXPTR "\n",
+                     start, smallblks, buf_addr);
+               if (scsi_exec(pccb) != true) {
+                       scsi_print_error(pccb);
+                       blkcnt -= blks;
+                       break;
+               }
+               buf_addr += pccb->datalen;
+       } while (blks != 0);
+       debug("scsi_read_ext: end startblk " LBAF
+             ", blccnt %x buffer %" PRIXPTR "\n", start, smallblks, buf_addr);
+       return blkcnt;
+}
+
+/*******************************************************************************
+ * scsi_write
+ */
+
+/* Almost the maximum amount of the scsi_ext command.. */
+#define SCSI_MAX_WRITE_BLK 0xFFFF
+
+#ifdef CONFIG_BLK
+static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
+                       const void *buffer)
+#else
+static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr,
+                       lbaint_t blkcnt, const void *buffer)
+#endif
+{
+#ifdef CONFIG_BLK
+       struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
+#endif
+       lbaint_t start, blks;
+       uintptr_t buf_addr;
+       unsigned short smallblks;
+       ccb *pccb = (ccb *)&tempccb;
+
+       /* Setup device */
+       pccb->target = block_dev->target;
+       pccb->lun = block_dev->lun;
+       buf_addr = (unsigned long)buffer;
+       start = blknr;
+       blks = blkcnt;
+       debug("\n%s: dev %d startblk " LBAF ", blccnt " LBAF " buffer %lx\n",
+             __func__, block_dev->devnum, start, blks, (unsigned long)buffer);
+       do {
+               pccb->pdata = (unsigned char *)buf_addr;
+               if (blks > SCSI_MAX_WRITE_BLK) {
+                       pccb->datalen = (block_dev->blksz *
+                                        SCSI_MAX_WRITE_BLK);
+                       smallblks = SCSI_MAX_WRITE_BLK;
+                       scsi_setup_write_ext(pccb, start, smallblks);
+                       start += SCSI_MAX_WRITE_BLK;
+                       blks -= SCSI_MAX_WRITE_BLK;
+               } else {
+                       pccb->datalen = block_dev->blksz * blks;
+                       smallblks = (unsigned short)blks;
+                       scsi_setup_write_ext(pccb, start, smallblks);
+                       start += blks;
+                       blks = 0;
+               }
+               debug("%s: startblk " LBAF ", blccnt %x buffer %" PRIXPTR "\n",
+                     __func__, start, smallblks, buf_addr);
+               if (scsi_exec(pccb) != true) {
+                       scsi_print_error(pccb);
+                       blkcnt -= blks;
+                       break;
+               }
+               buf_addr += pccb->datalen;
+       } while (blks != 0);
+       debug("%s: end startblk " LBAF ", blccnt %x buffer %" PRIXPTR "\n",
+             __func__, start, smallblks, buf_addr);
+       return blkcnt;
+}
+
+#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)
+void scsi_init(void)
+{
+       int busdevfunc = -1;
+       int i;
+       /*
+        * Find a device from the list, this driver will support a single
+        * controller.
+        */
+       for (i = 0; i < ARRAY_SIZE(scsi_device_list); i++) {
+               /* get PCI Device ID */
+#ifdef CONFIG_DM_PCI
+               struct udevice *dev;
+               int ret;
+
+               ret = dm_pci_find_device(scsi_device_list[i].vendor,
+                                        scsi_device_list[i].device, 0, &dev);
+               if (!ret) {
+                       busdevfunc = dm_pci_get_bdf(dev);
+                       break;
+               }
+#else
+               busdevfunc = pci_find_device(scsi_device_list[i].vendor,
+                                            scsi_device_list[i].device,
+                                            0);
+#endif
+               if (busdevfunc != -1)
+                       break;
+       }
+
+       if (busdevfunc == -1) {
+               printf("Error: SCSI Controller(s) ");
+               for (i = 0; i < ARRAY_SIZE(scsi_device_list); i++) {
+                       printf("%04X:%04X ",
+                              scsi_device_list[i].vendor,
+                              scsi_device_list[i].device);
+               }
+               printf("not found\n");
+               return;
+       }
+#ifdef DEBUG
+       else {
+               printf("SCSI Controller (%04X,%04X) found (%d:%d:%d)\n",
+                      scsi_device_list[i].vendor,
+                      scsi_device_list[i].device,
+                      (busdevfunc >> 16) & 0xFF,
+                      (busdevfunc >> 11) & 0x1F,
+                      (busdevfunc >> 8) & 0x7);
+       }
+#endif
+       bootstage_start(BOOTSTAGE_ID_ACCUM_SCSI, "ahci");
+       scsi_low_level_init(busdevfunc);
+       scsi_scan(1);
+       bootstage_accum(BOOTSTAGE_ID_ACCUM_SCSI);
+}
+#endif
+
+/* copy src to dest, skipping leading and trailing blanks
+ * and null terminate the string
+ */
+static void scsi_ident_cpy(unsigned char *dest, unsigned char *src,
+                          unsigned int len)
+{
+       int start, end;
+
+       start = 0;
+       while (start < len) {
+               if (src[start] != ' ')
+                       break;
+               start++;
+       }
+       end = len-1;
+       while (end > start) {
+               if (src[end] != ' ')
+                       break;
+               end--;
+       }
+       for (; start <= end; start++)
+               *dest ++= src[start];
+       *dest = '\0';
+}
+
+static int scsi_read_capacity(ccb *pccb, lbaint_t *capacity,
+                             unsigned long *blksz)
+{
+       *capacity = 0;
+
+       memset(pccb->cmd, '\0', sizeof(pccb->cmd));
+       pccb->cmd[0] = SCSI_RD_CAPAC10;
+       pccb->cmd[1] = pccb->lun << 5;
+       pccb->cmdlen = 10;
+       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
+
+       pccb->datalen = 8;
+       if (scsi_exec(pccb) != true)
+               return 1;
+
+       *capacity = ((lbaint_t)pccb->pdata[0] << 24) |
+                   ((lbaint_t)pccb->pdata[1] << 16) |
+                   ((lbaint_t)pccb->pdata[2] << 8)  |
+                   ((lbaint_t)pccb->pdata[3]);
+
+       if (*capacity != 0xffffffff) {
+               /* Read capacity (10) was sufficient for this drive. */
+               *blksz = ((unsigned long)pccb->pdata[4] << 24) |
+                        ((unsigned long)pccb->pdata[5] << 16) |
+                        ((unsigned long)pccb->pdata[6] << 8)  |
+                        ((unsigned long)pccb->pdata[7]);
+               return 0;
+       }
+
+       /* Read capacity (10) was insufficient. Use read capacity (16). */
+       memset(pccb->cmd, '\0', sizeof(pccb->cmd));
+       pccb->cmd[0] = SCSI_RD_CAPAC16;
+       pccb->cmd[1] = 0x10;
+       pccb->cmdlen = 16;
+       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
+
+       pccb->datalen = 16;
+       if (scsi_exec(pccb) != true)
+               return 1;
+
+       *capacity = ((uint64_t)pccb->pdata[0] << 56) |
+                   ((uint64_t)pccb->pdata[1] << 48) |
+                   ((uint64_t)pccb->pdata[2] << 40) |
+                   ((uint64_t)pccb->pdata[3] << 32) |
+                   ((uint64_t)pccb->pdata[4] << 24) |
+                   ((uint64_t)pccb->pdata[5] << 16) |
+                   ((uint64_t)pccb->pdata[6] << 8)  |
+                   ((uint64_t)pccb->pdata[7]);
+
+       *blksz = ((uint64_t)pccb->pdata[8]  << 56) |
+                ((uint64_t)pccb->pdata[9]  << 48) |
+                ((uint64_t)pccb->pdata[10] << 40) |
+                ((uint64_t)pccb->pdata[11] << 32) |
+                ((uint64_t)pccb->pdata[12] << 24) |
+                ((uint64_t)pccb->pdata[13] << 16) |
+                ((uint64_t)pccb->pdata[14] << 8)  |
+                ((uint64_t)pccb->pdata[15]);
+
+       return 0;
+}
+
+
+/*
+ * Some setup (fill-in) routines
+ */
+static void scsi_setup_test_unit_ready(ccb *pccb)
+{
+       pccb->cmd[0] = SCSI_TST_U_RDY;
+       pccb->cmd[1] = pccb->lun << 5;
+       pccb->cmd[2] = 0;
+       pccb->cmd[3] = 0;
+       pccb->cmd[4] = 0;
+       pccb->cmd[5] = 0;
+       pccb->cmdlen = 6;
+       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
+}
+
+/**
+ * scsi_init_dev_desc_priv - initialize only SCSI specific blk_desc properties
+ *
+ * @dev_desc: Block device description pointer
+ */
+static void scsi_init_dev_desc_priv(struct blk_desc *dev_desc)
+{
+       dev_desc->target = 0xff;
+       dev_desc->lun = 0xff;
+       dev_desc->log2blksz =
+               LOG2_INVALID(typeof(dev_desc->log2blksz));
+       dev_desc->type = DEV_TYPE_UNKNOWN;
+       dev_desc->vendor[0] = 0;
+       dev_desc->product[0] = 0;
+       dev_desc->revision[0] = 0;
+       dev_desc->removable = false;
+#ifndef CONFIG_BLK
+       dev_desc->block_read = scsi_read;
+       dev_desc->block_write = scsi_write;
+#endif
+}
+
+#if !defined(CONFIG_DM_SCSI)
+/**
+ * scsi_init_dev_desc - initialize all SCSI specific blk_desc properties
+ *
+ * @dev_desc: Block device description pointer
+ * @devnum: Device number
+ */
+static void scsi_init_dev_desc(struct blk_desc *dev_desc, int devnum)
+{
+       dev_desc->lba = 0;
+       dev_desc->blksz = 0;
+       dev_desc->if_type = IF_TYPE_SCSI;
+       dev_desc->devnum = devnum;
+       dev_desc->part_type = PART_TYPE_UNKNOWN;
+
+       scsi_init_dev_desc_priv(dev_desc);
+}
+#endif
+
+/**
+ * scsi_detect_dev - Detect scsi device
+ *
+ * @target: target id
+ * @lun: target lun
+ * @dev_desc: block device description
+ *
+ * The scsi_detect_dev detects and fills a dev_desc structure when the device is
+ * detected.
+ *
+ * Return: 0 on success, error value otherwise
+ */
+static int scsi_detect_dev(int target, int lun, struct blk_desc *dev_desc)
+{
+       unsigned char perq, modi;
+       lbaint_t capacity;
+       unsigned long blksz;
+       ccb *pccb = (ccb *)&tempccb;
+
+       pccb->target = target;
+       pccb->lun = lun;
+       pccb->pdata = (unsigned char *)&tempbuff;
+       pccb->datalen = 512;
+       scsi_setup_inquiry(pccb);
+       if (scsi_exec(pccb) != true) {
+               if (pccb->contr_stat == SCSI_SEL_TIME_OUT) {
+                       /*
+                         * selection timeout => assuming no
+                         * device present
+                         */
+                       debug("Selection timeout ID %d\n",
+                             pccb->target);
+                       return -ETIMEDOUT;
+               }
+               scsi_print_error(pccb);
+               return -ENODEV;
+       }
+       perq = tempbuff[0];
+       modi = tempbuff[1];
+       if ((perq & 0x1f) == 0x1f)
+               return -ENODEV; /* skip unknown devices */
+       if ((modi & 0x80) == 0x80) /* drive is removable */
+               dev_desc->removable = true;
+       /* get info for this device */
+       scsi_ident_cpy((unsigned char *)dev_desc->vendor,
+                      &tempbuff[8], 8);
+       scsi_ident_cpy((unsigned char *)dev_desc->product,
+                      &tempbuff[16], 16);
+       scsi_ident_cpy((unsigned char *)dev_desc->revision,
+                      &tempbuff[32], 4);
+       dev_desc->target = pccb->target;
+       dev_desc->lun = pccb->lun;
+
+       pccb->datalen = 0;
+       scsi_setup_test_unit_ready(pccb);
+       if (scsi_exec(pccb) != true) {
+               if (dev_desc->removable) {
+                       dev_desc->type = perq;
+                       goto removable;
+               }
+               scsi_print_error(pccb);
+               return -EINVAL;
+       }
+       if (scsi_read_capacity(pccb, &capacity, &blksz)) {
+               scsi_print_error(pccb);
+               return -EINVAL;
+       }
+       dev_desc->lba = capacity;
+       dev_desc->blksz = blksz;
+       dev_desc->log2blksz = LOG2(dev_desc->blksz);
+       dev_desc->type = perq;
+removable:
+       return 0;
+}
+
+/*
+ * (re)-scan the scsi bus and reports scsi device info
+ * 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)
+{
+       int ret;
+       struct udevice *bdev;
+       struct blk_desc bd;
+       struct blk_desc *bdesc;
+       char str[10];
+
+       /*
+        * detect the scsi driver to get information about its geometry (block
+        * size, number of blocks) and other parameters (ids, type, ...)
+        */
+       scsi_init_dev_desc_priv(&bd);
+       if (scsi_detect_dev(id, lun, &bd))
+               return -ENODEV;
+
+       /*
+       * Create only one block device and do detection
+       * to make sure that there won't be a lot of
+       * block devices created
+       */
+       snprintf(str, sizeof(str), "id%dlun%d", id, lun);
+       ret = blk_create_devicef(dev, "scsi_blk", str, IF_TYPE_SCSI, -1,
+                       bd.blksz, bd.blksz * bd.lba, &bdev);
+       if (ret) {
+               debug("Can't create device\n");
+               return ret;
+       }
+
+       bdesc = dev_get_uclass_platdata(bdev);
+       bdesc->target = id;
+       bdesc->lun = lun;
+       bdesc->removable = bd.removable;
+       bdesc->type = bd.type;
+       memcpy(&bdesc->vendor, &bd.vendor, sizeof(bd.vendor));
+       memcpy(&bdesc->product, &bd.product, sizeof(bd.product));
+       memcpy(&bdesc->revision, &bd.revision,  sizeof(bd.revision));
+       part_init(bdesc);
+
+       if (mode == 1) {
+               printf("  Device %d: ", 0);
+               dev_print(bdesc);
+       }
+       return 0;
+}
+
+int scsi_scan(int mode)
+{
+       unsigned char i, lun;
+       struct uclass *uc;
+       struct udevice *dev; /* SCSI controller */
+       int ret;
+
+       if (mode == 1)
+               printf("scanning bus for devices...\n");
+
+       blk_unbind_all(IF_TYPE_SCSI);
+
+       ret = uclass_get(UCLASS_SCSI, &uc);
+       if (ret)
+               return ret;
+
+       uclass_foreach_dev(dev, uc) {
+               struct scsi_platdata *plat; /* scsi controller platdata */
+
+               /* probe SCSI controller driver */
+               ret = device_probe(dev);
+               if (ret)
+                       return ret;
+
+               /* Get controller platdata */
+               plat = dev_get_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)
+{
+       unsigned char i, lun;
+       int ret;
+
+       if (mode == 1)
+               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);
+
+       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,
+                                             &scsi_dev_desc[scsi_max_devs]);
+                       if (ret)
+                               continue;
+                       part_init(&scsi_dev_desc[scsi_max_devs]);
+
+                       if (mode == 1) {
+                               printf("  Device %d: ", 0);
+                               dev_print(&scsi_dev_desc[scsi_max_devs]);
+                       } /* if mode */
+                       scsi_max_devs++;
+               } /* next LUN */
+       }
+       if (scsi_max_devs > 0)
+               scsi_curr_dev = 0;
+       else
+               scsi_curr_dev = -1;
+
+       printf("Found %d device(s).\n", scsi_max_devs);
+#ifndef CONFIG_SPL_BUILD
+       setenv_ulong("scsidevs", scsi_max_devs);
+#endif
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_BLK
+static const struct blk_ops scsi_blk_ops = {
+       .read   = scsi_read,
+       .write  = scsi_write,
+};
+
+U_BOOT_DRIVER(scsi_blk) = {
+       .name           = "scsi_blk",
+       .id             = UCLASS_BLK,
+       .ops            = &scsi_blk_ops,
+};
+#else
+U_BOOT_LEGACY_BLK(scsi) = {
+       .if_typename    = "scsi",
+       .if_type        = IF_TYPE_SCSI,
+       .max_devs       = CONFIG_SYS_SCSI_MAX_DEVICE,
+       .desc           = scsi_dev_desc,
+};
+#endif