dm: scsi: Remove the forward declarations
Reorder the code to avoid needing forward declarations. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
parent
a31e2c93cb
commit
73a9cfde78
656
cmd/scsi.c
656
cmd/scsi.c
|
|
@ -50,130 +50,230 @@ static int scsi_curr_dev; /* current device */
|
|||
|
||||
static struct blk_desc scsi_dev_desc[CONFIG_SYS_SCSI_MAX_DEVICE];
|
||||
|
||||
/********************************************************************************
|
||||
* forward declerations of some Setup Routines
|
||||
/****************************************************************************************
|
||||
* scsi_read
|
||||
*/
|
||||
void scsi_setup_test_unit_ready(ccb * pccb);
|
||||
void scsi_setup_read6(ccb * pccb, lbaint_t start, unsigned short blocks);
|
||||
void scsi_setup_read_ext(ccb * pccb, lbaint_t start, unsigned short blocks);
|
||||
void scsi_setup_read16(ccb * pccb, lbaint_t start, unsigned long blocks);
|
||||
|
||||
static void scsi_setup_write_ext(ccb *pccb, lbaint_t start,
|
||||
unsigned short blocks);
|
||||
void scsi_setup_inquiry(ccb * pccb);
|
||||
void scsi_ident_cpy (unsigned char *dest, unsigned char *src, unsigned int len);
|
||||
/* almost the maximum amount of the scsi_ext command.. */
|
||||
#define SCSI_MAX_READ_BLK 0xFFFF
|
||||
#define SCSI_LBA48_READ 0xFFFFFFF
|
||||
|
||||
|
||||
static int scsi_read_capacity(ccb *pccb, lbaint_t *capacity,
|
||||
unsigned long *blksz);
|
||||
static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
|
||||
lbaint_t blkcnt, void *buffer);
|
||||
static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr,
|
||||
lbaint_t blkcnt, const void *buffer);
|
||||
|
||||
|
||||
/*********************************************************************************
|
||||
* (re)-scan the scsi bus and reports scsi device info
|
||||
* to the user if mode = 1
|
||||
*/
|
||||
void scsi_scan(int mode)
|
||||
#ifdef CONFIG_SYS_64BIT_LBA
|
||||
void scsi_setup_read16(ccb * pccb, lbaint_t start, unsigned long blocks)
|
||||
{
|
||||
unsigned char i,perq,modi,lun;
|
||||
lbaint_t capacity;
|
||||
unsigned long blksz;
|
||||
ccb* pccb=(ccb *)&tempccb;
|
||||
|
||||
if(mode==1) {
|
||||
printf("scanning bus for devices...\n");
|
||||
}
|
||||
for(i=0;i<CONFIG_SYS_SCSI_MAX_DEVICE;i++) {
|
||||
scsi_dev_desc[i].target=0xff;
|
||||
scsi_dev_desc[i].lun=0xff;
|
||||
scsi_dev_desc[i].lba=0;
|
||||
scsi_dev_desc[i].blksz=0;
|
||||
scsi_dev_desc[i].log2blksz =
|
||||
LOG2_INVALID(typeof(scsi_dev_desc[i].log2blksz));
|
||||
scsi_dev_desc[i].type=DEV_TYPE_UNKNOWN;
|
||||
scsi_dev_desc[i].vendor[0]=0;
|
||||
scsi_dev_desc[i].product[0]=0;
|
||||
scsi_dev_desc[i].revision[0]=0;
|
||||
scsi_dev_desc[i].removable = false;
|
||||
scsi_dev_desc[i].if_type=IF_TYPE_SCSI;
|
||||
scsi_dev_desc[i].devnum = i;
|
||||
scsi_dev_desc[i].part_type=PART_TYPE_UNKNOWN;
|
||||
scsi_dev_desc[i].block_read=scsi_read;
|
||||
scsi_dev_desc[i].block_write = scsi_write;
|
||||
}
|
||||
scsi_max_devs=0;
|
||||
for(i=0;i<CONFIG_SYS_SCSI_MAX_SCSI_ID;i++) {
|
||||
pccb->target=i;
|
||||
for(lun=0;lun<CONFIG_SYS_SCSI_MAX_LUN;lun++) {
|
||||
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) {
|
||||
debug ("Selection timeout ID %d\n",pccb->target);
|
||||
continue; /* selection timeout => assuming no device present */
|
||||
}
|
||||
scsi_print_error(pccb);
|
||||
continue;
|
||||
}
|
||||
perq=tempbuff[0];
|
||||
modi=tempbuff[1];
|
||||
if((perq & 0x1f)==0x1f) {
|
||||
continue; /* skip unknown devices */
|
||||
}
|
||||
if((modi&0x80)==0x80) /* drive is removable */
|
||||
scsi_dev_desc[scsi_max_devs].removable=true;
|
||||
/* get info for this device */
|
||||
scsi_ident_cpy((unsigned char *)&scsi_dev_desc[scsi_max_devs].vendor[0],
|
||||
&tempbuff[8], 8);
|
||||
scsi_ident_cpy((unsigned char *)&scsi_dev_desc[scsi_max_devs].product[0],
|
||||
&tempbuff[16], 16);
|
||||
scsi_ident_cpy((unsigned char *)&scsi_dev_desc[scsi_max_devs].revision[0],
|
||||
&tempbuff[32], 4);
|
||||
scsi_dev_desc[scsi_max_devs].target=pccb->target;
|
||||
scsi_dev_desc[scsi_max_devs].lun=pccb->lun;
|
||||
|
||||
pccb->datalen=0;
|
||||
scsi_setup_test_unit_ready(pccb);
|
||||
if (scsi_exec(pccb) != true) {
|
||||
if (scsi_dev_desc[scsi_max_devs].removable == true) {
|
||||
scsi_dev_desc[scsi_max_devs].type=perq;
|
||||
goto removable;
|
||||
}
|
||||
scsi_print_error(pccb);
|
||||
continue;
|
||||
}
|
||||
if (scsi_read_capacity(pccb, &capacity, &blksz)) {
|
||||
scsi_print_error(pccb);
|
||||
continue;
|
||||
}
|
||||
scsi_dev_desc[scsi_max_devs].lba=capacity;
|
||||
scsi_dev_desc[scsi_max_devs].blksz=blksz;
|
||||
scsi_dev_desc[scsi_max_devs].log2blksz =
|
||||
LOG2(scsi_dev_desc[scsi_max_devs].blksz);
|
||||
scsi_dev_desc[scsi_max_devs].type=perq;
|
||||
part_init(&scsi_dev_desc[scsi_max_devs]);
|
||||
removable:
|
||||
if(mode==1) {
|
||||
printf (" Device %d: ", scsi_max_devs);
|
||||
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);
|
||||
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
|
||||
|
||||
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]);
|
||||
}
|
||||
|
||||
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]);
|
||||
}
|
||||
|
||||
void scsi_setup_read6(ccb * pccb, lbaint_t start, unsigned short blocks)
|
||||
{
|
||||
pccb->cmd[0]=SCSI_READ6;
|
||||
pccb->cmd[1]=pccb->lun<<5 | (((unsigned char)(start>>16))&0x1f);
|
||||
pccb->cmd[2]=((unsigned char) (start>>8))&0xff;
|
||||
pccb->cmd[3]=((unsigned char) (start))&0xff;
|
||||
pccb->cmd[4]=(unsigned char) blocks & 0xff;
|
||||
pccb->cmd[5]=0;
|
||||
pccb->cmdlen=6;
|
||||
pccb->msgout[0]=SCSI_IDENTIFY; /* NOT USED */
|
||||
debug ("scsi_setup_read6: cmd: %02X %02X startblk %02X%02X blccnt %02X\n",
|
||||
pccb->cmd[0],pccb->cmd[1],
|
||||
pccb->cmd[2],pccb->cmd[3],pccb->cmd[4]);
|
||||
}
|
||||
|
||||
|
||||
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 */
|
||||
}
|
||||
|
||||
static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
|
||||
lbaint_t blkcnt, void *buffer)
|
||||
{
|
||||
int device = block_dev->devnum;
|
||||
lbaint_t start, blks;
|
||||
uintptr_t buf_addr;
|
||||
unsigned short smallblks = 0;
|
||||
ccb* pccb=(ccb *)&tempccb;
|
||||
device&=0xff;
|
||||
/* Setup device
|
||||
*/
|
||||
pccb->target=scsi_dev_desc[device].target;
|
||||
pccb->lun=scsi_dev_desc[device].lun;
|
||||
buf_addr=(unsigned long)buffer;
|
||||
start=blknr;
|
||||
blks=blkcnt;
|
||||
debug("\nscsi_read: dev %d startblk " LBAF
|
||||
", blccnt " LBAF " buffer %lx\n",
|
||||
device, 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 = scsi_dev_desc[device].blksz * blocks;
|
||||
scsi_setup_read16(pccb, start, blocks);
|
||||
start += blocks;
|
||||
blks -= blocks;
|
||||
} else
|
||||
#endif
|
||||
if (blks > SCSI_MAX_READ_BLK) {
|
||||
pccb->datalen=scsi_dev_desc[device].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=scsi_dev_desc[device].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
|
||||
|
||||
static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr,
|
||||
lbaint_t blkcnt, const void *buffer)
|
||||
{
|
||||
int device = block_dev->devnum;
|
||||
lbaint_t start, blks;
|
||||
uintptr_t buf_addr;
|
||||
unsigned short smallblks;
|
||||
ccb* pccb = (ccb *)&tempccb;
|
||||
device &= 0xff;
|
||||
/* Setup device
|
||||
*/
|
||||
pccb->target = scsi_dev_desc[device].target;
|
||||
pccb->lun = scsi_dev_desc[device].lun;
|
||||
buf_addr = (unsigned long)buffer;
|
||||
start = blknr;
|
||||
blks = blkcnt;
|
||||
debug("\n%s: dev %d startblk " LBAF ", blccnt " LBAF " buffer %lx\n",
|
||||
__func__, device, start, blks, (unsigned long)buffer);
|
||||
do {
|
||||
pccb->pdata = (unsigned char *)buf_addr;
|
||||
if (blks > SCSI_MAX_WRITE_BLK) {
|
||||
pccb->datalen = (scsi_dev_desc[device].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 = scsi_dev_desc[device].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;
|
||||
}
|
||||
|
||||
int scsi_get_disk_count(void)
|
||||
|
|
@ -390,129 +490,6 @@ U_BOOT_CMD(
|
|||
);
|
||||
#endif
|
||||
|
||||
/****************************************************************************************
|
||||
* scsi_read
|
||||
*/
|
||||
|
||||
/* almost the maximum amount of the scsi_ext command.. */
|
||||
#define SCSI_MAX_READ_BLK 0xFFFF
|
||||
#define SCSI_LBA48_READ 0xFFFFFFF
|
||||
|
||||
static ulong scsi_read(struct blk_desc *block_dev, lbaint_t blknr,
|
||||
lbaint_t blkcnt, void *buffer)
|
||||
{
|
||||
int device = block_dev->devnum;
|
||||
lbaint_t start, blks;
|
||||
uintptr_t buf_addr;
|
||||
unsigned short smallblks = 0;
|
||||
ccb* pccb=(ccb *)&tempccb;
|
||||
device&=0xff;
|
||||
/* Setup device
|
||||
*/
|
||||
pccb->target=scsi_dev_desc[device].target;
|
||||
pccb->lun=scsi_dev_desc[device].lun;
|
||||
buf_addr=(unsigned long)buffer;
|
||||
start=blknr;
|
||||
blks=blkcnt;
|
||||
debug("\nscsi_read: dev %d startblk " LBAF
|
||||
", blccnt " LBAF " buffer %lx\n",
|
||||
device, 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 = scsi_dev_desc[device].blksz * blocks;
|
||||
scsi_setup_read16(pccb, start, blocks);
|
||||
start += blocks;
|
||||
blks -= blocks;
|
||||
} else
|
||||
#endif
|
||||
if (blks > SCSI_MAX_READ_BLK) {
|
||||
pccb->datalen=scsi_dev_desc[device].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=scsi_dev_desc[device].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
|
||||
|
||||
static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr,
|
||||
lbaint_t blkcnt, const void *buffer)
|
||||
{
|
||||
int device = block_dev->devnum;
|
||||
lbaint_t start, blks;
|
||||
uintptr_t buf_addr;
|
||||
unsigned short smallblks;
|
||||
ccb* pccb = (ccb *)&tempccb;
|
||||
device &= 0xff;
|
||||
/* Setup device
|
||||
*/
|
||||
pccb->target = scsi_dev_desc[device].target;
|
||||
pccb->lun = scsi_dev_desc[device].lun;
|
||||
buf_addr = (unsigned long)buffer;
|
||||
start = blknr;
|
||||
blks = blkcnt;
|
||||
debug("\n%s: dev %d startblk " LBAF ", blccnt " LBAF " buffer %lx\n",
|
||||
__func__, device, start, blks, (unsigned long)buffer);
|
||||
do {
|
||||
pccb->pdata = (unsigned char *)buf_addr;
|
||||
if (blks > SCSI_MAX_WRITE_BLK) {
|
||||
pccb->datalen = (scsi_dev_desc[device].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 = scsi_dev_desc[device].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;
|
||||
}
|
||||
|
||||
/* copy src to dest, skipping leading and trailing blanks
|
||||
* and null terminate the string
|
||||
*/
|
||||
|
|
@ -630,105 +607,106 @@ void scsi_setup_test_unit_ready(ccb * pccb)
|
|||
pccb->msgout[0]=SCSI_IDENTIFY; /* NOT USED */
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SYS_64BIT_LBA
|
||||
void scsi_setup_read16(ccb * pccb, lbaint_t start, unsigned long blocks)
|
||||
/*********************************************************************************
|
||||
* (re)-scan the scsi bus and reports scsi device info
|
||||
* to the user if mode = 1
|
||||
*/
|
||||
void scsi_scan(int mode)
|
||||
{
|
||||
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
|
||||
unsigned char i,perq,modi,lun;
|
||||
lbaint_t capacity;
|
||||
unsigned long blksz;
|
||||
ccb* pccb=(ccb *)&tempccb;
|
||||
|
||||
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]);
|
||||
}
|
||||
if(mode==1) {
|
||||
printf("scanning bus for devices...\n");
|
||||
}
|
||||
for(i=0;i<CONFIG_SYS_SCSI_MAX_DEVICE;i++) {
|
||||
scsi_dev_desc[i].target=0xff;
|
||||
scsi_dev_desc[i].lun=0xff;
|
||||
scsi_dev_desc[i].lba=0;
|
||||
scsi_dev_desc[i].blksz=0;
|
||||
scsi_dev_desc[i].log2blksz =
|
||||
LOG2_INVALID(typeof(scsi_dev_desc[i].log2blksz));
|
||||
scsi_dev_desc[i].type=DEV_TYPE_UNKNOWN;
|
||||
scsi_dev_desc[i].vendor[0]=0;
|
||||
scsi_dev_desc[i].product[0]=0;
|
||||
scsi_dev_desc[i].revision[0]=0;
|
||||
scsi_dev_desc[i].removable = false;
|
||||
scsi_dev_desc[i].if_type=IF_TYPE_SCSI;
|
||||
scsi_dev_desc[i].devnum = i;
|
||||
scsi_dev_desc[i].part_type=PART_TYPE_UNKNOWN;
|
||||
scsi_dev_desc[i].block_read=scsi_read;
|
||||
scsi_dev_desc[i].block_write = scsi_write;
|
||||
}
|
||||
scsi_max_devs=0;
|
||||
for(i=0;i<CONFIG_SYS_SCSI_MAX_SCSI_ID;i++) {
|
||||
pccb->target=i;
|
||||
for(lun=0;lun<CONFIG_SYS_SCSI_MAX_LUN;lun++) {
|
||||
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) {
|
||||
debug ("Selection timeout ID %d\n",pccb->target);
|
||||
continue; /* selection timeout => assuming no device present */
|
||||
}
|
||||
scsi_print_error(pccb);
|
||||
continue;
|
||||
}
|
||||
perq=tempbuff[0];
|
||||
modi=tempbuff[1];
|
||||
if((perq & 0x1f)==0x1f) {
|
||||
continue; /* skip unknown devices */
|
||||
}
|
||||
if((modi&0x80)==0x80) /* drive is removable */
|
||||
scsi_dev_desc[scsi_max_devs].removable=true;
|
||||
/* get info for this device */
|
||||
scsi_ident_cpy((unsigned char *)&scsi_dev_desc[scsi_max_devs].vendor[0],
|
||||
&tempbuff[8], 8);
|
||||
scsi_ident_cpy((unsigned char *)&scsi_dev_desc[scsi_max_devs].product[0],
|
||||
&tempbuff[16], 16);
|
||||
scsi_ident_cpy((unsigned char *)&scsi_dev_desc[scsi_max_devs].revision[0],
|
||||
&tempbuff[32], 4);
|
||||
scsi_dev_desc[scsi_max_devs].target=pccb->target;
|
||||
scsi_dev_desc[scsi_max_devs].lun=pccb->lun;
|
||||
|
||||
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]);
|
||||
}
|
||||
|
||||
void scsi_setup_read6(ccb * pccb, lbaint_t start, unsigned short blocks)
|
||||
{
|
||||
pccb->cmd[0]=SCSI_READ6;
|
||||
pccb->cmd[1]=pccb->lun<<5 | (((unsigned char)(start>>16))&0x1f);
|
||||
pccb->cmd[2]=((unsigned char) (start>>8))&0xff;
|
||||
pccb->cmd[3]=((unsigned char) (start))&0xff;
|
||||
pccb->cmd[4]=(unsigned char) blocks & 0xff;
|
||||
pccb->cmd[5]=0;
|
||||
pccb->cmdlen=6;
|
||||
pccb->msgout[0]=SCSI_IDENTIFY; /* NOT USED */
|
||||
debug ("scsi_setup_read6: cmd: %02X %02X startblk %02X%02X blccnt %02X\n",
|
||||
pccb->cmd[0],pccb->cmd[1],
|
||||
pccb->cmd[2],pccb->cmd[3],pccb->cmd[4]);
|
||||
}
|
||||
|
||||
|
||||
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;
|
||||
pccb->datalen=0;
|
||||
scsi_setup_test_unit_ready(pccb);
|
||||
if (scsi_exec(pccb) != true) {
|
||||
if (scsi_dev_desc[scsi_max_devs].removable == true) {
|
||||
scsi_dev_desc[scsi_max_devs].type=perq;
|
||||
goto removable;
|
||||
}
|
||||
scsi_print_error(pccb);
|
||||
continue;
|
||||
}
|
||||
if (scsi_read_capacity(pccb, &capacity, &blksz)) {
|
||||
scsi_print_error(pccb);
|
||||
continue;
|
||||
}
|
||||
scsi_dev_desc[scsi_max_devs].lba=capacity;
|
||||
scsi_dev_desc[scsi_max_devs].blksz=blksz;
|
||||
scsi_dev_desc[scsi_max_devs].log2blksz =
|
||||
LOG2(scsi_dev_desc[scsi_max_devs].blksz);
|
||||
scsi_dev_desc[scsi_max_devs].type=perq;
|
||||
part_init(&scsi_dev_desc[scsi_max_devs]);
|
||||
removable:
|
||||
if(mode==1) {
|
||||
printf (" Device %d: ", scsi_max_devs);
|
||||
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
|
||||
pccb->cmd[4]=(unsigned char)pccb->datalen;
|
||||
pccb->cmd[5]=0;
|
||||
pccb->cmdlen=6;
|
||||
pccb->msgout[0]=SCSI_IDENTIFY; /* NOT USED */
|
||||
scsi_curr_dev = -1;
|
||||
|
||||
printf("Found %d device(s).\n", scsi_max_devs);
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
setenv_ulong("scsidevs", scsi_max_devs);
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user