mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-11 22:03:15 +00:00
a238b0dacf
Previously, ret could be used uninitialized if blk_get_device_part_str() failed. Default to ret being set to -1 so that we always return an err up if we have a problem and then invert the logic on testing ums_count as when that is non-zero is the time we can return 0. Cc: John Tobias <john.tobias.ph@gmail.com> Acked-by: Marek Vasut <marex@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com>
246 lines
5.2 KiB
C
246 lines
5.2 KiB
C
/*
|
|
* Copyright (C) 2011 Samsung Electronics
|
|
* Lukasz Majewski <l.majewski@samsung.com>
|
|
*
|
|
* Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <console.h>
|
|
#include <g_dnl.h>
|
|
#include <part.h>
|
|
#include <usb.h>
|
|
#include <usb_mass_storage.h>
|
|
|
|
static int ums_read_sector(struct ums *ums_dev,
|
|
ulong start, lbaint_t blkcnt, void *buf)
|
|
{
|
|
struct blk_desc *block_dev = &ums_dev->block_dev;
|
|
lbaint_t blkstart = start + ums_dev->start_sector;
|
|
|
|
return block_dev->block_read(block_dev, blkstart, blkcnt, buf);
|
|
}
|
|
|
|
static int ums_write_sector(struct ums *ums_dev,
|
|
ulong start, lbaint_t blkcnt, const void *buf)
|
|
{
|
|
struct blk_desc *block_dev = &ums_dev->block_dev;
|
|
lbaint_t blkstart = start + ums_dev->start_sector;
|
|
|
|
return block_dev->block_write(block_dev, blkstart, blkcnt, buf);
|
|
}
|
|
|
|
static struct ums *ums;
|
|
static int ums_count;
|
|
|
|
static void ums_fini(void)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ums_count; i++)
|
|
free((void *)ums[i].name);
|
|
free(ums);
|
|
ums = 0;
|
|
ums_count = 0;
|
|
}
|
|
|
|
#define UMS_NAME_LEN 16
|
|
|
|
static int ums_init(const char *devtype, const char *devnums_part_str)
|
|
{
|
|
char *s, *t, *devnum_part_str, *name;
|
|
struct blk_desc *block_dev;
|
|
disk_partition_t info;
|
|
int partnum;
|
|
int ret = -1;
|
|
struct ums *ums_new;
|
|
|
|
s = strdup(devnums_part_str);
|
|
if (!s)
|
|
return -1;
|
|
|
|
t = s;
|
|
ums_count = 0;
|
|
|
|
for (;;) {
|
|
devnum_part_str = strsep(&t, ",");
|
|
if (!devnum_part_str)
|
|
break;
|
|
|
|
partnum = blk_get_device_part_str(devtype, devnum_part_str,
|
|
&block_dev, &info, 1);
|
|
|
|
if (partnum < 0)
|
|
goto cleanup;
|
|
|
|
/* Check if the argument is in legacy format. If yes,
|
|
* expose all partitions by setting the partnum = 0
|
|
* e.g. ums 0 mmc 0
|
|
*/
|
|
if (!strchr(devnum_part_str, ':'))
|
|
partnum = 0;
|
|
|
|
/* f_mass_storage.c assumes SECTOR_SIZE sectors */
|
|
if (block_dev->blksz != SECTOR_SIZE)
|
|
goto cleanup;
|
|
|
|
ums_new = realloc(ums, (ums_count + 1) * sizeof(*ums));
|
|
if (!ums_new)
|
|
goto cleanup;
|
|
ums = ums_new;
|
|
|
|
/* if partnum = 0, expose all partitions */
|
|
if (partnum == 0) {
|
|
ums[ums_count].start_sector = 0;
|
|
ums[ums_count].num_sectors = block_dev->lba;
|
|
} else {
|
|
ums[ums_count].start_sector = info.start;
|
|
ums[ums_count].num_sectors = info.size;
|
|
}
|
|
|
|
ums[ums_count].read_sector = ums_read_sector;
|
|
ums[ums_count].write_sector = ums_write_sector;
|
|
|
|
name = malloc(UMS_NAME_LEN);
|
|
if (!name)
|
|
goto cleanup;
|
|
snprintf(name, UMS_NAME_LEN, "UMS disk %d", ums_count);
|
|
ums[ums_count].name = name;
|
|
ums[ums_count].block_dev = *block_dev;
|
|
|
|
printf("UMS: LUN %d, dev %d, hwpart %d, sector %#x, count %#x\n",
|
|
ums_count, ums[ums_count].block_dev.devnum,
|
|
ums[ums_count].block_dev.hwpart,
|
|
ums[ums_count].start_sector,
|
|
ums[ums_count].num_sectors);
|
|
|
|
ums_count++;
|
|
}
|
|
|
|
if (ums_count)
|
|
ret = 0;
|
|
|
|
cleanup:
|
|
free(s);
|
|
|
|
if (ret < 0)
|
|
ums_fini();
|
|
|
|
return ret;
|
|
}
|
|
|
|
int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
|
|
int argc, char * const argv[])
|
|
{
|
|
const char *usb_controller;
|
|
const char *devtype;
|
|
const char *devnum;
|
|
unsigned int controller_index;
|
|
int rc;
|
|
int cable_ready_timeout __maybe_unused;
|
|
|
|
if (argc < 3)
|
|
return CMD_RET_USAGE;
|
|
|
|
usb_controller = argv[1];
|
|
if (argc >= 4) {
|
|
devtype = argv[2];
|
|
devnum = argv[3];
|
|
} else {
|
|
devtype = "mmc";
|
|
devnum = argv[2];
|
|
}
|
|
|
|
rc = ums_init(devtype, devnum);
|
|
if (rc < 0)
|
|
return CMD_RET_FAILURE;
|
|
|
|
controller_index = (unsigned int)(simple_strtoul(
|
|
usb_controller, NULL, 0));
|
|
if (board_usb_init(controller_index, USB_INIT_DEVICE)) {
|
|
error("Couldn't init USB controller.");
|
|
rc = CMD_RET_FAILURE;
|
|
goto cleanup_ums_init;
|
|
}
|
|
|
|
rc = fsg_init(ums, ums_count);
|
|
if (rc) {
|
|
error("fsg_init failed");
|
|
rc = CMD_RET_FAILURE;
|
|
goto cleanup_board;
|
|
}
|
|
|
|
rc = g_dnl_register("usb_dnl_ums");
|
|
if (rc) {
|
|
error("g_dnl_register failed");
|
|
rc = CMD_RET_FAILURE;
|
|
goto cleanup_board;
|
|
}
|
|
|
|
/* Timeout unit: seconds */
|
|
cable_ready_timeout = UMS_CABLE_READY_TIMEOUT;
|
|
|
|
if (!g_dnl_board_usb_cable_connected()) {
|
|
/*
|
|
* Won't execute if we don't know whether the cable is
|
|
* connected.
|
|
*/
|
|
puts("Please connect USB cable.\n");
|
|
|
|
while (!g_dnl_board_usb_cable_connected()) {
|
|
if (ctrlc()) {
|
|
puts("\rCTRL+C - Operation aborted.\n");
|
|
rc = CMD_RET_SUCCESS;
|
|
goto cleanup_register;
|
|
}
|
|
if (!cable_ready_timeout) {
|
|
puts("\rUSB cable not detected.\n" \
|
|
"Command exit.\n");
|
|
rc = CMD_RET_SUCCESS;
|
|
goto cleanup_register;
|
|
}
|
|
|
|
printf("\rAuto exit in: %.2d s.", cable_ready_timeout);
|
|
mdelay(1000);
|
|
cable_ready_timeout--;
|
|
}
|
|
puts("\r\n");
|
|
}
|
|
|
|
while (1) {
|
|
usb_gadget_handle_interrupts(controller_index);
|
|
|
|
rc = fsg_main_thread(NULL);
|
|
if (rc) {
|
|
/* Check I/O error */
|
|
if (rc == -EIO)
|
|
printf("\rCheck USB cable connection\n");
|
|
|
|
/* Check CTRL+C */
|
|
if (rc == -EPIPE)
|
|
printf("\rCTRL+C - Operation aborted\n");
|
|
|
|
rc = CMD_RET_SUCCESS;
|
|
goto cleanup_register;
|
|
}
|
|
}
|
|
|
|
cleanup_register:
|
|
g_dnl_unregister();
|
|
cleanup_board:
|
|
board_usb_cleanup(controller_index, USB_INIT_DEVICE);
|
|
cleanup_ums_init:
|
|
ums_fini();
|
|
|
|
return rc;
|
|
}
|
|
|
|
U_BOOT_CMD(ums, 4, 1, do_usb_mass_storage,
|
|
"Use the UMS [USB Mass Storage]",
|
|
"<USB_controller> [<devtype>] <dev[:part]> e.g. ums 0 mmc 0\n"
|
|
" devtype defaults to mmc"
|
|
);
|