Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dm: scsi: Add a device pointer to scan_exec(), scsi_bus_reset()

Browse Source 
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@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
master
Simon Glass 7 years ago
parent 322f73f473
commit 4682c8a19b
6 changed files with 40 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      arch/arm/mach-omap2/sata.c
  2. 2
      cmd/scsi.c
  3. 15
      drivers/ata/ahci.c
  4. 5
      drivers/scsi/sandbox_scsi.c
  5. 31
      drivers/scsi/scsi.c
  6. 4
      include/scsi.h

4
arch/arm/mach-omap2/sata.c
Unescape View File

@ -63,8 +63,10 @@ void scsi_init(void)
scsi_scan(1); scsi_scan(1);
} }
void scsi_bus_reset(void) int scsi_bus_reset(struct udevice *dev)
{ {
ahci_reset((void __iomem *)DWC_AHSATA_BASE); ahci_reset((void __iomem *)DWC_AHSATA_BASE);
ahci_init((void __iomem *)DWC_AHSATA_BASE); ahci_init((void __iomem *)DWC_AHSATA_BASE);
return 0;
} }

2
cmd/scsi.c
Unescape View File

@ -36,7 +36,7 @@ static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
case 2: case 2:
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(); scsi_bus_reset(NULL);
ret = scsi_scan(1); ret = scsi_scan(1);
if (ret) if (ret)
return CMD_RET_FAILURE; return CMD_RET_FAILURE;

15
drivers/ata/ahci.c
Unescape View File

@ -26,7 +26,9 @@
static int ata_io_flush(struct ahci_uc_priv *uc_priv, u8 port); static int ata_io_flush(struct ahci_uc_priv *uc_priv, u8 port);
#ifndef CONFIG_DM_SCSI
struct ahci_uc_priv *probe_ent = NULL; struct ahci_uc_priv *probe_ent = NULL;
#endif
#define writel_with_flush(a,b) do { writel(a,b); readl(b); } while (0) #define writel_with_flush(a,b) do { writel(a,b); readl(b); } while (0)
@ -926,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; int ret;
switch (pccb->cmd[0]) { switch (pccb->cmd[0]) {
@ -1128,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*/ /*Not implement*/
return 0;
} }

5
drivers/scsi/sandbox_scsi.c
Unescape View File

@ -11,15 +11,16 @@
#include <common.h> #include <common.h>
#include <scsi.h> #include <scsi.h>
void scsi_bus_reset(void) int scsi_bus_reset(struct udevice *dev)
{ {
return 0;
} }
void scsi_init(void) void scsi_init(void)
{ {
} }
int scsi_exec(struct scsi_cmd *pccb) int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb)
{ {
return 0; return 0;
} }

31
drivers/scsi/scsi.c
Unescape View File

@ -151,6 +151,9 @@ static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
{ {
#ifdef CONFIG_BLK #ifdef CONFIG_BLK
struct blk_desc *block_dev = dev_get_uclass_platdata(dev); struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
struct udevice *bdev = dev->parent;
#else
struct udevice *bdev = NULL;
#endif #endif
lbaint_t start, blks; lbaint_t start, blks;
uintptr_t buf_addr; 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 debug("scsi_read_ext: startblk " LBAF
", blccnt %x buffer %" PRIXPTR "\n", ", blccnt %x buffer %" PRIXPTR "\n",
start, smallblks, buf_addr); start, smallblks, buf_addr);
if (scsi_exec(pccb) != true) { if (scsi_exec(bdev, pccb)) {
scsi_print_error(pccb); scsi_print_error(pccb);
blkcnt -= blks; blkcnt -= blks;
break; break;
@ -224,6 +227,9 @@ static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr,
{ {
#ifdef CONFIG_BLK #ifdef CONFIG_BLK
struct blk_desc *block_dev = dev_get_uclass_platdata(dev); struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
struct udevice *bdev = dev->parent;
#else
struct udevice *bdev = NULL;
#endif #endif
lbaint_t start, blks; lbaint_t start, blks;
uintptr_t buf_addr; 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", debug("%s: startblk " LBAF ", blccnt %x buffer %" PRIXPTR "\n",
__func__, start, smallblks, buf_addr); __func__, start, smallblks, buf_addr);
if (scsi_exec(pccb) != true) { if (scsi_exec(bdev, pccb)) {
scsi_print_error(pccb); scsi_print_error(pccb);
blkcnt -= blks; blkcnt -= blks;
break; break;
@ -350,8 +356,8 @@ static void scsi_ident_cpy(unsigned char *dest, unsigned char *src,
*dest = '\0'; *dest = '\0';
} }
static int scsi_read_capacity(struct scsi_cmd *pccb, lbaint_t *capacity, static int scsi_read_capacity(struct udevice *dev, struct scsi_cmd *pccb,
unsigned long *blksz) lbaint_t *capacity, unsigned long *blksz)
{ {
*capacity = 0; *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->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
pccb->datalen = 8; pccb->datalen = 8;
if (scsi_exec(pccb) != true) if (scsi_exec(dev, pccb) != true)
return 1; return 1;
*capacity = ((lbaint_t)pccb->pdata[0] << 24) | *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->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
pccb->datalen = 16; pccb->datalen = 16;
if (scsi_exec(pccb) != true) if (scsi_exec(dev, pccb) != true)
return 1; return 1;
*capacity = ((uint64_t)pccb->pdata[0] << 56) | *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 * 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; unsigned char perq, modi;
lbaint_t capacity; 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->pdata = (unsigned char *)&tempbuff;
pccb->datalen = 512; pccb->datalen = 512;
scsi_setup_inquiry(pccb); scsi_setup_inquiry(pccb);
if (scsi_exec(pccb) != true) { if (scsi_exec(dev, pccb) != true) {
if (pccb->contr_stat == SCSI_SEL_TIME_OUT) { if (pccb->contr_stat == SCSI_SEL_TIME_OUT) {
/* /*
* selection timeout => assuming no * 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; pccb->datalen = 0;
scsi_setup_test_unit_ready(pccb); scsi_setup_test_unit_ready(pccb);
if (scsi_exec(pccb) != true) { if (scsi_exec(dev, pccb) != true) {
if (dev_desc->removable) { if (dev_desc->removable) {
dev_desc->type = perq; dev_desc->type = perq;
goto removable; goto removable;
@ -531,7 +538,7 @@ static int scsi_detect_dev(int target, int lun, struct blk_desc *dev_desc)
scsi_print_error(pccb); scsi_print_error(pccb);
return -EINVAL; return -EINVAL;
} }
if (scsi_read_capacity(pccb, &capacity, &blksz)) { if (scsi_read_capacity(dev, pccb, &capacity, &blksz)) {
scsi_print_error(pccb); scsi_print_error(pccb);
return -EINVAL; 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, ...) * size, number of blocks) and other parameters (ids, type, ...)
*/ */
scsi_init_dev_desc_priv(&bd); scsi_init_dev_desc_priv(&bd);
if (scsi_detect_dev(id, lun, &bd)) if (scsi_detect_dev(dev, id, lun, &bd))
return -ENODEV; return -ENODEV;
/* /*
@ -642,7 +649,7 @@ int scsi_scan(int mode)
scsi_max_devs = 0; scsi_max_devs = 0;
for (i = 0; i < CONFIG_SYS_SCSI_MAX_SCSI_ID; i++) { for (i = 0; i < CONFIG_SYS_SCSI_MAX_SCSI_ID; i++) {
for (lun = 0; lun < CONFIG_SYS_SCSI_MAX_LUN; lun++) { 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]); &scsi_dev_desc[scsi_max_devs]);
if (ret) if (ret)
continue; continue;

4
include/scsi.h
Unescape View File

@ -196,8 +196,8 @@ void scsi_low_level_init(int busdevfunc);
void scsi_init(void); void scsi_init(void);
#endif #endif
int scsi_exec(struct scsi_cmd *pccb); int scsi_exec(struct udevice *dev, struct scsi_cmd *pccb);
void scsi_bus_reset(void); int scsi_bus_reset(struct udevice *dev);
/*************************************************************************** /***************************************************************************
* functions residing inside cmd_scsi.c * functions residing inside cmd_scsi.c

Write Preview
Loading…
Cancel
Save