qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: scsi: Document and rename the scsi_scan() parameter 

The 'mode' parameter is actually a flag to determine whether to display
a list of devices found during the scan. Rename it to reflect this, add a
function comment and adjust callers to use a boolean.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2017-06-14 21:28:41 -06:00
parent 4682c8a19b
commit 8eab1a58dd
7 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/ls102xa/ls102xa_sata.c
View File

@ -36,7 +36,7 @@ int ls1021a_sata_init(void)
out_le32(&ccsr_ahci->ptc, AHCI_PORT_TRANS_CFG); out_le32(&ccsr_ahci->ptc, AHCI_PORT_TRANS_CFG);
ahci_init((void __iomem *)AHCI_BASE_ADDR); ahci_init((void __iomem *)AHCI_BASE_ADDR);
scsi_scan(0); scsi_scan(false);
return 0; return 0;
} }

4
arch/arm/cpu/armv8/fsl-layerscape/soc.c
View File

@ -225,7 +225,7 @@ int sata_init(void)
out_le32(&ccsr_ahci->axicc, AHCI_PORT_AXICC_CFG); out_le32(&ccsr_ahci->axicc, AHCI_PORT_AXICC_CFG);
ahci_init((void __iomem *)CONFIG_SYS_SATA1); ahci_init((void __iomem *)CONFIG_SYS_SATA1);
scsi_scan(0); scsi_scan(false);
return 0; return 0;
} }
@ -244,7 +244,7 @@ int sata_init(void)
out_le32(&ccsr_ahci->axicc, AHCI_PORT_AXICC_CFG); out_le32(&ccsr_ahci->axicc, AHCI_PORT_AXICC_CFG);
ahci_init((void __iomem *)CONFIG_SYS_SATA); ahci_init((void __iomem *)CONFIG_SYS_SATA);
scsi_scan(0); scsi_scan(false);
return 0; return 0;
} }

2
board/highbank/highbank.c
View File

@ -67,7 +67,7 @@ void scsi_init(void)
cphy_disable_overrides(); cphy_disable_overrides();
if (reg & PWRDOM_STAT_SATA) { if (reg & PWRDOM_STAT_SATA) {
ahci_init((void __iomem *)HB_AHCI_BASE); ahci_init((void __iomem *)HB_AHCI_BASE);
scsi_scan(1); scsi_scan(true);
} }
} }
#endif #endif

4
cmd/scsi.c
View File

@ -37,7 +37,7 @@ static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
if (strncmp(argv[1], "res", 3) == 0) { if (strncmp(argv[1], "res", 3) == 0) {
printf("\nReset SCSI\n"); printf("\nReset SCSI\n");
scsi_bus_reset(NULL); scsi_bus_reset(NULL);
ret = scsi_scan(1); ret = scsi_scan(true);
if (ret) if (ret)
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
return ret; return ret;
@ -55,7 +55,7 @@ static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
return 0; return 0;
} }
if (strncmp(argv[1], "scan", 4) == 0) { if (strncmp(argv[1], "scan", 4) == 0) {
ret = scsi_scan(1); ret = scsi_scan(true);
if (ret) if (ret)
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
return ret; return ret;

2
common/spl/spl_sata.c
View File

@ -34,7 +34,7 @@ static int spl_sata_load_image(struct spl_image_info *spl_image,
return err; return err;
} else { } else {
/* try to recognize storage devices immediately */ /* try to recognize storage devices immediately */
scsi_scan(0); scsi_scan(false);
stor_dev = blk_get_devnum_by_type(IF_TYPE_SCSI, 0); stor_dev = blk_get_devnum_by_type(IF_TYPE_SCSI, 0);
if (!stor_dev) if (!stor_dev)
return -ENODEV; return -ENODEV;

20
drivers/scsi/scsi.c
View File

@ -326,7 +326,7 @@ void scsi_init(void)
#endif #endif
bootstage_start(BOOTSTAGE_ID_ACCUM_SCSI, "ahci"); bootstage_start(BOOTSTAGE_ID_ACCUM_SCSI, "ahci");
scsi_low_level_init(busdevfunc); scsi_low_level_init(busdevfunc);
scsi_scan(1); scsi_scan(true);
bootstage_accum(BOOTSTAGE_ID_ACCUM_SCSI); bootstage_accum(BOOTSTAGE_ID_ACCUM_SCSI);
} }
#endif #endif
@ -555,7 +555,7 @@ removable:
* to the user if mode = 1 * to the user if mode = 1
*/ */
#if defined(CONFIG_DM_SCSI) #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; int ret;
struct udevice *bdev; struct udevice *bdev;
@ -594,21 +594,21 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, int mode)
memcpy(&bdesc->revision, &bd.revision, sizeof(bd.revision)); memcpy(&bdesc->revision, &bd.revision, sizeof(bd.revision));
part_init(bdesc); part_init(bdesc);
if (mode == 1) { if (verbose) {
printf(" Device %d: ", 0); printf(" Device %d: ", 0);
dev_print(bdesc); dev_print(bdesc);
} }
return 0; return 0;
} }
int scsi_scan(int mode) int scsi_scan(bool verbose)
{ {
unsigned char i, lun; unsigned char i, lun;
struct uclass *uc; struct uclass *uc;
struct udevice *dev; /* SCSI controller */ struct udevice *dev; /* SCSI controller */
int ret; int ret;
if (mode == 1) if (verbose)
printf("scanning bus for devices...\n"); printf("scanning bus for devices...\n");
blk_unbind_all(IF_TYPE_SCSI); blk_unbind_all(IF_TYPE_SCSI);
@ -630,18 +630,18 @@ int scsi_scan(int mode)
for (i = 0; i < plat->max_id; i++) for (i = 0; i < plat->max_id; i++)
for (lun = 0; lun < plat->max_lun; lun++) for (lun = 0; lun < plat->max_lun; lun++)
do_scsi_scan_one(dev, i, lun, mode); do_scsi_scan_one(dev, i, lun, verbose);
} }
return 0; return 0;
} }
#else #else
int scsi_scan(int mode) int scsi_scan(bool verbose)
{ {
unsigned char i, lun; unsigned char i, lun;
int ret; int ret;
if (mode == 1) if (verbose)
printf("scanning bus for devices...\n"); printf("scanning bus for devices...\n");
for (i = 0; i < CONFIG_SYS_SCSI_MAX_DEVICE; i++) for (i = 0; i < CONFIG_SYS_SCSI_MAX_DEVICE; i++)
scsi_init_dev_desc(&scsi_dev_desc[i], i); scsi_init_dev_desc(&scsi_dev_desc[i], i);
@ -655,10 +655,10 @@ int scsi_scan(int mode)
continue; continue;
part_init(&scsi_dev_desc[scsi_max_devs]); part_init(&scsi_dev_desc[scsi_max_devs]);
if (mode == 1) { if (verbose) {
printf(" Device %d: ", 0); printf(" Device %d: ", 0);
dev_print(&scsi_dev_desc[scsi_max_devs]); dev_print(&scsi_dev_desc[scsi_max_devs]);
} /* if mode */ }
scsi_max_devs++; scsi_max_devs++;
} /* next LUN */ } /* next LUN */
} }

8
include/scsi.h
View File

@ -199,10 +199,12 @@ void scsi_init(void);
int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb); int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb);
int scsi_bus_reset(struct udevice *dev); int scsi_bus_reset(struct udevice *dev);
/*************************************************************************** /**
* functions residing inside cmd_scsi.c * scsi_scan() - Scan all SCSI controllers for available devices
*
* @vebose: true to show information about each device found
*/ */
int scsi_scan(int mode); int scsi_scan(bool verbose);
#define SCSI_IDENTIFY 0xC0 /* not used */ #define SCSI_IDENTIFY 0xC0 /* not used */