[U-Boot] [PATCH V4 0/4] introduce Rockchip rockusb

[U-Boot] [PATCH V4 0/4] introduce Rockchip rockusb

[Eddie Cai]

rockusb is a protocol run between host pc and device. it help people get device
info, flash image to device. this patch implement rockusb on device sid

Changes in v4:
-use enum instead of macro define
-move some structure define and macro to f_rockusb.h
-add some function comment as Simon required
-address other comment from Simon
-fix build error as Lukasz point out

Changes in v3:
-switch back to use g_dnl code
-address comment from Lukasz and Simon
-fix checkpatch error

Changes in v2:
-switch to use usb masstorage framework
-add readme for rockusb

Eddie Cai (4):
  usb: rockchip: add the rockusb gadget
  usb: rockchip: add rockusb command
  rockchip:usb: add a simple readme for rockusb
  rockchip: usb: enable rockusb on rk3288 based board

 arch/arm/include/asm/arch-rockchip/f_rockusb.h | 122 +++++
 cmd/Kconfig                                    |   8 +
 cmd/Makefile                                   |   1 +
 cmd/rockusb.c                                  |  74 +++
 doc/README.rockusb                             |  52 ++
 drivers/usb/gadget/Kconfig                     |   6 +
 drivers/usb/gadget/Makefile                    |   1 +
 drivers/usb/gadget/f_rockusb.c                 | 680 +++++++++++++++++++++++++
 include/configs/rk3288_common.h                |   2 +
 9 files changed, 946 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/f_rockusb.h
 create mode 100644 cmd/rockusb.c
 create mode 100644 doc/README.rockusb
 create mode 100644 drivers/usb/gadget/f_rockusb.c

-- 
1.9.1

[U-Boot] [PATCH V4 1/4] usb: rockchip: add the rockusb gadget

[Eddie Cai]

this patch implement rockusb protocol on the device side. this is based on USB
download gadget infrastructure. the rockusb function implements the rd, wl, rid
commands. it can work with rkdeveloptool

Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>

Changes in v4:
-use enum instead of macro define                                               
-move some structure define and macro to f_rockusb.h                            
-add some function comment as Simon required                                    
-address other comment from Simon                                               
-fix build error as Lukasz point out

Changes in v3:
-split the macro to f_rockusb.h
-use ALLOC_CACHE_ALIGN_BUFFER to define cache safe struct inside the function.
-fix checkpatch error
---
 arch/arm/include/asm/arch-rockchip/f_rockusb.h | 122 +++++
 drivers/usb/gadget/Kconfig                     |   6 +
 drivers/usb/gadget/Makefile                    |   1 +
 drivers/usb/gadget/f_rockusb.c                 | 680 +++++++++++++++++++++++++
 4 files changed, 809 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-rockchip/f_rockusb.h
 create mode 100644 drivers/usb/gadget/f_rockusb.c

diff --git a/arch/arm/include/asm/arch-rockchip/f_rockusb.h b/arch/arm/include/asm/arch-rockchip/f_rockusb.h
new file mode 100644
index 0000000..18d7c11
--- /dev/null
+++ b/arch/arm/include/asm/arch-rockchip/f_rockusb.h
@@ -0,0 +1,122 @@
+/*
+ * (C) Copyright 2017
+ *
+ * Eddie Cai <eddie.cai.linux@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __F_ROCKUSB_H
+#define __F_ROCKUSB_H
+#define ROCKUSB_VERSION		"0.1"
+
+#define ROCKUSB_INTERFACE_CLASS	0xff
+#define ROCKUSB_INTERFACE_SUB_CLASS	0x06
+#define ROCKUSB_INTERFACE_PROTOCOL	0x05
+
+#define RX_ENDPOINT_MAXIMUM_PACKET_SIZE_2_0  (0x0200)
+#define RX_ENDPOINT_MAXIMUM_PACKET_SIZE_1_1  (0x0040)
+#define TX_ENDPOINT_MAXIMUM_PACKET_SIZE      (0x0040)
+
+#define EP_BUFFER_SIZE			4096
+/*
+ * EP_BUFFER_SIZE must always be an integral multiple of maxpacket size
+ * (64 or 512 or 1024), else we break on certain controllers like DWC3
+ * that expect bulk OUT requests to be divisible by maxpacket size.
+ */
+
+#define CONFIG_ROCKUSB_BUF_ADDR		CONFIG_SYS_LOAD_ADDR
+#define CONFIG_ROCKUSB_BUF_SIZE		0x08000000
+
+#define RKUSB_STATUS_IDLE			0
+#define RKUSB_STATUS_CMD			1
+#define RKUSB_STATUS_RXDATA			2
+#define RKUSB_STATUS_TXDATA			3
+#define RKUSB_STATUS_CSW			4
+#define RKUSB_STATUS_RXDATA_PREPARE		5
+#define RKUSB_STATUS_TXDATA_PREPARE		6
+
+enum rkusb_command{
+K_FW_TEST_UNIT_READY	= 0x00,
+K_FW_READ_FLASH_ID = 0x01,
+K_FW_SET_DEVICE_ID = 0x02,
+K_FW_TEST_BAD_BLOCK = 0x03,
+K_FW_READ_10 = 0x04,
+K_FW_WRITE_10 = 0x05,
+K_FW_ERASE_10 = 0x06,
+K_FW_WRITE_SPARE = 0x07,
+K_FW_READ_SPARE = 0x08,
+
+K_FW_ERASE_10_FORCE = 0x0b,
+K_FW_GET_VERSION = 0x0c,
+
+K_FW_LBA_READ_10 = 0x14,
+K_FW_LBA_WRITE_10 = 0x15,
+K_FW_ERASE_SYS_DISK = 0x16,
+K_FW_SDRAM_READ_10 = 0x17,
+K_FW_SDRAM_WRITE_10 = 0x18,
+K_FW_SDRAM_EXECUTE = 0x19,
+K_FW_READ_FLASH_INFO = 0x1A,
+K_FW_GET_CHIP_VER = 0x1B,
+K_FW_LOW_FORMAT = 0x1C,
+K_FW_SET_RESET_FLAG = 0x1E,
+K_FW_SPI_READ_10 = 0x21,
+K_FW_SPI_WRITE_10 = 0x22,
+
+K_FW_SESSION = 0X30,
+K_FW_RESET = 0xff,
+};
+
+#define CBW_DIRECTION_OUT		0x00
+#define CBW_DIRECTION_IN		0x80
+
+struct cmd_dispatch_info {
+  enum rkusb_command cmd;
+  /* call back function to handle rockusb command */
+  void (*cb)(struct usb_ep *ep, struct usb_request *req);
+};
+
+/* Bulk-only data structures */
+
+/* Command Block Wrapper */
+struct fsg_bulk_cb_wrap {
+        __le32  signature;              /* Contains 'USBC' */
+        u32     tag;                    /* Unique per command id */
+        __le32  data_transfer_length;   /* Size of the data */
+        u8      flags;                  /* Direction in bit 7 */
+        u8      lun;                    /* lun (normally 0) */
+        u8      length;                 /* Of the CDB, <= MAX_COMMAND_SIZE */
+        u8      CDB[16];                /* Command Data Block */
+};
+
+#define USB_BULK_CB_WRAP_LEN    31
+#define USB_BULK_CB_SIG         0x43425355      /* Spells out USBC */
+#define USB_BULK_IN_FLAG        0x80
+
+/* Command status Wrapper */
+struct bulk_cs_wrap {
+        __le32  signature;              /* Should = 'USBS' */
+        u32     tag;                    /* Same as original command */
+        __le32  residue;                /* Amount not transferred */
+        u8      status;                 /* See below */
+};
+
+#define USB_BULK_CS_WRAP_LEN    13
+#define USB_BULK_CS_SIG         0x53425355      /* Spells out 'USBS' */
+#define USB_STATUS_PASS         0
+#define USB_STATUS_FAIL         1
+#define USB_STATUS_PHASE_ERROR  2
+
+#define CSW_GOOD                0x00
+#define CSW_FAIL                0x01
+
+struct f_rockusb {
+        struct usb_function usb_function;
+        /* IN/OUT EP's and corresponding requests */
+        struct usb_ep *in_ep, *out_ep;
+        struct usb_request *in_req, *out_req;
+};
+/* init rockusb device, tell rockusb which device you want to read/write*/
+void rockusb_dev_init(char *dev_type, int dev_index);
+#endif /* __F_ROCKUSB_H */
+
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 261ed12..30da8f4 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -112,6 +112,12 @@ config G_DNL_VENDOR_NUM
 config G_DNL_PRODUCT_NUM
 	hex "Product ID of USB device"
 
+config USB_FUNCTION_ROCKUSB
+	bool "Enable USB rockusb gadget"
+	default y
+	help
+	  This enables the USB part of the rockusb gadget.
+    
 config USBNET_DEVADDR
 	string "USB Gadget Ethernet device mac address"
 	default "de:ad:be:ef:00:01"
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 0fbbb7c..0eb27a3 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o
 obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o
 obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o
 obj-$(CONFIG_USB_FUNCTION_FASTBOOT) += f_fastboot.o
+obj-$(CONFIG_USB_FUNCTION_ROCKUSB) += f_rockusb.o
 endif
 endif
 ifdef CONFIG_USB_ETHER
diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c
new file mode 100644
index 0000000..e5ef643
--- /dev/null
+++ b/drivers/usb/gadget/f_rockusb.c
@@ -0,0 +1,680 @@
+/*
+ * (C) Copyright 2017
+ *
+ * Eddie Cai <eddie.cai.linux@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <config.h>
+#include <common.h>
+#include <errno.h>
+#include <malloc.h>
+#include <memalign.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/composite.h>
+#include <linux/compiler.h>
+#include <version.h>
+#include <g_dnl.h>
+#include <asm/arch/f_rockusb.h>
+
+static inline struct f_rockusb *func_to_rockusb(struct usb_function *f)
+{
+	return container_of(f, struct f_rockusb, usb_function);
+}
+
+static struct usb_endpoint_descriptor fs_ep_in = {
+	.bLength            = USB_DT_ENDPOINT_SIZE,
+	.bDescriptorType    = USB_DT_ENDPOINT,
+	.bEndpointAddress   = USB_DIR_IN,
+	.bmAttributes       = USB_ENDPOINT_XFER_BULK,
+	.wMaxPacketSize     = cpu_to_le16(64),
+};
+
+static struct usb_endpoint_descriptor fs_ep_out = {
+	.bLength		= USB_DT_ENDPOINT_SIZE,
+	.bDescriptorType	= USB_DT_ENDPOINT,
+	.bEndpointAddress	= USB_DIR_OUT,
+	.bmAttributes		= USB_ENDPOINT_XFER_BULK,
+	.wMaxPacketSize		= cpu_to_le16(64),
+};
+
+static struct usb_endpoint_descriptor hs_ep_in = {
+	.bLength		= USB_DT_ENDPOINT_SIZE,
+	.bDescriptorType	= USB_DT_ENDPOINT,
+	.bEndpointAddress	= USB_DIR_IN,
+	.bmAttributes		= USB_ENDPOINT_XFER_BULK,
+	.wMaxPacketSize		= cpu_to_le16(512),
+};
+
+static struct usb_endpoint_descriptor hs_ep_out = {
+	.bLength		= USB_DT_ENDPOINT_SIZE,
+	.bDescriptorType	= USB_DT_ENDPOINT,
+	.bEndpointAddress	= USB_DIR_OUT,
+	.bmAttributes		= USB_ENDPOINT_XFER_BULK,
+	.wMaxPacketSize		= cpu_to_le16(512),
+};
+
+static struct usb_interface_descriptor interface_desc = {
+	.bLength		= USB_DT_INTERFACE_SIZE,
+	.bDescriptorType	= USB_DT_INTERFACE,
+	.bInterfaceNumber	= 0x00,
+	.bAlternateSetting	= 0x00,
+	.bNumEndpoints		= 0x02,
+	.bInterfaceClass	= ROCKUSB_INTERFACE_CLASS,
+	.bInterfaceSubClass	= ROCKUSB_INTERFACE_SUB_CLASS,
+	.bInterfaceProtocol	= ROCKUSB_INTERFACE_PROTOCOL,
+};
+
+static struct usb_descriptor_header *rkusb_fs_function[] = {
+	(struct usb_descriptor_header *)&interface_desc,
+	(struct usb_descriptor_header *)&fs_ep_in,
+	(struct usb_descriptor_header *)&fs_ep_out,
+};
+
+static struct usb_descriptor_header *rkusb_hs_function[] = {
+	(struct usb_descriptor_header *)&interface_desc,
+	(struct usb_descriptor_header *)&hs_ep_in,
+	(struct usb_descriptor_header *)&hs_ep_out,
+	NULL,
+};
+
+static const char rkusb_name[] = "Rockchip Rockusb";
+
+static struct usb_string rkusb_string_defs[] = {
+	[0].s = rkusb_name,
+	{  }			/* end of list */
+};
+
+static struct usb_gadget_strings stringtab_rkusb = {
+	.language	= 0x0409,	/* en-us */
+	.strings	= rkusb_string_defs,
+};
+
+static struct usb_gadget_strings *rkusb_strings[] = {
+	&stringtab_rkusb,
+	NULL,
+};
+
+static struct f_rockusb *rockusb_func = 0;
+static char *rockusb_dev_type = 0;
+static unsigned int rockusb_dev_index;
+static unsigned int download_tag;
+static unsigned int download_lba;
+static unsigned int download_size;
+static unsigned int download_bytes;
+static int reboot_flag;
+struct blk_desc *download_desc = 0;
+static void rx_handler_command(struct usb_ep *ep, struct usb_request *req);
+static int rockusb_tx_write_csw(u32 tag, int residue, u8 status, int size);
+
+static struct usb_endpoint_descriptor *rkusb_ep_desc(
+struct usb_gadget *g,
+struct usb_endpoint_descriptor *fs,
+struct usb_endpoint_descriptor *hs)
+{
+        if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH)
+                return hs;
+        return fs;
+}
+
+static void rockusb_complete(struct usb_ep *ep, struct usb_request *req)
+{
+	int status = req->status;
+	if (!status)
+		return;
+	debug("status: %d ep '%s' trans: %d\n", status, ep->name, req->actual);
+}
+
+/* config the rockusb device*/
+static int rockusb_bind(struct usb_configuration *c, struct usb_function *f)
+{
+	int id;
+	struct usb_gadget *gadget = c->cdev->gadget;
+	struct f_rockusb *f_rkusb = func_to_rockusb(f);
+	const char *s;
+
+	id = usb_interface_id(c, f);
+	if (id < 0)
+		return id;
+	interface_desc.bInterfaceNumber = id;
+
+	id = usb_string_id(c->cdev);
+	if (id < 0)
+		return id;
+
+	rkusb_string_defs[0].id = id;
+	interface_desc.iInterface = id;
+
+	f_rkusb->in_ep = usb_ep_autoconfig(gadget, &fs_ep_in);
+	if (!f_rkusb->in_ep)
+		return -ENODEV;
+	f_rkusb->in_ep->driver_data = c->cdev;
+
+	f_rkusb->out_ep = usb_ep_autoconfig(gadget, &fs_ep_out);
+	if (!f_rkusb->out_ep)
+		return -ENODEV;
+	f_rkusb->out_ep->driver_data = c->cdev;
+
+	f->descriptors = rkusb_fs_function;
+
+	if (gadget_is_dualspeed(gadget)) {
+		hs_ep_in.bEndpointAddress = fs_ep_in.bEndpointAddress;
+		hs_ep_out.bEndpointAddress = fs_ep_out.bEndpointAddress;
+		f->hs_descriptors = rkusb_hs_function;
+	}
+
+	s = getenv("serial#");
+	if (s)
+		g_dnl_set_serialnumber((char *)s);
+
+	return 0;
+}
+
+static void rockusb_unbind(struct usb_configuration *c, struct usb_function *f)
+{
+  /* clear the configuration*/
+  memset(rockusb_func, 0, sizeof(*rockusb_func));
+}
+
+static void rockusb_disable(struct usb_function *f)
+{
+	struct f_rockusb *f_rkusb = func_to_rockusb(f);
+
+	usb_ep_disable(f_rkusb->out_ep);
+	usb_ep_disable(f_rkusb->in_ep);
+
+	if (f_rkusb->out_req) {
+		free(f_rkusb->out_req->buf);
+		usb_ep_free_request(f_rkusb->out_ep, f_rkusb->out_req);
+		f_rkusb->out_req = NULL;
+	}
+	if (f_rkusb->in_req) {
+		free(f_rkusb->in_req->buf);
+		usb_ep_free_request(f_rkusb->in_ep, f_rkusb->in_req);
+		f_rkusb->in_req = NULL;
+	}
+}
+
+static struct usb_request *rockusb_start_ep(struct usb_ep *ep)
+{
+	struct usb_request *req;
+
+	req = usb_ep_alloc_request(ep, 0);
+	if (!req)
+		return NULL;
+
+	req->length = EP_BUFFER_SIZE;
+	req->buf = memalign(CONFIG_SYS_CACHELINE_SIZE, EP_BUFFER_SIZE);
+	if (!req->buf) {
+		usb_ep_free_request(ep, req);
+		return NULL;
+	}
+	memset(req->buf, 0, req->length);
+
+	return req;
+}
+
+static int rockusb_set_alt(struct usb_function *f,
+			    unsigned interface, unsigned alt)
+{
+	int ret;
+	struct usb_composite_dev *cdev = f->config->cdev;
+	struct usb_gadget *gadget = cdev->gadget;
+	struct f_rockusb *f_rkusb = func_to_rockusb(f);
+	const struct usb_endpoint_descriptor *d;
+
+	debug("%s: func: %s intf: %d alt: %d\n",
+	      __func__, f->name, interface, alt);
+
+	d = rkusb_ep_desc(gadget, &fs_ep_out, &hs_ep_out);
+	ret = usb_ep_enable(f_rkusb->out_ep, d);
+	if (ret) {
+	    printf("failed to enable out ep\n");
+		return ret;
+	}
+
+	f_rkusb->out_req = rockusb_start_ep(f_rkusb->out_ep);
+	if (!f_rkusb->out_req) {
+	    printf("failed to alloc out req\n");
+		ret = -EINVAL;
+		goto err;
+	}
+	f_rkusb->out_req->complete = rx_handler_command;
+
+	d = rkusb_ep_desc(gadget, &fs_ep_in, &hs_ep_in);
+	ret = usb_ep_enable(f_rkusb->in_ep, d);
+	if (ret) {
+	    printf("failed to enable in ep\n");
+		goto err;
+	}
+
+	f_rkusb->in_req = rockusb_start_ep(f_rkusb->in_ep);
+	if (!f_rkusb->in_req) {
+	    printf("failed alloc req in\n");
+		ret = -EINVAL;
+		goto err;
+	}
+	f_rkusb->in_req->complete = rockusb_complete;
+
+	ret = usb_ep_queue(f_rkusb->out_ep, f_rkusb->out_req, 0);
+	if (ret)
+		goto err;
+
+	return 0;
+err:
+	rockusb_disable(f);
+	return ret;
+}
+
+static int rockusb_add(struct usb_configuration *c)
+{
+	struct f_rockusb *f_rkusb = rockusb_func;
+	int status;
+
+	debug("%s: cdev: 0x%p\n", __func__, c->cdev);
+
+	if (!f_rkusb) {
+		f_rkusb = memalign(CONFIG_SYS_CACHELINE_SIZE, sizeof(*f_rkusb));
+		if (!f_rkusb)
+			return -ENOMEM;
+
+		rockusb_func = f_rkusb;
+		memset(f_rkusb, 0, sizeof(*f_rkusb));
+	}
+
+	f_rkusb->usb_function.name = "f_rockusb";
+	f_rkusb->usb_function.bind = rockusb_bind;
+	f_rkusb->usb_function.unbind = rockusb_unbind;
+	f_rkusb->usb_function.set_alt = rockusb_set_alt;
+	f_rkusb->usb_function.disable = rockusb_disable;
+	f_rkusb->usb_function.strings = rkusb_strings;
+
+	status = usb_add_function(c, &f_rkusb->usb_function);
+	if (status) {
+		free(f_rkusb);
+		rockusb_func = f_rkusb;
+	}
+	return status;
+}
+
+void rockusb_dev_init(char *dev_type, int dev_index)
+{
+	rockusb_dev_type = dev_type;
+	rockusb_dev_index = dev_index;
+}
+
+DECLARE_GADGET_BIND_CALLBACK(usb_dnl_rockusb, rockusb_add);
+
+static int rockusb_tx_write(const char *buffer, unsigned int buffer_size)
+{
+	struct usb_request *in_req = rockusb_func->in_req;
+	int ret;
+
+	memcpy(in_req->buf, buffer, buffer_size);
+	in_req->length = buffer_size;
+	usb_ep_dequeue(rockusb_func->in_ep, in_req);
+	ret = usb_ep_queue(rockusb_func->in_ep, in_req, 0);
+	if (ret)
+		printf("Error %d on queue\n", ret);
+	return 0;
+}
+
+static int rockusb_tx_write_str(const char *buffer)
+{
+	return rockusb_tx_write(buffer, strlen(buffer));
+}
+
+#ifdef DEBUG
+static void printcbw(char *buf)
+{
+	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
+				 sizeof(struct fsg_bulk_cb_wrap));
+
+	memcpy((char *)cbw, buf, USB_BULK_CB_WRAP_LEN);
+
+	debug("cbw: signature:%x\n", cbw->signature);
+	debug("cbw: tag=%x\n", cbw->tag);
+	debug("cbw: data_transfer_length=%d\n", cbw->data_transfer_length);
+	debug("cbw: flags=%x\n", cbw->flags);
+	debug("cbw: lun=%d\n", cbw->lun);
+	debug("cbw: length=%d\n", cbw->length);
+	debug("cbw: ucOperCode=%x\n", cbw->CDB[0]);
+	debug("cbw: ucReserved=%x\n", cbw->CDB[1]);
+	debug("cbw: dwAddress:%x %x %x %x\n", cbw->CDB[5], cbw->CDB[4],
+	      cbw->CDB[3], cbw->CDB[2]);
+	debug("cbw: ucReserved2=%x\n", cbw->CDB[6]);
+	debug("cbw: uslength:%x %x\n", cbw->CDB[8], cbw->CDB[7]);
+}
+
+static void printcsw(char *buf)
+{
+	ALLOC_CACHE_ALIGN_BUFFER(struct bulk_cs_wrap, csw,
+				 sizeof(struct bulk_cs_wrap));
+	memcpy((char *)csw, buf, USB_BULK_CS_WRAP_LEN);
+	debug("csw: signature:%x\n", csw->signature);
+	debug("csw: tag:%x\n", csw->tag);
+	debug("csw: residue:%x\n", csw->residue);
+	debug("csw: status:%x\n", csw->status);
+}
+#endif
+
+static int rockusb_tx_write_csw(u32 tag, int residue, u8 status, int size)
+{
+	ALLOC_CACHE_ALIGN_BUFFER(struct bulk_cs_wrap, csw,
+				 sizeof(struct bulk_cs_wrap));
+	csw->signature = cpu_to_le32(USB_BULK_CS_SIG);
+	csw->tag = tag;
+	csw->residue = cpu_to_be32(residue);
+	csw->status = status;
+#ifdef DEBUG
+	printcsw((char *)&csw);
+#endif
+	return rockusb_tx_write((char *)csw, size);
+}
+
+static unsigned int rx_bytes_expected(struct usb_ep *ep)
+{
+	int rx_remain = download_size - download_bytes;
+	unsigned int rem;
+	unsigned int maxpacket = ep->maxpacket;
+
+	if (rx_remain <= 0)
+		return 0;
+	else if (rx_remain > EP_BUFFER_SIZE)
+		return EP_BUFFER_SIZE;
+
+	rem = rx_remain % maxpacket;
+	if (rem > 0)
+		rx_remain = rx_remain + (maxpacket - rem);
+
+	return rx_remain;
+}
+
+/* usb_request complete call back to handle down load image */
+static void rx_handler_dl_image(struct usb_ep *ep, struct usb_request *req)
+{
+	unsigned int transfer_size = download_size - download_bytes;
+	const unsigned char *buffer = req->buf;
+	unsigned int buffer_size = req->actual;
+
+	if (!download_desc) {
+		printf("rx_handler_dl_image blk_get_dev\n");
+		download_desc = blk_get_dev(rockusb_dev_type,
+					    rockusb_dev_index);
+		if (!download_desc ||
+		    download_desc->type == DEV_TYPE_UNKNOWN) {
+			error("invalid mmc device\n");
+			rockusb_tx_write_csw(download_tag, 0, CSW_FAIL,
+					     USB_BULK_CS_WRAP_LEN);
+			return;
+		}
+	}
+
+	if (req->status != 0) {
+		printf("Bad status: %d\n", req->status);
+		rockusb_tx_write_csw(download_tag, 0,
+				     CSW_FAIL, USB_BULK_CS_WRAP_LEN);
+		return;
+	}
+
+	if (buffer_size < transfer_size)
+		transfer_size = buffer_size;
+
+	memcpy((void *)CONFIG_ROCKUSB_BUF_ADDR + download_bytes,
+	       buffer, transfer_size);
+	download_bytes += transfer_size;
+
+	/* Check if transfer is done */
+	if (download_bytes >= download_size) {
+		int blks = 0, blkcnt = download_size/512;
+		printf("download %d bytes finished, start writing to lba %x\n",
+		       download_bytes, download_lba);
+		blks = blk_dwrite(download_desc, download_lba, blkcnt,
+					(char *)CONFIG_ROCKUSB_BUF_ADDR);
+		if (blks != blkcnt) {
+			error("failed writing to device %s: %d\n",
+			      rockusb_dev_type, rockusb_dev_index);
+			rockusb_tx_write_csw(download_tag, 0,
+					     CSW_FAIL, USB_BULK_CS_WRAP_LEN);
+			return;
+		}
+
+		req->complete = rx_handler_command;
+		req->length = EP_BUFFER_SIZE;
+		download_size = 0;
+		printf("done\n");
+		rockusb_tx_write_csw(download_tag, 0, CSW_GOOD,
+				     USB_BULK_CS_WRAP_LEN);
+	} else {
+		req->length = rx_bytes_expected(ep);
+	}
+
+	req->actual = 0;
+	usb_ep_queue(ep, req, 0);
+}
+
+static void cb_test_unit_ready(struct usb_ep *ep, struct usb_request *req)
+{
+	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
+				 sizeof(struct fsg_bulk_cb_wrap));
+
+	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
+
+	rockusb_tx_write_csw(cbw->tag, cbw->data_transfer_length,
+			     CSW_GOOD, USB_BULK_CS_WRAP_LEN);
+}
+
+static void cb_read_storage_id(struct usb_ep *ep, struct usb_request *req)
+{
+	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
+				 sizeof(struct fsg_bulk_cb_wrap));
+	char emmc_id[] = "EMMC ";
+
+	printf("cb_read_storage_id\n");
+	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
+	rockusb_tx_write_str(emmc_id);
+	rockusb_tx_write_csw(cbw->tag, cbw->data_transfer_length, CSW_GOOD,
+			     USB_BULK_CS_WRAP_LEN);
+}
+
+static void cb_write_lba(struct usb_ep *ep, struct usb_request *req)
+{
+	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
+				 sizeof(struct fsg_bulk_cb_wrap));
+	int sector_count;
+
+	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
+	sector_count = (int)get_unaligned_be16(&cbw->CDB[7]);
+	download_lba = get_unaligned_be32(&cbw->CDB[2]);
+	download_size = sector_count * 512;
+	download_bytes = 0;
+	download_tag = cbw->tag;
+	if ((0 == download_size) || (download_size > CONFIG_ROCKUSB_BUF_SIZE)) {
+		rockusb_tx_write_csw(cbw->tag, cbw->data_transfer_length,
+				     CSW_FAIL, USB_BULK_CS_WRAP_LEN);
+	} else {
+		req->complete = rx_handler_dl_image;
+		req->length = rx_bytes_expected(ep);
+	}
+}
+
+int __weak rkusb_set_reboot_flag(int flag)
+{
+	printf("rkusb_set_reboot_flag: %d\n", reboot_flag);
+	return -ENOSYS;
+}
+
+static void compl_do_reset(struct usb_ep *ep, struct usb_request *req)
+{
+	rkusb_set_reboot_flag(reboot_flag);
+	do_reset(NULL, 0, 0, NULL);
+}
+
+static void cb_reboot(struct usb_ep *ep, struct usb_request *req)
+{
+	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
+				 sizeof(struct fsg_bulk_cb_wrap));
+	reboot_flag = 0;
+	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
+	reboot_flag = cbw->CDB[1];
+	rockusb_func->in_req->complete = compl_do_reset;
+	rockusb_tx_write_csw(cbw->tag, cbw->data_transfer_length, CSW_GOOD,
+			     USB_BULK_CS_WRAP_LEN);
+}
+
+static void cb_not_support(struct usb_ep *ep, struct usb_request *req)
+{
+	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
+				 sizeof(struct fsg_bulk_cb_wrap));
+
+	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
+	printf("Rockusb command %x not support yet\n", cbw->CDB[0]);
+	rockusb_tx_write_csw(cbw->tag, 0, CSW_FAIL, USB_BULK_CS_WRAP_LEN);
+}
+
+static const struct cmd_dispatch_info cmd_dispatch_info[] = {
+	{
+		.cmd = K_FW_TEST_UNIT_READY,
+		.cb = cb_test_unit_ready,
+	},
+	{
+		.cmd = K_FW_READ_FLASH_ID,
+		.cb = cb_read_storage_id,
+	},
+	{
+		.cmd = K_FW_SET_DEVICE_ID,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_TEST_BAD_BLOCK,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_READ_10,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_WRITE_10,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_ERASE_10,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_WRITE_SPARE,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_READ_SPARE,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_ERASE_10_FORCE,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_GET_VERSION,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_LBA_READ_10,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_LBA_WRITE_10,
+		.cb = cb_write_lba,
+	},
+	{
+		.cmd = K_FW_ERASE_SYS_DISK,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_SDRAM_READ_10,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_SDRAM_WRITE_10,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_SDRAM_EXECUTE,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_READ_FLASH_INFO,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_GET_CHIP_VER,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_LOW_FORMAT,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_SET_RESET_FLAG,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_SPI_READ_10,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_SPI_WRITE_10,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_SESSION,
+		.cb = cb_not_support,
+	},
+	{
+		.cmd = K_FW_RESET,
+		.cb = cb_reboot,
+	},
+};
+
+static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)
+{
+	void (*func_cb)(struct usb_ep *ep, struct usb_request *req) = NULL;
+	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
+				 sizeof(struct fsg_bulk_cb_wrap));
+	char *cmdbuf = req->buf;
+	int i;
+
+	if (req->status || req->length == 0)
+		return;
+
+	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
+#ifdef DEBUG
+	printcbw(req->buf);
+#endif
+
+	for (i = 0; i < ARRAY_SIZE(cmd_dispatch_info); i++) {
+		if (cmd_dispatch_info[i].cmd == cbw->CDB[0]) {
+			func_cb = cmd_dispatch_info[i].cb;
+			break;
+		}
+	}
+
+	if (!func_cb) {
+		error("unknown command: %s", (char *)req->buf);
+		rockusb_tx_write_str("FAILunknown command");
+	} else {
+		if (req->actual < req->length) {
+			u8 *buf = (u8 *)req->buf;
+			buf[req->actual] = 0;
+			func_cb(ep, req);
+		} else {
+			error("buffer overflow");
+			rockusb_tx_write_str("FAILbuffer overflow");
+		}
+	}
+
+	*cmdbuf = '\0';
+	req->actual = 0;
+	usb_ep_queue(ep, req, 0);
+}
-- 
1.9.1

[U-Boot] [PATCH V4 1/4] usb: rockchip: add the rockusb gadget

[Lukasz Majewski]

Hi Eddie,

> this patch implement rockusb protocol on the device side. this is
> based on USB download gadget infrastructure. the rockusb function
> implements the rd, wl, rid commands. it can work with rkdeveloptool
> 
> Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>

I've check this code with checkpatch:

lukma at jawa:~/work/embedded/u-boot-denx
(github-dfu-testing)$ ./scripts/checkpatch.pl
0001-usb-rockchip-add-the-rockusb-gadget.patch No typos will be found -
file '/home/lukma/work/embedded/u-boot-denx/spelling.txt': No such file
or directory WARNING: missing space after enum definition #76: FILE:
arch/arm/include/asm/arch-rockchip/f_rockusb.h:39: +enum rkusb_command{

WARNING: please, no spaces at the start of a line
#111: FILE: arch/arm/include/asm/arch-rockchip/f_rockusb.h:74:
+  enum rkusb_command cmd;$

[And the list is "a bit" longer .... ]

Please check all patches with checkpatch.pl before sending them to ML.





I've also gave it a try with build tests [1]:

https://travis-ci.org/lmajewski/u-boot-dfu/builds/228507332

It seems like it introduces some issues with other boards - for example
"siemens":

https://travis-ci.org/lmajewski/u-boot-dfu/jobs/228507333


Please pay attention to build your code against other boards, which use
USB gadget infrastructure.

For your convenience - please find attached patch to modify u-boot's
vanilla version of .travis.yml file to perform build tests.

Best regards,
Łukasz Majewski


> 
> Changes in v4:
> -use enum instead of macro
> define -move some structure define and macro to
> f_rockusb.h -add some function comment as Simon
> required -address other comment from
> Simon -fix build error as Lukasz point out
> 
> Changes in v3:
> -split the macro to f_rockusb.h
> -use ALLOC_CACHE_ALIGN_BUFFER to define cache safe struct inside the
> function. -fix checkpatch error
> ---
>  arch/arm/include/asm/arch-rockchip/f_rockusb.h | 122 +++++
>  drivers/usb/gadget/Kconfig                     |   6 +
>  drivers/usb/gadget/Makefile                    |   1 +
>  drivers/usb/gadget/f_rockusb.c                 | 680
> +++++++++++++++++++++++++ 4 files changed, 809 insertions(+)
>  create mode 100644 arch/arm/include/asm/arch-rockchip/f_rockusb.h
>  create mode 100644 drivers/usb/gadget/f_rockusb.c
> 
> diff --git a/arch/arm/include/asm/arch-rockchip/f_rockusb.h
> b/arch/arm/include/asm/arch-rockchip/f_rockusb.h new file mode 100644
> index 0000000..18d7c11
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-rockchip/f_rockusb.h
> @@ -0,0 +1,122 @@
> +/*
> + * (C) Copyright 2017
> + *
> + * Eddie Cai <eddie.cai.linux@gmail.com>
> + *
> + * SPDX-License-Identifier:	GPL-2.0+
> + */
> +
> +#ifndef __F_ROCKUSB_H
> +#define __F_ROCKUSB_H
> +#define ROCKUSB_VERSION		"0.1"
> +
> +#define ROCKUSB_INTERFACE_CLASS	0xff
> +#define ROCKUSB_INTERFACE_SUB_CLASS	0x06
> +#define ROCKUSB_INTERFACE_PROTOCOL	0x05
> +
> +#define RX_ENDPOINT_MAXIMUM_PACKET_SIZE_2_0  (0x0200)
> +#define RX_ENDPOINT_MAXIMUM_PACKET_SIZE_1_1  (0x0040)
> +#define TX_ENDPOINT_MAXIMUM_PACKET_SIZE      (0x0040)
> +
> +#define EP_BUFFER_SIZE			4096
> +/*
> + * EP_BUFFER_SIZE must always be an integral multiple of maxpacket
> size
> + * (64 or 512 or 1024), else we break on certain controllers like
> DWC3
> + * that expect bulk OUT requests to be divisible by maxpacket size.
> + */
> +
> +#define CONFIG_ROCKUSB_BUF_ADDR		CONFIG_SYS_LOAD_ADDR
> +#define CONFIG_ROCKUSB_BUF_SIZE		0x08000000
> +
> +#define RKUSB_STATUS_IDLE			0
> +#define RKUSB_STATUS_CMD			1
> +#define RKUSB_STATUS_RXDATA			2
> +#define RKUSB_STATUS_TXDATA			3
> +#define RKUSB_STATUS_CSW			4
> +#define RKUSB_STATUS_RXDATA_PREPARE		5
> +#define RKUSB_STATUS_TXDATA_PREPARE		6
> +
> +enum rkusb_command{
> +K_FW_TEST_UNIT_READY	= 0x00,
> +K_FW_READ_FLASH_ID = 0x01,
> +K_FW_SET_DEVICE_ID = 0x02,
> +K_FW_TEST_BAD_BLOCK = 0x03,
> +K_FW_READ_10 = 0x04,
> +K_FW_WRITE_10 = 0x05,
> +K_FW_ERASE_10 = 0x06,
> +K_FW_WRITE_SPARE = 0x07,
> +K_FW_READ_SPARE = 0x08,
> +
> +K_FW_ERASE_10_FORCE = 0x0b,
> +K_FW_GET_VERSION = 0x0c,
> +
> +K_FW_LBA_READ_10 = 0x14,
> +K_FW_LBA_WRITE_10 = 0x15,
> +K_FW_ERASE_SYS_DISK = 0x16,
> +K_FW_SDRAM_READ_10 = 0x17,
> +K_FW_SDRAM_WRITE_10 = 0x18,
> +K_FW_SDRAM_EXECUTE = 0x19,
> +K_FW_READ_FLASH_INFO = 0x1A,
> +K_FW_GET_CHIP_VER = 0x1B,
> +K_FW_LOW_FORMAT = 0x1C,
> +K_FW_SET_RESET_FLAG = 0x1E,
> +K_FW_SPI_READ_10 = 0x21,
> +K_FW_SPI_WRITE_10 = 0x22,
> +
> +K_FW_SESSION = 0X30,
> +K_FW_RESET = 0xff,
> +};
> +
> +#define CBW_DIRECTION_OUT		0x00
> +#define CBW_DIRECTION_IN		0x80
> +
> +struct cmd_dispatch_info {
> +  enum rkusb_command cmd;
> +  /* call back function to handle rockusb command */
> +  void (*cb)(struct usb_ep *ep, struct usb_request *req);
> +};
> +
> +/* Bulk-only data structures */
> +
> +/* Command Block Wrapper */
> +struct fsg_bulk_cb_wrap {
> +        __le32  signature;              /* Contains 'USBC' */
> +        u32     tag;                    /* Unique per command id */
> +        __le32  data_transfer_length;   /* Size of the data */
> +        u8      flags;                  /* Direction in bit 7 */
> +        u8      lun;                    /* lun (normally 0) */
> +        u8      length;                 /* Of the CDB, <=
> MAX_COMMAND_SIZE */
> +        u8      CDB[16];                /* Command Data Block */
> +};
> +
> +#define USB_BULK_CB_WRAP_LEN    31
> +#define USB_BULK_CB_SIG         0x43425355      /* Spells out USBC */
> +#define USB_BULK_IN_FLAG        0x80
> +
> +/* Command status Wrapper */
> +struct bulk_cs_wrap {
> +        __le32  signature;              /* Should = 'USBS' */
> +        u32     tag;                    /* Same as original command
> */
> +        __le32  residue;                /* Amount not transferred */
> +        u8      status;                 /* See below */
> +};
> +
> +#define USB_BULK_CS_WRAP_LEN    13
> +#define USB_BULK_CS_SIG         0x53425355      /* Spells out 'USBS'
> */ +#define USB_STATUS_PASS         0
> +#define USB_STATUS_FAIL         1
> +#define USB_STATUS_PHASE_ERROR  2
> +
> +#define CSW_GOOD                0x00
> +#define CSW_FAIL                0x01
> +
> +struct f_rockusb {
> +        struct usb_function usb_function;
> +        /* IN/OUT EP's and corresponding requests */
> +        struct usb_ep *in_ep, *out_ep;
> +        struct usb_request *in_req, *out_req;
> +};
> +/* init rockusb device, tell rockusb which device you want to
> read/write*/ +void rockusb_dev_init(char *dev_type, int dev_index);
> +#endif /* __F_ROCKUSB_H */
> +
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 261ed12..30da8f4 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -112,6 +112,12 @@ config G_DNL_VENDOR_NUM
>  config G_DNL_PRODUCT_NUM
>  	hex "Product ID of USB device"
>  
> +config USB_FUNCTION_ROCKUSB
> +	bool "Enable USB rockusb gadget"
> +	default y
> +	help
> +	  This enables the USB part of the rockusb gadget.
> +    
>  config USBNET_DEVADDR
>  	string "USB Gadget Ethernet device mac address"
>  	default "de:ad:be:ef:00:01"
> diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
> index 0fbbb7c..0eb27a3 100644
> --- a/drivers/usb/gadget/Makefile
> +++ b/drivers/usb/gadget/Makefile
> @@ -28,6 +28,7 @@ obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o
>  obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o
>  obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o
>  obj-$(CONFIG_USB_FUNCTION_FASTBOOT) += f_fastboot.o
> +obj-$(CONFIG_USB_FUNCTION_ROCKUSB) += f_rockusb.o
>  endif
>  endif
>  ifdef CONFIG_USB_ETHER
> diff --git a/drivers/usb/gadget/f_rockusb.c
> b/drivers/usb/gadget/f_rockusb.c new file mode 100644
> index 0000000..e5ef643
> --- /dev/null
> +++ b/drivers/usb/gadget/f_rockusb.c
> @@ -0,0 +1,680 @@
> +/*
> + * (C) Copyright 2017
> + *
> + * Eddie Cai <eddie.cai.linux@gmail.com>
> + *
> + * SPDX-License-Identifier:	GPL-2.0+
> + */
> +
> +#include <config.h>
> +#include <common.h>
> +#include <errno.h>
> +#include <malloc.h>
> +#include <memalign.h>
> +#include <linux/usb/ch9.h>
> +#include <linux/usb/gadget.h>
> +#include <linux/usb/composite.h>
> +#include <linux/compiler.h>
> +#include <version.h>
> +#include <g_dnl.h>
> +#include <asm/arch/f_rockusb.h>
> +
> +static inline struct f_rockusb *func_to_rockusb(struct usb_function
> *f) +{
> +	return container_of(f, struct f_rockusb, usb_function);
> +}
> +
> +static struct usb_endpoint_descriptor fs_ep_in = {
> +	.bLength            = USB_DT_ENDPOINT_SIZE,
> +	.bDescriptorType    = USB_DT_ENDPOINT,
> +	.bEndpointAddress   = USB_DIR_IN,
> +	.bmAttributes       = USB_ENDPOINT_XFER_BULK,
> +	.wMaxPacketSize     = cpu_to_le16(64),
> +};
> +
> +static struct usb_endpoint_descriptor fs_ep_out = {
> +	.bLength		= USB_DT_ENDPOINT_SIZE,
> +	.bDescriptorType	= USB_DT_ENDPOINT,
> +	.bEndpointAddress	= USB_DIR_OUT,
> +	.bmAttributes		= USB_ENDPOINT_XFER_BULK,
> +	.wMaxPacketSize		= cpu_to_le16(64),
> +};
> +
> +static struct usb_endpoint_descriptor hs_ep_in = {
> +	.bLength		= USB_DT_ENDPOINT_SIZE,
> +	.bDescriptorType	= USB_DT_ENDPOINT,
> +	.bEndpointAddress	= USB_DIR_IN,
> +	.bmAttributes		= USB_ENDPOINT_XFER_BULK,
> +	.wMaxPacketSize		= cpu_to_le16(512),
> +};
> +
> +static struct usb_endpoint_descriptor hs_ep_out = {
> +	.bLength		= USB_DT_ENDPOINT_SIZE,
> +	.bDescriptorType	= USB_DT_ENDPOINT,
> +	.bEndpointAddress	= USB_DIR_OUT,
> +	.bmAttributes		= USB_ENDPOINT_XFER_BULK,
> +	.wMaxPacketSize		= cpu_to_le16(512),
> +};
> +
> +static struct usb_interface_descriptor interface_desc = {
> +	.bLength		= USB_DT_INTERFACE_SIZE,
> +	.bDescriptorType	= USB_DT_INTERFACE,
> +	.bInterfaceNumber	= 0x00,
> +	.bAlternateSetting	= 0x00,
> +	.bNumEndpoints		= 0x02,
> +	.bInterfaceClass	= ROCKUSB_INTERFACE_CLASS,
> +	.bInterfaceSubClass	= ROCKUSB_INTERFACE_SUB_CLASS,
> +	.bInterfaceProtocol	= ROCKUSB_INTERFACE_PROTOCOL,
> +};
> +
> +static struct usb_descriptor_header *rkusb_fs_function[] = {
> +	(struct usb_descriptor_header *)&interface_desc,
> +	(struct usb_descriptor_header *)&fs_ep_in,
> +	(struct usb_descriptor_header *)&fs_ep_out,
> +};
> +
> +static struct usb_descriptor_header *rkusb_hs_function[] = {
> +	(struct usb_descriptor_header *)&interface_desc,
> +	(struct usb_descriptor_header *)&hs_ep_in,
> +	(struct usb_descriptor_header *)&hs_ep_out,
> +	NULL,
> +};
> +
> +static const char rkusb_name[] = "Rockchip Rockusb";
> +
> +static struct usb_string rkusb_string_defs[] = {
> +	[0].s = rkusb_name,
> +	{  }			/* end of list */
> +};
> +
> +static struct usb_gadget_strings stringtab_rkusb = {
> +	.language	= 0x0409,	/* en-us */
> +	.strings	= rkusb_string_defs,
> +};
> +
> +static struct usb_gadget_strings *rkusb_strings[] = {
> +	&stringtab_rkusb,
> +	NULL,
> +};
> +
> +static struct f_rockusb *rockusb_func = 0;
> +static char *rockusb_dev_type = 0;
> +static unsigned int rockusb_dev_index;
> +static unsigned int download_tag;
> +static unsigned int download_lba;
> +static unsigned int download_size;
> +static unsigned int download_bytes;
> +static int reboot_flag;
> +struct blk_desc *download_desc = 0;
> +static void rx_handler_command(struct usb_ep *ep, struct usb_request
> *req); +static int rockusb_tx_write_csw(u32 tag, int residue, u8
> status, int size); +
> +static struct usb_endpoint_descriptor *rkusb_ep_desc(
> +struct usb_gadget *g,
> +struct usb_endpoint_descriptor *fs,
> +struct usb_endpoint_descriptor *hs)
> +{
> +        if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH)
> +                return hs;
> +        return fs;
> +}
> +
> +static void rockusb_complete(struct usb_ep *ep, struct usb_request
> *req) +{
> +	int status = req->status;
> +	if (!status)
> +		return;
> +	debug("status: %d ep '%s' trans: %d\n", status, ep->name,
> req->actual); +}
> +
> +/* config the rockusb device*/
> +static int rockusb_bind(struct usb_configuration *c, struct
> usb_function *f) +{
> +	int id;
> +	struct usb_gadget *gadget = c->cdev->gadget;
> +	struct f_rockusb *f_rkusb = func_to_rockusb(f);
> +	const char *s;
> +
> +	id = usb_interface_id(c, f);
> +	if (id < 0)
> +		return id;
> +	interface_desc.bInterfaceNumber = id;
> +
> +	id = usb_string_id(c->cdev);
> +	if (id < 0)
> +		return id;
> +
> +	rkusb_string_defs[0].id = id;
> +	interface_desc.iInterface = id;
> +
> +	f_rkusb->in_ep = usb_ep_autoconfig(gadget, &fs_ep_in);
> +	if (!f_rkusb->in_ep)
> +		return -ENODEV;
> +	f_rkusb->in_ep->driver_data = c->cdev;
> +
> +	f_rkusb->out_ep = usb_ep_autoconfig(gadget, &fs_ep_out);
> +	if (!f_rkusb->out_ep)
> +		return -ENODEV;
> +	f_rkusb->out_ep->driver_data = c->cdev;
> +
> +	f->descriptors = rkusb_fs_function;
> +
> +	if (gadget_is_dualspeed(gadget)) {
> +		hs_ep_in.bEndpointAddress =
> fs_ep_in.bEndpointAddress;
> +		hs_ep_out.bEndpointAddress =
> fs_ep_out.bEndpointAddress;
> +		f->hs_descriptors = rkusb_hs_function;
> +	}
> +
> +	s = getenv("serial#");
> +	if (s)
> +		g_dnl_set_serialnumber((char *)s);
> +
> +	return 0;
> +}
> +
> +static void rockusb_unbind(struct usb_configuration *c, struct
> usb_function *f) +{
> +  /* clear the configuration*/
> +  memset(rockusb_func, 0, sizeof(*rockusb_func));
> +}
> +
> +static void rockusb_disable(struct usb_function *f)
> +{
> +	struct f_rockusb *f_rkusb = func_to_rockusb(f);
> +
> +	usb_ep_disable(f_rkusb->out_ep);
> +	usb_ep_disable(f_rkusb->in_ep);
> +
> +	if (f_rkusb->out_req) {
> +		free(f_rkusb->out_req->buf);
> +		usb_ep_free_request(f_rkusb->out_ep,
> f_rkusb->out_req);
> +		f_rkusb->out_req = NULL;
> +	}
> +	if (f_rkusb->in_req) {
> +		free(f_rkusb->in_req->buf);
> +		usb_ep_free_request(f_rkusb->in_ep, f_rkusb->in_req);
> +		f_rkusb->in_req = NULL;
> +	}
> +}
> +
> +static struct usb_request *rockusb_start_ep(struct usb_ep *ep)
> +{
> +	struct usb_request *req;
> +
> +	req = usb_ep_alloc_request(ep, 0);
> +	if (!req)
> +		return NULL;
> +
> +	req->length = EP_BUFFER_SIZE;
> +	req->buf = memalign(CONFIG_SYS_CACHELINE_SIZE,
> EP_BUFFER_SIZE);
> +	if (!req->buf) {
> +		usb_ep_free_request(ep, req);
> +		return NULL;
> +	}
> +	memset(req->buf, 0, req->length);
> +
> +	return req;
> +}
> +
> +static int rockusb_set_alt(struct usb_function *f,
> +			    unsigned interface, unsigned alt)
> +{
> +	int ret;
> +	struct usb_composite_dev *cdev = f->config->cdev;
> +	struct usb_gadget *gadget = cdev->gadget;
> +	struct f_rockusb *f_rkusb = func_to_rockusb(f);
> +	const struct usb_endpoint_descriptor *d;
> +
> +	debug("%s: func: %s intf: %d alt: %d\n",
> +	      __func__, f->name, interface, alt);
> +
> +	d = rkusb_ep_desc(gadget, &fs_ep_out, &hs_ep_out);
> +	ret = usb_ep_enable(f_rkusb->out_ep, d);
> +	if (ret) {
> +	    printf("failed to enable out ep\n");
> +		return ret;
> +	}
> +
> +	f_rkusb->out_req = rockusb_start_ep(f_rkusb->out_ep);
> +	if (!f_rkusb->out_req) {
> +	    printf("failed to alloc out req\n");
> +		ret = -EINVAL;
> +		goto err;
> +	}
> +	f_rkusb->out_req->complete = rx_handler_command;
> +
> +	d = rkusb_ep_desc(gadget, &fs_ep_in, &hs_ep_in);
> +	ret = usb_ep_enable(f_rkusb->in_ep, d);
> +	if (ret) {
> +	    printf("failed to enable in ep\n");
> +		goto err;
> +	}
> +
> +	f_rkusb->in_req = rockusb_start_ep(f_rkusb->in_ep);
> +	if (!f_rkusb->in_req) {
> +	    printf("failed alloc req in\n");
> +		ret = -EINVAL;
> +		goto err;
> +	}
> +	f_rkusb->in_req->complete = rockusb_complete;
> +
> +	ret = usb_ep_queue(f_rkusb->out_ep, f_rkusb->out_req, 0);
> +	if (ret)
> +		goto err;
> +
> +	return 0;
> +err:
> +	rockusb_disable(f);
> +	return ret;
> +}
> +
> +static int rockusb_add(struct usb_configuration *c)
> +{
> +	struct f_rockusb *f_rkusb = rockusb_func;
> +	int status;
> +
> +	debug("%s: cdev: 0x%p\n", __func__, c->cdev);
> +
> +	if (!f_rkusb) {
> +		f_rkusb = memalign(CONFIG_SYS_CACHELINE_SIZE,
> sizeof(*f_rkusb));
> +		if (!f_rkusb)
> +			return -ENOMEM;
> +
> +		rockusb_func = f_rkusb;
> +		memset(f_rkusb, 0, sizeof(*f_rkusb));
> +	}
> +
> +	f_rkusb->usb_function.name = "f_rockusb";
> +	f_rkusb->usb_function.bind = rockusb_bind;
> +	f_rkusb->usb_function.unbind = rockusb_unbind;
> +	f_rkusb->usb_function.set_alt = rockusb_set_alt;
> +	f_rkusb->usb_function.disable = rockusb_disable;
> +	f_rkusb->usb_function.strings = rkusb_strings;
> +
> +	status = usb_add_function(c, &f_rkusb->usb_function);
> +	if (status) {
> +		free(f_rkusb);
> +		rockusb_func = f_rkusb;
> +	}
> +	return status;
> +}
> +
> +void rockusb_dev_init(char *dev_type, int dev_index)
> +{
> +	rockusb_dev_type = dev_type;
> +	rockusb_dev_index = dev_index;
> +}
> +
> +DECLARE_GADGET_BIND_CALLBACK(usb_dnl_rockusb, rockusb_add);
> +
> +static int rockusb_tx_write(const char *buffer, unsigned int
> buffer_size) +{
> +	struct usb_request *in_req = rockusb_func->in_req;
> +	int ret;
> +
> +	memcpy(in_req->buf, buffer, buffer_size);
> +	in_req->length = buffer_size;
> +	usb_ep_dequeue(rockusb_func->in_ep, in_req);
> +	ret = usb_ep_queue(rockusb_func->in_ep, in_req, 0);
> +	if (ret)
> +		printf("Error %d on queue\n", ret);
> +	return 0;
> +}
> +
> +static int rockusb_tx_write_str(const char *buffer)
> +{
> +	return rockusb_tx_write(buffer, strlen(buffer));
> +}
> +
> +#ifdef DEBUG
> +static void printcbw(char *buf)
> +{
> +	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
> +				 sizeof(struct fsg_bulk_cb_wrap));
> +
> +	memcpy((char *)cbw, buf, USB_BULK_CB_WRAP_LEN);
> +
> +	debug("cbw: signature:%x\n", cbw->signature);
> +	debug("cbw: tag=%x\n", cbw->tag);
> +	debug("cbw: data_transfer_length=%d\n",
> cbw->data_transfer_length);
> +	debug("cbw: flags=%x\n", cbw->flags);
> +	debug("cbw: lun=%d\n", cbw->lun);
> +	debug("cbw: length=%d\n", cbw->length);
> +	debug("cbw: ucOperCode=%x\n", cbw->CDB[0]);
> +	debug("cbw: ucReserved=%x\n", cbw->CDB[1]);
> +	debug("cbw: dwAddress:%x %x %x %x\n", cbw->CDB[5],
> cbw->CDB[4],
> +	      cbw->CDB[3], cbw->CDB[2]);
> +	debug("cbw: ucReserved2=%x\n", cbw->CDB[6]);
> +	debug("cbw: uslength:%x %x\n", cbw->CDB[8], cbw->CDB[7]);
> +}
> +
> +static void printcsw(char *buf)
> +{
> +	ALLOC_CACHE_ALIGN_BUFFER(struct bulk_cs_wrap, csw,
> +				 sizeof(struct bulk_cs_wrap));
> +	memcpy((char *)csw, buf, USB_BULK_CS_WRAP_LEN);
> +	debug("csw: signature:%x\n", csw->signature);
> +	debug("csw: tag:%x\n", csw->tag);
> +	debug("csw: residue:%x\n", csw->residue);
> +	debug("csw: status:%x\n", csw->status);
> +}
> +#endif
> +
> +static int rockusb_tx_write_csw(u32 tag, int residue, u8 status, int
> size) +{
> +	ALLOC_CACHE_ALIGN_BUFFER(struct bulk_cs_wrap, csw,
> +				 sizeof(struct bulk_cs_wrap));
> +	csw->signature = cpu_to_le32(USB_BULK_CS_SIG);
> +	csw->tag = tag;
> +	csw->residue = cpu_to_be32(residue);
> +	csw->status = status;
> +#ifdef DEBUG
> +	printcsw((char *)&csw);
> +#endif
> +	return rockusb_tx_write((char *)csw, size);
> +}
> +
> +static unsigned int rx_bytes_expected(struct usb_ep *ep)
> +{
> +	int rx_remain = download_size - download_bytes;
> +	unsigned int rem;
> +	unsigned int maxpacket = ep->maxpacket;
> +
> +	if (rx_remain <= 0)
> +		return 0;
> +	else if (rx_remain > EP_BUFFER_SIZE)
> +		return EP_BUFFER_SIZE;
> +
> +	rem = rx_remain % maxpacket;
> +	if (rem > 0)
> +		rx_remain = rx_remain + (maxpacket - rem);
> +
> +	return rx_remain;
> +}
> +
> +/* usb_request complete call back to handle down load image */
> +static void rx_handler_dl_image(struct usb_ep *ep, struct
> usb_request *req) +{
> +	unsigned int transfer_size = download_size - download_bytes;
> +	const unsigned char *buffer = req->buf;
> +	unsigned int buffer_size = req->actual;
> +
> +	if (!download_desc) {
> +		printf("rx_handler_dl_image blk_get_dev\n");
> +		download_desc = blk_get_dev(rockusb_dev_type,
> +					    rockusb_dev_index);
> +		if (!download_desc ||
> +		    download_desc->type == DEV_TYPE_UNKNOWN) {
> +			error("invalid mmc device\n");
> +			rockusb_tx_write_csw(download_tag, 0,
> CSW_FAIL,
> +					     USB_BULK_CS_WRAP_LEN);
> +			return;
> +		}
> +	}
> +
> +	if (req->status != 0) {
> +		printf("Bad status: %d\n", req->status);
> +		rockusb_tx_write_csw(download_tag, 0,
> +				     CSW_FAIL, USB_BULK_CS_WRAP_LEN);
> +		return;
> +	}
> +
> +	if (buffer_size < transfer_size)
> +		transfer_size = buffer_size;
> +
> +	memcpy((void *)CONFIG_ROCKUSB_BUF_ADDR + download_bytes,
> +	       buffer, transfer_size);
> +	download_bytes += transfer_size;
> +
> +	/* Check if transfer is done */
> +	if (download_bytes >= download_size) {
> +		int blks = 0, blkcnt = download_size/512;
> +		printf("download %d bytes finished, start writing to
> lba %x\n",
> +		       download_bytes, download_lba);
> +		blks = blk_dwrite(download_desc, download_lba,
> blkcnt,
> +					(char
> *)CONFIG_ROCKUSB_BUF_ADDR);
> +		if (blks != blkcnt) {
> +			error("failed writing to device %s: %d\n",
> +			      rockusb_dev_type, rockusb_dev_index);
> +			rockusb_tx_write_csw(download_tag, 0,
> +					     CSW_FAIL,
> USB_BULK_CS_WRAP_LEN);
> +			return;
> +		}
> +
> +		req->complete = rx_handler_command;
> +		req->length = EP_BUFFER_SIZE;
> +		download_size = 0;
> +		printf("done\n");
> +		rockusb_tx_write_csw(download_tag, 0, CSW_GOOD,
> +				     USB_BULK_CS_WRAP_LEN);
> +	} else {
> +		req->length = rx_bytes_expected(ep);
> +	}
> +
> +	req->actual = 0;
> +	usb_ep_queue(ep, req, 0);
> +}
> +
> +static void cb_test_unit_ready(struct usb_ep *ep, struct usb_request
> *req) +{
> +	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
> +				 sizeof(struct fsg_bulk_cb_wrap));
> +
> +	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
> +
> +	rockusb_tx_write_csw(cbw->tag, cbw->data_transfer_length,
> +			     CSW_GOOD, USB_BULK_CS_WRAP_LEN);
> +}
> +
> +static void cb_read_storage_id(struct usb_ep *ep, struct usb_request
> *req) +{
> +	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
> +				 sizeof(struct fsg_bulk_cb_wrap));
> +	char emmc_id[] = "EMMC ";
> +
> +	printf("cb_read_storage_id\n");
> +	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
> +	rockusb_tx_write_str(emmc_id);
> +	rockusb_tx_write_csw(cbw->tag, cbw->data_transfer_length,
> CSW_GOOD,
> +			     USB_BULK_CS_WRAP_LEN);
> +}
> +
> +static void cb_write_lba(struct usb_ep *ep, struct usb_request *req)
> +{
> +	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
> +				 sizeof(struct fsg_bulk_cb_wrap));
> +	int sector_count;
> +
> +	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
> +	sector_count = (int)get_unaligned_be16(&cbw->CDB[7]);
> +	download_lba = get_unaligned_be32(&cbw->CDB[2]);
> +	download_size = sector_count * 512;
> +	download_bytes = 0;
> +	download_tag = cbw->tag;
> +	if ((0 == download_size) || (download_size >
> CONFIG_ROCKUSB_BUF_SIZE)) {
> +		rockusb_tx_write_csw(cbw->tag,
> cbw->data_transfer_length,
> +				     CSW_FAIL, USB_BULK_CS_WRAP_LEN);
> +	} else {
> +		req->complete = rx_handler_dl_image;
> +		req->length = rx_bytes_expected(ep);
> +	}
> +}
> +
> +int __weak rkusb_set_reboot_flag(int flag)
> +{
> +	printf("rkusb_set_reboot_flag: %d\n", reboot_flag);
> +	return -ENOSYS;
> +}
> +
> +static void compl_do_reset(struct usb_ep *ep, struct usb_request
> *req) +{
> +	rkusb_set_reboot_flag(reboot_flag);
> +	do_reset(NULL, 0, 0, NULL);
> +}
> +
> +static void cb_reboot(struct usb_ep *ep, struct usb_request *req)
> +{
> +	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
> +				 sizeof(struct fsg_bulk_cb_wrap));
> +	reboot_flag = 0;
> +	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
> +	reboot_flag = cbw->CDB[1];
> +	rockusb_func->in_req->complete = compl_do_reset;
> +	rockusb_tx_write_csw(cbw->tag, cbw->data_transfer_length,
> CSW_GOOD,
> +			     USB_BULK_CS_WRAP_LEN);
> +}
> +
> +static void cb_not_support(struct usb_ep *ep, struct usb_request
> *req) +{
> +	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
> +				 sizeof(struct fsg_bulk_cb_wrap));
> +
> +	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
> +	printf("Rockusb command %x not support yet\n", cbw->CDB[0]);
> +	rockusb_tx_write_csw(cbw->tag, 0, CSW_FAIL,
> USB_BULK_CS_WRAP_LEN); +}
> +
> +static const struct cmd_dispatch_info cmd_dispatch_info[] = {
> +	{
> +		.cmd = K_FW_TEST_UNIT_READY,
> +		.cb = cb_test_unit_ready,
> +	},
> +	{
> +		.cmd = K_FW_READ_FLASH_ID,
> +		.cb = cb_read_storage_id,
> +	},
> +	{
> +		.cmd = K_FW_SET_DEVICE_ID,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_TEST_BAD_BLOCK,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_READ_10,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_WRITE_10,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_ERASE_10,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_WRITE_SPARE,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_READ_SPARE,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_ERASE_10_FORCE,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_GET_VERSION,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_LBA_READ_10,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_LBA_WRITE_10,
> +		.cb = cb_write_lba,
> +	},
> +	{
> +		.cmd = K_FW_ERASE_SYS_DISK,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_SDRAM_READ_10,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_SDRAM_WRITE_10,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_SDRAM_EXECUTE,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_READ_FLASH_INFO,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_GET_CHIP_VER,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_LOW_FORMAT,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_SET_RESET_FLAG,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_SPI_READ_10,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_SPI_WRITE_10,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_SESSION,
> +		.cb = cb_not_support,
> +	},
> +	{
> +		.cmd = K_FW_RESET,
> +		.cb = cb_reboot,
> +	},
> +};
> +
> +static void rx_handler_command(struct usb_ep *ep, struct usb_request
> *req) +{
> +	void (*func_cb)(struct usb_ep *ep, struct usb_request *req)
> = NULL;
> +	ALLOC_CACHE_ALIGN_BUFFER(struct fsg_bulk_cb_wrap, cbw,
> +				 sizeof(struct fsg_bulk_cb_wrap));
> +	char *cmdbuf = req->buf;
> +	int i;
> +
> +	if (req->status || req->length == 0)
> +		return;
> +
> +	memcpy((char *)cbw, req->buf, USB_BULK_CB_WRAP_LEN);
> +#ifdef DEBUG
> +	printcbw(req->buf);
> +#endif
> +
> +	for (i = 0; i < ARRAY_SIZE(cmd_dispatch_info); i++) {
> +		if (cmd_dispatch_info[i].cmd == cbw->CDB[0]) {
> +			func_cb = cmd_dispatch_info[i].cb;
> +			break;
> +		}
> +	}
> +
> +	if (!func_cb) {
> +		error("unknown command: %s", (char *)req->buf);
> +		rockusb_tx_write_str("FAILunknown command");
> +	} else {
> +		if (req->actual < req->length) {
> +			u8 *buf = (u8 *)req->buf;
> +			buf[req->actual] = 0;
> +			func_cb(ep, req);
> +		} else {
> +			error("buffer overflow");
> +			rockusb_tx_write_str("FAILbuffer overflow");
> +		}
> +	}
> +
> +	*cmdbuf = '\0';
> +	req->actual = 0;
> +	usb_ep_queue(ep, req, 0);
> +}




Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ci-travis-Modify-original-.travis.yml-to-build-for-D.patch
Type: text/x-patch
Size: 11244 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170503/ef0f8885/attachment.bin>

[U-Boot] [PATCH V4 2/4] usb: rockchip: add rockusb command

[Eddie Cai]

this patch add rockusb command. the usage is
rockusb <USB_controller> <devtype> <dev[:part]>
e.g. rockusb 0 mmc 0

Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Changes in v4:
-move USB_FUNCTION_ROCKUSB to drivers/usb/gadget/Kconfig
-modify the dependence

Changes in v3:
-fix comment from Simon and Lukasz
-fix checkpactch error
---
 cmd/Kconfig   |  8 +++++++
 cmd/Makefile  |  1 +
 cmd/rockusb.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 cmd/rockusb.c

diff --git a/cmd/Kconfig b/cmd/Kconfig
index d9f7151..aa490c6 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -518,6 +518,14 @@ config CMD_DFU
 	  Enables the command "dfu" which is used to have U-Boot create a DFU
 	  class device via USB.
 
+config CMD_ROCKUSB
+        bool "rockusb"
+	default y
+        depends on USB_FUNCTION_ROCKUSB
+        help
+          enable rockusb command support to comunication with rockusb device.
+          for more detail about this command, please read doc/README.rockusb.
+
 config CMD_USB_MASS_STORAGE
 	bool "UMS usb mass storage"
 	help
diff --git a/cmd/Makefile b/cmd/Makefile
index e987868..65d998d 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -109,6 +109,7 @@ obj-$(CONFIG_CMD_READ) += read.o
 obj-$(CONFIG_CMD_REGINFO) += reginfo.o
 obj-$(CONFIG_CMD_REISER) += reiser.o
 obj-$(CONFIG_CMD_REMOTEPROC) += remoteproc.o
+obj-$(CONFIG_CMD_ROCKUSB) += rockusb.o
 obj-$(CONFIG_SANDBOX) += host.o
 obj-$(CONFIG_CMD_SATA) += sata.o
 obj-$(CONFIG_CMD_SF) += sf.o
diff --git a/cmd/rockusb.c b/cmd/rockusb.c
new file mode 100644
index 0000000..ae2baa6
--- /dev/null
+++ b/cmd/rockusb.c
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2017 Eddie Cai <eddie.cai.linux@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <command.h>
+#include <console.h>
+#include <g_dnl.h>
+#include <usb.h>
+#include <asm/arch/f_rockusb.h>
+
+static int do_rockusb(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+{
+	int controller_index, dev_index;
+	char *usb_controller;
+	char *devtype;
+	char *devnum;
+	int ret;
+
+	if (argc < 2)
+		return CMD_RET_USAGE;
+
+	usb_controller = argv[1];
+	controller_index = simple_strtoul(usb_controller, NULL, 0);
+
+	if (argc >= 4) {
+		devtype = argv[2];
+		devnum  = argv[3];
+	} else {
+		return CMD_RET_USAGE;
+	}
+	dev_index = simple_strtoul(devnum, NULL, 0);
+	rockusb_dev_init(devtype, dev_index);
+
+	ret = board_usb_init(controller_index, USB_INIT_DEVICE);
+	if (ret) {
+		error("USB init failed: %d", ret);
+		return CMD_RET_FAILURE;
+	}
+
+	g_dnl_clear_detach();
+	ret = g_dnl_register("usb_dnl_rockusb");
+	if (ret)
+		return CMD_RET_FAILURE;
+
+	if (!g_dnl_board_usb_cable_connected()) {
+		puts("\rUSB cable not detected, Command exit.\n");
+		ret = CMD_RET_FAILURE;
+		goto exit;
+	}
+
+	while (1) {
+		if (g_dnl_detach())
+			break;
+		if (ctrlc())
+			break;
+		usb_gadget_handle_interrupts(controller_index);
+	}
+	ret = CMD_RET_SUCCESS;
+
+exit:
+	g_dnl_unregister();
+	g_dnl_clear_detach();
+	board_usb_cleanup(controller_index, USB_INIT_DEVICE);
+
+	return ret;
+}
+
+U_BOOT_CMD(rockusb, 4, 1, do_rockusb,
+	   "use the rockusb protocol",
+	   "<USB_controller> <devtype> <dev[:part]>  e.g. rockusb 0 mmc 0\n"
+);
-- 
1.9.1

[U-Boot] [PATCH V4 3/4] rockchip:usb: add a simple readme for rockusb

[Eddie Cai]

add a simple readme to introduce rockusb and tell people how to use it

Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Changes in v4:
-add some blank line to make it look better

Changes in v3:
-fix checkpatch error
---
 doc/README.rockusb | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 doc/README.rockusb

diff --git a/doc/README.rockusb b/doc/README.rockusb
new file mode 100644
index 0000000..272e4f3
--- /dev/null
+++ b/doc/README.rockusb
@@ -0,0 +1,52 @@
+Rockusb (Rockchip USB protocol)
+=====================================================
+
+Overview
+--------
+
+Rockusb protocol is widely used with Rockchip devices.
+It can read/write info, image to/from devices. This
+document briefly describes how to use Rockusb for upgrading
+firmware (e.g. kernel, u-boot, rootfs, etc.).
+
+Tools
+--------
+There are many tools can support Rockusb protocol. rkdeveloptool
+(https://github.com/rockchip-linux/rkdeveloptool) is open source,
+It is maintained by Rockchip. People don't want to build from source
+can download from here
+(https://github.com/rockchip-linux/rkbin/blob/master/tools/rkdeveloptool)
+
+Usage
+--------
+The Usage of Rockusb command is:
+
+rockusb <USB_controller> <devtype> <dev[:part]>
+
+e.g. rockusb 0 mmc 0
+
+On your U-Boot console, type this command to enter rockusb mode.
+On your host PC. use lsusb command. you should see a usb device
+using 0x2207 as its USB verdor id. 
+
+for more detail about the rkdeveloptool. please read the usage.
+
+rkdeveloptool -h
+
+use rkdeveloptool wl command to write lba. BeginSec is the lba on device
+you want to write. 
+
+sudo rkdeveloptool wl  <BeginSec> <File>
+
+to flash U-Boot image use below command. U-Boot binary is made by mkimage. 
+see doc/README.rockchip for more detail about how to get U-Boot binary.
+
+sudo rkdeveloptool wl  64 <U-Boot binary>
+
+There are plenty of Rockusb command. but wl(write lba) and
+rd(reboot) command. These two command can let people flash
+image to device.
+
+To do
+-----
+* Fully support Rockusb protocol
-- 
1.9.1

[U-Boot] [PATCH V4 4/4] rockchip: usb: enable rockusb on rk3288 based board

[Eddie Cai]

all rk3288 based boards support rockusb, so enable it

Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>

Changes in v4:
-move to rk3288_common.h

Changes in v3:
-move to defconfig
---
 include/configs/rk3288_common.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index e7a8f72..27717dd 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -80,6 +80,8 @@
 #define CONFIG_G_DNL_MANUFACTURER	"Rockchip"
 #define CONFIG_G_DNL_VENDOR_NUM		0x2207
 #define CONFIG_G_DNL_PRODUCT_NUM	0x320a
+#define CONFIG_USB_FUNCTION_ROCKUSB
+#define CONFIG_CMD_ROCKUSB
 
 /* usb host support */
 #ifdef CONFIG_CMD_USB
-- 
1.9.1