2018-05-06 21:58:06 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
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
|
2015-03-25 18:22:16 +00:00
|
|
|
* Driver model conversion:
|
|
|
|
* (C) Copyright 2015 Google, Inc
|
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
|
|
|
*/
|
|
|
|
|
|
|
|
/* 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>
|
2020-05-10 17:39:58 +00:00
|
|
|
#include <blk.h>
|
2002-08-17 09:36:01 +00:00
|
|
|
#include <command.h>
|
2015-03-25 18:22:16 +00:00
|
|
|
#include <dm.h>
|
2015-03-25 18:22:15 +00:00
|
|
|
#include <errno.h>
|
2020-05-10 17:40:05 +00:00
|
|
|
#include <log.h>
|
2015-03-25 18:22:14 +00:00
|
|
|
#include <mapmem.h>
|
2015-09-02 23:24:58 +00:00
|
|
|
#include <memalign.h>
|
2008-05-21 20:12:00 +00:00
|
|
|
#include <asm/byteorder.h>
|
2020-05-10 17:39:56 +00:00
|
|
|
#include <asm/cache.h>
|
2002-08-17 09:36:01 +00:00
|
|
|
#include <asm/processor.h>
|
2015-03-25 18:22:16 +00:00
|
|
|
#include <dm/device-internal.h>
|
2016-02-29 22:25:58 +00:00
|
|
|
#include <dm/lists.h>
|
2002-08-17 09:36:01 +00:00
|
|
|
|
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
|
|
|
|
|
|
|
#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)
|
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static struct scsi_cmd usb_ccb __aligned(ARCH_DMA_MINALIGN);
|
2008-12-10 14:52:06 +00:00
|
|
|
static __u32 CBWTag;
|
2003-09-10 18:20:28 +00:00
|
|
|
|
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
|
|
|
|
2018-11-21 07:43:57 +00:00
|
|
|
#if !CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:34 +00:00
|
|
|
static struct blk_desc usb_dev_desc[USB_MAX_STOR_DEV];
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
struct us_data;
|
2017-06-15 03:28:30 +00:00
|
|
|
typedef int (*trans_cmnd)(struct scsi_cmd *cb, struct us_data *data);
|
2008-12-10 14:52:06 +00:00
|
|
|
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 */
|
2012-08-10 16:27:11 +00:00
|
|
|
# define USB_READY (1 << 0)
|
2008-12-10 14:52:06 +00:00
|
|
|
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 */
|
2017-06-15 03:28:30 +00:00
|
|
|
struct scsi_cmd *srb; /* current srb */
|
2008-12-10 14:52:06 +00:00
|
|
|
trans_reset transport_reset; /* reset routine */
|
|
|
|
trans_cmnd transport; /* transport routine */
|
2017-09-07 13:13:20 +00:00
|
|
|
unsigned short max_xfer_blk; /* maximum transfer blocks */
|
2002-08-17 09:36:01 +00:00
|
|
|
};
|
|
|
|
|
2018-11-21 07:43:57 +00:00
|
|
|
#if !CONFIG_IS_ENABLED(BLK)
|
2002-08-17 09:36:01 +00:00
|
|
|
static struct us_data usb_stor[USB_MAX_STOR_DEV];
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
2002-08-17 09:36:01 +00:00
|
|
|
|
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,
|
2016-02-29 22:25:34 +00:00
|
|
|
struct blk_desc *dev_desc);
|
2008-12-10 14:52:06 +00:00
|
|
|
int usb_storage_probe(struct usb_device *dev, unsigned int ifnum,
|
|
|
|
struct us_data *ss);
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
static unsigned long usb_stor_read(struct udevice *dev, lbaint_t blknr,
|
|
|
|
lbaint_t blkcnt, void *buffer);
|
|
|
|
static unsigned long usb_stor_write(struct udevice *dev, lbaint_t blknr,
|
|
|
|
lbaint_t blkcnt, const void *buffer);
|
|
|
|
#else
|
2016-02-29 22:25:34 +00:00
|
|
|
static unsigned long usb_stor_read(struct blk_desc *block_dev, lbaint_t blknr,
|
2015-12-07 18:38:48 +00:00
|
|
|
lbaint_t blkcnt, void *buffer);
|
2016-02-29 22:25:34 +00:00
|
|
|
static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr,
|
2015-12-07 18:38:48 +00:00
|
|
|
lbaint_t blkcnt, const void *buffer);
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
2002-08-17 09:36:01 +00:00
|
|
|
void uhci_show_temp_int_td(void);
|
|
|
|
|
2012-10-29 13:34:32 +00:00
|
|
|
static void usb_show_progress(void)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
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
|
|
|
{
|
2016-02-29 22:25:54 +00:00
|
|
|
int count = 0;
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
struct udevice *dev;
|
|
|
|
|
|
|
|
for (blk_first_device(IF_TYPE_USB, &dev);
|
|
|
|
dev;
|
|
|
|
blk_next_device(&dev)) {
|
|
|
|
struct blk_desc *desc = dev_get_uclass_platdata(dev);
|
|
|
|
|
|
|
|
printf(" Device %d: ", desc->devnum);
|
|
|
|
dev_print(desc);
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
#else
|
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
|
|
|
}
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
2016-02-29 22:25:54 +00:00
|
|
|
if (!count) {
|
|
|
|
printf("No storage devices, perhaps not 'usb start'ed..?\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-03-16 13:45:44 +00:00
|
|
|
return 0;
|
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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Get Max LUN -> len = %i, result = %i\n", len, (int) *result);
|
2012-04-03 09:26:06 +00:00
|
|
|
return (len > 0) ? *result : 0;
|
2010-10-05 20:04:26 +00:00
|
|
|
}
|
|
|
|
|
2016-02-29 22:25:54 +00:00
|
|
|
static int usb_stor_probe_device(struct usb_device *udev)
|
2015-03-25 18:22:15 +00:00
|
|
|
{
|
2016-02-29 22:25:54 +00:00
|
|
|
int lun, max_lun;
|
2016-02-29 22:25:58 +00:00
|
|
|
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
struct us_data *data;
|
|
|
|
int ret;
|
|
|
|
#else
|
2016-02-29 22:25:54 +00:00
|
|
|
int start;
|
|
|
|
|
|
|
|
if (udev == NULL)
|
2015-03-25 18:22:15 +00:00
|
|
|
return -ENOENT; /* no more devices available */
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
debug("\n\nProbing for storage\n");
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
/*
|
|
|
|
* We store the us_data in the mass storage device's platdata. It
|
|
|
|
* is shared by all LUNs (block devices) attached to this mass storage
|
|
|
|
* device.
|
|
|
|
*/
|
|
|
|
data = dev_get_platdata(udev->dev);
|
|
|
|
if (!usb_storage_probe(udev, 0, data))
|
|
|
|
return 0;
|
|
|
|
max_lun = usb_get_max_lun(data);
|
|
|
|
for (lun = 0; lun <= max_lun; lun++) {
|
|
|
|
struct blk_desc *blkdev;
|
|
|
|
struct udevice *dev;
|
2016-05-01 17:36:29 +00:00
|
|
|
char str[10];
|
2016-02-29 22:25:58 +00:00
|
|
|
|
2016-05-01 17:36:29 +00:00
|
|
|
snprintf(str, sizeof(str), "lun%d", lun);
|
|
|
|
ret = blk_create_devicef(udev->dev, "usb_storage_blk", str,
|
|
|
|
IF_TYPE_USB, usb_max_devs, 512, 0,
|
|
|
|
&dev);
|
2016-02-29 22:25:58 +00:00
|
|
|
if (ret) {
|
|
|
|
debug("Cannot bind driver\n");
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
blkdev = dev_get_uclass_platdata(dev);
|
|
|
|
blkdev->target = 0xff;
|
|
|
|
blkdev->lun = lun;
|
2015-03-25 18:22:15 +00:00
|
|
|
|
2016-02-29 22:25:58 +00:00
|
|
|
ret = usb_stor_get_info(udev, data, blkdev);
|
2018-10-15 09:21:07 +00:00
|
|
|
if (ret == 1) {
|
2016-02-29 22:25:58 +00:00
|
|
|
usb_max_devs++;
|
|
|
|
debug("%s: Found device %p\n", __func__, udev);
|
|
|
|
} else {
|
|
|
|
debug("usb_stor_get_info: Invalid device\n");
|
|
|
|
ret = device_unbind(dev);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else
|
2016-02-29 22:25:53 +00:00
|
|
|
/* We don't have space to even probe if we hit the maximum */
|
|
|
|
if (usb_max_devs == USB_MAX_STOR_DEV) {
|
|
|
|
printf("max USB Storage Device reached: %d stopping\n",
|
|
|
|
usb_max_devs);
|
|
|
|
return -ENOSPC;
|
|
|
|
}
|
|
|
|
|
2016-02-29 22:25:54 +00:00
|
|
|
if (!usb_storage_probe(udev, 0, &usb_stor[usb_max_devs]))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* OK, it's a storage device. Iterate over its LUNs and populate
|
|
|
|
* usb_dev_desc'
|
|
|
|
*/
|
|
|
|
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++) {
|
|
|
|
struct blk_desc *blkdev;
|
|
|
|
|
|
|
|
blkdev = &usb_dev_desc[usb_max_devs];
|
|
|
|
memset(blkdev, '\0', sizeof(struct blk_desc));
|
|
|
|
blkdev->if_type = IF_TYPE_USB;
|
|
|
|
blkdev->devnum = usb_max_devs;
|
|
|
|
blkdev->part_type = PART_TYPE_UNKNOWN;
|
|
|
|
blkdev->target = 0xff;
|
|
|
|
blkdev->type = DEV_TYPE_UNKNOWN;
|
|
|
|
blkdev->block_read = usb_stor_read;
|
|
|
|
blkdev->block_write = usb_stor_write;
|
|
|
|
blkdev->lun = lun;
|
|
|
|
blkdev->priv = udev;
|
|
|
|
|
|
|
|
if (usb_stor_get_info(udev, &usb_stor[start],
|
|
|
|
&usb_dev_desc[usb_max_devs]) == 1) {
|
2016-02-29 22:25:58 +00:00
|
|
|
debug("partype: %d\n", blkdev->part_type);
|
|
|
|
part_init(blkdev);
|
|
|
|
debug("partype: %d\n", blkdev->part_type);
|
2016-02-29 22:25:54 +00:00
|
|
|
usb_max_devs++;
|
|
|
|
debug("%s: Found device %p\n", __func__, udev);
|
2015-03-25 18:22:15 +00:00
|
|
|
}
|
|
|
|
}
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
2015-03-25 18:22:15 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void usb_stor_reset(void)
|
|
|
|
{
|
|
|
|
usb_max_devs = 0;
|
|
|
|
}
|
|
|
|
|
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)
|
|
|
|
{
|
2008-12-10 14:52:06 +00:00
|
|
|
if (mode == 1)
|
2012-09-25 22:14:36 +00:00
|
|
|
printf(" scanning usb for storage devices... ");
|
2008-12-10 14:52:06 +00:00
|
|
|
|
2018-11-21 07:43:56 +00:00
|
|
|
#if !CONFIG_IS_ENABLED(DM_USB)
|
2016-12-21 08:35:08 +00:00
|
|
|
unsigned char i;
|
|
|
|
|
2002-08-17 09:36:01 +00:00
|
|
|
usb_disable_asynch(1); /* asynch transfer not allowed */
|
|
|
|
|
2015-03-25 18:22:15 +00:00
|
|
|
usb_stor_reset();
|
2008-12-10 14:52:06 +00:00
|
|
|
for (i = 0; i < USB_MAX_DEVICE; i++) {
|
2015-03-25 18:22:15 +00:00
|
|
|
struct usb_device *dev;
|
|
|
|
|
2008-12-10 14:52:06 +00:00
|
|
|
dev = usb_get_dev_index(i); /* get device */
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("i=%d\n", i);
|
2015-03-25 18:22:15 +00:00
|
|
|
if (usb_stor_probe_device(dev))
|
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 */
|
2016-12-21 08:35:08 +00:00
|
|
|
#endif
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-04-12 11:04:33 +00:00
|
|
|
#ifdef DEBUG
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static void usb_show_srb(struct scsi_cmd *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 */
|
2015-03-25 18:22:14 +00:00
|
|
|
debug("Bulk xfer 0x%lx(%d) try #%d\n",
|
|
|
|
(ulong)map_to_sysmem(buf), this_xfer,
|
|
|
|
11 - maxtry);
|
2002-08-17 09:36:01 +00:00
|
|
|
result = usb_bulk_msg(us->pusb_dev, pipe, buf,
|
2008-12-10 14:52:06 +00:00
|
|
|
this_xfer, &partial,
|
|
|
|
USB_CNTL_TIMEOUT * 5);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("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
|
|
|
|
*/
|
2013-04-12 11:04:33 +00:00
|
|
|
#ifdef DEBUG
|
2002-08-17 09:36:01 +00:00
|
|
|
display_int_status(us->pusb_dev->status);
|
|
|
|
#endif
|
|
|
|
if (us->pusb_dev->status & USB_ST_STALLED) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("stalled ->clearing endpoint" \
|
|
|
|
"halt for pipe 0x%x\n", pipe);
|
2002-08-17 09:36:01 +00:00
|
|
|
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) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("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) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Device NAKed bulk_msg\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
return result;
|
|
|
|
}
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("bulk transferred with error");
|
2008-12-10 14:52:06 +00:00
|
|
|
if (this_xfer == partial) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug(" %ld, but data ok\n",
|
|
|
|
us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* if our try counter reaches 0, bail out */
|
2013-04-12 11:04:33 +00:00
|
|
|
debug(" %ld, data %d\n",
|
|
|
|
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.
|
|
|
|
*/
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("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,
|
2012-10-29 13:34:32 +00:00
|
|
|
0, us->ifnum, NULL, 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)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("RESET:stall\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("BBB_reset result %d: status %lX reset\n",
|
|
|
|
result, 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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("BBB_reset result %d: status %lX clearing IN endpoint\n",
|
|
|
|
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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("BBB_reset result %d: status %lX clearing OUT endpoint\n",
|
|
|
|
result, us->pusb_dev->status);
|
|
|
|
debug("BBB_reset done\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
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;
|
|
|
|
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("CB_reset result %d: status %lX 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));
|
|
|
|
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("CB_reset done\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
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.
|
|
|
|
*/
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_stor_BBB_comdat(struct scsi_cmd *srb, struct us_data *us)
|
2003-09-10 18:20:28 +00:00
|
|
|
{
|
|
|
|
int result;
|
|
|
|
int actlen;
|
|
|
|
int dir_in;
|
|
|
|
unsigned int pipe;
|
2015-03-25 18:22:11 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(struct umass_bbb_cbw, cbw, 1);
|
2003-09-10 18:20:28 +00:00
|
|
|
|
|
|
|
dir_in = US_DIRECTION(srb->cmd[0]);
|
|
|
|
|
|
|
|
#ifdef BBB_COMDAT_TRACE
|
2013-04-12 11:04:34 +00:00
|
|
|
printf("dir %d lun %d cmdlen %d cmd %p datalen %lu pdata %p\n",
|
2008-12-10 14:52:06 +00:00
|
|
|
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)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("usb_stor_BBB_comdat:cmdlen too large\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
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!!! */
|
2015-04-01 14:18:46 +00:00
|
|
|
|
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)
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("usb_stor_BBB_comdat:usb_bulk_msg error\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
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
|
|
|
|
*/
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_stor_CB_comdat(struct scsi_cmd *srb, struct us_data *us)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
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--) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("CBI gets a command: Try %d\n", 5 - retry);
|
|
|
|
#ifdef DEBUG
|
2002-08-17 09:36:01 +00:00
|
|
|
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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("CB_transport: control msg returned %d, 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;
|
2013-04-12 11:04:33 +00:00
|
|
|
debug(" stall during command found," \
|
|
|
|
" clear pipe\n");
|
2008-12-10 14:52:06 +00:00
|
|
|
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
|
|
|
}
|
2013-04-12 11:04:33 +00:00
|
|
|
debug(" error during command %02X" \
|
|
|
|
" Stat = %lX\n", srb->cmd[0],
|
|
|
|
us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
/* transfer the data payload for this command, if one exists*/
|
|
|
|
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("CBI attempted to transfer data," \
|
|
|
|
" result is %d status %lX, len %d\n",
|
|
|
|
result, us->pusb_dev->status,
|
|
|
|
us->pusb_dev->act_len);
|
2008-12-10 14:52:06 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_stor_CBI_get_status(struct scsi_cmd *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;
|
2019-08-18 08:55:26 +00:00
|
|
|
usb_int_msg(us->pusb_dev, us->irqpipe,
|
2019-08-18 08:55:27 +00:00
|
|
|
(void *)&us->ip_data, us->irqmaxp, us->irqinterval, false);
|
2004-02-26 23:46:20 +00:00
|
|
|
timeout = 1000;
|
|
|
|
while (timeout--) {
|
2015-04-01 14:18:46 +00:00
|
|
|
if (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;
|
|
|
|
}
|
2016-03-15 19:16:39 +00:00
|
|
|
debug("Got interrupt data 0x%x, transferred %d status 0x%lX\n",
|
2013-04-12 11:04:33 +00:00
|
|
|
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 */
|
2012-10-29 13:34:32 +00:00
|
|
|
static int usb_stor_BBB_clear_endpt_stall(struct us_data *us, __u8 endpt)
|
2003-09-10 18:20:28 +00:00
|
|
|
{
|
|
|
|
/* ENDPOINT_HALT = 0, so set value to 0 */
|
2016-09-06 13:17:35 +00:00
|
|
|
return usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev, 0),
|
|
|
|
USB_REQ_CLEAR_FEATURE, USB_RECIP_ENDPOINT, 0,
|
|
|
|
endpt, NULL, 0, USB_CNTL_TIMEOUT * 5);
|
2003-09-10 18:20:28 +00:00
|
|
|
}
|
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_stor_BBB_transport(struct scsi_cmd *srb, struct us_data *us)
|
2003-09-10 18:20:28 +00:00
|
|
|
{
|
|
|
|
int result, retry;
|
|
|
|
int dir_in;
|
|
|
|
int actlen, data_actlen;
|
|
|
|
unsigned int pipe, pipein, pipeout;
|
2015-03-25 18:22:11 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(struct umass_bbb_csw, 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 */
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("COMMAND phase\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
result = usb_stor_BBB_comdat(srb, us);
|
|
|
|
if (result < 0) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("failed to send CBW status %ld\n",
|
|
|
|
us->pusb_dev->status);
|
2003-09-10 18:20:28 +00:00
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
}
|
2012-08-10 16:27:11 +00:00
|
|
|
if (!(us->flags & USB_READY))
|
|
|
|
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;
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("DATA phase\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
if (dir_in)
|
|
|
|
pipe = pipein;
|
|
|
|
else
|
|
|
|
pipe = pipeout;
|
2015-04-01 14:18:46 +00:00
|
|
|
|
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)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("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) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("usb_bulk_msg error status %ld\n",
|
|
|
|
us->pusb_dev->status);
|
2003-09-10 18:20:28 +00:00
|
|
|
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:
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("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)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("STATUS:stall\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
/* 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) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("usb_bulk_msg error status %ld\n",
|
|
|
|
us->pusb_dev->status);
|
2003-09-10 18:20:28 +00:00
|
|
|
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)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("!CSWSIGNATURE\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
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)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("!Tag\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
2012-04-03 09:26:06 +00:00
|
|
|
} else if (csw->bCSWStatus > CSWSTATUS_PHASE) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug(">PHASE\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
2012-04-03 09:26:06 +00:00
|
|
|
} else if (csw->bCSWStatus == CSWSTATUS_PHASE) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("=PHASE\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
usb_stor_BBB_reset(us);
|
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
} else if (data_actlen > srb->datalen) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("transferred %dB instead of %ldB\n",
|
|
|
|
data_actlen, srb->datalen);
|
2003-09-10 18:20:28 +00:00
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
2012-04-03 09:26:06 +00:00
|
|
|
} else if (csw->bCSWStatus == CSWSTATUS_FAILED) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("FAILED\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
return USB_STOR_TRANSPORT_FAILED;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_stor_CB_transport(struct scsi_cmd *srb, struct us_data *us)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
2008-12-10 14:52:06 +00:00
|
|
|
int result, status;
|
2017-06-15 03:28:30 +00:00
|
|
|
struct scsi_cmd *psrb;
|
|
|
|
struct scsi_cmd 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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("command / Data returned %d, status %lX\n",
|
|
|
|
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) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug(" USB CBI Command Error\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
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) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug(" USB CBI Command Good\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
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)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("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 */
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("No auto request and good\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("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)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug(" AUTO REQUEST ERROR %ld\n",
|
|
|
|
us->pusb_dev->status);
|
2002-08-17 09:36:01 +00:00
|
|
|
return USB_STOR_TRANSPORT_ERROR;
|
|
|
|
}
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("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;
|
|
|
|
}
|
|
|
|
|
2017-09-07 13:13:21 +00:00
|
|
|
static void usb_stor_set_max_xfer_blk(struct usb_device *udev,
|
|
|
|
struct us_data *us)
|
2017-09-07 13:13:20 +00:00
|
|
|
{
|
|
|
|
/*
|
2019-09-15 22:16:25 +00:00
|
|
|
* Limit the total size of a transfer to 120 KB.
|
|
|
|
*
|
|
|
|
* Some devices are known to choke with anything larger. It seems like
|
|
|
|
* the problem stems from the fact that original IDE controllers had
|
|
|
|
* only an 8-bit register to hold the number of sectors in one transfer
|
|
|
|
* and even those couldn't handle a full 256 sectors.
|
|
|
|
*
|
|
|
|
* Because we want to make sure we interoperate with as many devices as
|
|
|
|
* possible, we will maintain a 240 sector transfer size limit for USB
|
|
|
|
* Mass Storage devices.
|
|
|
|
*
|
|
|
|
* Tests show that other operating have similar limits with Microsoft
|
|
|
|
* Windows 7 limiting transfers to 128 sectors for both USB2 and USB3
|
|
|
|
* and Apple Mac OS X 10.11 limiting transfers to 256 sectors for USB2
|
|
|
|
* and 2048 for USB3 devices.
|
2017-09-07 13:13:20 +00:00
|
|
|
*/
|
2019-09-15 22:16:25 +00:00
|
|
|
unsigned short blk = 240;
|
|
|
|
|
|
|
|
#if CONFIG_IS_ENABLED(DM_USB)
|
|
|
|
size_t size;
|
|
|
|
int ret;
|
|
|
|
|
2017-09-07 13:13:21 +00:00
|
|
|
ret = usb_get_max_xfer_size(udev, (size_t *)&size);
|
2019-09-15 22:16:25 +00:00
|
|
|
if ((ret >= 0) && (size < blk * 512))
|
2017-09-07 13:13:21 +00:00
|
|
|
blk = size / 512;
|
|
|
|
#endif
|
2017-09-07 13:13:20 +00:00
|
|
|
|
|
|
|
us->max_xfer_blk = blk;
|
|
|
|
}
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_inquiry(struct scsi_cmd *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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("inquiry returns %d\n", i);
|
2008-12-10 14:52:06 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_request_sense(struct scsi_cmd *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);
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Request Sense returned %02X %02X %02X\n",
|
|
|
|
srb->sense_buf[2], srb->sense_buf[12],
|
|
|
|
srb->sense_buf[13]);
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->pdata = (uchar *)ptr;
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_test_unit_ready(struct scsi_cmd *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;
|
2012-08-10 16:27:11 +00:00
|
|
|
if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD) {
|
|
|
|
ss->flags |= USB_READY;
|
2002-08-17 09:36:01 +00:00
|
|
|
return 0;
|
2012-08-10 16:27:11 +00:00
|
|
|
}
|
2008-12-10 14:52:06 +00:00
|
|
|
usb_request_sense(srb, ss);
|
2012-12-13 01:55:29 +00:00
|
|
|
/*
|
|
|
|
* Check the Key Code Qualifier, if it matches
|
|
|
|
* "Not Ready - medium not present"
|
|
|
|
* (the sense Key equals 0x2 and the ASC is 0x3a)
|
|
|
|
* return immediately as the medium being absent won't change
|
|
|
|
* unless there is a user action.
|
|
|
|
*/
|
|
|
|
if ((srb->sense_buf[2] == 0x02) &&
|
|
|
|
(srb->sense_buf[12] == 0x3a))
|
|
|
|
return -1;
|
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;
|
|
|
|
}
|
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_read_capacity(struct scsi_cmd *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;
|
|
|
|
}
|
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_read_10(struct scsi_cmd *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;
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("read10: start %lx blocks %x\n", start, blocks);
|
2008-12-10 14:52:06 +00:00
|
|
|
return ss->transport(srb, ss);
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
|
2017-06-15 03:28:30 +00:00
|
|
|
static int usb_write_10(struct scsi_cmd *srb, struct us_data *ss,
|
|
|
|
unsigned long start, unsigned short blocks)
|
2009-11-03 06:52:10 +00:00
|
|
|
{
|
|
|
|
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;
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("write10: start %lx blocks %x\n", start, blocks);
|
2009-11-03 06:52:10 +00:00
|
|
|
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
|
2016-02-29 22:25:34 +00:00
|
|
|
* struct blk_desc in include/part.h.
|
2006-08-22 08:38:18 +00:00
|
|
|
*/
|
|
|
|
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 */
|
|
|
|
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
static unsigned long usb_stor_read(struct udevice *dev, lbaint_t blknr,
|
|
|
|
lbaint_t blkcnt, void *buffer)
|
|
|
|
#else
|
2016-02-29 22:25:34 +00:00
|
|
|
static unsigned long usb_stor_read(struct blk_desc *block_dev, lbaint_t blknr,
|
2015-12-07 18:38:48 +00:00
|
|
|
lbaint_t blkcnt, void *buffer)
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
2012-10-12 14:26:07 +00:00
|
|
|
lbaint_t start, blks;
|
|
|
|
uintptr_t buf_addr;
|
2002-08-17 09:36:01 +00:00
|
|
|
unsigned short smallblks;
|
2016-02-29 22:25:54 +00:00
|
|
|
struct usb_device *udev;
|
2011-12-21 07:08:12 +00:00
|
|
|
struct us_data *ss;
|
2015-03-25 18:22:13 +00:00
|
|
|
int retry;
|
2017-06-15 03:28:30 +00:00
|
|
|
struct scsi_cmd *srb = &usb_ccb;
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
struct blk_desc *block_dev;
|
|
|
|
#endif
|
2004-03-02 14:05:39 +00:00
|
|
|
|
|
|
|
if (blkcnt == 0)
|
|
|
|
return 0;
|
2008-12-10 14:52:06 +00:00
|
|
|
/* Setup device */
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
block_dev = dev_get_uclass_platdata(dev);
|
|
|
|
udev = dev_get_parent_priv(dev_get_parent(dev));
|
|
|
|
debug("\nusb_read: udev %d\n", block_dev->devnum);
|
|
|
|
#else
|
2016-02-29 22:25:54 +00:00
|
|
|
debug("\nusb_read: udev %d\n", block_dev->devnum);
|
|
|
|
udev = usb_dev_desc[block_dev->devnum].priv;
|
|
|
|
if (!udev) {
|
2015-03-25 18:22:13 +00:00
|
|
|
debug("%s: No device\n", __func__);
|
|
|
|
return 0;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
2016-02-29 22:25:54 +00:00
|
|
|
ss = (struct us_data *)udev->privptr;
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
usb_disable_asynch(1); /* asynch transfer not allowed */
|
usb: Keep async schedule running only across mass storage xfers
Rather than keeping the asynchronous schedule running always, keep it
running only across USB mass storage transfers for now, as it seems
that keeping it running all the time interferes with certain control
transfers during device enumeration.
Note that running the async schedule all the time should not be an
issue, especially on EHCI HCD, as that one implements most of the
transfers using async schedule.
Note that we have usb_disable_asynch(), which however is utterly broken.
The usb_disable_asynch() blocks the USB core from doing async transfers
by setting a global flag. The async schedule should however be disabled
per USB controller. Moreover, setting a global flag does not prevent the
controller from using the async schedule, which e.g. the EHCI HCD does.
This patch implements additional callback to the controller, which
permits it to lock the async schedule and keep it running across
multiple transfers. Once the schedule is unlocked, it must also be
disabled. This thus prevents the async schedule from running outside
of the USB mass storage transfers.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Tested-by: Tom Rini <trini@konsulko.com> [omap3_beagle, previously failing]
2020-04-06 12:29:44 +00:00
|
|
|
usb_lock_async(udev, 1);
|
2016-02-29 22:25:54 +00:00
|
|
|
srb->lun = block_dev->lun;
|
2015-04-01 14:18:46 +00:00
|
|
|
buf_addr = (uintptr_t)buffer;
|
2008-12-10 14:52:06 +00:00
|
|
|
start = blknr;
|
|
|
|
blks = blkcnt;
|
|
|
|
|
2018-08-06 11:47:40 +00:00
|
|
|
debug("\nusb_read: dev %d startblk " LBAF ", blccnt " LBAF " buffer %lx\n",
|
|
|
|
block_dev->devnum, start, blks, buf_addr);
|
2008-12-10 14:52:06 +00:00
|
|
|
|
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;
|
2017-09-07 13:13:20 +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:
|
2017-09-07 13:13:20 +00:00
|
|
|
if (smallblks == ss->max_xfer_blk)
|
2002-08-17 09:36:01 +00:00
|
|
|
usb_show_progress();
|
2016-02-29 22:25:54 +00:00
|
|
|
srb->datalen = block_dev->blksz * smallblks;
|
2008-12-10 14:52:06 +00:00
|
|
|
srb->pdata = (unsigned char *)buf_addr;
|
2011-12-21 07:08:12 +00:00
|
|
|
if (usb_read_10(srb, ss, start, smallblks)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Read ERROR\n");
|
2019-10-05 17:18:38 +00:00
|
|
|
ss->flags &= ~USB_READY;
|
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);
|
|
|
|
|
2018-08-06 11:47:40 +00:00
|
|
|
debug("usb_read: end startblk " LBAF ", blccnt %x buffer %lx\n",
|
2013-04-12 11:04:33 +00:00
|
|
|
start, smallblks, buf_addr);
|
2008-12-10 14:52:06 +00:00
|
|
|
|
usb: Keep async schedule running only across mass storage xfers
Rather than keeping the asynchronous schedule running always, keep it
running only across USB mass storage transfers for now, as it seems
that keeping it running all the time interferes with certain control
transfers during device enumeration.
Note that running the async schedule all the time should not be an
issue, especially on EHCI HCD, as that one implements most of the
transfers using async schedule.
Note that we have usb_disable_asynch(), which however is utterly broken.
The usb_disable_asynch() blocks the USB core from doing async transfers
by setting a global flag. The async schedule should however be disabled
per USB controller. Moreover, setting a global flag does not prevent the
controller from using the async schedule, which e.g. the EHCI HCD does.
This patch implements additional callback to the controller, which
permits it to lock the async schedule and keep it running across
multiple transfers. Once the schedule is unlocked, it must also be
disabled. This thus prevents the async schedule from running outside
of the USB mass storage transfers.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Tested-by: Tom Rini <trini@konsulko.com> [omap3_beagle, previously failing]
2020-04-06 12:29:44 +00:00
|
|
|
usb_lock_async(udev, 0);
|
2002-08-17 09:36:01 +00:00
|
|
|
usb_disable_asynch(0); /* asynch transfer allowed */
|
2017-09-07 13:13:20 +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
|
|
|
}
|
|
|
|
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
static unsigned long usb_stor_write(struct udevice *dev, lbaint_t blknr,
|
|
|
|
lbaint_t blkcnt, const void *buffer)
|
|
|
|
#else
|
2016-02-29 22:25:34 +00:00
|
|
|
static unsigned long usb_stor_write(struct blk_desc *block_dev, lbaint_t blknr,
|
2015-12-07 18:38:48 +00:00
|
|
|
lbaint_t blkcnt, const void *buffer)
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
2009-11-03 06:52:10 +00:00
|
|
|
{
|
2012-10-12 14:26:07 +00:00
|
|
|
lbaint_t start, blks;
|
|
|
|
uintptr_t buf_addr;
|
2009-11-03 06:52:10 +00:00
|
|
|
unsigned short smallblks;
|
2016-02-29 22:25:54 +00:00
|
|
|
struct usb_device *udev;
|
2011-12-21 07:08:12 +00:00
|
|
|
struct us_data *ss;
|
2015-03-25 18:22:13 +00:00
|
|
|
int retry;
|
2017-06-15 03:28:30 +00:00
|
|
|
struct scsi_cmd *srb = &usb_ccb;
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
struct blk_desc *block_dev;
|
|
|
|
#endif
|
2009-11-03 06:52:10 +00:00
|
|
|
|
|
|
|
if (blkcnt == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Setup device */
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
block_dev = dev_get_uclass_platdata(dev);
|
|
|
|
udev = dev_get_parent_priv(dev_get_parent(dev));
|
|
|
|
debug("\nusb_read: udev %d\n", block_dev->devnum);
|
|
|
|
#else
|
2016-02-29 22:25:54 +00:00
|
|
|
debug("\nusb_read: udev %d\n", block_dev->devnum);
|
|
|
|
udev = usb_dev_desc[block_dev->devnum].priv;
|
|
|
|
if (!udev) {
|
|
|
|
debug("%s: No device\n", __func__);
|
2015-03-25 18:22:13 +00:00
|
|
|
return 0;
|
2016-02-29 22:25:54 +00:00
|
|
|
}
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
2016-02-29 22:25:54 +00:00
|
|
|
ss = (struct us_data *)udev->privptr;
|
2009-11-03 06:52:10 +00:00
|
|
|
|
|
|
|
usb_disable_asynch(1); /* asynch transfer not allowed */
|
usb: Keep async schedule running only across mass storage xfers
Rather than keeping the asynchronous schedule running always, keep it
running only across USB mass storage transfers for now, as it seems
that keeping it running all the time interferes with certain control
transfers during device enumeration.
Note that running the async schedule all the time should not be an
issue, especially on EHCI HCD, as that one implements most of the
transfers using async schedule.
Note that we have usb_disable_asynch(), which however is utterly broken.
The usb_disable_asynch() blocks the USB core from doing async transfers
by setting a global flag. The async schedule should however be disabled
per USB controller. Moreover, setting a global flag does not prevent the
controller from using the async schedule, which e.g. the EHCI HCD does.
This patch implements additional callback to the controller, which
permits it to lock the async schedule and keep it running across
multiple transfers. Once the schedule is unlocked, it must also be
disabled. This thus prevents the async schedule from running outside
of the USB mass storage transfers.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Tested-by: Tom Rini <trini@konsulko.com> [omap3_beagle, previously failing]
2020-04-06 12:29:44 +00:00
|
|
|
usb_lock_async(udev, 1);
|
2009-11-03 06:52:10 +00:00
|
|
|
|
2016-02-29 22:25:54 +00:00
|
|
|
srb->lun = block_dev->lun;
|
2015-04-01 14:18:46 +00:00
|
|
|
buf_addr = (uintptr_t)buffer;
|
2009-11-03 06:52:10 +00:00
|
|
|
start = blknr;
|
|
|
|
blks = blkcnt;
|
|
|
|
|
2018-08-06 11:47:40 +00:00
|
|
|
debug("\nusb_write: dev %d startblk " LBAF ", blccnt " LBAF " buffer %lx\n",
|
|
|
|
block_dev->devnum, start, blks, buf_addr);
|
2009-11-03 06:52:10 +00:00
|
|
|
|
|
|
|
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;
|
2017-09-07 13:13:20 +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:
|
2017-09-07 13:13:20 +00:00
|
|
|
if (smallblks == ss->max_xfer_blk)
|
2009-11-03 06:52:10 +00:00
|
|
|
usb_show_progress();
|
2016-02-29 22:25:54 +00:00
|
|
|
srb->datalen = block_dev->blksz * smallblks;
|
2009-11-03 06:52:10 +00:00
|
|
|
srb->pdata = (unsigned char *)buf_addr;
|
2011-12-21 07:08:12 +00:00
|
|
|
if (usb_write_10(srb, ss, start, smallblks)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Write ERROR\n");
|
2019-10-05 17:18:38 +00:00
|
|
|
ss->flags &= ~USB_READY;
|
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);
|
|
|
|
|
2018-08-06 11:47:40 +00:00
|
|
|
debug("usb_write: end startblk " LBAF ", blccnt %x buffer %lx\n",
|
|
|
|
start, smallblks, buf_addr);
|
2009-11-03 06:52:10 +00:00
|
|
|
|
usb: Keep async schedule running only across mass storage xfers
Rather than keeping the asynchronous schedule running always, keep it
running only across USB mass storage transfers for now, as it seems
that keeping it running all the time interferes with certain control
transfers during device enumeration.
Note that running the async schedule all the time should not be an
issue, especially on EHCI HCD, as that one implements most of the
transfers using async schedule.
Note that we have usb_disable_asynch(), which however is utterly broken.
The usb_disable_asynch() blocks the USB core from doing async transfers
by setting a global flag. The async schedule should however be disabled
per USB controller. Moreover, setting a global flag does not prevent the
controller from using the async schedule, which e.g. the EHCI HCD does.
This patch implements additional callback to the controller, which
permits it to lock the async schedule and keep it running across
multiple transfers. Once the schedule is unlocked, it must also be
disabled. This thus prevents the async schedule from running outside
of the USB mass storage transfers.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Tested-by: Tom Rini <trini@konsulko.com> [omap3_beagle, previously failing]
2020-04-06 12:29:44 +00:00
|
|
|
usb_lock_async(udev, 0);
|
2009-11-03 06:52:10 +00:00
|
|
|
usb_disable_asynch(0); /* asynch transfer allowed */
|
2017-09-07 13:13:20 +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;
|
2013-04-12 11:04:34 +00:00
|
|
|
struct usb_endpoint_descriptor *ep_desc;
|
2002-08-17 09:36:01 +00:00
|
|
|
unsigned int flags = 0;
|
|
|
|
|
|
|
|
/* let's examine the device now */
|
|
|
|
iface = &dev->config.if_desc[ifnum];
|
|
|
|
|
|
|
|
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) {
|
2015-03-25 18:22:12 +00:00
|
|
|
debug("Not mass storage\n");
|
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 */
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("\n\nUSB Mass Storage device detected\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
/* Initialize the us_data structure with some useful info */
|
|
|
|
ss->flags = flags;
|
|
|
|
ss->ifnum = ifnum;
|
|
|
|
ss->pusb_dev = dev;
|
|
|
|
ss->attention_done = 0;
|
2015-10-11 11:26:27 +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 */
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Transport: ");
|
2002-08-17 09:36:01 +00:00
|
|
|
switch (ss->protocol) {
|
|
|
|
case US_PR_CB:
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Control/Bulk\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
ss->transport = usb_stor_CB_transport;
|
|
|
|
ss->transport_reset = usb_stor_CB_reset;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case US_PR_CBI:
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Control/Bulk/Interrupt\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
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:
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Bulk/Bulk/Bulk\n");
|
2003-09-10 18:20:28 +00:00
|
|
|
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++) {
|
2013-04-12 11:04:34 +00:00
|
|
|
ep_desc = &iface->ep_desc[i];
|
2002-08-17 09:36:01 +00:00
|
|
|
/* is it an BULK endpoint? */
|
2013-04-12 11:04:34 +00:00
|
|
|
if ((ep_desc->bmAttributes &
|
2008-12-10 14:52:06 +00:00
|
|
|
USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) {
|
2013-04-12 11:04:34 +00:00
|
|
|
if (ep_desc->bEndpointAddress & USB_DIR_IN)
|
|
|
|
ss->ep_in = ep_desc->bEndpointAddress &
|
|
|
|
USB_ENDPOINT_NUMBER_MASK;
|
2002-08-17 09:36:01 +00:00
|
|
|
else
|
2008-12-10 14:52:06 +00:00
|
|
|
ss->ep_out =
|
2013-04-12 11:04:34 +00:00
|
|
|
ep_desc->bEndpointAddress &
|
2002-08-17 09:36:01 +00:00
|
|
|
USB_ENDPOINT_NUMBER_MASK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* is it an interrupt endpoint? */
|
2013-04-12 11:04:34 +00:00
|
|
|
if ((ep_desc->bmAttributes &
|
|
|
|
USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) {
|
|
|
|
ss->ep_int = ep_desc->bEndpointAddress &
|
|
|
|
USB_ENDPOINT_NUMBER_MASK;
|
|
|
|
ss->irqinterval = ep_desc->bInterval;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
|
|
|
}
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Endpoints In %d Out %d Int %d\n",
|
|
|
|
ss->ep_in, ss->ep_out, ss->ep_int);
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
/* 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)) {
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("Problems with device\n");
|
2002-08-17 09:36:01 +00:00
|
|
|
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
|
|
|
}
|
2017-09-07 13:13:20 +00:00
|
|
|
|
|
|
|
/* Set the maximum transfer size per host controller setting */
|
2017-09-07 13:13:21 +00:00
|
|
|
usb_stor_set_max_xfer_blk(dev, ss);
|
2017-09-07 13:13:20 +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,
|
2016-02-29 22:25:34 +00:00
|
|
|
struct blk_desc *dev_desc)
|
2002-08-17 09:36:01 +00:00
|
|
|
{
|
2008-12-10 14:52:06 +00:00
|
|
|
unsigned char perq, modi;
|
2015-04-01 14:18:46 +00:00
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(u32, cap, 2);
|
|
|
|
ALLOC_CACHE_ALIGN_BUFFER(u8, usb_stor_buf, 36);
|
|
|
|
u32 capacity, blksz;
|
2017-06-15 03:28:30 +00:00
|
|
|
struct scsi_cmd *pccb = &usb_ccb;
|
2005-07-21 09:57:57 +00:00
|
|
|
|
|
|
|
pccb->pdata = usb_stor_buf;
|
|
|
|
|
|
|
|
dev_desc->target = dev->devnum;
|
|
|
|
pccb->lun = dev_desc->lun;
|
2013-04-12 11:04:33 +00:00
|
|
|
debug(" address %d\n", dev_desc->target);
|
2002-08-17 09:36:01 +00:00
|
|
|
|
2015-03-25 18:22:12 +00:00
|
|
|
if (usb_inquiry(pccb, ss)) {
|
|
|
|
debug("%s: usb_inquiry() failed\n", __func__);
|
2002-08-17 09:36:01 +00:00
|
|
|
return -1;
|
2015-03-25 18:22:12 +00:00
|
|
|
}
|
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
|
|
|
|
2014-11-08 06:02:14 +00:00
|
|
|
/*
|
|
|
|
* Skip unknown devices (0x1f) and enclosure service devices (0x0d),
|
|
|
|
* they would not respond to test_unit_ready .
|
|
|
|
*/
|
|
|
|
if (((perq & 0x1f) == 0x1f) || ((perq & 0x1f) == 0x0d)) {
|
2015-03-25 18:22:12 +00:00
|
|
|
debug("%s: unknown/unsupported device\n", __func__);
|
2008-12-10 14:52:06 +00:00
|
|
|
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
|
|
|
}
|
2015-04-01 14:18:46 +00:00
|
|
|
memcpy(dev_desc->vendor, (const void *)&usb_stor_buf[8], 8);
|
|
|
|
memcpy(dev_desc->product, (const void *)&usb_stor_buf[16], 16);
|
|
|
|
memcpy(dev_desc->revision, (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 */
|
2013-04-12 11:04:33 +00:00
|
|
|
debug("ISO Vers %X, Response Data %X\n", usb_stor_buf[2],
|
|
|
|
usb_stor_buf[3]);
|
2008-12-10 14:52:06 +00:00
|
|
|
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]);
|
2017-04-11 01:23:11 +00:00
|
|
|
if (dev_desc->removable == 1)
|
2005-07-21 09:57:57 +00:00
|
|
|
dev_desc->type = perq;
|
2008-12-10 14:52:06 +00:00
|
|
|
return 0;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2015-04-01 14:18:46 +00:00
|
|
|
pccb->pdata = (unsigned char *)cap;
|
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");
|
2019-10-05 17:18:38 +00:00
|
|
|
ss->flags &= ~USB_READY;
|
2005-07-21 09:57:57 +00:00
|
|
|
cap[0] = 2880;
|
|
|
|
cap[1] = 0x200;
|
2002-08-17 09:36:01 +00:00
|
|
|
}
|
2015-04-01 14:18:46 +00:00
|
|
|
debug("Read Capacity returns: 0x%08x, 0x%08x\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;
|
2015-04-01 14:18:46 +00:00
|
|
|
|
2008-05-21 20:12:00 +00:00
|
|
|
cap[0] = cpu_to_be32(cap[0]);
|
|
|
|
cap[1] = cpu_to_be32(cap[1]);
|
2015-04-01 14:18:46 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
capacity = be32_to_cpu(cap[0]) + 1;
|
|
|
|
blksz = be32_to_cpu(cap[1]);
|
2008-05-21 20:12:00 +00:00
|
|
|
|
2015-04-01 14:18:46 +00:00
|
|
|
debug("Capacity = 0x%08x, blocksz = 0x%08x\n", capacity, blksz);
|
|
|
|
dev_desc->lba = capacity;
|
|
|
|
dev_desc->blksz = blksz;
|
2013-04-09 21:11:56 +00:00
|
|
|
dev_desc->log2blksz = LOG2(dev_desc->blksz);
|
2005-07-21 09:57:57 +00:00
|
|
|
dev_desc->type = perq;
|
2013-04-12 11:04:33 +00:00
|
|
|
debug(" address %d\n", dev_desc->target);
|
2002-08-17 09:36:01 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
2015-03-25 18:22:16 +00:00
|
|
|
|
2018-11-21 07:43:56 +00:00
|
|
|
#if CONFIG_IS_ENABLED(DM_USB)
|
2015-03-25 18:22:16 +00:00
|
|
|
|
|
|
|
static int usb_mass_storage_probe(struct udevice *dev)
|
|
|
|
{
|
2015-09-29 05:32:01 +00:00
|
|
|
struct usb_device *udev = dev_get_parent_priv(dev);
|
2015-03-25 18:22:16 +00:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
usb_disable_asynch(1); /* asynch transfer not allowed */
|
|
|
|
ret = usb_stor_probe_device(udev);
|
|
|
|
usb_disable_asynch(0); /* asynch transfer allowed */
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct udevice_id usb_mass_storage_ids[] = {
|
|
|
|
{ .compatible = "usb-mass-storage" },
|
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
|
|
|
U_BOOT_DRIVER(usb_mass_storage) = {
|
|
|
|
.name = "usb_mass_storage",
|
|
|
|
.id = UCLASS_MASS_STORAGE,
|
|
|
|
.of_match = usb_mass_storage_ids,
|
|
|
|
.probe = usb_mass_storage_probe,
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
.platdata_auto_alloc_size = sizeof(struct us_data),
|
|
|
|
#endif
|
2015-03-25 18:22:16 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
UCLASS_DRIVER(usb_mass_storage) = {
|
|
|
|
.id = UCLASS_MASS_STORAGE,
|
|
|
|
.name = "usb_mass_storage",
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct usb_device_id mass_storage_id_table[] = {
|
|
|
|
{
|
|
|
|
.match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
|
|
|
|
.bInterfaceClass = USB_CLASS_MASS_STORAGE
|
|
|
|
},
|
|
|
|
{ } /* Terminating entry */
|
|
|
|
};
|
|
|
|
|
2015-07-06 22:47:51 +00:00
|
|
|
U_BOOT_USB_DEVICE(usb_mass_storage, mass_storage_id_table);
|
2016-02-29 22:25:58 +00:00
|
|
|
#endif
|
2015-03-25 18:22:16 +00:00
|
|
|
|
2018-11-21 07:43:57 +00:00
|
|
|
#if CONFIG_IS_ENABLED(BLK)
|
2016-02-29 22:25:58 +00:00
|
|
|
static const struct blk_ops usb_storage_ops = {
|
|
|
|
.read = usb_stor_read,
|
|
|
|
.write = usb_stor_write,
|
|
|
|
};
|
|
|
|
|
|
|
|
U_BOOT_DRIVER(usb_storage_blk) = {
|
|
|
|
.name = "usb_storage_blk",
|
|
|
|
.id = UCLASS_BLK,
|
|
|
|
.ops = &usb_storage_ops,
|
|
|
|
};
|
2016-05-01 17:36:06 +00:00
|
|
|
#else
|
|
|
|
U_BOOT_LEGACY_BLK(usb) = {
|
|
|
|
.if_typename = "usb",
|
|
|
|
.if_type = IF_TYPE_USB,
|
|
|
|
.max_devs = USB_MAX_STOR_DEV,
|
|
|
|
.desc = usb_dev_desc,
|
|
|
|
};
|
2015-03-25 18:22:16 +00:00
|
|
|
#endif
|