From 764cc673d345abf775ed9d05737a3dd856b5dfde Mon Sep 17 00:00:00 2001 From: Ye Li Date: Thu, 18 Jul 2019 20:42:17 -0700 Subject: [PATCH] MLK-22293-4 fastboot: Change to use SCSI interface for sata device After enabling AHCI driver and DM SCSI, we need to access SCSI device for SATA Signed-off-by: Ye Li --- drivers/fastboot/fb_fsl/fb_fsl_common.c | 4 ++-- drivers/fastboot/fb_fsl/fb_fsl_dev.c | 8 ++++---- drivers/fastboot/fb_fsl/fb_fsl_partitions.c | 16 +++++----------- 3 files changed, 11 insertions(+), 17 deletions(-) mode change 100755 => 100644 drivers/fastboot/fb_fsl/fb_fsl_common.c mode change 100755 => 100644 drivers/fastboot/fb_fsl/fb_fsl_dev.c diff --git a/drivers/fastboot/fb_fsl/fb_fsl_common.c b/drivers/fastboot/fb_fsl/fb_fsl_common.c old mode 100755 new mode 100644 index 28d3882407..d48ffbf57d --- a/drivers/fastboot/fb_fsl/fb_fsl_common.c +++ b/drivers/fastboot/fb_fsl/fb_fsl_common.c @@ -92,10 +92,10 @@ int get_block_size(void) { struct blk_desc *dev_desc; dev_no = fastboot_devinfo.dev_id; - dev_desc = blk_get_dev(fastboot_devinfo.type == DEV_SATA ? "sata" : "mmc", dev_no); + dev_desc = blk_get_dev(fastboot_devinfo.type == DEV_SATA ? "scsi" : "mmc", dev_no); if (NULL == dev_desc) { printf("** Block device %s %d not supported\n", - fastboot_devinfo.type == DEV_SATA ? "sata" : "mmc", + fastboot_devinfo.type == DEV_SATA ? "scsi" : "mmc", dev_no); return 0; } diff --git a/drivers/fastboot/fb_fsl/fb_fsl_dev.c b/drivers/fastboot/fb_fsl/fb_fsl_dev.c old mode 100755 new mode 100644 index feb65edaa3..97566ddedb --- a/drivers/fastboot/fb_fsl/fb_fsl_dev.c +++ b/drivers/fastboot/fb_fsl/fb_fsl_dev.c @@ -178,7 +178,7 @@ static void process_flash_blkdev(const char *cmdbuf, void *download_buffer, dev_no = fastboot_devinfo.dev_id; printf("sparse flash target is %s:%d\n", - fastboot_devinfo.type == DEV_SATA ? "sata" : "mmc", + fastboot_devinfo.type == DEV_SATA ? "scsi" : "mmc", dev_no); if (fastboot_devinfo.type == DEV_MMC) { mmc = find_mmc_device(dev_no); @@ -186,10 +186,10 @@ static void process_flash_blkdev(const char *cmdbuf, void *download_buffer, printf("MMC card init failed!\n"); } - dev_desc = blk_get_dev(fastboot_devinfo.type == DEV_SATA ? "sata" : "mmc", dev_no); + dev_desc = blk_get_dev(fastboot_devinfo.type == DEV_SATA ? "scsi" : "mmc", dev_no); if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) { printf("** Block device %s %d not supported\n", - fastboot_devinfo.type == DEV_SATA ? "sata" : "mmc", + fastboot_devinfo.type == DEV_SATA ? "scsi" : "mmc", dev_no); return; } @@ -244,7 +244,7 @@ static void process_flash_blkdev(const char *cmdbuf, void *download_buffer, } sprintf(blk_write, "%s write 0x%x 0x%x 0x%x", - fastboot_devinfo.type == DEV_SATA ? "sata" : "mmc", + fastboot_devinfo.type == DEV_SATA ? "scsi" : "mmc", (unsigned int)(uintptr_t)download_buffer, /*source*/ ptn->start, /*dest*/ temp /*length*/); diff --git a/drivers/fastboot/fb_fsl/fb_fsl_partitions.c b/drivers/fastboot/fb_fsl/fb_fsl_partitions.c index be27be7926..483677caf2 100644 --- a/drivers/fastboot/fb_fsl/fb_fsl_partitions.c +++ b/drivers/fastboot/fb_fsl/fb_fsl_partitions.c @@ -18,8 +18,8 @@ #include #include #include -#ifdef CONFIG_SATA -#include +#ifdef CONFIG_DM_SCSI +#include #endif #if defined(CONFIG_FASTBOOT_LOCK) @@ -147,17 +147,11 @@ static int _fastboot_parts_load_from_ptable(void) /* sata case in env */ if (fastboot_devinfo.type == DEV_SATA) { -#ifdef CONFIG_SATA +#ifdef CONFIG_DM_SCSI int sata_device_no = fastboot_devinfo.dev_id; puts("flash target is SATA\n"); - if (sata_initialize()) - return -1; - if (sata_device_no >= CONFIG_SYS_SATA_MAX_DEVICE) { - printf("Unknown SATA(%d) device for fastboot\n", - sata_device_no); - return -1; - } - dev_desc = sata_get_dev(sata_device_no); + scsi_scan(false); + dev_desc = blk_get_dev("scsi", sata_device_no); #else /*! CONFIG_SATA*/ puts("SATA isn't buildin\n"); return -1; -- 2.17.1