2002-08-17 09:36:01 +00:00
|
|
|
/*
|
2005-08-03 23:14:12 +00:00
|
|
|
* Most of this source has been derived from the Linux USB
|
|
|
|
* project:
|
|
|
|
* (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net)
|
|
|
|
* (c) 2000 David L. Brown, Jr. (usb-storage@davidb.org)
|
|
|
|
* (c) 1999 Michael Gee (michael@linuxspecific.com)
|
|
|
|
* (c) 2000 Yggdrasil Computing, Inc.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Adapted for U-Boot:
|
|
|
|
* (C) Copyright 2001 Denis Peter, MPL AG Switzerland
|
2002-08-17 09:36:01 +00:00
|
|
|
*
|
2003-09-10 18:20:28 +00:00
|
|
|
* For BBB support (C) Copyright 2003
|
2009-05-13 08:54:10 +00:00
|
|
|
* Gary Jennejohn, DENX Software Engineering <garyj@denx.de>
|
2003-09-10 18:20:28 +00:00
|
|
|
*
|
2005-08-03 23:14:12 +00:00
|
|
|
* BBB support based on /sys/dev/usb/umass.c from
|
2003-09-10 18:20:28 +00:00
|
|
|
* FreeBSD.
|
2002-08-17 09:36:01 +00:00
|
|
|
*
|
|
|
|
* See file CREDITS for list of people who contributed to this
|
|
|
|
* project.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License as
|
|
|
|
* published by the Free Software Foundation; either version 2 of
|
|
|
|
* the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2004-02-26 23:46:20 +00:00
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2002-08-17 09:36:01 +00:00
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
|
|
* MA 02111-1307 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Note:
|
|
|
|
* Currently only the CBI transport protocoll has been implemented, and it
|
|
|
|
* is only tested with a TEAC USB Floppy. Other Massstorages with CBI or CB
|
|
|
|
* transport protocoll may work as well.
|
|
|
|
*/
|
2003-09-10 18:20:28 +00:00
|
|
|
/*
|
|
|
|
* New Note:
|
|
|
|
* Support for USB Mass Storage Devices (BBB) has been added. It has
|
|
|
|
* only been tested with USB memory sticks.
|
|
|
|
*/
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
2008-05-21 20:12:00 +00:00
|
|
|
#include <asm/byteorder.h>
|
2002-08-17 09:36:01 +00:00
|
|
|
#include <asm/processor.h>
|
|
|
|
|
2007-02-20 08:04:34 +00:00
|
|
|
#include <part.h>
|
2002-08-17 09:36:01 +00:00
|
|
|
#include <usb.h>
|
|
|
|
|
2004-02-26 23:46:20 +00:00
|
|
|
#undef BBB_COMDAT_TRACE
|
|
|
|
#undef BBB_XPORT_TRACE
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
#ifdef USB_STOR_DEBUG
|
2011-10-25 09:39:16 +00:00
|
|
|
#define USB_BLK_DEBUG 1
|
2002-08-17 09:36:01 +00:00
|
|
|
#else
|
2011-10-25 09:39:16 +00:00
|
|
|
#define USB_BLK_DEBUG 0
|
2002-08-17 09:36:01 +00:00
|
|
|
#endif
|
|
|
|
|
2011-10-25 09:39:16 +00:00
|
|
|
#define USB_STOR_PRINTF(fmt, args...) debug_cond(USB_BLK_DEBUG, fmt, ##args)
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
#include <scsi.h>
|
|
|
|
/* direction table -- this indicates the direction of the data
|
|
|
|
* transfer for each command code -- a 1 indicates input
|
|
|
|
*/
|
2010-10-20 11:16:04 +00:00
|
|
|
static const unsigned char us_direction[256/8] = {
|
2002-08-17 09:36:01 +00:00
|
|
|
0x28, 0x81, 0x14, 0x14, 0x20, 0x01, 0x90, 0x77,
|
|
|
|
0x0C, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
|
|
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
|
|
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
|
|
|
};
|
|
|
|
#define US_DIRECTION(x) ((us_direction[x>>3] >> (x & 7)) & 1)
|
|
|
|
|
2012-04-03 09:26:06 +00:00
|
|
|
static ccb usb_ccb __attribute__((aligned(ARCH_DMA_MINALIGN)));
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* CBI style
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define US_CBI_ADSC 0
|
|
|
|
|
2003-09-10 18:20:28 +00:00
|
|
|
/*
|
|
|
|
* BULK only
|
|
|
|
*/
|
|
|
|
#define US_BBB_RESET 0xff
|
|
|
|
#define US_BBB_GET_MAX_LUN 0xfe
|
|
|
|
|
|
|
|
/* Command Block Wrapper */
|
|
|
|
typedef struct {
|
|
|
|
__u32 dCBWSignature;
|
|
|
|
# define CBWSIGNATURE 0x43425355
|
|
|
|
__u32 dCBWTag;
|
|
|
|
__u32 dCBWDataTransferLength;
|
|
|
|
__u8 bCBWFlags;
|
|
|
|
# define CBWFLAGS_OUT 0x00
|
|
|
|
# define CBWFLAGS_IN 0x80
|
|
|
|
__u8 bCBWLUN;
|
|
|
|
__u8 bCDBLength;
|
|
|
|
# define CBWCDBLENGTH 16
|
|
|
|
__u8 CBWCDB[CBWCDBLENGTH];
|
|
|
|
} umass_bbb_cbw_t;
|
2004-02-26 23:46:20 +00:00
|
|
|
#define UMASS_BBB_CBW_SIZE 31
|
2008-12-10 14:52:06 +00:00
|
|
|
static __u32 CBWTag;
|
2003-09-10 18:20:28 +00:00
|
|
|
|
|
|
|
/* Command Status Wrapper */
|
|
|
|
typedef struct {
|
|
|
|
__u32 dCSWSignature;
|
|
|
|
# define CSWSIGNATURE 0x53425355
|
|
|
|
__u32 dCSWTag;
|
|
|
|
__u32 dCSWDataResidue;
|
|
|
|
__u8 bCSWStatus;
|
|
|
|
# define CSWSTATUS_GOOD 0x0
|
2004-02-26 23:46:20 +00:00
|
|
|
# define CSWSTATUS_FAILED 0x1
|
2003-09-10 18:20:28 +00:00
|
|
|
# define CSWSTATUS_PHASE 0x2
|
|
|
|
} umass_bbb_csw_t;
|
2004-02-26 23:46:20 +00:00
|
|
|
#define UMASS_BBB_CSW_SIZE 13
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
#define USB_MAX_STOR_DEV 5
|
2008-12-10 14:52:06 +00:00
|
|
|
static int usb_max_devs; /* number of highest available usb device */
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
static block_dev_desc_t usb_dev_desc[USB_MAX_STOR_DEV];
|
|
|
|
|
|
|
|
struct us_data;
|
2008-12-10 14:52:06 +00:00
|
|
|
typedef int (*trans_cmnd)(ccb *cb, struct us_data *data);
|
|
|
|
typedef int (*trans_reset)(struct us_data *data);
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
struct us_data {
|
2008-12-10 14:52:06 +00:00
|
|
|
struct usb_device *pusb_dev; /* this usb_device */
|
|
|
|
|
|
|
|
unsigned int flags; /* from filter initially */
|
|
|
|
unsigned char ifnum; /* interface number */
|
|
|
|
unsigned char ep_in; /* in endpoint */
|
|
|
|
unsigned char ep_out; /* out ....... */
|
|
|
|
unsigned char ep_int; /* interrupt . */
|
|
|
|
unsigned char subclass; /* as in overview */
|
|
|
|
unsigned char protocol; /* .............. */
|
|
|
|
unsigned char attention_done; /* force attn on first cmd */
|
|
|
|
unsigned short ip_data; /* interrupt data */
|
|
|
|
int action; /* what to do */
|
|
|
|
int ip_wanted; /* needed */
|
|
|
|
int *irq_handle; /* for USB int requests */
|
|
|
|
unsigned int irqpipe; /* pipe for release_irq */
|
|
|
|
unsigned char irqmaxp; /* max packed for irq Pipe */
|
|
|
|
unsigned char irqinterval; /* Intervall for IRQ Pipe */
|
2011-12-21 07:08:12 +00:00
|
|
|
unsigned long max_xfer_blk; /* Max blocks per xfer */
|
2008-12-10 14:52:06 +00:00
|
|
|
ccb *srb; /* current srb */
|
|
|
|
trans_reset transport_reset; /* reset routine */
|
|
|
|
trans_cmnd transport; /* transport routine */
|
2002-08-17 09:36:01 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct us_data usb_stor[USB_MAX_STOR_DEV];
|
|
|
|
|
|
|
|
|
2004-02-26 23:46:20 +00:00
|
|
|
#define USB_STOR_TRANSPORT_GOOD 0
|
2002-08-17 09:36:01 +00:00
|
|
|
#define USB_STOR_TRANSPORT_FAILED -1
|
|
|
|
#define USB_STOR_TRANSPORT_ERROR -2
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
int usb_stor_get_info(struct usb_device *dev, struct us_data *us,
|
|
|
|
block_dev_desc_t *dev_desc);
|
|
|
|
int usb_storage_probe(struct usb_device *dev, unsigned int ifnum,
|
|
|
|
struct us_data *ss);
|
|
|
|
unsigned long usb_stor_read(int device, unsigned long blknr,
|
|
|
|
unsigned long blkcnt, void *buffer);
|
2009-11-03 06:52:10 +00:00
|
|
|
unsigned long usb_stor_write(int device, unsigned long blknr,
|
|
|
|
unsigned long blkcnt, const void *buffer);
|
2002-08-17 09:36:01 +00:00
|
|
|
struct usb_device * usb_get_dev_index(int index);
|
|
|
|
void uhci_show_temp_int_td(void);
|
|
|
|
|
2011-05-24 05:31:19 +00:00
|
|
|
#ifdef CONFIG_PARTITIONS
|
2002-08-17 09:36:01 +00:00
|
|
|
block_dev_desc_t *usb_stor_get_dev(int index)
|
|
|
|
{
|
2010-03-12 13:46:56 +00:00
|
|
|
return (index < usb_max_devs) ? &usb_dev_desc[index] : NULL;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2011-05-24 05:31:19 +00:00
|
|
|
#endif
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
void usb_show_progress(void)
|
|
|
|
{
|
2010-07-19 09:36:59 +00:00
|
|
|
debug(".");
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
/*******************************************************************************
|
2005-07-21 09:57:57 +00:00
|
|
|
* show info on storage devices; 'usb start/init' must be invoked earlier
|
|
|
|
* as we only retrieve structures populated during devices initialization
|
|
|
|
*/
|
2008-03-25 01:09:07 +00:00
|
|
|
int usb_stor_info(void)
|
2005-07-21 09:57:57 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2008-03-25 01:09:07 +00:00
|
|
|
if (usb_max_devs > 0) {
|
2005-07-21 09:57:57 +00:00
|
|
|
for (i = 0; i < usb_max_devs; i++) {
|
2008-12-10 14:52:06 +00:00
|
|
|
printf(" Device %d: ", i);
|
2005-07-21 09:57:57 +00:00
|
|
|
dev_print(&usb_dev_desc[i]);
|
|
|
|
}
|
2008-03-26 17:26:43 +00:00
|
|
|
return 0;
|
2008-03-25 01:09:07 +00:00
|
|
|
}
|
2008-04-13 16:59:26 +00:00
|
|
|
|
2008-03-26 17:26:43 +00:00
|
|
|
printf("No storage devices, perhaps not 'usb start'ed..?\n");
|
|
|
|
return 1;
|
2005-07-21 09:57:57 +00:00
|
|
|
}
|
|
|
|
|
2010-10-05 20:04:26 +00:00
|
|
|
static unsigned int usb_get_max_lun(struct us_data *us)
|
|
|
|
{
|
|
|
|
int len;
|
2012-04-03 09:26:06 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(unsigned char, result, 1);
|
2010-10-05 20:04:26 +00:00
|
|
|
len = usb_control_msg(us->pusb_dev,
|
|
|
|
usb_rcvctrlpipe(us->pusb_dev, 0),
|
|
|
|
US_BBB_GET_MAX_LUN,
|
|
|
|
USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
|
|
|
|
0, us->ifnum,
|
2012-04-03 09:26:06 +00:00
|
|
|
result, sizeof(char),
|
2010-10-05 20:04:26 +00:00
|
|
|
USB_CNTL_TIMEOUT * 5);
|
|
|
|
USB_STOR_PRINTF("Get Max LUN -> len = %i, result = %i\n",
|
2012-04-03 09:26:06 +00:00
|
|
|
len, (int) *result);
|
|
|
|
return (len > 0) ? *result : 0;
|
2010-10-05 20:04:26 +00:00
|
|
|
}
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
/*******************************************************************************
|
2005-07-21 09:57:57 +00:00
|
|
|
* scan the usb and reports device info
|
2002-08-17 09:36:01 +00:00
|
|
|
* to the user if mode = 1
|
|
|
|
* returns current device or -1 if no
|
|
|
|
*/
|
|
|
|
int usb_stor_scan(int mode)
|
|
|
|
{
|
|
|
|
unsigned char i;
|
|
|
|
struct usb_device *dev;
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
if (mode == 1)
|
2005-07-21 09:57:57 +00:00
|
|
|
printf(" scanning bus for storage devices... ");
|
2008-12-10 14:52:06 +00:00
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
usb_disable_asynch(1); /* asynch transfer not allowed */
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
for (i = 0; i < USB_MAX_STOR_DEV; i++) {
|
|
|
|
memset(&usb_dev_desc[i], 0, sizeof(block_dev_desc_t));
|
|
|
|
usb_dev_desc[i].if_type = IF_TYPE_USB;
|
|
|
|
usb_dev_desc[i].dev = i;
|
|
|
|
usb_dev_desc[i].part_type = PART_TYPE_UNKNOWN;
|
2010-07-19 09:36:56 +00:00
|
|
|
usb_dev_desc[i].target = 0xff;
|
|
|
|
usb_dev_desc[i].type = DEV_TYPE_UNKNOWN;
|
2008-12-10 14:52:06 +00:00
|
|
|
usb_dev_desc[i].block_read = usb_stor_read;
|
2009-11-03 06:52:10 +00:00
|
|
|
usb_dev_desc[i].block_write = usb_stor_write;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2005-07-21 09:57:57 +00:00
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
usb_max_devs = 0;
|
|
|
|
for (i = 0; i < USB_MAX_DEVICE; i++) {
|
|
|
|
dev = usb_get_dev_index(i); /* get device */
|
|
|
|
USB_STOR_PRINTF("i=%d\n", i);
|
|
|
|
if (dev == NULL)
|
2011-02-03 21:04:26 +00:00
|
|
|
break; /* no more devices available */
|
2008-12-10 14:52:06 +00:00
|
|
|
|
|
|
|
if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) {
|
2010-10-05 20:04:26 +00:00
|
|
|
/* OK, it's a storage device. Iterate over its LUNs
|
|
|
|
* and populate `usb_dev_desc'.
|
2008-12-10 14:52:06 +00:00
|
|
|
*/
|
2010-10-05 20:04:26 +00:00
|
|
|
int lun, max_lun, start = usb_max_devs;
|
|
|
|
|
|
|
|
max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]);
|
|
|
|
for (lun = 0;
|
|
|
|
lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV;
|
|
|
|
lun++) {
|
|
|
|
usb_dev_desc[usb_max_devs].lun = lun;
|
|
|
|
if (usb_stor_get_info(dev, &usb_stor[start],
|
|
|
|
&usb_dev_desc[usb_max_devs]) == 1) {
|
2002-08-17 09:36:01 +00:00
|
|
|
usb_max_devs++;
|
2010-10-05 20:04:26 +00:00
|
|
|
}
|
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
}
|
|
|
|
/* if storage device */
|
|
|
|
if (usb_max_devs == USB_MAX_STOR_DEV) {
|
|
|
|
printf("max USB Storage Device reached: %d stopping\n",
|
|
|
|
usb_max_devs);
|
2002-08-17 09:36:01 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
} /* for */
|
2005-08-02 15:06:17 +00:00
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
usb_disable_asynch(0); /* asynch transfer allowed */
|
2005-07-21 09:57:57 +00:00
|
|
|
printf("%d Storage Device(s) found\n", usb_max_devs);
|
2008-12-10 14:52:06 +00:00
|
|
|
if (usb_max_devs > 0)
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
2008-12-10 14:52:06 +00:00
|
|
|
return -1;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int usb_stor_irq(struct usb_device *dev)
|
|
|
|
{
|
|
|
|
struct us_data *us;
|
2008-12-10 14:52:06 +00:00
|
|
|
us = (struct us_data *)dev->privptr;
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
if (us->ip_wanted)
|
|
|
|
us->ip_wanted = 0;
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef USB_STOR_DEBUG
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
static void usb_show_srb(ccb *pccb)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
|
|
|
int i;
|
2008-12-10 14:52:06 +00:00
|
|
|
printf("SRB: len %d datalen 0x%lX\n ", pccb->cmdlen, pccb->datalen);
|
|
|
|
for (i = 0; i < 12; i++)
|
|
|
|
printf("%02X ", pccb->cmd[i]);
|
2002-08-17 09:36:01 +00:00
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void display_int_status(unsigned long tmp)
|
|
|
|
{
|
|
|
|
printf("Status: %s %s %s %s %s %s %s\n",
|
|
|
|
(tmp & USB_ST_ACTIVE) ? "Active" : "",
|
|
|
|
(tmp & USB_ST_STALLED) ? "Stalled" : "",
|
|
|
|
(tmp & USB_ST_BUF_ERR) ? "Buffer Error" : "",
|
|
|
|
(tmp & USB_ST_BABBLE_DET) ? "Babble Det" : "",
|
|
|
|
(tmp & USB_ST_NAK_REC) ? "NAKed" : "",
|
|
|
|
(tmp & USB_ST_CRC_ERR) ? "CRC Error" : "",
|
|
|
|
(tmp & USB_ST_BIT_ERR) ? "Bitstuff Error" : "");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
/***********************************************************************
|
|
|
|
* Data transfer routines
|
|
|
|
***********************************************************************/
|
|
|
|
|
|
|
|
static int us_one_transfer(struct us_data *us, int pipe, char *buf, int length)
|
|
|
|
{
|
|
|
|
int max_size;
|
|
|
|
int this_xfer;
|
|
|
|
int result;
|
|
|
|
int partial;
|
|
|
|
int maxtry;
|
|
|
|
int stat;
|
|
|
|
|
|
|
|
/* determine the maximum packet size for these transfers */
|
|
|
|
max_size = usb_maxpacket(us->pusb_dev, pipe) * 16;
|
|
|
|
|
|
|
|
/* while we have data left to transfer */
|
|
|
|
while (length) {
|
|
|
|
|
|
|
|
/* calculate how long this will be -- maximum or a remainder */
|
|
|
|
this_xfer = length > max_size ? max_size : length;
|
|
|
|
length -= this_xfer;
|
|
|
|
|
|
|
|
/* setup the retry counter */
|
|
|
|
maxtry = 10;
|
|
|
|
|
|
|
|
/* set up the transfer loop */
|
|
|
|
do {
|
|
|
|
/* transfer the data */
|
|
|
|
USB_STOR_PRINTF("Bulk xfer 0x%x(%d) try #%d\n",
|
|
|
|
(unsigned int)buf, this_xfer, 11 - maxtry);
|
|
|
|
result = usb_bulk_msg(us->pusb_dev, pipe, buf,
|
2008-12-10 14:52:06 +00:00
|
|
|
this_xfer, &partial,
|
|
|
|
USB_CNTL_TIMEOUT * 5);
|
2002-08-17 09:36:01 +00:00
|
|
|
USB_STOR_PRINTF("bulk_msg returned %d xferred %d/%d\n",
|
|
|
|
result, partial, this_xfer);
|
2008-12-10 14:52:06 +00:00
|
|
|
if (us->pusb_dev->status != 0) {
|
|
|
|
/* if we stall, we need to clear it before
|
|
|
|
* we go on
|
|
|
|
*/
|
2002-08-17 09:36:01 +00:00
|
|
|
#ifdef USB_STOR_DEBUG
|
|
|
|
display_int_status(us->pusb_dev->status);
|
|
|
|
#endif
|
|
|
|
if (us->pusb_dev->status & USB_ST_STALLED) {
|
|
|
|
USB_STOR_PRINTF("stalled ->clearing endpoint halt for pipe 0x%x\n", pipe);
|
|
|
|
stat = us->pusb_dev->status;
|
|
|
|
usb_clear_halt(us->pusb_dev, pipe);
|
2008-12-10 14:52:06 +00:00
|
|
|
us->pusb_dev->status = stat;
|
|
|
|
if (this_xfer == partial) {
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF("bulk transferred with error %lX, but data ok\n", us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
if (us->pusb_dev->status & USB_ST_NAK_REC) {
|
|
|
|
USB_STOR_PRINTF("Device NAKed bulk_msg\n");
|
|
|
|
return result;
|
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF("bulk transferred with error");
|
|
|
|
if (this_xfer == partial) {
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF(" %ld, but data ok\n",
|
2008-12-10 14:52:06 +00:00
|
|
|
us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* if our try counter reaches 0, bail out */
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF(" %ld, data %d\n",
|
2008-12-10 14:52:06 +00:00
|
|
|
us->pusb_dev->status, partial);
|
2002-08-17 09:36:01 +00:00
|
|
|
if (!maxtry--)
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
/* update to show what data was transferred */
|
|
|
|
this_xfer -= partial;
|
|
|
|
buf += partial;
|
|
|
|
/* continue until this transfer is done */
|
2008-12-10 14:52:06 +00:00
|
|
|
} while (this_xfer);
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* if we get here, we're done and successful */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-09-10 18:20:28 +00:00
|
|
|
static int usb_stor_BBB_reset(struct us_data *us)
|
|
|
|
{
|
|
|
|
int result;
|
|
|
|
unsigned int pipe;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reset recovery (5.3.4 in Universal Serial Bus Mass Storage Class)
|
|
|
|
*
|
|
|
|
* For Reset Recovery the host shall issue in the following order:
|
|
|
|
* a) a Bulk-Only Mass Storage Reset
|
|
|
|
* b) a Clear Feature HALT to the Bulk-In endpoint
|
|
|
|
* c) a Clear Feature HALT to the Bulk-Out endpoint
|
|
|
|
*
|
|
|
|
* This is done in 3 steps.
|
|
|
|
*
|
|
|
|
* If the reset doesn't succeed, the device should be port reset.
|
|
|
|
*
|
|
|
|
* This comment stolen from FreeBSD's /sys/dev/usb/umass.c.
|
|
|
|
*/
|
|
|
|
USB_STOR_PRINTF("BBB_reset\n");
|
2008-12-10 14:52:06 +00:00
|
|
|
result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev, 0),
|
|
|
|
US_BBB_RESET,
|
|
|
|
USB_TYPE_CLASS | USB_RECIP_INTERFACE,
|
|
|
|
0, us->ifnum, 0, 0, USB_CNTL_TIMEOUT * 5);
|
2005-07-21 09:57:57 +00:00
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
if ((result < 0) && (us->pusb_dev->status & USB_ST_STALLED)) {
|
2003-09-10 18:20:28 +00:00
|
|
|
USB_STOR_PRINTF("RESET:stall\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2005-07-21 09:57:57 +00:00
|
|
|
|
2003-09-10 18:20:28 +00:00
|
|
|
/* long wait for reset */
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(150);
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF("BBB_reset result %d: status %lX reset\n", result,
|
2008-12-10 14:52:06 +00:00
|
|
|
us->pusb_dev->status);
|
2003-09-10 18:20:28 +00:00
|
|
|
pipe = usb_rcvbulkpipe(us->pusb_dev, us->ep_in);
|
|
|
|
result = usb_clear_halt(us->pusb_dev, pipe);
|
|
|
|
/* long wait for reset */
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(150);
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF("BBB_reset result %d: status %lX clearing IN endpoint\n",
|
2008-12-10 14:52:06 +00:00
|
|
|
result, us->pusb_dev->status);
|
2003-09-10 18:20:28 +00:00
|
|
|
/* long wait for reset */
|
|
|
|
pipe = usb_sndbulkpipe(us->pusb_dev, us->ep_out);
|
|
|
|
result = usb_clear_halt(us->pusb_dev, pipe);
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(150);
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF("BBB_reset result %d: status %lX"
|
2008-12-10 14:52:06 +00:00
|
|
|
" clearing OUT endpoint\n", result,
|
|
|
|
us->pusb_dev->status);
|
2003-09-10 18:20:28 +00:00
|
|
|
USB_STOR_PRINTF("BBB_reset done\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
/* FIXME: this reset function doesn't really reset the port, and it
|
|
|
|
* should. Actually it should probably do what it's doing here, and
|
|
|
|
* reset the port physically
|
|
|
|
*/
|
|
|
|
static int usb_stor_CB_reset(struct us_data *us)
|
|
|
|
{
|
|
|
|
unsigned char cmd[12];
|
|
|
|
int result;
|
|
|
|
|
|
|
|
USB_STOR_PRINTF("CB_reset\n");
|
2008-12-10 14:52:06 +00:00
|
|
|
memset(cmd, 0xff, sizeof(cmd));
|
2002-08-17 09:36:01 +00:00
|
|
|
cmd[0] = SCSI_SEND_DIAG;
|
|
|
|
cmd[1] = 4;
|
2008-12-10 14:52:06 +00:00
|
|
|
result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev, 0),
|
|
|
|
US_CBI_ADSC,
|
|
|
|
USB_TYPE_CLASS | USB_RECIP_INTERFACE,
|
|
|
|
0, us->ifnum, cmd, sizeof(cmd),
|
|
|
|
USB_CNTL_TIMEOUT * 5);
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
/* long wait for reset */
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(1500);
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF("CB_reset result %d: status %lX"
|
2008-12-10 14:52:06 +00:00
|
|
|
" clearing endpoint halt\n", result,
|
|
|
|
us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
usb_clear_halt(us->pusb_dev, usb_rcvbulkpipe(us->pusb_dev, us->ep_in));
|
|
|
|
usb_clear_halt(us->pusb_dev, usb_rcvbulkpipe(us->pusb_dev, us->ep_out));
|
|
|
|
|
|
|
|
USB_STOR_PRINTF("CB_reset done\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-09-10 18:20:28 +00:00
|
|
|
/*
|
|
|
|
* Set up the command for a BBB device. Note that the actual SCSI
|
|
|
|
* command is copied into cbw.CBWCDB.
|
|
|
|
*/
|
|
|
|
int usb_stor_BBB_comdat(ccb *srb, struct us_data *us)
|
|
|
|
{
|
|
|
|
int result;
|
|
|
|
int actlen;
|
|
|
|
int dir_in;
|
|
|
|
unsigned int pipe;
|
2012-04-03 09:26:06 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(umass_bbb_cbw_t, cbw, 1);
|
2003-09-10 18:20:28 +00:00
|
|
|
|
|
|
|
dir_in = US_DIRECTION(srb->cmd[0]);
|
|
|
|
|
|
|
|
#ifdef BBB_COMDAT_TRACE
|
2008-12-10 14:52:06 +00:00
|
|
|
printf("dir %d lun %d cmdlen %d cmd %p datalen %d pdata %p\n",
|
|
|
|
dir_in, srb->lun, srb->cmdlen, srb->cmd, srb->datalen,
|
|
|
|
srb->pdata);
|
2003-09-10 18:20:28 +00:00
|
|
|
if (srb->cmdlen) {
|
2008-12-10 14:52:06 +00:00
|
|
|
for (result = 0; result < srb->cmdlen; result++)
|
2003-09-10 18:20:28 +00:00
|
|
|
printf("cmd[%d] %#x ", result, srb->cmd[result]);
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
/* sanity checks */
|
|
|
|
if (!(srb->cmdlen <= CBWCDBLENGTH)) {
|
|
|
|
USB_STOR_PRINTF("usb_stor_BBB_comdat:cmdlen too large\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* always OUT to the ep */
|
|
|
|
pipe = usb_sndbulkpipe(us->pusb_dev, us->ep_out);
|
|
|
|
|
2012-04-03 09:26:06 +00:00
|
|
|
cbw->dCBWSignature = cpu_to_le32(CBWSIGNATURE);
|
|
|
|
cbw->dCBWTag = cpu_to_le32(CBWTag++);
|
|
|
|
cbw->dCBWDataTransferLength = cpu_to_le32(srb->datalen);
|
|
|
|
cbw->bCBWFlags = (dir_in ? CBWFLAGS_IN : CBWFLAGS_OUT);
|
|
|
|
cbw->bCBWLUN = srb->lun;
|
|
|
|
cbw->bCDBLength = srb->cmdlen;
|
2003-09-10 18:20:28 +00:00
|
|
|
/* copy the command data into the CBW command data buffer */
|
|
|
|
/* DST SRC LEN!!! */
|
2012-04-03 09:26:06 +00:00
|
|
|
memcpy(cbw->CBWCDB, srb->cmd, srb->cmdlen);
|
|
|
|
result = usb_bulk_msg(us->pusb_dev, pipe, cbw, UMASS_BBB_CBW_SIZE,
|
2008-12-10 14:52:06 +00:00
|
|
|
&actlen, USB_CNTL_TIMEOUT * 5);
|
2003-09-10 18:20:28 +00:00
|
|
|
if (result < 0)
|
|
|
|
USB_STOR_PRINTF("usb_stor_BBB_comdat:usb_bulk_msg error\n");
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
/* FIXME: we also need a CBI_command which sets up the completion
|
|
|
|
* interrupt, and waits for it
|
|
|
|
*/
|
|
|
|
int usb_stor_CB_comdat(ccb *srb, struct us_data *us)
|
|
|
|
{
|
2005-10-13 14:45:02 +00:00
|
|
|
int result = 0;
|
2008-12-10 14:52:06 +00:00
|
|
|
int dir_in, retry;
|
2002-08-17 09:36:01 +00:00
|
|
|
unsigned int pipe;
|
|
|
|
unsigned long status;
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
retry = 5;
|
|
|
|
dir_in = US_DIRECTION(srb->cmd[0]);
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
if (dir_in)
|
|
|
|
pipe = usb_rcvbulkpipe(us->pusb_dev, us->ep_in);
|
|
|
|
else
|
|
|
|
pipe = usb_sndbulkpipe(us->pusb_dev, us->ep_out);
|
|
|
|
|
|
|
|
while (retry--) {
|
|
|
|
USB_STOR_PRINTF("CBI gets a command: Try %d\n", 5 - retry);
|
2002-08-17 09:36:01 +00:00
|
|
|
#ifdef USB_STOR_DEBUG
|
|
|
|
usb_show_srb(srb);
|
|
|
|
#endif
|
|
|
|
/* let's send the command via the control pipe */
|
2008-12-10 14:52:06 +00:00
|
|
|
result = usb_control_msg(us->pusb_dev,
|
|
|
|
usb_sndctrlpipe(us->pusb_dev , 0),
|
|
|
|
US_CBI_ADSC,
|
|
|
|
USB_TYPE_CLASS | USB_RECIP_INTERFACE,
|
2002-08-17 09:36:01 +00:00
|
|
|
0, us->ifnum,
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->cmd, srb->cmdlen,
|
|
|
|
USB_CNTL_TIMEOUT * 5);
|
|
|
|
USB_STOR_PRINTF("CB_transport: control msg returned %d,"
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
" status %lX\n", result, us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
/* check the return code for the command */
|
|
|
|
if (result < 0) {
|
2008-12-10 14:52:06 +00:00
|
|
|
if (us->pusb_dev->status & USB_ST_STALLED) {
|
|
|
|
status = us->pusb_dev->status;
|
|
|
|
USB_STOR_PRINTF(" stall during command found,"
|
|
|
|
" clear pipe\n");
|
|
|
|
usb_clear_halt(us->pusb_dev,
|
|
|
|
usb_sndctrlpipe(us->pusb_dev, 0));
|
|
|
|
us->pusb_dev->status = status;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF(" error during command %02X"
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
" Stat = %lX\n", srb->cmd[0],
|
2008-12-10 14:52:06 +00:00
|
|
|
us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
/* transfer the data payload for this command, if one exists*/
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF("CB_transport: control msg returned %d,"
|
|
|
|
" direction is %s to go 0x%lx\n", result,
|
|
|
|
dir_in ? "IN" : "OUT", srb->datalen);
|
2002-08-17 09:36:01 +00:00
|
|
|
if (srb->datalen) {
|
2008-12-10 14:52:06 +00:00
|
|
|
result = us_one_transfer(us, pipe, (char *)srb->pdata,
|
|
|
|
srb->datalen);
|
|
|
|
USB_STOR_PRINTF("CBI attempted to transfer data,"
|
|
|
|
" result is %d status %lX, len %d\n",
|
|
|
|
result, us->pusb_dev->status,
|
|
|
|
us->pusb_dev->act_len);
|
|
|
|
if (!(us->pusb_dev->status & USB_ST_NAK_REC))
|
2002-08-17 09:36:01 +00:00
|
|
|
break;
|
|
|
|
} /* if (srb->datalen) */
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* return result */
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
int usb_stor_CBI_get_status(ccb *srb, struct us_data *us)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
|
|
|
int timeout;
|
|
|
|
|
2004-02-26 23:46:20 +00:00
|
|
|
us->ip_wanted = 1;
|
2008-12-10 14:52:06 +00:00
|
|
|
submit_int_msg(us->pusb_dev, us->irqpipe,
|
2004-02-26 23:46:20 +00:00
|
|
|
(void *) &us->ip_data, us->irqmaxp, us->irqinterval);
|
|
|
|
timeout = 1000;
|
|
|
|
while (timeout--) {
|
|
|
|
if ((volatile int *) us->ip_wanted == 0)
|
2002-08-17 09:36:01 +00:00
|
|
|
break;
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(10);
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
if (us->ip_wanted) {
|
2008-12-10 14:52:06 +00:00
|
|
|
printf(" Did not get interrupt on CBI\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
us->ip_wanted = 0;
|
|
|
|
return USB_STOR_TRANSPORT_ERROR;
|
|
|
|
}
|
2004-02-26 23:46:20 +00:00
|
|
|
USB_STOR_PRINTF
|
|
|
|
("Got interrupt data 0x%x, transfered %d status 0x%lX\n",
|
|
|
|
us->ip_data, us->pusb_dev->irq_act_len,
|
|
|
|
us->pusb_dev->irq_status);
|
2002-08-17 09:36:01 +00:00
|
|
|
/* UFI gives us ASC and ASCQ, like a request sense */
|
|
|
|
if (us->subclass == US_SC_UFI) {
|
|
|
|
if (srb->cmd[0] == SCSI_REQ_SENSE ||
|
|
|
|
srb->cmd[0] == SCSI_INQUIRY)
|
|
|
|
return USB_STOR_TRANSPORT_GOOD; /* Good */
|
2004-02-26 23:46:20 +00:00
|
|
|
else if (us->ip_data)
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
2002-08-17 09:36:01 +00:00
|
|
|
else
|
2004-02-26 23:46:20 +00:00
|
|
|
return USB_STOR_TRANSPORT_GOOD;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
/* otherwise, we interpret the data normally */
|
|
|
|
switch (us->ip_data) {
|
2004-02-26 23:46:20 +00:00
|
|
|
case 0x0001:
|
|
|
|
return USB_STOR_TRANSPORT_GOOD;
|
|
|
|
case 0x0002:
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
default:
|
|
|
|
return USB_STOR_TRANSPORT_ERROR;
|
|
|
|
} /* switch */
|
2002-08-17 09:36:01 +00:00
|
|
|
return USB_STOR_TRANSPORT_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define USB_TRANSPORT_UNKNOWN_RETRY 5
|
|
|
|
#define USB_TRANSPORT_NOT_READY_RETRY 10
|
|
|
|
|
2003-09-10 18:20:28 +00:00
|
|
|
/* clear a stall on an endpoint - special for BBB devices */
|
|
|
|
int usb_stor_BBB_clear_endpt_stall(struct us_data *us, __u8 endpt)
|
|
|
|
{
|
|
|
|
int result;
|
|
|
|
|
|
|
|
/* ENDPOINT_HALT = 0, so set value to 0 */
|
2008-12-10 14:52:06 +00:00
|
|
|
result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev, 0),
|
2003-09-10 18:20:28 +00:00
|
|
|
USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT,
|
2008-12-10 14:52:06 +00:00
|
|
|
0, endpt, 0, 0, USB_CNTL_TIMEOUT * 5);
|
2003-09-10 18:20:28 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
int usb_stor_BBB_transport(ccb *srb, struct us_data *us)
|
|
|
|
{
|
|
|
|
int result, retry;
|
|
|
|
int dir_in;
|
|
|
|
int actlen, data_actlen;
|
|
|
|
unsigned int pipe, pipein, pipeout;
|
2012-04-03 09:26:06 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(umass_bbb_csw_t, csw, 1);
|
2003-09-10 18:20:28 +00:00
|
|
|
#ifdef BBB_XPORT_TRACE
|
|
|
|
unsigned char *ptr;
|
|
|
|
int index;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
dir_in = US_DIRECTION(srb->cmd[0]);
|
|
|
|
|
|
|
|
/* COMMAND phase */
|
|
|
|
USB_STOR_PRINTF("COMMAND phase\n");
|
|
|
|
result = usb_stor_BBB_comdat(srb, us);
|
|
|
|
if (result < 0) {
|
|
|
|
USB_STOR_PRINTF("failed to send CBW status %ld\n",
|
|
|
|
us->pusb_dev->status);
|
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
}
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(5);
|
2003-09-10 18:20:28 +00:00
|
|
|
pipein = usb_rcvbulkpipe(us->pusb_dev, us->ep_in);
|
|
|
|
pipeout = usb_sndbulkpipe(us->pusb_dev, us->ep_out);
|
|
|
|
/* DATA phase + error handling */
|
|
|
|
data_actlen = 0;
|
|
|
|
/* no data, go immediately to the STATUS phase */
|
|
|
|
if (srb->datalen == 0)
|
|
|
|
goto st;
|
2004-02-26 23:46:20 +00:00
|
|
|
USB_STOR_PRINTF("DATA phase\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
if (dir_in)
|
|
|
|
pipe = pipein;
|
|
|
|
else
|
|
|
|
pipe = pipeout;
|
2008-12-10 14:52:06 +00:00
|
|
|
result = usb_bulk_msg(us->pusb_dev, pipe, srb->pdata, srb->datalen,
|
|
|
|
&data_actlen, USB_CNTL_TIMEOUT * 5);
|
2003-09-10 18:20:28 +00:00
|
|
|
/* special handling of STALL in DATA phase */
|
2008-12-10 14:52:06 +00:00
|
|
|
if ((result < 0) && (us->pusb_dev->status & USB_ST_STALLED)) {
|
2003-09-11 19:48:06 +00:00
|
|
|
USB_STOR_PRINTF("DATA:stall\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
/* clear the STALL on the endpoint */
|
2008-12-10 14:52:06 +00:00
|
|
|
result = usb_stor_BBB_clear_endpt_stall(us,
|
|
|
|
dir_in ? us->ep_in : us->ep_out);
|
2003-09-10 18:20:28 +00:00
|
|
|
if (result >= 0)
|
|
|
|
/* continue on to STATUS phase */
|
|
|
|
goto st;
|
|
|
|
}
|
|
|
|
if (result < 0) {
|
|
|
|
USB_STOR_PRINTF("usb_bulk_msg error status %ld\n",
|
|
|
|
us->pusb_dev->status);
|
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
}
|
|
|
|
#ifdef BBB_XPORT_TRACE
|
|
|
|
for (index = 0; index < data_actlen; index++)
|
|
|
|
printf("pdata[%d] %#x ", index, srb->pdata[index]);
|
|
|
|
printf("\n");
|
|
|
|
#endif
|
|
|
|
/* STATUS phase + error handling */
|
2008-12-10 14:52:06 +00:00
|
|
|
st:
|
2003-09-10 18:20:28 +00:00
|
|
|
retry = 0;
|
2008-12-10 14:52:06 +00:00
|
|
|
again:
|
2003-09-10 18:20:28 +00:00
|
|
|
USB_STOR_PRINTF("STATUS phase\n");
|
2012-04-03 09:26:06 +00:00
|
|
|
result = usb_bulk_msg(us->pusb_dev, pipein, csw, UMASS_BBB_CSW_SIZE,
|
2005-07-21 09:57:57 +00:00
|
|
|
&actlen, USB_CNTL_TIMEOUT*5);
|
|
|
|
|
2003-09-10 18:20:28 +00:00
|
|
|
/* special handling of STALL in STATUS phase */
|
2008-12-10 14:52:06 +00:00
|
|
|
if ((result < 0) && (retry < 1) &&
|
|
|
|
(us->pusb_dev->status & USB_ST_STALLED)) {
|
2003-09-10 18:20:28 +00:00
|
|
|
USB_STOR_PRINTF("STATUS:stall\n");
|
|
|
|
/* clear the STALL on the endpoint */
|
|
|
|
result = usb_stor_BBB_clear_endpt_stall(us, us->ep_in);
|
|
|
|
if (result >= 0 && (retry++ < 1))
|
|
|
|
/* do a retry */
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
if (result < 0) {
|
|
|
|
USB_STOR_PRINTF("usb_bulk_msg error status %ld\n",
|
|
|
|
us->pusb_dev->status);
|
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
}
|
|
|
|
#ifdef BBB_XPORT_TRACE
|
2012-04-03 09:26:06 +00:00
|
|
|
ptr = (unsigned char *)csw;
|
2003-09-10 18:20:28 +00:00
|
|
|
for (index = 0; index < UMASS_BBB_CSW_SIZE; index++)
|
|
|
|
printf("ptr[%d] %#x ", index, ptr[index]);
|
|
|
|
printf("\n");
|
|
|
|
#endif
|
|
|
|
/* misuse pipe to get the residue */
|
2012-04-03 09:26:06 +00:00
|
|
|
pipe = le32_to_cpu(csw->dCSWDataResidue);
|
2003-09-10 18:20:28 +00:00
|
|
|
if (pipe == 0 && srb->datalen != 0 && srb->datalen - data_actlen != 0)
|
|
|
|
pipe = srb->datalen - data_actlen;
|
2012-04-03 09:26:06 +00:00
|
|
|
if (CSWSIGNATURE != le32_to_cpu(csw->dCSWSignature)) {
|
2003-09-10 18:20:28 +00:00
|
|
|
USB_STOR_PRINTF("!CSWSIGNATURE\n");
|
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
2012-04-03 09:26:06 +00:00
|
|
|
} else if ((CBWTag - 1) != le32_to_cpu(csw->dCSWTag)) {
|
2003-09-10 18:20:28 +00:00
|
|
|
USB_STOR_PRINTF("!Tag\n");
|
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
2012-04-03 09:26:06 +00:00
|
|
|
} else if (csw->bCSWStatus > CSWSTATUS_PHASE) {
|
2003-09-10 18:20:28 +00:00
|
|
|
USB_STOR_PRINTF(">PHASE\n");
|
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
2012-04-03 09:26:06 +00:00
|
|
|
} else if (csw->bCSWStatus == CSWSTATUS_PHASE) {
|
2003-09-10 18:20:28 +00:00
|
|
|
USB_STOR_PRINTF("=PHASE\n");
|
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
} else if (data_actlen > srb->datalen) {
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF("transferred %dB instead of %ldB\n",
|
2003-09-10 18:20:28 +00:00
|
|
|
data_actlen, srb->datalen);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
2012-04-03 09:26:06 +00:00
|
|
|
} else if (csw->bCSWStatus == CSWSTATUS_FAILED) {
|
2003-09-10 18:20:28 +00:00
|
|
|
USB_STOR_PRINTF("FAILED\n");
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
int usb_stor_CB_transport(ccb *srb, struct us_data *us)
|
|
|
|
{
|
2008-12-10 14:52:06 +00:00
|
|
|
int result, status;
|
2002-08-17 09:36:01 +00:00
|
|
|
ccb *psrb;
|
|
|
|
ccb reqsrb;
|
2008-12-10 14:52:06 +00:00
|
|
|
int retry, notready;
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2008-07-14 13:19:07 +00:00
|
|
|
psrb = &reqsrb;
|
2008-12-10 14:52:06 +00:00
|
|
|
status = USB_STOR_TRANSPORT_GOOD;
|
|
|
|
retry = 0;
|
|
|
|
notready = 0;
|
2002-08-17 09:36:01 +00:00
|
|
|
/* issue the command */
|
|
|
|
do_retry:
|
2008-12-10 14:52:06 +00:00
|
|
|
result = usb_stor_CB_comdat(srb, us);
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF("command / Data returned %d, status %lX\n",
|
2008-12-10 14:52:06 +00:00
|
|
|
result, us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
/* if this is an CBI Protocol, get IRQ */
|
2008-12-10 14:52:06 +00:00
|
|
|
if (us->protocol == US_PR_CBI) {
|
|
|
|
status = usb_stor_CBI_get_status(srb, us);
|
2002-08-17 09:36:01 +00:00
|
|
|
/* if the status is error, report it */
|
2008-12-10 14:52:06 +00:00
|
|
|
if (status == USB_STOR_TRANSPORT_ERROR) {
|
2002-08-17 09:36:01 +00:00
|
|
|
USB_STOR_PRINTF(" USB CBI Command Error\n");
|
|
|
|
return status;
|
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->sense_buf[12] = (unsigned char)(us->ip_data >> 8);
|
|
|
|
srb->sense_buf[13] = (unsigned char)(us->ip_data & 0xff);
|
|
|
|
if (!us->ip_data) {
|
|
|
|
/* if the status is good, report it */
|
|
|
|
if (status == USB_STOR_TRANSPORT_GOOD) {
|
2002-08-17 09:36:01 +00:00
|
|
|
USB_STOR_PRINTF(" USB CBI Command Good\n");
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* do we have to issue an auto request? */
|
|
|
|
/* HERE we have to check the result */
|
2008-12-10 14:52:06 +00:00
|
|
|
if ((result < 0) && !(us->pusb_dev->status & USB_ST_STALLED)) {
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF("ERROR %lX\n", us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
us->transport_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_ERROR;
|
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
if ((us->protocol == US_PR_CBI) &&
|
|
|
|
((srb->cmd[0] == SCSI_REQ_SENSE) ||
|
|
|
|
(srb->cmd[0] == SCSI_INQUIRY))) {
|
|
|
|
/* do not issue an autorequest after request sense */
|
2002-08-17 09:36:01 +00:00
|
|
|
USB_STOR_PRINTF("No auto request and good\n");
|
|
|
|
return USB_STOR_TRANSPORT_GOOD;
|
|
|
|
}
|
|
|
|
/* issue an request_sense */
|
2008-12-10 14:52:06 +00:00
|
|
|
memset(&psrb->cmd[0], 0, 12);
|
|
|
|
psrb->cmd[0] = SCSI_REQ_SENSE;
|
|
|
|
psrb->cmd[1] = srb->lun << 5;
|
|
|
|
psrb->cmd[4] = 18;
|
|
|
|
psrb->datalen = 18;
|
2008-07-14 13:19:07 +00:00
|
|
|
psrb->pdata = &srb->sense_buf[0];
|
2008-12-10 14:52:06 +00:00
|
|
|
psrb->cmdlen = 12;
|
2002-08-17 09:36:01 +00:00
|
|
|
/* issue the command */
|
2008-12-10 14:52:06 +00:00
|
|
|
result = usb_stor_CB_comdat(psrb, us);
|
|
|
|
USB_STOR_PRINTF("auto request returned %d\n", result);
|
2002-08-17 09:36:01 +00:00
|
|
|
/* if this is an CBI Protocol, get IRQ */
|
2008-12-10 14:52:06 +00:00
|
|
|
if (us->protocol == US_PR_CBI)
|
|
|
|
status = usb_stor_CBI_get_status(psrb, us);
|
|
|
|
|
|
|
|
if ((result < 0) && !(us->pusb_dev->status & USB_ST_STALLED)) {
|
GCC4.6: Squash subsequent warnings in usb_storage.c
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Remy Bohmer <linux@bohmer.net>
2011-10-25 09:39:17 +00:00
|
|
|
USB_STOR_PRINTF(" AUTO REQUEST ERROR %ld\n",
|
2008-12-10 14:52:06 +00:00
|
|
|
us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
return USB_STOR_TRANSPORT_ERROR;
|
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF("autorequest returned 0x%02X 0x%02X 0x%02X 0x%02X\n",
|
|
|
|
srb->sense_buf[0], srb->sense_buf[2],
|
|
|
|
srb->sense_buf[12], srb->sense_buf[13]);
|
2002-08-17 09:36:01 +00:00
|
|
|
/* Check the auto request result */
|
2008-12-10 14:52:06 +00:00
|
|
|
if ((srb->sense_buf[2] == 0) &&
|
|
|
|
(srb->sense_buf[12] == 0) &&
|
|
|
|
(srb->sense_buf[13] == 0)) {
|
|
|
|
/* ok, no sense */
|
2002-08-17 09:36:01 +00:00
|
|
|
return USB_STOR_TRANSPORT_GOOD;
|
2008-12-10 14:52:06 +00:00
|
|
|
}
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
/* Check the auto request result */
|
2008-12-10 14:52:06 +00:00
|
|
|
switch (srb->sense_buf[2]) {
|
|
|
|
case 0x01:
|
|
|
|
/* Recovered Error */
|
2003-09-10 18:20:28 +00:00
|
|
|
return USB_STOR_TRANSPORT_GOOD;
|
2004-02-26 23:46:20 +00:00
|
|
|
break;
|
2008-12-10 14:52:06 +00:00
|
|
|
case 0x02:
|
|
|
|
/* Not Ready */
|
|
|
|
if (notready++ > USB_TRANSPORT_NOT_READY_RETRY) {
|
|
|
|
printf("cmd 0x%02X returned 0x%02X 0x%02X 0x%02X"
|
|
|
|
" 0x%02X (NOT READY)\n", srb->cmd[0],
|
|
|
|
srb->sense_buf[0], srb->sense_buf[2],
|
|
|
|
srb->sense_buf[12], srb->sense_buf[13]);
|
2003-09-10 18:20:28 +00:00
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
} else {
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(100);
|
2003-09-10 18:20:28 +00:00
|
|
|
goto do_retry;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2008-12-10 14:52:06 +00:00
|
|
|
if (retry++ > USB_TRANSPORT_UNKNOWN_RETRY) {
|
|
|
|
printf("cmd 0x%02X returned 0x%02X 0x%02X 0x%02X"
|
|
|
|
" 0x%02X\n", srb->cmd[0], srb->sense_buf[0],
|
|
|
|
srb->sense_buf[2], srb->sense_buf[12],
|
|
|
|
srb->sense_buf[13]);
|
2003-09-10 18:20:28 +00:00
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
2008-12-10 14:52:06 +00:00
|
|
|
} else
|
2003-09-10 18:20:28 +00:00
|
|
|
goto do_retry;
|
|
|
|
break;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
static int usb_inquiry(ccb *srb, struct us_data *ss)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
2008-12-10 14:52:06 +00:00
|
|
|
int retry, i;
|
|
|
|
retry = 5;
|
2002-08-17 09:36:01 +00:00
|
|
|
do {
|
2008-12-10 14:52:06 +00:00
|
|
|
memset(&srb->cmd[0], 0, 12);
|
|
|
|
srb->cmd[0] = SCSI_INQUIRY;
|
2010-10-05 20:04:26 +00:00
|
|
|
srb->cmd[1] = srb->lun << 5;
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->cmd[4] = 36;
|
|
|
|
srb->datalen = 36;
|
|
|
|
srb->cmdlen = 12;
|
|
|
|
i = ss->transport(srb, ss);
|
|
|
|
USB_STOR_PRINTF("inquiry returns %d\n", i);
|
|
|
|
if (i == 0)
|
2002-08-17 09:36:01 +00:00
|
|
|
break;
|
2010-03-12 08:07:00 +00:00
|
|
|
} while (--retry);
|
2003-09-10 18:20:28 +00:00
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
if (!retry) {
|
2002-08-17 09:36:01 +00:00
|
|
|
printf("error in inquiry\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
static int usb_request_sense(ccb *srb, struct us_data *ss)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
|
|
|
char *ptr;
|
2004-02-26 23:46:20 +00:00
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
ptr = (char *)srb->pdata;
|
|
|
|
memset(&srb->cmd[0], 0, 12);
|
|
|
|
srb->cmd[0] = SCSI_REQ_SENSE;
|
2010-10-05 20:04:26 +00:00
|
|
|
srb->cmd[1] = srb->lun << 5;
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->cmd[4] = 18;
|
|
|
|
srb->datalen = 18;
|
2008-07-14 13:19:07 +00:00
|
|
|
srb->pdata = &srb->sense_buf[0];
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->cmdlen = 12;
|
|
|
|
ss->transport(srb, ss);
|
|
|
|
USB_STOR_PRINTF("Request Sense returned %02X %02X %02X\n",
|
|
|
|
srb->sense_buf[2], srb->sense_buf[12],
|
|
|
|
srb->sense_buf[13]);
|
|
|
|
srb->pdata = (uchar *)ptr;
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
static int usb_test_unit_ready(ccb *srb, struct us_data *ss)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
2005-07-21 09:57:57 +00:00
|
|
|
int retries = 10;
|
2003-09-10 18:20:28 +00:00
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
do {
|
2008-12-10 14:52:06 +00:00
|
|
|
memset(&srb->cmd[0], 0, 12);
|
|
|
|
srb->cmd[0] = SCSI_TST_U_RDY;
|
2010-10-05 20:04:26 +00:00
|
|
|
srb->cmd[1] = srb->lun << 5;
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->datalen = 0;
|
|
|
|
srb->cmdlen = 12;
|
|
|
|
if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
2008-12-10 14:52:06 +00:00
|
|
|
usb_request_sense(srb, ss);
|
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
2012-03-05 13:47:00 +00:00
|
|
|
mdelay(100);
|
2008-12-10 14:52:06 +00:00
|
|
|
} while (retries--);
|
2003-09-10 18:20:28 +00:00
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
static int usb_read_capacity(ccb *srb, struct us_data *ss)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
|
|
|
int retry;
|
2008-12-10 14:52:06 +00:00
|
|
|
/* XXX retries */
|
|
|
|
retry = 3;
|
2002-08-17 09:36:01 +00:00
|
|
|
do {
|
2008-12-10 14:52:06 +00:00
|
|
|
memset(&srb->cmd[0], 0, 12);
|
|
|
|
srb->cmd[0] = SCSI_RD_CAPAC;
|
2010-10-05 20:04:26 +00:00
|
|
|
srb->cmd[1] = srb->lun << 5;
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->datalen = 8;
|
|
|
|
srb->cmdlen = 12;
|
|
|
|
if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
2008-12-10 14:52:06 +00:00
|
|
|
} while (retry--);
|
2003-09-10 18:20:28 +00:00
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
static int usb_read_10(ccb *srb, struct us_data *ss, unsigned long start,
|
|
|
|
unsigned short blocks)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
2008-12-10 14:52:06 +00:00
|
|
|
memset(&srb->cmd[0], 0, 12);
|
|
|
|
srb->cmd[0] = SCSI_READ10;
|
2010-10-05 20:04:26 +00:00
|
|
|
srb->cmd[1] = srb->lun << 5;
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
|
|
|
|
srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
|
|
|
|
srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
|
|
|
|
srb->cmd[5] = ((unsigned char) (start)) & 0xff;
|
|
|
|
srb->cmd[7] = ((unsigned char) (blocks >> 8)) & 0xff;
|
|
|
|
srb->cmd[8] = (unsigned char) blocks & 0xff;
|
|
|
|
srb->cmdlen = 12;
|
|
|
|
USB_STOR_PRINTF("read10: start %lx blocks %x\n", start, blocks);
|
|
|
|
return ss->transport(srb, ss);
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
|
2009-11-03 06:52:10 +00:00
|
|
|
static int usb_write_10(ccb *srb, struct us_data *ss, unsigned long start,
|
|
|
|
unsigned short blocks)
|
|
|
|
{
|
|
|
|
memset(&srb->cmd[0], 0, 12);
|
|
|
|
srb->cmd[0] = SCSI_WRITE10;
|
2010-10-05 20:04:26 +00:00
|
|
|
srb->cmd[1] = srb->lun << 5;
|
2009-11-03 06:52:10 +00:00
|
|
|
srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
|
|
|
|
srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
|
|
|
|
srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
|
|
|
|
srb->cmd[5] = ((unsigned char) (start)) & 0xff;
|
|
|
|
srb->cmd[7] = ((unsigned char) (blocks >> 8)) & 0xff;
|
|
|
|
srb->cmd[8] = (unsigned char) blocks & 0xff;
|
|
|
|
srb->cmdlen = 12;
|
|
|
|
USB_STOR_PRINTF("write10: start %lx blocks %x\n", start, blocks);
|
|
|
|
return ss->transport(srb, ss);
|
|
|
|
}
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2006-08-22 08:38:18 +00:00
|
|
|
#ifdef CONFIG_USB_BIN_FIXUP
|
|
|
|
/*
|
|
|
|
* Some USB storage devices queried for SCSI identification data respond with
|
|
|
|
* binary strings, which if output to the console freeze the terminal. The
|
|
|
|
* workaround is to modify the vendor and product strings read from such
|
|
|
|
* device with proper values (as reported by 'usb info').
|
|
|
|
*
|
|
|
|
* Vendor and product length limits are taken from the definition of
|
|
|
|
* block_dev_desc_t in include/part.h.
|
|
|
|
*/
|
|
|
|
static void usb_bin_fixup(struct usb_device_descriptor descriptor,
|
|
|
|
unsigned char vendor[],
|
|
|
|
unsigned char product[]) {
|
|
|
|
const unsigned char max_vendor_len = 40;
|
|
|
|
const unsigned char max_product_len = 20;
|
|
|
|
if (descriptor.idVendor == 0x0424 && descriptor.idProduct == 0x223a) {
|
2008-12-10 14:52:06 +00:00
|
|
|
strncpy((char *)vendor, "SMSC", max_vendor_len);
|
|
|
|
strncpy((char *)product, "Flash Media Cntrller",
|
|
|
|
max_product_len);
|
2006-08-22 08:38:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_USB_BIN_FIXUP */
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
unsigned long usb_stor_read(int device, unsigned long blknr,
|
|
|
|
unsigned long blkcnt, void *buffer)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
2008-12-10 14:52:06 +00:00
|
|
|
unsigned long start, blks, buf_addr;
|
2002-08-17 09:36:01 +00:00
|
|
|
unsigned short smallblks;
|
|
|
|
struct usb_device *dev;
|
2011-12-21 07:08:12 +00:00
|
|
|
struct us_data *ss;
|
2008-12-10 14:52:06 +00:00
|
|
|
int retry, i;
|
2004-03-02 14:05:39 +00:00
|
|
|
ccb *srb = &usb_ccb;
|
|
|
|
|
|
|
|
if (blkcnt == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
device &= 0xff;
|
2008-12-10 14:52:06 +00:00
|
|
|
/* Setup device */
|
|
|
|
USB_STOR_PRINTF("\nusb_read: dev %d \n", device);
|
|
|
|
dev = NULL;
|
|
|
|
for (i = 0; i < USB_MAX_DEVICE; i++) {
|
|
|
|
dev = usb_get_dev_index(i);
|
|
|
|
if (dev == NULL)
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
2008-12-10 14:52:06 +00:00
|
|
|
if (dev->devnum == usb_dev_desc[device].target)
|
2002-08-17 09:36:01 +00:00
|
|
|
break;
|
|
|
|
}
|
2011-12-21 07:08:12 +00:00
|
|
|
ss = (struct us_data *)dev->privptr;
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
usb_disable_asynch(1); /* asynch transfer not allowed */
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->lun = usb_dev_desc[device].lun;
|
|
|
|
buf_addr = (unsigned long)buffer;
|
|
|
|
start = blknr;
|
|
|
|
blks = blkcnt;
|
2011-12-21 07:08:12 +00:00
|
|
|
if (usb_test_unit_ready(srb, ss)) {
|
2008-12-10 14:52:06 +00:00
|
|
|
printf("Device NOT ready\n Request Sense returned %02X %02X"
|
|
|
|
" %02X\n", srb->sense_buf[2], srb->sense_buf[12],
|
|
|
|
srb->sense_buf[13]);
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
|
|
|
|
USB_STOR_PRINTF("\nusb_read: dev %d startblk %lx, blccnt %lx"
|
|
|
|
" buffer %lx\n", device, start, blks, buf_addr);
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
do {
|
2008-12-10 14:52:06 +00:00
|
|
|
/* XXX need some comment here */
|
|
|
|
retry = 2;
|
|
|
|
srb->pdata = (unsigned char *)buf_addr;
|
2011-12-21 07:08:12 +00:00
|
|
|
if (blks > ss->max_xfer_blk)
|
|
|
|
smallblks = ss->max_xfer_blk;
|
2008-12-10 14:52:06 +00:00
|
|
|
else
|
|
|
|
smallblks = (unsigned short) blks;
|
2002-08-17 09:36:01 +00:00
|
|
|
retry_it:
|
2011-12-21 07:08:12 +00:00
|
|
|
if (smallblks == ss->max_xfer_blk)
|
2002-08-17 09:36:01 +00:00
|
|
|
usb_show_progress();
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->datalen = usb_dev_desc[device].blksz * smallblks;
|
|
|
|
srb->pdata = (unsigned char *)buf_addr;
|
2011-12-21 07:08:12 +00:00
|
|
|
if (usb_read_10(srb, ss, start, smallblks)) {
|
2002-08-17 09:36:01 +00:00
|
|
|
USB_STOR_PRINTF("Read ERROR\n");
|
2011-12-21 07:08:12 +00:00
|
|
|
usb_request_sense(srb, ss);
|
2008-12-10 14:52:06 +00:00
|
|
|
if (retry--)
|
2002-08-17 09:36:01 +00:00
|
|
|
goto retry_it;
|
2008-12-10 14:52:06 +00:00
|
|
|
blkcnt -= blks;
|
2002-08-17 09:36:01 +00:00
|
|
|
break;
|
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
start += smallblks;
|
|
|
|
blks -= smallblks;
|
|
|
|
buf_addr += srb->datalen;
|
|
|
|
} while (blks != 0);
|
|
|
|
|
|
|
|
USB_STOR_PRINTF("usb_read: end startblk %lx, blccnt %x buffer %lx\n",
|
|
|
|
start, smallblks, buf_addr);
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
usb_disable_asynch(0); /* asynch transfer allowed */
|
2011-12-21 07:08:12 +00:00
|
|
|
if (blkcnt >= ss->max_xfer_blk)
|
2010-07-19 09:36:59 +00:00
|
|
|
debug("\n");
|
2008-12-10 14:52:06 +00:00
|
|
|
return blkcnt;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
|
2009-11-03 06:52:10 +00:00
|
|
|
unsigned long usb_stor_write(int device, unsigned long blknr,
|
|
|
|
unsigned long blkcnt, const void *buffer)
|
|
|
|
{
|
|
|
|
unsigned long start, blks, buf_addr;
|
|
|
|
unsigned short smallblks;
|
|
|
|
struct usb_device *dev;
|
2011-12-21 07:08:12 +00:00
|
|
|
struct us_data *ss;
|
2009-11-03 06:52:10 +00:00
|
|
|
int retry, i;
|
|
|
|
ccb *srb = &usb_ccb;
|
|
|
|
|
|
|
|
if (blkcnt == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
device &= 0xff;
|
|
|
|
/* Setup device */
|
|
|
|
USB_STOR_PRINTF("\nusb_write: dev %d \n", device);
|
|
|
|
dev = NULL;
|
|
|
|
for (i = 0; i < USB_MAX_DEVICE; i++) {
|
|
|
|
dev = usb_get_dev_index(i);
|
|
|
|
if (dev == NULL)
|
|
|
|
return 0;
|
|
|
|
if (dev->devnum == usb_dev_desc[device].target)
|
|
|
|
break;
|
|
|
|
}
|
2011-12-21 07:08:12 +00:00
|
|
|
ss = (struct us_data *)dev->privptr;
|
2009-11-03 06:52:10 +00:00
|
|
|
|
|
|
|
usb_disable_asynch(1); /* asynch transfer not allowed */
|
|
|
|
|
|
|
|
srb->lun = usb_dev_desc[device].lun;
|
|
|
|
buf_addr = (unsigned long)buffer;
|
|
|
|
start = blknr;
|
|
|
|
blks = blkcnt;
|
2011-12-21 07:08:12 +00:00
|
|
|
if (usb_test_unit_ready(srb, ss)) {
|
2009-11-03 06:52:10 +00:00
|
|
|
printf("Device NOT ready\n Request Sense returned %02X %02X"
|
|
|
|
" %02X\n", srb->sense_buf[2], srb->sense_buf[12],
|
|
|
|
srb->sense_buf[13]);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
USB_STOR_PRINTF("\nusb_write: dev %d startblk %lx, blccnt %lx"
|
|
|
|
" buffer %lx\n", device, start, blks, buf_addr);
|
|
|
|
|
|
|
|
do {
|
|
|
|
/* If write fails retry for max retry count else
|
|
|
|
* return with number of blocks written successfully.
|
|
|
|
*/
|
|
|
|
retry = 2;
|
|
|
|
srb->pdata = (unsigned char *)buf_addr;
|
2011-12-21 07:08:12 +00:00
|
|
|
if (blks > ss->max_xfer_blk)
|
|
|
|
smallblks = ss->max_xfer_blk;
|
2009-11-03 06:52:10 +00:00
|
|
|
else
|
|
|
|
smallblks = (unsigned short) blks;
|
|
|
|
retry_it:
|
2011-12-21 07:08:12 +00:00
|
|
|
if (smallblks == ss->max_xfer_blk)
|
2009-11-03 06:52:10 +00:00
|
|
|
usb_show_progress();
|
|
|
|
srb->datalen = usb_dev_desc[device].blksz * smallblks;
|
|
|
|
srb->pdata = (unsigned char *)buf_addr;
|
2011-12-21 07:08:12 +00:00
|
|
|
if (usb_write_10(srb, ss, start, smallblks)) {
|
2009-11-03 06:52:10 +00:00
|
|
|
USB_STOR_PRINTF("Write ERROR\n");
|
2011-12-21 07:08:12 +00:00
|
|
|
usb_request_sense(srb, ss);
|
2009-11-03 06:52:10 +00:00
|
|
|
if (retry--)
|
|
|
|
goto retry_it;
|
|
|
|
blkcnt -= blks;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
start += smallblks;
|
|
|
|
blks -= smallblks;
|
|
|
|
buf_addr += srb->datalen;
|
|
|
|
} while (blks != 0);
|
|
|
|
|
|
|
|
USB_STOR_PRINTF("usb_write: end startblk %lx, blccnt %x buffer %lx\n",
|
|
|
|
start, smallblks, buf_addr);
|
|
|
|
|
|
|
|
usb_disable_asynch(0); /* asynch transfer allowed */
|
2011-12-21 07:08:12 +00:00
|
|
|
if (blkcnt >= ss->max_xfer_blk)
|
2010-07-19 09:36:59 +00:00
|
|
|
debug("\n");
|
2009-11-03 06:52:10 +00:00
|
|
|
return blkcnt;
|
|
|
|
|
|
|
|
}
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
/* Probe to see if a new device is actually a Storage device */
|
2008-12-10 14:52:06 +00:00
|
|
|
int usb_storage_probe(struct usb_device *dev, unsigned int ifnum,
|
|
|
|
struct us_data *ss)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
2009-10-31 17:37:38 +00:00
|
|
|
struct usb_interface *iface;
|
2002-08-17 09:36:01 +00:00
|
|
|
int i;
|
|
|
|
unsigned int flags = 0;
|
|
|
|
|
|
|
|
int protocol = 0;
|
|
|
|
int subclass = 0;
|
|
|
|
|
|
|
|
/* let's examine the device now */
|
|
|
|
iface = &dev->config.if_desc[ifnum];
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* this is the place to patch some storage devices */
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF("iVendor %X iProduct %X\n", dev->descriptor.idVendor,
|
|
|
|
dev->descriptor.idProduct);
|
|
|
|
|
|
|
|
if ((dev->descriptor.idVendor) == 0x066b &&
|
|
|
|
(dev->descriptor.idProduct) == 0x0103) {
|
2002-08-17 09:36:01 +00:00
|
|
|
USB_STOR_PRINTF("patched for E-USB\n");
|
|
|
|
protocol = US_PR_CB;
|
|
|
|
subclass = US_SC_UFI; /* an assumption */
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (dev->descriptor.bDeviceClass != 0 ||
|
2009-10-31 17:37:38 +00:00
|
|
|
iface->desc.bInterfaceClass != USB_CLASS_MASS_STORAGE ||
|
|
|
|
iface->desc.bInterfaceSubClass < US_SC_MIN ||
|
|
|
|
iface->desc.bInterfaceSubClass > US_SC_MAX) {
|
2002-08-17 09:36:01 +00:00
|
|
|
/* if it's not a mass storage, we go no further */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-07-21 09:57:57 +00:00
|
|
|
memset(ss, 0, sizeof(struct us_data));
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
/* At this point, we know we've got a live one */
|
|
|
|
USB_STOR_PRINTF("\n\nUSB Mass Storage device detected\n");
|
|
|
|
|
|
|
|
/* Initialize the us_data structure with some useful info */
|
|
|
|
ss->flags = flags;
|
|
|
|
ss->ifnum = ifnum;
|
|
|
|
ss->pusb_dev = dev;
|
|
|
|
ss->attention_done = 0;
|
|
|
|
|
|
|
|
/* If the device has subclass and protocol, then use that. Otherwise,
|
|
|
|
* take data from the specific interface.
|
|
|
|
*/
|
|
|
|
if (subclass) {
|
|
|
|
ss->subclass = subclass;
|
|
|
|
ss->protocol = protocol;
|
|
|
|
} else {
|
2009-10-31 17:37:38 +00:00
|
|
|
ss->subclass = iface->desc.bInterfaceSubClass;
|
|
|
|
ss->protocol = iface->desc.bInterfaceProtocol;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* set the handler pointers based on the protocol */
|
|
|
|
USB_STOR_PRINTF("Transport: ");
|
|
|
|
switch (ss->protocol) {
|
|
|
|
case US_PR_CB:
|
|
|
|
USB_STOR_PRINTF("Control/Bulk\n");
|
|
|
|
ss->transport = usb_stor_CB_transport;
|
|
|
|
ss->transport_reset = usb_stor_CB_reset;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case US_PR_CBI:
|
|
|
|
USB_STOR_PRINTF("Control/Bulk/Interrupt\n");
|
|
|
|
ss->transport = usb_stor_CB_transport;
|
|
|
|
ss->transport_reset = usb_stor_CB_reset;
|
|
|
|
break;
|
2003-09-10 18:20:28 +00:00
|
|
|
case US_PR_BULK:
|
|
|
|
USB_STOR_PRINTF("Bulk/Bulk/Bulk\n");
|
|
|
|
ss->transport = usb_stor_BBB_transport;
|
|
|
|
ss->transport_reset = usb_stor_BBB_reset;
|
|
|
|
break;
|
2002-08-17 09:36:01 +00:00
|
|
|
default:
|
2004-02-26 23:46:20 +00:00
|
|
|
printf("USB Storage Transport unknown / not yet implemented\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We are expecting a minimum of 2 endpoints - in and out (bulk).
|
|
|
|
* An optional interrupt is OK (necessary for CBI protocol).
|
|
|
|
* We will ignore any others.
|
|
|
|
*/
|
2009-10-31 17:37:38 +00:00
|
|
|
for (i = 0; i < iface->desc.bNumEndpoints; i++) {
|
2002-08-17 09:36:01 +00:00
|
|
|
/* is it an BULK endpoint? */
|
2008-12-10 14:52:06 +00:00
|
|
|
if ((iface->ep_desc[i].bmAttributes &
|
|
|
|
USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) {
|
2002-08-17 09:36:01 +00:00
|
|
|
if (iface->ep_desc[i].bEndpointAddress & USB_DIR_IN)
|
|
|
|
ss->ep_in = iface->ep_desc[i].bEndpointAddress &
|
|
|
|
USB_ENDPOINT_NUMBER_MASK;
|
|
|
|
else
|
2008-12-10 14:52:06 +00:00
|
|
|
ss->ep_out =
|
|
|
|
iface->ep_desc[i].bEndpointAddress &
|
2002-08-17 09:36:01 +00:00
|
|
|
USB_ENDPOINT_NUMBER_MASK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* is it an interrupt endpoint? */
|
2008-12-10 14:52:06 +00:00
|
|
|
if ((iface->ep_desc[i].bmAttributes &
|
|
|
|
USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) {
|
2002-08-17 09:36:01 +00:00
|
|
|
ss->ep_int = iface->ep_desc[i].bEndpointAddress &
|
|
|
|
USB_ENDPOINT_NUMBER_MASK;
|
|
|
|
ss->irqinterval = iface->ep_desc[i].bInterval;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
USB_STOR_PRINTF("Endpoints In %d Out %d Int %d\n",
|
|
|
|
ss->ep_in, ss->ep_out, ss->ep_int);
|
|
|
|
|
|
|
|
/* Do some basic sanity checks, and bail if we find a problem */
|
2009-10-31 17:37:38 +00:00
|
|
|
if (usb_set_interface(dev, iface->desc.bInterfaceNumber, 0) ||
|
2002-08-17 09:36:01 +00:00
|
|
|
!ss->ep_in || !ss->ep_out ||
|
|
|
|
(ss->protocol == US_PR_CBI && ss->ep_int == 0)) {
|
|
|
|
USB_STOR_PRINTF("Problems with device\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* set class specific stuff */
|
2003-09-10 18:20:28 +00:00
|
|
|
/* We only handle certain protocols. Currently, these are
|
|
|
|
* the only ones.
|
2004-02-26 23:46:20 +00:00
|
|
|
* The SFF8070 accepts the requests used in u-boot
|
2002-08-17 09:36:01 +00:00
|
|
|
*/
|
2004-02-26 23:46:20 +00:00
|
|
|
if (ss->subclass != US_SC_UFI && ss->subclass != US_SC_SCSI &&
|
|
|
|
ss->subclass != US_SC_8070) {
|
2008-12-10 14:52:06 +00:00
|
|
|
printf("Sorry, protocol %d not yet supported.\n", ss->subclass);
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
if (ss->ep_int) {
|
|
|
|
/* we had found an interrupt endpoint, prepare irq pipe
|
|
|
|
* set up the IRQ pipe and handler
|
|
|
|
*/
|
2002-08-17 09:36:01 +00:00
|
|
|
ss->irqinterval = (ss->irqinterval > 0) ? ss->irqinterval : 255;
|
|
|
|
ss->irqpipe = usb_rcvintpipe(ss->pusb_dev, ss->ep_int);
|
|
|
|
ss->irqmaxp = usb_maxpacket(dev, ss->irqpipe);
|
2008-12-10 14:52:06 +00:00
|
|
|
dev->irq_handle = usb_stor_irq;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
dev->privptr = (void *)ss;
|
2002-08-17 09:36:01 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
int usb_stor_get_info(struct usb_device *dev, struct us_data *ss,
|
|
|
|
block_dev_desc_t *dev_desc)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
2008-12-10 14:52:06 +00:00
|
|
|
unsigned char perq, modi;
|
2012-04-03 09:26:06 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(unsigned long, cap, 2);
|
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(unsigned char, usb_stor_buf, 36);
|
2008-12-10 14:52:06 +00:00
|
|
|
unsigned long *capacity, *blksz;
|
2005-07-21 09:57:57 +00:00
|
|
|
ccb *pccb = &usb_ccb;
|
|
|
|
|
|
|
|
pccb->pdata = usb_stor_buf;
|
|
|
|
|
|
|
|
dev_desc->target = dev->devnum;
|
|
|
|
pccb->lun = dev_desc->lun;
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF(" address %d\n", dev_desc->target);
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
if (usb_inquiry(pccb, ss))
|
2002-08-17 09:36:01 +00:00
|
|
|
return -1;
|
2005-08-02 15:06:17 +00:00
|
|
|
|
2005-07-21 09:57:57 +00:00
|
|
|
perq = usb_stor_buf[0];
|
|
|
|
modi = usb_stor_buf[1];
|
2008-12-10 14:52:06 +00:00
|
|
|
|
|
|
|
if ((perq & 0x1f) == 0x1f) {
|
|
|
|
/* skip unknown devices */
|
|
|
|
return 0;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
if ((modi&0x80) == 0x80) {
|
|
|
|
/* drive is removable */
|
2005-07-21 09:57:57 +00:00
|
|
|
dev_desc->removable = 1;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2012-04-03 09:26:06 +00:00
|
|
|
memcpy(&dev_desc->vendor[0], (const void *) &usb_stor_buf[8], 8);
|
|
|
|
memcpy(&dev_desc->product[0], (const void *) &usb_stor_buf[16], 16);
|
|
|
|
memcpy(&dev_desc->revision[0], (const void *) &usb_stor_buf[32], 4);
|
2005-07-21 09:57:57 +00:00
|
|
|
dev_desc->vendor[8] = 0;
|
|
|
|
dev_desc->product[16] = 0;
|
|
|
|
dev_desc->revision[4] = 0;
|
2006-08-22 08:38:18 +00:00
|
|
|
#ifdef CONFIG_USB_BIN_FIXUP
|
2008-12-10 14:52:06 +00:00
|
|
|
usb_bin_fixup(dev->descriptor, (uchar *)dev_desc->vendor,
|
|
|
|
(uchar *)dev_desc->product);
|
2006-08-22 08:38:18 +00:00
|
|
|
#endif /* CONFIG_USB_BIN_FIXUP */
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF("ISO Vers %X, Response Data %X\n", usb_stor_buf[2],
|
|
|
|
usb_stor_buf[3]);
|
|
|
|
if (usb_test_unit_ready(pccb, ss)) {
|
|
|
|
printf("Device NOT ready\n"
|
|
|
|
" Request Sense returned %02X %02X %02X\n",
|
|
|
|
pccb->sense_buf[2], pccb->sense_buf[12],
|
|
|
|
pccb->sense_buf[13]);
|
|
|
|
if (dev_desc->removable == 1) {
|
2005-07-21 09:57:57 +00:00
|
|
|
dev_desc->type = perq;
|
2002-08-17 09:36:01 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
return 0;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2005-07-21 09:57:57 +00:00
|
|
|
pccb->pdata = (unsigned char *)&cap[0];
|
2008-12-10 14:52:06 +00:00
|
|
|
memset(pccb->pdata, 0, 8);
|
|
|
|
if (usb_read_capacity(pccb, ss) != 0) {
|
2002-08-17 09:36:01 +00:00
|
|
|
printf("READ_CAP ERROR\n");
|
2005-07-21 09:57:57 +00:00
|
|
|
cap[0] = 2880;
|
|
|
|
cap[1] = 0x200;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF("Read Capacity returns: 0x%lx, 0x%lx\n", cap[0],
|
|
|
|
cap[1]);
|
2002-08-17 09:36:01 +00:00
|
|
|
#if 0
|
2008-12-10 14:52:06 +00:00
|
|
|
if (cap[0] > (0x200000 * 10)) /* greater than 10 GByte */
|
|
|
|
cap[0] >>= 16;
|
2002-08-17 09:36:01 +00:00
|
|
|
#endif
|
2008-05-21 20:12:00 +00:00
|
|
|
cap[0] = cpu_to_be32(cap[0]);
|
|
|
|
cap[1] = cpu_to_be32(cap[1]);
|
|
|
|
|
2003-09-10 18:20:28 +00:00
|
|
|
/* this assumes bigendian! */
|
2005-07-21 09:57:57 +00:00
|
|
|
cap[0] += 1;
|
|
|
|
capacity = &cap[0];
|
|
|
|
blksz = &cap[1];
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF("Capacity = 0x%lx, blocksz = 0x%lx\n",
|
|
|
|
*capacity, *blksz);
|
2005-07-21 09:57:57 +00:00
|
|
|
dev_desc->lba = *capacity;
|
|
|
|
dev_desc->blksz = *blksz;
|
|
|
|
dev_desc->type = perq;
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF(" address %d\n", dev_desc->target);
|
|
|
|
USB_STOR_PRINTF("partype: %d\n", dev_desc->part_type);
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2011-12-21 07:08:12 +00:00
|
|
|
/*
|
|
|
|
* The U-Boot EHCI driver cannot handle more than 4096 * 5 bytes in a
|
|
|
|
* transfer without running itself out of qt_buffers.
|
|
|
|
*/
|
|
|
|
ss->max_xfer_blk = (4096 * 5) / dev_desc->blksz;
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
init_part(dev_desc);
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_STOR_PRINTF("partype: %d\n", dev_desc->part_type);
|
2002-08-17 09:36:01 +00:00
|
|
|
return 1;
|
|
|
|
}
|