All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/6] usb:composite:g_dnl: Composite gadget (g_dnl) for USB downloading functions
Date: Sat, 14 Apr 2012 11:55:08 +0200	[thread overview]
Message-ID: <201204141155.09093.marex@denx.de> (raw)
In-Reply-To: <1334215049-20362-2-git-send-email-l.majewski@samsung.com>

Dear Lukasz Majewski,

> Composite USB download gadget (g_dnl) for download functions (e.g. DFU,
> THOR, others)
> 
> Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Marek Vasut <marex@denx.de>
> ---
>  drivers/usb/gadget/Makefile |    1 +
>  drivers/usb/gadget/g_dnl.c  |  231
> +++++++++++++++++++++++++++++++++++++++++++ include/g_dnl.h             | 
>  97 ++++++++++++++++++
>  3 files changed, 329 insertions(+), 0 deletions(-)
>  create mode 100644 drivers/usb/gadget/g_dnl.c
>  create mode 100644 include/g_dnl.h
> 
> diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
> index 87d1918..2c067c8 100644
> --- a/drivers/usb/gadget/Makefile
> +++ b/drivers/usb/gadget/Makefile
> @@ -29,6 +29,7 @@ LIB	:= $(obj)libusb_gadget.o
>  ifdef CONFIG_USB_GADGET
>  COBJS-y += epautoconf.o config.o usbstring.o
>  COBJS-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += s3c_udc_otg.o
> +COBJS-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o
>  endif
>  ifdef CONFIG_USB_ETHER
>  COBJS-y += ether.o epautoconf.o config.o usbstring.o
> diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
> new file mode 100644
> index 0000000..425f4f6
> --- /dev/null
> +++ b/drivers/usb/gadget/g_dnl.c
> @@ -0,0 +1,231 @@
> +/*
> + * g_dnl.c -- USB Downloader Gadget
> + *
> + * Copyright (C) 2012 Samsung Electronics
> + * Lukasz Majewski  <l.majewski@samsung.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
> USA + */
> +#undef DEBUG
> +#define DEBUG
> +#include <errno.h>
> +#include <common.h>
> +#include <malloc.h>
> +#include <linux/usb/ch9.h>
> +#include <usbdescriptors.h>
> +#include <linux/usb/gadget.h>
> +#include <linux/usb/f_usbd_thor.h>
> +
> +#include <mmc.h>
> +#include <part.h>
> +
> +#include <g_dnl.h>
> +
> +#include "usbd_thor.h"
> +#include "gadget_chips.h"
> +
> +#include "composite.c"
> +
> +#define DRIVER_VERSION		"usb_dnl 2.0"
> +
> +static const char shortname[] = "usb_dnl_";
> +static const char product[] = "SLP USB download gadget";
> +static const char manufacturer[] = "Samsung";
> +
> +static struct usb_device_descriptor device_desc = {
> +	.bLength =		sizeof device_desc,
> +	.bDescriptorType =	USB_DT_DEVICE,
> +
> +	.bcdUSB =		__constant_cpu_to_le16(0x0200),
> +	.bDeviceClass =		USB_CLASS_COMM,
> +	.bDeviceSubClass =      0x02,	/*0x02:CDC-modem , 0x00:CDC-serial*/
> +
> +	.idVendor =		__constant_cpu_to_le16(DRIVER_VENDOR_NUM),
> +	.idProduct =		__constant_cpu_to_le16(DRIVER_PRODUCT_NUM),
> +	.iProduct =		STRING_PRODUCT,
> +	.bNumConfigurations =	1,
> +};
> +
> +static const struct usb_descriptor_header *otg_desc[] = {
> +	(struct usb_descriptor_header *) &(struct usb_otg_descriptor){
> +		.bLength =		sizeof(struct usb_otg_descriptor),
> +		.bDescriptorType =	USB_DT_OTG,
> +		.bmAttributes =		USB_OTG_SRP,
> +	},
> +	NULL,
> +};
> +
> +/* static strings, in UTF-8 */
> +static struct usb_string odin_string_defs[] = {
> +	{ 0, manufacturer, },
> +	{ 1, product, },
> +};
> +
> +static struct usb_gadget_strings odin_string_tab = {
> +	.language	= 0x0409,	/* en-us */
> +	.strings	= odin_string_defs,
> +};
> +
> +static struct usb_gadget_strings *g_dnl_composite_strings[] = {
> +	&odin_string_tab,
> +	NULL,
> +};
> +
> +static int g_dnl_unbind(struct usb_composite_dev *cdev)
> +{
> +	debug("%s\n", __func__);
> +	return 0;
> +}
> +
> +static int g_dnl_do_config(struct usb_configuration *c)
> +{
> +	int ret = -1;
> +	char *s = (char *) c->cdev->driver->name;
> +
> +	debug("%s: c: 0x%p cdev: 0x%p\n", __func__, c, c->cdev);
> +
> +	if (gadget_is_otg(c->cdev->gadget)) {
> +		c->descriptors = otg_desc;
> +		c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
> +	}
> +
> +	printf("GADGET DRIVER: %s\n", s);

Drop this printf()

> +
> +	if (!strcmp(s, "usb_dnl_thor"))
> +		ret = f_usbd_add(c);
> +
> +	return ret;
> +}
> +
> +static int g_dnl_config_register(struct usb_composite_dev *cdev)
> +{
> +	debug("%s:\n", __func__);
> +	static struct usb_configuration config = {
> +		.label = "usbd_thor_download",
> +		.bmAttributes =	USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
> +		.bConfigurationValue =	CONFIG_USBDOWNLOADER,
> +		.iConfiguration =	STRING_USBDOWN,
> +
> +		.bind = g_dnl_do_config,
> +	};
> +
> +	return usb_add_config(cdev, &config);
> +}
> +
> +static int g_dnl_bind(struct usb_composite_dev *cdev)
> +{
> +	int			gcnum;
> +	int id, ret;
> +	struct usb_gadget	*gadget = cdev->gadget;
> +
> +	debug("%s: gadget: 0x%p cdev: 0x%p\n", __func__, gadget, cdev);
> +
> +	id = usb_string_id(cdev);
> +
> +	if (id < 0)
> +		return id;
> +	odin_string_defs[0].id = id;
> +	device_desc.iManufacturer = id;
> +
> +	id = usb_string_id(cdev);
> +	if (id < 0)
> +		return id;
> +
> +	odin_string_defs[1].id = id;
> +	device_desc.iProduct = id;
> +
> +	ret = g_dnl_config_register(cdev);
> +	if (ret)
> +		goto error;
> +
> +
> +	gcnum = usb_gadget_controller_number(gadget);
> +
> +	debug("gcnum: %d\n", gcnum);
> +	if (gcnum >= 0)
> +		device_desc.bcdDevice = cpu_to_le16(0x0200 + gcnum);
> +	else {
> +		printf("%s: controller '%s' not recognized\n",
> +			shortname, gadget->name);
> +		device_desc.bcdDevice = __constant_cpu_to_le16(0x9999);
> +	}
> +
> +	return 0;
> +
> + error:
> +	g_dnl_unbind(cdev);
> +	return -ENOMEM;
> +}
> +
> +static void g_dnl_suspend(struct usb_composite_dev *cdev)
> +{
> +	if (cdev->gadget->speed == USB_SPEED_UNKNOWN)
> +		return;
> +
> +	debug("suspend\n");
> +}
> +
> +static void g_dnl_resume(struct usb_composite_dev *cdev)
> +{
> +	debug("resume\n");

__FILE__, __func__, __LINE__ ?

> +}
> +
> +static struct usb_composite_driver g_dnl_driver = {
> +	.name		= shortname,
> +	.dev		= &device_desc,
> +	.strings	= g_dnl_composite_strings,
> +
> +	.bind		= g_dnl_bind,
> +	.unbind		= g_dnl_unbind,
> +
> +	.suspend	= g_dnl_suspend,
> +	.resume		= g_dnl_resume,
> +};
> +
> +int g_dnl_init(char *s, struct g_dnl *dnl)
> +{
> +
> +	int ret;
> +	static char str[16];
> +
> +	memset(str, 0x00, sizeof(str));
> +	strncpy(str, shortname, sizeof(shortname));
> +
> +	if (!strncmp(s, "thor", sizeof(s))) {
> +		strncat(str, s, sizeof(str));
> +	} else {
> +		printf("%s: unknown command: %s\n", __func__, s);
> +		return -EINVAL;
> +	}
> +
> +	strncpy((char *) g_dnl_driver.name, (const char *) str, sizeof(str));
> +
> +	usbd_thor_udc_probe();
> +	set_udc_gadget_private_data(dnl);
> +
> +	ret = usb_composite_register(&g_dnl_driver);
> +
> +	if (ret) {
> +		printf("%s: failed!, error:%d ", __func__, ret);
> +		return ret;
> +	}
> +
> +	return 0;
> +}
> +
> +void g_dnl_cleanup(void)
> +{
> +	usb_composite_unregister(&g_dnl_driver);
> +}
> diff --git a/include/g_dnl.h b/include/g_dnl.h
> new file mode 100644
> index 0000000..9777b60
> --- /dev/null
> +++ b/include/g_dnl.h
> @@ -0,0 +1,97 @@
> +/*
> + *  Copyright (C) 2012 Samsung Electronics
> + *  Lukasz Majewski <l.majewski@samsung.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#ifndef __G_DOWNLOAD_H_
> +#define __G_DOWNLOAD_H_
> +
> +#include <mmc.h>
> +#include <linux/usb/ch9.h>
> +#include <usbdescriptors.h>
> +#include <linux/usb/gadget.h>
> +
> +enum { THOR = 1 };
> +enum {MMC = 1, FAT = 2, RAW = 3};
> +
> +struct g_dnl {
> +	int prot;
> +
> +	char *file_name;
> +	int file_size;
> +
> +	int (*init) (struct g_dnl *dnl);
> +	int (*info) (void);
> +
> +	int (*dl) (struct g_dnl *dnl);
> +	int (*ul) (struct g_dnl *dnl);
> +
> +	unsigned int *rx_buf;
> +	unsigned int *tx_buf;
> +
> +	int (*cmd) (struct g_dnl *dnl);
> +
> +	int medium;
> +	int (*store) (struct g_dnl *dnl, int medium);
> +	unsigned int p; /* private */
> +
> +	int packet_size;
> +};
> +
> +/**
> + * dnl_init - initialize code downloader
> + * @dnl: Interface to download functions
> + *
> + * returns zero, or a negative error code.
> + */
> +static inline int dnl_init(struct g_dnl *dnl)
> +{
> +	return dnl->init(dnl);
> +}
> +
> +/**
> + * dnl_download - handle download operation
> + * @dnl: Interface to download functions
> + *
> + * returns zero on success or a negative error code.
> + *
> + */
> +static inline int dnl_download(struct g_dnl *dnl)
> +{
> +	return dnl->dl(dnl);
> +}
> +
> +/**
> + * dnl_command - handle various commands
> + * @dnl: Interface to download functions
> + *
> + * returns zero on success or a negative error code.
> + *
> + */
> +static inline int dnl_command(struct g_dnl *dnl)
> +{
> +	return dnl->cmd(dnl);
> +}
> +
> +int g_dnl_init(char *s, struct g_dnl *dnl);
> +void set_udc_gadget_private_data(void *);
> +struct g_dnl *get_udc_gadget_private_data(struct usb_gadget *gadget);
> +
> +void usbd_thor_udc_probe(void);
> +
> +#endif /* __G_DOWNLOAD_H_ */

  reply	other threads:[~2012-04-14  9:55 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-12  7:17 [U-Boot] [PATCH 0/6] usb:composite:download Composite download gadget Lukasz Majewski
2012-04-12  7:17 ` [U-Boot] [PATCH 1/6] usb:composite:g_dnl: Composite gadget (g_dnl) for USB downloading functions Lukasz Majewski
2012-04-14  9:55   ` Marek Vasut [this message]
2012-04-12  7:17 ` [U-Boot] [PATCH 2/6] usb:g_dnl:f_usbd_thor: USB Download function to support THOR protocol Lukasz Majewski
2012-04-14  9:58   ` Marek Vasut
2012-04-14 13:12   ` Wolfgang Denk
2012-04-14 13:29   ` Wolfgang Denk
2012-04-12  7:17 ` [U-Boot] [PATCH 3/6] usb:g_dnl:thor: THOR protocol back end support for f_usbd_thor function Lukasz Majewski
2012-04-14 10:00   ` Marek Vasut
2012-04-14 13:30   ` Wolfgang Denk
2012-04-12  7:17 ` [U-Boot] [PATCH 4/6] usb:command: Support for USB Download command Lukasz Majewski
2012-04-14 10:04   ` Marek Vasut
2012-04-14 13:33   ` Wolfgang Denk
2012-04-12  7:17 ` [U-Boot] [PATCH 5/6] usb:g_dnl: Support for g_dnl download usb gadget for GONI board Lukasz Majewski
2012-04-14 13:39   ` Wolfgang Denk
2012-04-12  7:17 ` [U-Boot] [PATCH 6/6] usb:g_dnl: Support for g_dnl download usb gadget for TRATS board Lukasz Majewski
2012-04-14 13:40   ` Wolfgang Denk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201204141155.09093.marex@denx.de \
    --to=marex@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.