Hi Mateusz.

On 01/09/2014 11:31 PM, Mateusz Zalega wrote:

Proper adjustment for supporting DFU at GONI target has been made. The s5p_goni.h file has been updated. Moreover, the code for low level USB initialization has been added to Goni board code.

The malloc pool has been enlarged in order to support larger buffer sizes needed by DFU implementation.

Change-Id: I7812f395a3ee3660cec31f4d8c954057c0149863 Signed-off-by: Arkadiusz Wlodarczyk a.wlodarczyk@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com Signed-off-by: Mateusz Zalega m.zalega@samsung.com Tested-by: Arkadiusz Wlodarczyk a.wlodarczyk@samsung.com Tested-by: Mateusz Zalega m.zalega@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com

---

board/samsung/goni/goni.c | 10 +++++++++ include/configs/s5p_goni.h | 54 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index 366f648..5498daa 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -13,6 +13,9 @@ #include <usb/s3c_udc.h> #include <asm/arch/cpu.h> #include <power/max8998_pmic.h> +#include <usb.h> +#include <usb_mass_storage.h>

DECLARE_GLOBAL_DATA_PTR;

static struct s5pc110_gpio *s5pc110_gpio; @@ -172,4 +175,11 @@ struct s3c_plat_otg_data s5pc110_otg_data = { .regs_otg = S5PC110_OTG_BASE, .usb_phy_ctrl = S5PC110_USB_PHY_CONTROL, };

+int board_usb_init(int index, enum usb_init_type init) +{

• debug("USB_udc_probe\n");
• s3c_udc_probe(&s5pc110_otg_data);
• return 0;

Always return 0? return s3c_udc_probe(&s5pc110_otg_data);

+} #endif diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 1d2dcc0..24a0fcc 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -39,7 +39,7 @@ #define CONFIG_CMDLINE_EDITING

/* Size of malloc() pool.*/ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 80 * SZ_1M)

/*

• select serial console configuration

@@ -70,14 +70,18 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_REGINFO #define CONFIG_CMD_ONENAND -#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MMC +#define CONFIG_CMD_DFU

-#define CONFIG_BOOTDELAY 1 -#define CONFIG_ZERO_BOOTDELAY_CHECK +/* USB Composite download gadget - g_dnl */ +#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC

-#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS +/* USB Samsung's IDs */ +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 +#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 +#define CONFIG_G_DNL_MANUFACTURER "Samsung"

/* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ #define MTDIDS_DEFAULT "onenand0=samsung-onenand" @@ -90,7 +94,34 @@ ",12m(modem)"\ ",60m(qboot)\0"

-#define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT +#define CONFIG_BOOTDELAY 1 +#define CONFIG_ZERO_BOOTDELAY_CHECK

+/* partitions definitions */ +#define PARTS_CSA "csa-mmc" +#define PARTS_BOOTLOADER "u-boot" +#define PARTS_BOOT "boot" +#define PARTS_ROOT "platform" +#define PARTS_DATA "data" +#define PARTS_CSC "csc" +#define PARTS_UMS "ums"

+#define CONFIG_DFU_ALT \

• "u-boot raw 0x80 0x400;" \
• "uImage ext4 0 2;" \
• "exynos3-goni.dtb ext4 0 2;" \

exynos3-goni.dtb?

Best Regards, Jaehoon Chung

• ""PARTS_ROOT" part 0 5\0"

+#define PARTS_DEFAULT \

• "uuid_disk=${uuid_gpt_disk};" \
• "name="PARTS_CSA",size=8MiB,uuid=${uuid_gpt_"PARTS_CSA"};" \
• "name="PARTS_BOOTLOADER",size=60MiB," \
• "uuid=${uuid_gpt_"PARTS_BOOTLOADER"};" \
• "name="PARTS_BOOT",size=100MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \
• "name="PARTS_ROOT",size=1GiB,uuid=${uuid_gpt_"PARTS_ROOT"};" \
• "name="PARTS_DATA",size=3GiB,uuid=${uuid_gpt_"PARTS_DATA"};" \
• "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \
• "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

#define CONFIG_BOOTCOMMAND "run mmcboot"

@@ -144,18 +175,18 @@ "verify=n\0" \ "rootfstype=ext4\0" \ "console=" CONFIG_DEFAULT_CONSOLE \

• "mtdparts=" MTDPARTS_DEFAULT \ "meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \
• "loaduimage=fatload mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \

• "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ "mmcdev=0\0" \ "mmcbootpart=2\0" \ "mmcrootpart=5\0" \
• "partitions=" PARTS_DEFAULT \ "bootblock=9\0" \ "ubiblock=8\0" \ "ubi=enabled\0" \

• "opts=always_resume=1"

• "opts=always_resume=1\0" \
• "dfu_alt_info=" CONFIG_DFU_ALT "\0"

-/* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_PROMPT "Goni # " @@ -194,6 +225,7 @@

#define CONFIG_CMD_FAT #define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE

/* write support for filesystems */ #define CONFIG_FAT_WRITE

On 01/10/14 06:03, Jaehoon Chung wrote:

This patch should be separated with dfu and mmc.

ACK, because we're going to remove the bl_len assertion, see below.

On 01/09/2014 11:31 PM, Mateusz Zalega wrote:

...

When user attempted to perform a raw write using DFU (vide dfu_fill_entity_mmc) with MMC interface not initialized before, get_mmc_blk_size() reported invalid (zero) block size - it wasn't possible to write ie. a new u-boot image.

This commit fixes that by initializing device in get_mmc_blk_size() when needed.

Tested on Samsung Goni.

v2 changes:

• code cleanup
• minor dfu_alt_info format change

v3 changes:

• moved invalid block length check to mmc core
• removed redundant 'has_init' check

Change-Id: Icb50bb9f805a9a78848acd19f682fad474cb9082 Signed-off-by: Mateusz Zalega m.zalega@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com Reviewed-by: Lukasz Majewski l.majewski@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com

---

drivers/dfu/dfu_mmc.c | 106 ++++++++++++++++++++++++++----------------- drivers/mmc/mmc.c | 13 ++++-- include/configs/am335x_evm.h | 8 ++-- include/configs/trats.h | 2 +- include/configs/trats2.h | 2 +- include/dfu.h | 5 -- 6 files changed, 80 insertions(+), 56 deletions(-)

diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c

(...)

...

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index e1461a9..f2fa230 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -15,6 +15,7 @@ #include <malloc.h> #include <linux/list.h> #include <div64.h> +#include <errno.h> #include "mmc_private.h"

/* Set block count limit because of 16 bit register limit on some hardware*/ @@ -1266,17 +1267,23 @@ static int mmc_complete_init(struct mmc *mmc)

int mmc_init(struct mmc *mmc) {

• if (mmc->has_init)

• return 0;
  

What difference before?

It doesn't have to go through get_timer(). The effect, although negligible, saves some cycles.

...

int err = IN_PROGRESS; unsigned start = get_timer(0);

• if (mmc->has_init)

• return 0;
  

  if (!mmc->init_in_progress) err = mmc_start_init(mmc);

Need not to change.

...

if (!err || err == IN_PROGRESS) err = mmc_complete_init(mmc);

Ditto.

NAK, it improves code readability.

...

debug("%s: %d, time %lu\n", __func__, err, get_timer(start));

• if (!mmc->read_bl_len || !mmc->write_bl_len) {

• error("invalid block length\n");
  

• return -ENODEV;
  

• }

I know mmc->read_bl_len and write_bl_len is set at init time. Why this condition needs?

I added it as a countermeasure after fixing the bug and mistook its purpose when writing a late update to this patch, my bad.

Given the circumstances it might be a sound assertion, but we shouldn't clobber the codebase that we aim to optimize for size, should we.

ACK, will remove.

...

return err; }

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 8af4d6a..d76962f 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -312,10 +312,10 @@ "boot part 0 1;" \ "rootfs part 0 2;" \ "MLO fat 0 1;" \

• "MLO.raw mmc 100 100;" \
• "u-boot.img.raw mmc 300 400;" \
• "spl-os-args.raw mmc 80 80;" \
• "spl-os-image.raw mmc 900 2000;" \

• "MLO.raw mmc 0x100 0x100;" \
• "u-boot.img.raw mmc 0x300 0x400;" \
• "spl-os-args.raw mmc 0x80 0x80;" \
• "spl-os-image.raw mmc 0x900 0x2000;" \ "spl-os-args fat 0 1;" \ "spl-os-image fat 0 1;" \ "u-boot.img fat 0 1;" \

diff --git a/include/configs/trats.h b/include/configs/trats.h index 6cd15c2..ed3b278 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -140,7 +140,7 @@ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

#define CONFIG_DFU_ALT \

• "u-boot mmc 80 400;" \

• "u-boot raw 0x80 0x400;" \ "uImage ext4 0 2;" \ "exynos4210-trats.dtb ext4 0 2;" \ ""PARTS_ROOT" part 0 5\0"

diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 5d86a3d..a22be63 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -169,7 +169,7 @@ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

#define CONFIG_DFU_ALT \

• "u-boot mmc 80 800;" \

• "u-boot mmc 0x80 0x800;" \

u-boot mmc? u-boot raw? what's correct?

raw - ACK

...

"uImage ext4 0 2;" \ "exynos4412-trats2.dtb ext4 0 2;" \ ""PARTS_ROOT" part 0 5\0" diff --git a/include/dfu.h b/include/dfu.h index f973426..f2e83db 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -64,11 +64,6 @@ struct ram_internal_data { unsigned int size; };

-static inline unsigned int get_mmc_blk_size(int dev) -{

• return find_mmc_device(dev)->read_bl_len;

-}

#define DFU_NAME_SIZE 32 #define DFU_CMD_BUF_SIZE 128 #ifndef CONFIG_SYS_DFU_DATA_BUF_SIZE

Hi Mateusz,

On 01/09/2014 11:31 PM, Mateusz Zalega wrote:

In some cases MMC was still uninitialized while media capacity check, leading to broken ums command.

Change-Id: I4b86c2c59e430fb8b55272ea14f00316d8cb3dca Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com Cc: Kyungmin Park kyungmin.park@samsung.com

---

board/samsung/common/ums.c | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index dc155ad..0d8f30d 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -37,6 +37,9 @@ static struct ums ums_dev = {

static struct ums *ums_disk_init(struct mmc *mmc) {

• if (mmc_init(mmc))

• return NULL;
  

• uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE; uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR;

--> if (mmc_init(mmc)) return NULL;

Locate this point.

Best Regards, Jaehoon Chung

Hi

On Mon, Jan 13, 2014 at 3:39 PM, Mateusz Zalega m.zalega@samsung.com wrote:

On 01/10/14 06:08, Jaehoon Chung wrote:

...

...

index dc155ad..0d8f30d 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -37,6 +37,9 @@ static struct ums ums_dev = {

static struct ums *ums_disk_init(struct mmc *mmc) {

• if (mmc_init(mmc))

•        return NULL;
  

• uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE; uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR;

--> if (mmc_init(mmc)) return NULL;

Locate this point.

If you're asking to put this if() block after variable declaration, NAK.

I don't understand your point

It's perfectly fine C99 code. I'm not aware of any existing U-Boot style guidelines that would forbid me to leave it this way.

These variables are only meaningful when mmc_init() returns a valid pointer.

http://www.denx.de/wiki/U-Boot/CodingStyle

Michael

Regards,

Mateusz Zalega Samsung R&D Institute Poland _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot

Hi Mateusz,

In some cases MMC was still uninitialized while media capacity check, leading to broken ums command.

Change-Id: I4b86c2c59e430fb8b55272ea14f00316d8cb3dca Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com Cc: Kyungmin Park kyungmin.park@samsung.com

---

board/samsung/common/ums.c | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index dc155ad..0d8f30d 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -37,6 +37,9 @@ static struct ums ums_dev = {

static struct ums *ums_disk_init(struct mmc *mmc) {

• if (mmc_init(mmc))

• return NULL;
  

• uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE; uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR;

Tested-by: Lukasz Majewski l.majewski@samsung.com

Tested at: Exynos4210 - TRATS.

On 01/14/14 01:49, Minkyu Kang wrote:

On 09/01/14 23:31, Mateusz Zalega wrote:

...

In some cases MMC was still uninitialized while media capacity check, leading to broken ums command.

Change-Id: I4b86c2c59e430fb8b55272ea14f00316d8cb3dca Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com Cc: Kyungmin Park kyungmin.park@samsung.com

---

board/samsung/common/ums.c | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index dc155ad..0d8f30d 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -37,6 +37,9 @@ static struct ums ums_dev = {

static struct ums *ums_disk_init(struct mmc *mmc) {

• if (mmc_init(mmc))

• return NULL;
  

• uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE; uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR;

Why don't you init the mmc before call this function?

diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index dc155ad..7017c2a 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -72,5 +72,8 @@ struct ums *ums_init(unsigned int dev_num) if (!mmc) return NULL;

•   if (mmc_init(mmc))
  

•           return NULL;
  

•   return ums_disk_init(mmc);
  

}

I agree, ACK.

Hi Heiko,

Preprocessor definitions and hardcoded implementation selection in g_dnl core were replaced by a linker list made of {usb_function_name, bind_callback) pairs.

Could you test those g_dnl related patches?

You would probably need to apply the whole series for testing.

Thanks in advance.

Regards, Lukasz

Change-Id: I4e0515e7fd61ff19793e9ac9a6c48b07c616c9dc Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Kyungmin Park kyungmin.park@samsung.com

---

common/cmd_dfu.c | 3 +- common/cmd_thordown.c | 3 +- common/cmd_usb_mass_storage.c | 2 +- drivers/usb/gadget/f_dfu.c | 11 ++++-- drivers/usb/gadget/f_mass_storage.c | 6 +++ drivers/usb/gadget/f_thor.c | 5 +++ drivers/usb/gadget/g_dnl.c | 74 +++++++++++++++++-------------------- include/dfu.h | 7 ---- include/g_dnl.h | 11 ++++++ include/thor.h | 8 ---- include/usb_mass_storage.h | 8 ---- 11 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c index 5547678..a03538d 100644 --- a/common/cmd_dfu.c +++ b/common/cmd_dfu.c @@ -22,7 +22,6 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

• char *s = "dfu"; int ret, i = 0;

  ret = dfu_init_env_entities(interface,

simple_strtoul(devstring, @@ -38,7 +37,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int controller_index = simple_strtoul(usb_controller, NULL, 0); board_usb_init(controller_index, USB_INIT_DEVICE);

• g_dnl_register(s);

• g_dnl_register("usb_dnl_dfu"); while (1) { if (dfu_reset()) /*

diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index c4b3511..2dd7509 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -22,7 +22,6 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

• const char *s = "thor"; int ret;

  puts("TIZEN "THOR" Downloader\n");

@@ -40,7 +39,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) goto exit; }

• g_dnl_register(s);

• g_dnl_register("usb_dnl_thor");

  ret = thor_init(); if (ret) {

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 99487f4..c8e152c 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -40,7 +40,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; }

• g_dnl_register("ums");

• g_dnl_register("usb_dnl_ums");

  while (1) { usb_gadget_handle_interrupts();

diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index a045864..cde1895 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -18,12 +18,14 @@ #include <errno.h> #include <common.h> #include <malloc.h> +#include <linker_lists.h>

#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb/composite.h>

#include <dfu.h> +#include <g_dnl.h> #include "f_dfu.h"

struct f_dfu { @@ -768,9 +770,7 @@ static int dfu_bind_config(struct usb_configuration *c) int dfu_add(struct usb_configuration *c) {

• int id;
• id = usb_string_id(c->cdev);

• int id = usb_string_id(c->cdev); if (id < 0) return id; strings_dfu_generic[0].id = id;

@@ -781,3 +781,8 @@ int dfu_add(struct usb_configuration *c)

return dfu_bind_config(c); }

+/* export dfu_add to g_dnl.o */ +ll_entry_declare(struct g_dnl_bind_callback, dfu_bind_callback,

• g_dnl_bind_callbacks) = { .usb_function_name =
  

"usb_dnl_dfu",

• 			  .fptr = dfu_add };
  

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index b1fe8bd..b7d03f2 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -243,6 +243,7 @@ #include <config.h> #include <malloc.h> #include <common.h> +#include <linker_lists.h> #include <usb.h>

#include <linux/err.h> @@ -255,6 +256,7 @@ #include <linux/usb/gadget.h> #include <linux/usb/composite.h> #include <usb/lin_gadget_compat.h> +#include <g_dnl.h>

/*------------------------------------------------------------------------*/

@@ -2778,3 +2780,7 @@ int fsg_init(struct ums *ums_dev)

return 0; }

+ll_entry_declare(struct g_dnl_bind_callback, fsg_bind_callback,

• g_dnl_bind_callbacks) = { .usb_function_name =
  

"usb_dnl_ums",

• 			  .fptr = fsg_add };
  

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index c4c9909..3f428c8 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -17,6 +17,7 @@

#include <errno.h> #include <common.h> +#include <linker_lists.h> #include <malloc.h> #include <version.h> #include <linux/usb/ch9.h> @@ -1001,3 +1002,7 @@ int thor_add(struct usb_configuration *c) debug("%s:\n", __func__); return thor_func_init(c); }

+ll_entry_declare(struct g_dnl_bind_callback, thor_bind_callback,

• g_dnl_bind_callbacks) = { .usb_function_name =
  

"usb_dnl_thor",

• 			  .fptr = thor_add };
  

diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index dd95afe..00ace2c 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -41,7 +41,6 @@

#define DRIVER_VERSION "usb_dnl 2.0"

-static const char shortname[] = "usb_dnl_"; static const char product[] = "USB download gadget"; static char g_dnl_serial[MAX_STRING_SERIAL]; static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER; @@ -95,30 +94,38 @@ static int g_dnl_unbind(struct usb_composite_dev *cdev) free(cdev->config); cdev->config = NULL;

• debug("%s: calling usb_gadget_disconnect for "

• 	"controller '%s'\n", shortname,
  

gadget->name);

• debug("%s: calling usb_gadget_disconnect for controller

'%s'\n",

• 	__func__, gadget->name);
  

  usb_gadget_disconnect(gadget);

  return 0;

}

+static inline struct g_dnl_bind_callback * g_dnl_first_bind_callback(void) +{

• return ll_entry_start(struct g_dnl_bind_callback,

• 		g_dnl_bind_callbacks);
  

+}

+static inline struct g_dnl_bind_callback * g_dnl_last_bind_callback(void) +{

• return ll_entry_end(struct g_dnl_bind_callback,

• 		g_dnl_bind_callbacks);
  

+}

static int g_dnl_do_config(struct usb_configuration *c) { const char *s = c->cdev->driver->name;

• int ret = -1;

  debug("%s: configuration: 0x%p composite dev: 0x%p\n",

•      __func__, c, c->cdev);
  

• 	__func__, c, c->cdev);
  

  printf("GADGET DRIVER: %s\n", s);

• if (!strcmp(s, "usb_dnl_dfu"))

• ret = dfu_add(c);
  

• else if (!strcmp(s, "usb_dnl_ums"))

• ret = fsg_add(c);
  

• else if (!strcmp(s, "usb_dnl_thor"))

• ret = thor_add(c);
  

• return ret;

• struct g_dnl_bind_callback *callback =

g_dnl_first_bind_callback();

• for (; callback != g_dnl_last_bind_callback(); ++callback)

• if (!strcmp(s, callback->usb_function_name))
  

• 	return callback->fptr(c);
  

• return -ENODEV;

}

static int g_dnl_config_register(struct usb_composite_dev *cdev) @@ -203,12 +210,12 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) device_desc.bcdDevice = cpu_to_le16(gcnum); else { debug("%s: controller '%s' not recognized\n",

• 	shortname, gadget->name);
  

• 		__func__, gadget->name);
  

  device_desc.bcdDevice =

__constant_cpu_to_le16(0x9999); }

• debug("%s: calling usb_gadget_connect for "

• 	"controller '%s'\n", shortname,
  

gadget->name);

• debug("%s: calling usb_gadget_connect for controller '%s'\n",

• 	__func__, gadget->name);
  

  usb_gadget_connect(gadget);

  return 0;

@@ -227,36 +234,21 @@ static struct usb_composite_driver g_dnl_driver = { .unbind = g_dnl_unbind, };

-int g_dnl_register(const char *type) +/*

• • NOTICE:
• • Registering via USB function name won't be necessary after

rewriting

• • g_dnl to support multiple USB functions.
• */

+int g_dnl_register(const char *name) {

• /* The largest function name is 4 */
• static char name[sizeof(shortname) + 4];
• int ret;
• if (!strcmp(type, "dfu")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else if (!strcmp(type, "ums")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else if (!strcmp(type, "thor")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else {

• printf("%s: unknown command: %s\n", __func__, type);
  

• return -EINVAL;
  

• }

• debug("%s: g_dnl_driver.name = %s\n", __func__, name); g_dnl_driver.name = name;

• debug("%s: g_dnl_driver.name: %s\n", __func__,

g_dnl_driver.name);

• ret = usb_composite_register(&g_dnl_driver);

• int ret = usb_composite_register(&g_dnl_driver); if (ret) {

• printf("%s: failed!, error: %d\n", __func__, ret);
  

• debug("%s: failed!, error: %d\n", __func__, ret);
  

  return ret; }

• return 0;

}

diff --git a/include/dfu.h b/include/dfu.h index f2e83db..6fd75d0 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -164,12 +164,5 @@ static inline int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s) } #endif

-#ifdef CONFIG_DFU_FUNCTION int dfu_add(struct usb_configuration *c); -#else -int dfu_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __DFU_ENTITY_H_ */ diff --git a/include/g_dnl.h b/include/g_dnl.h index 8f813c2..4392f76 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -10,6 +10,17 @@

#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> +#include <linux/usb/composite.h>

+typedef int (*g_dnl_bind_callback_f)(struct usb_configuration *);

+/* used in Gadget downloader callback linker list */ +struct g_dnl_bind_callback +{

• const char *usb_function_name;
• g_dnl_bind_callback_f fptr;

+};

int g_dnl_bind_fixup(struct usb_device_descriptor *, const char *); int g_dnl_register(const char *s); void g_dnl_unregister(void); diff --git a/include/thor.h b/include/thor.h index afeade4..5051be7 100644 --- a/include/thor.h +++ b/include/thor.h @@ -15,13 +15,5 @@

int thor_handle(void); int thor_init(void);

-#ifdef CONFIG_THOR_FUNCTION int thor_add(struct usb_configuration *c); -#else -int thor_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __THOR_H_ */ diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index 9df3adc..6ee4f34 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -37,13 +37,5 @@ int fsg_init(struct ums *); void fsg_cleanup(void); struct ums *ums_init(unsigned int); int fsg_main_thread(void *);

-#ifdef CONFIG_USB_GADGET_MASS_STORAGE int fsg_add(struct usb_configuration *c); -#else -int fsg_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __USB_MASS_STORAGE_H__ */

Hi Mateusz,

Preprocessor definitions and hardcoded implementation selection in g_dnl core were replaced by a linker list made of {usb_function_name, bind_callback) pairs.

Tested-by: Lukasz Majewski l.majewski@samsung.com

Tested at: Exynos4210 - TRATS.

Acked-by: Lukasz Majewski l.majewski@samsung.com

Change-Id: I4e0515e7fd61ff19793e9ac9a6c48b07c616c9dc Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Kyungmin Park kyungmin.park@samsung.com

---

common/cmd_dfu.c | 3 +- common/cmd_thordown.c | 3 +- common/cmd_usb_mass_storage.c | 2 +- drivers/usb/gadget/f_dfu.c | 11 ++++-- drivers/usb/gadget/f_mass_storage.c | 6 +++ drivers/usb/gadget/f_thor.c | 5 +++ drivers/usb/gadget/g_dnl.c | 74 +++++++++++++++++-------------------- include/dfu.h | 7 ---- include/g_dnl.h | 11 ++++++ include/thor.h | 8 ---- include/usb_mass_storage.h | 8 ---- 11 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c index 5547678..a03538d 100644 --- a/common/cmd_dfu.c +++ b/common/cmd_dfu.c @@ -22,7 +22,6 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

• char *s = "dfu"; int ret, i = 0;

  ret = dfu_init_env_entities(interface,

simple_strtoul(devstring, @@ -38,7 +37,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int controller_index = simple_strtoul(usb_controller, NULL, 0); board_usb_init(controller_index, USB_INIT_DEVICE);

• g_dnl_register(s);

• g_dnl_register("usb_dnl_dfu"); while (1) { if (dfu_reset()) /*

diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index c4b3511..2dd7509 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -22,7 +22,6 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

• const char *s = "thor"; int ret;

  puts("TIZEN "THOR" Downloader\n");

@@ -40,7 +39,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) goto exit; }

• g_dnl_register(s);

• g_dnl_register("usb_dnl_thor");

  ret = thor_init(); if (ret) {

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 99487f4..c8e152c 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -40,7 +40,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; }

• g_dnl_register("ums");

• g_dnl_register("usb_dnl_ums");

  while (1) { usb_gadget_handle_interrupts();

diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index a045864..cde1895 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -18,12 +18,14 @@ #include <errno.h> #include <common.h> #include <malloc.h> +#include <linker_lists.h>

#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb/composite.h>

#include <dfu.h> +#include <g_dnl.h> #include "f_dfu.h"

struct f_dfu { @@ -768,9 +770,7 @@ static int dfu_bind_config(struct usb_configuration *c) int dfu_add(struct usb_configuration *c) {

• int id;
• id = usb_string_id(c->cdev);

• int id = usb_string_id(c->cdev); if (id < 0) return id; strings_dfu_generic[0].id = id;

@@ -781,3 +781,8 @@ int dfu_add(struct usb_configuration *c)

return dfu_bind_config(c); }

+/* export dfu_add to g_dnl.o */ +ll_entry_declare(struct g_dnl_bind_callback, dfu_bind_callback,

• g_dnl_bind_callbacks) = { .usb_function_name =
  

"usb_dnl_dfu",

• 			  .fptr = dfu_add };
  

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index b1fe8bd..b7d03f2 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -243,6 +243,7 @@ #include <config.h> #include <malloc.h> #include <common.h> +#include <linker_lists.h> #include <usb.h>

#include <linux/err.h> @@ -255,6 +256,7 @@ #include <linux/usb/gadget.h> #include <linux/usb/composite.h> #include <usb/lin_gadget_compat.h> +#include <g_dnl.h>

/*------------------------------------------------------------------------*/

@@ -2778,3 +2780,7 @@ int fsg_init(struct ums *ums_dev)

return 0; }

+ll_entry_declare(struct g_dnl_bind_callback, fsg_bind_callback,

• g_dnl_bind_callbacks) = { .usb_function_name =
  

"usb_dnl_ums",

• 			  .fptr = fsg_add };
  

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index c4c9909..3f428c8 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -17,6 +17,7 @@

#include <errno.h> #include <common.h> +#include <linker_lists.h> #include <malloc.h> #include <version.h> #include <linux/usb/ch9.h> @@ -1001,3 +1002,7 @@ int thor_add(struct usb_configuration *c) debug("%s:\n", __func__); return thor_func_init(c); }

+ll_entry_declare(struct g_dnl_bind_callback, thor_bind_callback,

• g_dnl_bind_callbacks) = { .usb_function_name =
  

"usb_dnl_thor",

• 			  .fptr = thor_add };
  

diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index dd95afe..00ace2c 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -41,7 +41,6 @@

#define DRIVER_VERSION "usb_dnl 2.0"

-static const char shortname[] = "usb_dnl_"; static const char product[] = "USB download gadget"; static char g_dnl_serial[MAX_STRING_SERIAL]; static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER; @@ -95,30 +94,38 @@ static int g_dnl_unbind(struct usb_composite_dev *cdev) free(cdev->config); cdev->config = NULL;

• debug("%s: calling usb_gadget_disconnect for "

• 	"controller '%s'\n", shortname,
  

gadget->name);

• debug("%s: calling usb_gadget_disconnect for controller

'%s'\n",

• 	__func__, gadget->name);
  

  usb_gadget_disconnect(gadget);

  return 0;

}

+static inline struct g_dnl_bind_callback * g_dnl_first_bind_callback(void) +{

• return ll_entry_start(struct g_dnl_bind_callback,

• 		g_dnl_bind_callbacks);
  

+}

+static inline struct g_dnl_bind_callback * g_dnl_last_bind_callback(void) +{

• return ll_entry_end(struct g_dnl_bind_callback,

• 		g_dnl_bind_callbacks);
  

+}

static int g_dnl_do_config(struct usb_configuration *c) { const char *s = c->cdev->driver->name;

• int ret = -1;

  debug("%s: configuration: 0x%p composite dev: 0x%p\n",

•      __func__, c, c->cdev);
  

• 	__func__, c, c->cdev);
  

  printf("GADGET DRIVER: %s\n", s);

• if (!strcmp(s, "usb_dnl_dfu"))

• ret = dfu_add(c);
  

• else if (!strcmp(s, "usb_dnl_ums"))

• ret = fsg_add(c);
  

• else if (!strcmp(s, "usb_dnl_thor"))

• ret = thor_add(c);
  

• return ret;

• struct g_dnl_bind_callback *callback =

g_dnl_first_bind_callback();

• for (; callback != g_dnl_last_bind_callback(); ++callback)

• if (!strcmp(s, callback->usb_function_name))
  

• 	return callback->fptr(c);
  

• return -ENODEV;

}

static int g_dnl_config_register(struct usb_composite_dev *cdev) @@ -203,12 +210,12 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) device_desc.bcdDevice = cpu_to_le16(gcnum); else { debug("%s: controller '%s' not recognized\n",

• 	shortname, gadget->name);
  

• 		__func__, gadget->name);
  

  device_desc.bcdDevice =

__constant_cpu_to_le16(0x9999); }

• debug("%s: calling usb_gadget_connect for "

• 	"controller '%s'\n", shortname,
  

gadget->name);

• debug("%s: calling usb_gadget_connect for controller '%s'\n",

• 	__func__, gadget->name);
  

  usb_gadget_connect(gadget);

  return 0;

@@ -227,36 +234,21 @@ static struct usb_composite_driver g_dnl_driver = { .unbind = g_dnl_unbind, };

-int g_dnl_register(const char *type) +/*

• • NOTICE:
• • Registering via USB function name won't be necessary after

rewriting

• • g_dnl to support multiple USB functions.
• */

+int g_dnl_register(const char *name) {

• /* The largest function name is 4 */
• static char name[sizeof(shortname) + 4];
• int ret;
• if (!strcmp(type, "dfu")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else if (!strcmp(type, "ums")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else if (!strcmp(type, "thor")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else {

• printf("%s: unknown command: %s\n", __func__, type);
  

• return -EINVAL;
  

• }

• debug("%s: g_dnl_driver.name = %s\n", __func__, name); g_dnl_driver.name = name;

• debug("%s: g_dnl_driver.name: %s\n", __func__,

g_dnl_driver.name);

• ret = usb_composite_register(&g_dnl_driver);

• int ret = usb_composite_register(&g_dnl_driver); if (ret) {

• printf("%s: failed!, error: %d\n", __func__, ret);
  

• debug("%s: failed!, error: %d\n", __func__, ret);
  

  return ret; }

• return 0;

}

diff --git a/include/dfu.h b/include/dfu.h index f2e83db..6fd75d0 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -164,12 +164,5 @@ static inline int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s) } #endif

-#ifdef CONFIG_DFU_FUNCTION int dfu_add(struct usb_configuration *c); -#else -int dfu_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __DFU_ENTITY_H_ */ diff --git a/include/g_dnl.h b/include/g_dnl.h index 8f813c2..4392f76 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -10,6 +10,17 @@

#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> +#include <linux/usb/composite.h>

+typedef int (*g_dnl_bind_callback_f)(struct usb_configuration *);

+/* used in Gadget downloader callback linker list */ +struct g_dnl_bind_callback +{

• const char *usb_function_name;
• g_dnl_bind_callback_f fptr;

+};

int g_dnl_bind_fixup(struct usb_device_descriptor *, const char *); int g_dnl_register(const char *s); void g_dnl_unregister(void); diff --git a/include/thor.h b/include/thor.h index afeade4..5051be7 100644 --- a/include/thor.h +++ b/include/thor.h @@ -15,13 +15,5 @@

int thor_handle(void); int thor_init(void);

-#ifdef CONFIG_THOR_FUNCTION int thor_add(struct usb_configuration *c); -#else -int thor_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __THOR_H_ */ diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index 9df3adc..6ee4f34 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -37,13 +37,5 @@ int fsg_init(struct ums *); void fsg_cleanup(void); struct ums *ums_init(unsigned int); int fsg_main_thread(void *);

-#ifdef CONFIG_USB_GADGET_MASS_STORAGE int fsg_add(struct usb_configuration *c); -#else -int fsg_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __USB_MASS_STORAGE_H__ */

Implementation made use of types defined in common.h, even though it wasn't #included. It worked in circumstances when .c files included every needed header (all).

Change-Id: Iafdd4f1997767e9eb84d583fd32c79c8c4d43afd Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com Cc: Tom Rini trini@ti.com --- include/part.h | 1 + 1 file changed, 1 insertion(+)

diff --git a/include/part.h b/include/part.h index 4beb6db..53532dc 100644 --- a/include/part.h +++ b/include/part.h @@ -8,6 +8,7 @@ #define _PART_H

#include <ide.h> +#include <common.h>

typedef struct block_dev_desc { int if_type; /* type of the interface */

Former usb_cable_connected() patch broke compilation of boards which do not support this feature.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com --- common/cmd_usb_mass_storage.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 5f557d5..5175bd5 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -45,6 +45,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, /* Timeout unit: seconds */ int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT;

+#ifdef CONFIG_USB_CABLE_CHECK if (!usb_cable_connected()) { puts("Please connect USB cable.\n");

@@ -65,6 +66,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, } puts("\r\n"); } +#endif

while (1) { usb_gadget_handle_interrupts();

Future patches will make DFU too large to fit in this board's SPL build.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Tom Rini trini@ti.com Cc: Lukasz Majewski l.majewski@samsung.com --- include/configs/am335x_evm.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 73a9adb..4f89556 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -302,6 +302,7 @@ #endif

/* USB Device Firmware Update support */ +#ifndef CONFIG_SPL_BUILD #define CONFIG_DFU_FUNCTION #define CONFIG_DFU_MMC #define CONFIG_CMD_DFU @@ -344,6 +345,7 @@ DFU_ALT_INFO_MMC \ DFU_ALT_INFO_RAM \ DFU_ALT_INFO_NAND +#endif

/* * Default to using SPI for environment, etc.

On Tuesday, February 04, 2014 at 06:02:38 PM, Mateusz Zalega wrote:

Preprocessor definitions and hardcoded implementation selection in g_dnl core were replaced by a linker list made of (usb_function_name, bind_callback) pairs.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Marek Vasut marex@denx.de

[...]

+/* export dfu_add to g_dnl.o */ +ll_entry_declare(struct g_dnl_bind_callback, dfu_bind_callback,

• g_dnl_bind_callbacks) = { .usb_function_name = "usb_dnl_dfu",
  

• 			  .fptr = dfu_add };
  

from linker-lists.h quote:

104 * ll_entry_declare() - Declare linker-generated array entry [...] 110 * This macro declares a variable that is placed into a linker-generated 111 * array. This is a basic building block for more advanced use of linker- 112 * generated arrays. The user is expected to build their own macro wrapper 113 * around this one.

Can you follow this advice and build a macro for declaring these USB devices ?

btw would you mind fixing the example for ll_entry_declare() in linker-lists.h ? It has four params in the example for some reason (it's a remnant from rework).

[...]

+static inline struct g_dnl_bind_callback * g_dnl_first_bind_callback(void) +{

• return ll_entry_start(struct g_dnl_bind_callback,

• 		g_dnl_bind_callbacks);
  

+}

+static inline struct g_dnl_bind_callback * g_dnl_last_bind_callback(void) +{

• return ll_entry_end(struct g_dnl_bind_callback,

• 		g_dnl_bind_callbacks);
  

+}

Are these two new functions called from multiple places at all? If not, just inline these ll_foo() calls and be done with it. FYI you can also make macros for these to avoid having to type all these args all around and duplicating the code.

static int g_dnl_do_config(struct usb_configuration *c) { const char *s = c->cdev->driver->name;

• int ret = -1;

  debug("%s: configuration: 0x%p composite dev: 0x%p\n",

•      __func__, c, c->cdev);
  

• 	__func__, c, c->cdev);
  

  printf("GADGET DRIVER: %s\n", s);

• if (!strcmp(s, "usb_dnl_dfu"))

• ret = dfu_add(c);
  

• else if (!strcmp(s, "usb_dnl_ums"))

• ret = fsg_add(c);
  

• else if (!strcmp(s, "usb_dnl_thor"))

• ret = thor_add(c);
  

• return ret;

• struct g_dnl_bind_callback *callback = g_dnl_first_bind_callback();
• for (; callback != g_dnl_last_bind_callback(); ++callback)

callback++ , this is not C++ where the order might matter. Nonetheless, you do want to use ll_entry_count() and ll_entry_get() with an iterator variable instead to make sure you don't step onto a corrupted field and crash in some weird way.

• if (!strcmp(s, callback->usb_function_name))
  

• 	return callback->fptr(c);
  

• return -ENODEV;

}

static int g_dnl_config_register(struct usb_composite_dev *cdev) @@ -203,12 +210,12 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) device_desc.bcdDevice = cpu_to_le16(gcnum); else { debug("%s: controller '%s' not recognized\n",

• 	shortname, gadget->name);
  

• 		__func__, gadget->name);
  

  device_desc.bcdDevice = __constant_cpu_to_le16(0x9999); }

• debug("%s: calling usb_gadget_connect for "

• 	"controller '%s'\n", shortname, gadget->name);
  

• debug("%s: calling usb_gadget_connect for controller '%s'\n",

• 	__func__, gadget->name);
  

Please split all these cleanups into a separate patch.

[...]

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com --- include/configs/s5p_goni.h | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 24a0fcc..d25c494 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -72,6 +72,7 @@ #define CONFIG_CMD_ONENAND #define CONFIG_CMD_MMC #define CONFIG_CMD_DFU +#define CONFIG_CMD_GPT

/* USB Composite download gadget - g_dnl */ #define CONFIG_USBDOWNLOAD_GADGET @@ -231,6 +232,10 @@ #define CONFIG_FAT_WRITE #define CONFIG_EXT4_WRITE

+/* GPT */ +#define CONFIG_EFI_PARTITION +#define CONFIG_PARTITION_UUIDS + #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)

#define CONFIG_SYS_CACHELINE_SIZE 64

When user attempted to perform a raw write using DFU (vide dfu_fill_entity_mmc) with MMC interface not initialized before, get_mmc_blk_size() reported invalid (zero) block size - it wasn't possible to write ie. a new u-boot image.

This commit fixes that by initializing device in get_mmc_blk_size() when needed.

Tested on Samsung Goni.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com Acked-by: Lukasz Majewski l.majewski@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com --- Changes since v1: - updated overlooked type in DFU_CONFIG_ALT, trats2.h --- drivers/dfu/dfu_mmc.c | 106 ++++++++++++++++++++++++++----------------- include/configs/am335x_evm.h | 8 ++-- include/configs/trats.h | 2 +- include/configs/trats2.h | 2 +- include/dfu.h | 5 -- 5 files changed, 70 insertions(+), 53 deletions(-)

diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index f942758..075e4cd 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -168,66 +168,88 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf, return ret; }

+/* + * @param s Parameter string containing space-separated arguments: + * 1st: + * raw (raw read/write) + * fat (files) + * ext4 (^) + * part (partition image) + * 2nd and 3rd: + * lba_start and lba_size, for raw write + * mmc_dev and mmc_part, for filesystems and part + */ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s) { - int dev, part; - struct mmc *mmc; - block_dev_desc_t *blk_dev; - disk_partition_t partinfo; - char *st; - - dfu->dev_type = DFU_DEV_MMC; - st = strsep(&s, " "); - if (!strcmp(st, "mmc")) { - dfu->layout = DFU_RAW_ADDR; - dfu->data.mmc.lba_start = simple_strtoul(s, &s, 16); - dfu->data.mmc.lba_size = simple_strtoul(++s, &s, 16); - dfu->data.mmc.lba_blk_size = get_mmc_blk_size(dfu->dev_num); - } else if (!strcmp(st, "fat")) { - dfu->layout = DFU_FS_FAT; - } else if (!strcmp(st, "ext4")) { - dfu->layout = DFU_FS_EXT4; - } else if (!strcmp(st, "part")) { + const char *argv[3]; + const char **parg = argv; + for (; parg < argv + sizeof(argv) / sizeof(*argv); ++parg) { + *parg = strsep(&s, " "); + if (*parg == NULL) { + error("Invalid number of arguments.\n"); + return -ENODEV; + } + }

- dfu->layout = DFU_RAW_ADDR; + const char *entity_type = argv[0]; + /* + * Base 0 means we'll accept (prefixed with 0x or 0) base 16, 8, + * with default 10. + */ + size_t second_arg = simple_strtoul(argv[1], NULL, 0); + size_t third_arg = simple_strtoul(argv[2], NULL, 0);

- dev = simple_strtoul(s, &s, 10); - s++; - part = simple_strtoul(s, &s, 10); + struct mmc *mmc = find_mmc_device(dfu->dev_num); + if (mmc == NULL) { + error("Couldn't find MMC device no. %d.\n", dfu->dev_num); + return -ENODEV; + }

- mmc = find_mmc_device(dev); - if (mmc == NULL || mmc_init(mmc)) { - printf("%s: could not find mmc device #%d!\n", - __func__, dev); - return -ENODEV; - } + if (mmc_init(mmc)) { + error("Couldn't init MMC device.\n"); + return -ENODEV; + }

- blk_dev = &mmc->block_dev; - if (get_partition_info(blk_dev, part, &partinfo) != 0) { - printf("%s: could not find partition #%d on mmc device #%d!\n", - __func__, part, dev); + if (!strcmp(entity_type, "raw")) { + dfu->layout = DFU_RAW_ADDR; + dfu->data.mmc.lba_start = second_arg; + dfu->data.mmc.lba_size = third_arg; + dfu->data.mmc.lba_blk_size = mmc->read_bl_len; + } else if (!strcmp(entity_type, "part")) { + disk_partition_t partinfo; + block_dev_desc_t *blk_dev = &mmc->block_dev; + int mmcdev = second_arg; + int mmcpart = third_arg; + + if (get_partition_info(blk_dev, mmcpart, &partinfo) != 0) { + error("Couldn't find part #%d on mmc device #%d\n", + mmcpart, mmcdev); return -ENODEV; }

- dfu->data.mmc.lba_start = partinfo.start; - dfu->data.mmc.lba_size = partinfo.size; - dfu->data.mmc.lba_blk_size = partinfo.blksz; - + dfu->layout = DFU_RAW_ADDR; + dfu->data.mmc.lba_start = partinfo.start; + dfu->data.mmc.lba_size = partinfo.size; + dfu->data.mmc.lba_blk_size = partinfo.blksz; + } else if (!strcmp(entity_type, "fat")) { + dfu->layout = DFU_FS_FAT; + } else if (!strcmp(entity_type, "ext4")) { + dfu->layout = DFU_FS_EXT4; } else { - printf("%s: Memory layout (%s) not supported!\n", __func__, st); + error("Memory layout (%s) not supported!\n", entity_type); return -ENODEV; }

- if (dfu->layout == DFU_FS_EXT4 || dfu->layout == DFU_FS_FAT) { - dfu->data.mmc.dev = simple_strtoul(s, &s, 10); - dfu->data.mmc.part = simple_strtoul(++s, &s, 10); + /* if it's NOT a raw write */ + if (strcmp(entity_type, "raw")) { + dfu->data.mmc.dev = second_arg; + dfu->data.mmc.part = third_arg; }

+ dfu->dev_type = DFU_DEV_MMC; dfu->read_medium = dfu_read_medium_mmc; dfu->write_medium = dfu_write_medium_mmc; dfu->flush_medium = dfu_flush_medium_mmc; - - /* initial state */ dfu->inited = 0;

return 0; diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 4f89556..22a54c1 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -311,10 +311,10 @@ "boot part 0 1;" \ "rootfs part 0 2;" \ "MLO fat 0 1;" \ - "MLO.raw mmc 100 100;" \ - "u-boot.img.raw mmc 300 400;" \ - "spl-os-args.raw mmc 80 80;" \ - "spl-os-image.raw mmc 900 2000;" \ + "MLO.raw mmc 0x100 0x100;" \ + "u-boot.img.raw mmc 0x300 0x400;" \ + "spl-os-args.raw mmc 0x80 0x80;" \ + "spl-os-image.raw mmc 0x900 0x2000;" \ "spl-os-args fat 0 1;" \ "spl-os-image fat 0 1;" \ "u-boot.img fat 0 1;" \ diff --git a/include/configs/trats.h b/include/configs/trats.h index fdd8b46..f4c66c1 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -141,7 +141,7 @@ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

#define CONFIG_DFU_ALT \ - "u-boot mmc 80 400;" \ + "u-boot raw 0x80 0x400;" \ "uImage ext4 0 2;" \ "exynos4210-trats.dtb ext4 0 2;" \ ""PARTS_BOOT" part 0 2;" \ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 83633b0..0a35367 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -172,7 +172,7 @@ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

#define CONFIG_DFU_ALT \ - "u-boot mmc 80 800;" \ + "u-boot raw 0x80 0x800;" \ "uImage ext4 0 2;" \ "exynos4412-trats2.dtb ext4 0 2;" \ ""PARTS_BOOT" part 0 2;" \ diff --git a/include/dfu.h b/include/dfu.h index 9956636..6fd75d0 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -64,11 +64,6 @@ struct ram_internal_data { unsigned int size; };

-static inline unsigned int get_mmc_blk_size(int dev) -{ - return find_mmc_device(dev)->read_bl_len; -} - #define DFU_NAME_SIZE 32 #define DFU_CMD_BUF_SIZE 128 #ifndef CONFIG_SYS_DFU_DATA_BUF_SIZE

mmc_init() doesn't call get_timer() anymore if MMC is already initialized.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Pantelis Antoniou panto@antoniou-consulting.com Cc: Minkyu Kang mk7.kang@samsung.com --- drivers/mmc/mmc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index c6a1c23..730ae01 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1279,15 +1279,18 @@ static int mmc_complete_init(struct mmc *mmc) int mmc_init(struct mmc *mmc) { int err = IN_PROGRESS; - unsigned start = get_timer(0); + unsigned start;

if (mmc->has_init) return 0; + + start = get_timer(0); + if (!mmc->init_in_progress) err = mmc_start_init(mmc); - if (!err || err == IN_PROGRESS) err = mmc_complete_init(mmc); + debug("%s: %d, time %lu\n", __func__, err, get_timer(start)); return err; }

Structure definition used type block_dev_desc_t, defined in part.h, which wasn't included in mmc.h. It worked only in circumstances when common.h, or another header using part.h was incuded in implementation files.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com --- include/mmc.h | 1 + 1 file changed, 1 insertion(+)

diff --git a/include/mmc.h b/include/mmc.h index b65ad9e..afc226a 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -12,6 +12,7 @@

#include <linux/list.h> #include <linux/compiler.h> +#include <part.h>

#define SD_VERSION_SD 0x20000 #define SD_VERSION_3 (SD_VERSION_SD | 0x300)

Configuration file for GONI has been updated to support FAT file system, new mmc partitioning scheme and read linux kernel from eMMC instead of OneNAND.

Signed-off-by: Arkadiusz Wlodarczyk a.wlodarczyk@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com Signed-off-by: Mateusz Zalega m.zalega@samsung.com Tested-by: Arkadiusz Wlodarczyk a.wlodarczyk@samsung.com Tested-by: Mateusz Zalega m.zalega@gmail.com Cc: Minkyu Kang mk7.kang@samsung.com --- include/configs/s5p_goni.h | 56 +++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 991c43e..b9b66c7 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -17,6 +17,7 @@ #define CONFIG_S5PC110 1 /* which is in a S5PC110 */ #define CONFIG_MACH_GONI 1 /* working with Goni */

+#include <linux/sizes.h> #include <asm/arch/cpu.h> /* get chip and board defs */

#define CONFIG_ARCH_CPU_INIT @@ -38,11 +39,9 @@ #define CONFIG_INITRD_TAG #define CONFIG_CMDLINE_EDITING

-/* - * Size of malloc() pool - * 1MB = 0x100000, 0x100000 = 1024 * 1024 - */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20)) +/* Size of malloc() pool.*/ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_1M) + /* * select serial console configuration */ @@ -90,30 +89,25 @@ ",7m(kernel)"\ ",1m(log)"\ ",12m(modem)"\ - ",60m(qboot)"\ - ",-(UBI)\0" + ",60m(qboot)\0"

#define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT

-#define CONFIG_BOOTCOMMAND "run ubifsboot" +#define CONFIG_BOOTCOMMAND "run mmcboot"

#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"

-#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext2" \ +#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \ " ${console} ${meminfo}"

#define CONFIG_COMMON_BOOT "${console} ${meminfo} ${mtdparts}"

-#define CONFIG_BOOTARGS "root=/dev/mtdblock8 ubi.mtd=8 ubi.mtd=3 ubi.mtd=6" \ - " rootfstype=cramfs " CONFIG_COMMON_BOOT +#define CONFIG_BOOTARGS "root=/dev/mtdblock8 rootfstype=ext4 " \ + CONFIG_COMMON_BOOT

#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x100000;" \ " onenand write 0x32008000 0x0 0x100000\0"

-#define CONFIG_UBI_MTD " ubi.mtd=${ubiblock} ubi.mtd=3 ubi.mtd=6" - -#define CONFIG_UBIFS_OPTION "rootflags=bulk_read,no_chk_data_crc" - #define CONFIG_MISC_COMMON #define CONFIG_MISC_INIT_R

@@ -130,36 +124,38 @@ "onenand erase 0x01560000 0x1eaa0000;" \ "onenand write 0x32000000 0x1260000 0x8C0000\0" \ "bootk=" \ - "onenand read 0x30007FC0 0xc00000 0x600000;" \ + "run loaduimage;" \ "bootm 0x30007FC0\0" \ "flashboot=" \ "set bootargs root=/dev/mtdblock${bootblock} " \ - "rootfstype=${rootfstype}" CONFIG_UBI_MTD " ${opts} " \ + "rootfstype=${rootfstype} ${opts} " \ "${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \ "ubifsboot=" \ "set bootargs root=ubi0!rootfs rootfstype=ubifs " \ - CONFIG_UBIFS_OPTION CONFIG_UBI_MTD " ${opts} ${lcdinfo} " \ + "${opts} ${lcdinfo} " \ CONFIG_COMMON_BOOT "; run bootk\0" \ "tftpboot=" \ "set bootargs root=ubi0!rootfs rootfstype=ubifs " \ - CONFIG_UBIFS_OPTION CONFIG_UBI_MTD " ${opts} ${lcdinfo} " \ - CONFIG_COMMON_BOOT "; tftp 0x30007FC0 uImage; " \ - "bootm 0x30007FC0\0" \ + "${opts} ${lcdinfo} " CONFIG_COMMON_BOOT \ + "; tftp 0x30007FC0 uImage; bootm 0x30007FC0\0" \ "ramboot=" \ "set bootargs " CONFIG_RAMDISK_BOOT \ - " initrd=0x33000000,8M ramdisk=8192\0" \ + "initrd=0x33000000,8M ramdisk=8192\0" \ "mmcboot=" \ - "set bootargs root=${mmcblk} rootfstype=${rootfstype}" \ - CONFIG_UBI_MTD " ${opts} ${lcdinfo} " \ + "set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \ + "rootfstype=${rootfstype} ${opts} ${lcdinfo} " \ CONFIG_COMMON_BOOT "; run bootk\0" \ "boottrace=setenv opts initcall_debug; run bootcmd\0" \ "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \ "verify=n\0" \ - "rootfstype=cramfs\0" \ + "rootfstype=ext4\0" \ "console=" CONFIG_DEFAULT_CONSOLE \ "mtdparts=" MTDPARTS_DEFAULT \ "meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \ - "mmcblk=/dev/mmcblk1p1\0" \ + "loaduimage=fatload mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ + "mmcdev=0\0" \ + "mmcbootpart=2\0" \ + "mmcrootpart=5\0" \ "bootblock=9\0" \ "ubiblock=8\0" \ "ubi=enabled\0" \ @@ -202,6 +198,13 @@

#define CONFIG_DOS_PARTITION 1

+#define CONFIG_CMD_FAT +#define CONFIG_CMD_EXT4 + +/* write support for filesystems */ +#define CONFIG_FAT_WRITE +#define CONFIG_EXT4_WRITE + #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)

#define CONFIG_SYS_CACHELINE_SIZE 64 @@ -226,5 +229,6 @@ #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_S3C_UDC_OTG #define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW 2

#endif /* __CONFIG_H */

Hi Mateusz,

Former usb_cable_connected() patch broke compilation of boards which do not support this feature.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com

---

common/cmd_usb_mass_storage.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 5f557d5..5175bd5 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -45,6 +45,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, /* Timeout unit: seconds */ int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT;

+#ifdef CONFIG_USB_CABLE_CHECK if (!usb_cable_connected()) { puts("Please connect USB cable.\n");

@@ -65,6 +66,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, } puts("\r\n"); } +#endif

while (1) { usb_gadget_handle_interrupts();

Acked-by: Lukasz Majewski l.majewski@samsung.com

Preprocessor definitions and hardcoded implementation selection in g_dnl core were replaced by a linker list made of (usb_function_name, bind_callback) pairs.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Marek Vasut marex@denx.de --- common/cmd_dfu.c | 3 +- common/cmd_thordown.c | 3 +- common/cmd_usb_mass_storage.c | 2 +- drivers/usb/gadget/f_dfu.c | 3 ++ drivers/usb/gadget/f_mass_storage.c | 3 ++ drivers/usb/gadget/f_thor.c | 2 ++ drivers/usb/gadget/g_dnl.c | 64 ++++++++++++++++--------------------- include/dfu.h | 7 ---- include/g_dnl.h | 24 ++++++++++++++ include/thor.h | 8 ----- include/usb_mass_storage.h | 8 ----- 11 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c index 5547678..a03538d 100644 --- a/common/cmd_dfu.c +++ b/common/cmd_dfu.c @@ -22,7 +22,6 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

- char *s = "dfu"; int ret, i = 0;

ret = dfu_init_env_entities(interface, simple_strtoul(devstring, @@ -38,7 +37,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int controller_index = simple_strtoul(usb_controller, NULL, 0); board_usb_init(controller_index, USB_INIT_DEVICE);

- g_dnl_register(s); + g_dnl_register("usb_dnl_dfu"); while (1) { if (dfu_reset()) /* diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index c4b3511..2dd7509 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -22,7 +22,6 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

- const char *s = "thor"; int ret;

puts("TIZEN "THOR" Downloader\n"); @@ -40,7 +39,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) goto exit; }

- g_dnl_register(s); + g_dnl_register("usb_dnl_thor");

ret = thor_init(); if (ret) { diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 5175bd5..4c2de48 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -40,7 +40,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; }

- g_dnl_register("ums"); + g_dnl_register("usb_dnl_ums");

/* Timeout unit: seconds */ int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT; diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index a045864..2f822c4 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -24,6 +24,7 @@ #include <linux/usb/composite.h>

#include <dfu.h> +#include <g_dnl.h> #include "f_dfu.h"

struct f_dfu { @@ -781,3 +782,5 @@ int dfu_add(struct usb_configuration *c)

return dfu_bind_config(c); } + +DECLARE_GADGET_BIND_CALLBACK(usb_dnl_dfu, dfu_add); diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index f896169..f88bb12 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -255,6 +255,7 @@ #include <linux/usb/gadget.h> #include <linux/usb/composite.h> #include <usb/lin_gadget_compat.h> +#include <g_dnl.h>

/*------------------------------------------------------------------------*/

@@ -2778,3 +2779,5 @@ int fsg_init(struct ums *ums_dev)

return 0; } + +DECLARE_GADGET_BIND_CALLBACK(usb_dnl_ums, fsg_add); diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index f5c0224..59d246d 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -999,3 +999,5 @@ int thor_add(struct usb_configuration *c) debug("%s:\n", __func__); return thor_func_init(c); } + +DECLARE_GADGET_BIND_CALLBACK(usb_dnl_thor, thor_add); diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index dd95afe..3575aca 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -41,7 +41,6 @@

#define DRIVER_VERSION "usb_dnl 2.0"

-static const char shortname[] = "usb_dnl_"; static const char product[] = "USB download gadget"; static char g_dnl_serial[MAX_STRING_SERIAL]; static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER; @@ -96,29 +95,36 @@ static int g_dnl_unbind(struct usb_composite_dev *cdev) free(cdev->config); cdev->config = NULL; debug("%s: calling usb_gadget_disconnect for " - "controller '%s'\n", shortname, gadget->name); + "controller '%s'\n", __func__, gadget->name); usb_gadget_disconnect(gadget);

return 0; }

+static inline struct g_dnl_bind_callback * g_dnl_bind_callback_first(void) +{ + return ll_entry_start(struct g_dnl_bind_callback, + g_dnl_bind_callbacks); +} + +static inline struct g_dnl_bind_callback * g_dnl_bind_callback_end(void) +{ + return ll_entry_end(struct g_dnl_bind_callback, + g_dnl_bind_callbacks); +} + static int g_dnl_do_config(struct usb_configuration *c) { const char *s = c->cdev->driver->name; - int ret = -1; + struct g_dnl_bind_callback *callback = g_dnl_bind_callback_first();

debug("%s: configuration: 0x%p composite dev: 0x%p\n", __func__, c, c->cdev);

- printf("GADGET DRIVER: %s\n", s); - if (!strcmp(s, "usb_dnl_dfu")) - ret = dfu_add(c); - else if (!strcmp(s, "usb_dnl_ums")) - ret = fsg_add(c); - else if (!strcmp(s, "usb_dnl_thor")) - ret = thor_add(c); - - return ret; + for (; callback != g_dnl_bind_callback_end(); callback++) + if (!strcmp(s, callback->usb_function_name)) + return callback->fptr(c); + return -ENODEV; }

static int g_dnl_config_register(struct usb_composite_dev *cdev) @@ -203,12 +209,12 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) device_desc.bcdDevice = cpu_to_le16(gcnum); else { debug("%s: controller '%s' not recognized\n", - shortname, gadget->name); + __func__, gadget->name); device_desc.bcdDevice = __constant_cpu_to_le16(0x9999); }

debug("%s: calling usb_gadget_connect for " - "controller '%s'\n", shortname, gadget->name); + "controller '%s'\n", __func__, gadget->name); usb_gadget_connect(gadget);

return 0; @@ -227,36 +233,22 @@ static struct usb_composite_driver g_dnl_driver = { .unbind = g_dnl_unbind, };

-int g_dnl_register(const char *type) +/* + * NOTICE: + * Registering via USB function name won't be necessary after rewriting + * g_dnl to support multiple USB functions. + */ +int g_dnl_register(const char *name) { - /* The largest function name is 4 */ - static char name[sizeof(shortname) + 4]; - int ret; - - if (!strcmp(type, "dfu")) { - strcpy(name, shortname); - strcat(name, type); - } else if (!strcmp(type, "ums")) { - strcpy(name, shortname); - strcat(name, type); - } else if (!strcmp(type, "thor")) { - strcpy(name, shortname); - strcat(name, type); - } else { - printf("%s: unknown command: %s\n", __func__, type); - return -EINVAL; - } + int ret = usb_composite_register(&g_dnl_driver);

+ debug("%s: g_dnl_driver.name = %s\n", __func__, name); g_dnl_driver.name = name;

- debug("%s: g_dnl_driver.name: %s\n", __func__, g_dnl_driver.name); - ret = usb_composite_register(&g_dnl_driver); - if (ret) { printf("%s: failed!, error: %d\n", __func__, ret); return ret; } - return 0; }

diff --git a/include/dfu.h b/include/dfu.h index f973426..9956636 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -169,12 +169,5 @@ static inline int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s) } #endif

-#ifdef CONFIG_DFU_FUNCTION int dfu_add(struct usb_configuration *c); -#else -int dfu_add(struct usb_configuration *c) -{ - return 0; -} -#endif #endif /* __DFU_ENTITY_H_ */ diff --git a/include/g_dnl.h b/include/g_dnl.h index 8f813c2..fb20bf0 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -10,6 +10,30 @@

#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> +#include <linux/usb/composite.h> +#include <linker_lists.h> + +/* + * @usb_fname: unescaped USB function name + * @callback_ptr: bind callback, one per function name + */ +#define DECLARE_GADGET_BIND_CALLBACK(usb_fname, callback_ptr) \ + ll_entry_declare(struct g_dnl_bind_callback, \ + __usb_function_name_##usb_fname, \ + g_dnl_bind_callbacks) = { \ + .usb_function_name = #usb_fname, \ + .fptr = callback_ptr \ + } + +typedef int (*g_dnl_bind_callback_f)(struct usb_configuration *); + +/* used in Gadget downloader callback linker list */ +struct g_dnl_bind_callback +{ + const char *usb_function_name; + g_dnl_bind_callback_f fptr; +}; + int g_dnl_bind_fixup(struct usb_device_descriptor *, const char *); int g_dnl_register(const char *s); void g_dnl_unregister(void); diff --git a/include/thor.h b/include/thor.h index afeade4..5051be7 100644 --- a/include/thor.h +++ b/include/thor.h @@ -15,13 +15,5 @@

int thor_handle(void); int thor_init(void); - -#ifdef CONFIG_THOR_FUNCTION int thor_add(struct usb_configuration *c); -#else -int thor_add(struct usb_configuration *c) -{ - return 0; -} -#endif #endif /* __THOR_H_ */ diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index 058dcf1..ed46064 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -40,13 +40,5 @@ int fsg_init(struct ums *); void fsg_cleanup(void); struct ums *ums_init(unsigned int); int fsg_main_thread(void *); - -#ifdef CONFIG_USB_GADGET_MASS_STORAGE int fsg_add(struct usb_configuration *c); -#else -int fsg_add(struct usb_configuration *c) -{ - return 0; -} -#endif #endif /* __USB_MASS_STORAGE_H__ */

Hi Mateusz,

Preprocessor definitions and hardcoded implementation selection in g_dnl core were replaced by a linker list made of (usb_function_name, bind_callback) pairs.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Marek Vasut marex@denx.de

---

common/cmd_dfu.c | 3 +- common/cmd_thordown.c | 3 +- common/cmd_usb_mass_storage.c | 2 +- drivers/usb/gadget/f_dfu.c | 3 ++ drivers/usb/gadget/f_mass_storage.c | 3 ++ drivers/usb/gadget/f_thor.c | 2 ++ drivers/usb/gadget/g_dnl.c | 64 ++++++++++++++++--------------------- include/dfu.h | 7 ---- include/g_dnl.h | 24 ++++++++++++++ include/thor.h | 8 ----- include/usb_mass_storage.h | 8 ----- 11 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c index 5547678..a03538d 100644 --- a/common/cmd_dfu.c +++ b/common/cmd_dfu.c @@ -22,7 +22,6 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

• char *s = "dfu"; int ret, i = 0;

  ret = dfu_init_env_entities(interface,

simple_strtoul(devstring, @@ -38,7 +37,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int controller_index = simple_strtoul(usb_controller, NULL, 0); board_usb_init(controller_index, USB_INIT_DEVICE);

• g_dnl_register(s);

• g_dnl_register("usb_dnl_dfu"); while (1) { if (dfu_reset()) /*

diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index c4b3511..2dd7509 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -22,7 +22,6 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

• const char *s = "thor"; int ret;

  puts("TIZEN "THOR" Downloader\n");

@@ -40,7 +39,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) goto exit; }

• g_dnl_register(s);

• g_dnl_register("usb_dnl_thor");

  ret = thor_init(); if (ret) {

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 5175bd5..4c2de48 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -40,7 +40,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; }

• g_dnl_register("ums");

• g_dnl_register("usb_dnl_ums");

  /* Timeout unit: seconds */ int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT;

diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index a045864..2f822c4 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -24,6 +24,7 @@ #include <linux/usb/composite.h>

#include <dfu.h> +#include <g_dnl.h> #include "f_dfu.h"

struct f_dfu { @@ -781,3 +782,5 @@ int dfu_add(struct usb_configuration *c)

return dfu_bind_config(c); }

+DECLARE_GADGET_BIND_CALLBACK(usb_dnl_dfu, dfu_add); diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index f896169..f88bb12 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -255,6 +255,7 @@ #include <linux/usb/gadget.h> #include <linux/usb/composite.h> #include <usb/lin_gadget_compat.h> +#include <g_dnl.h>

/*------------------------------------------------------------------------*/

@@ -2778,3 +2779,5 @@ int fsg_init(struct ums *ums_dev)

return 0; }

+DECLARE_GADGET_BIND_CALLBACK(usb_dnl_ums, fsg_add); diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index f5c0224..59d246d 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -999,3 +999,5 @@ int thor_add(struct usb_configuration *c) debug("%s:\n", __func__); return thor_func_init(c); }

+DECLARE_GADGET_BIND_CALLBACK(usb_dnl_thor, thor_add); diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index dd95afe..3575aca 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -41,7 +41,6 @@

#define DRIVER_VERSION "usb_dnl 2.0"

-static const char shortname[] = "usb_dnl_"; static const char product[] = "USB download gadget"; static char g_dnl_serial[MAX_STRING_SERIAL]; static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER; @@ -96,29 +95,36 @@ static int g_dnl_unbind(struct usb_composite_dev *cdev) free(cdev->config); cdev->config = NULL; debug("%s: calling usb_gadget_disconnect for "

• 	"controller '%s'\n", shortname,
  

gadget->name);

• 	"controller '%s'\n", __func__, gadget->name);
  

  usb_gadget_disconnect(gadget);

  return 0;

}

+static inline struct g_dnl_bind_callback * g_dnl_bind_callback_first(void) +{

• return ll_entry_start(struct g_dnl_bind_callback,

• 		g_dnl_bind_callbacks);
  

+}

+static inline struct g_dnl_bind_callback * g_dnl_bind_callback_end(void) +{

• return ll_entry_end(struct g_dnl_bind_callback,

• 		g_dnl_bind_callbacks);
  

+}

static int g_dnl_do_config(struct usb_configuration *c) { const char *s = c->cdev->driver->name;

• int ret = -1;

• struct g_dnl_bind_callback *callback =

g_dnl_bind_callback_first(); debug("%s: configuration: 0x%p composite dev: 0x%p\n", __func__, c, c->cdev);

• printf("GADGET DRIVER: %s\n", s);
• if (!strcmp(s, "usb_dnl_dfu"))

• ret = dfu_add(c);
  

• else if (!strcmp(s, "usb_dnl_ums"))

• ret = fsg_add(c);
  

• else if (!strcmp(s, "usb_dnl_thor"))

• ret = thor_add(c);
  

• return ret;

• for (; callback != g_dnl_bind_callback_end(); callback++)

• if (!strcmp(s, callback->usb_function_name))
  

• 	return callback->fptr(c);
  

• return -ENODEV;

}

static int g_dnl_config_register(struct usb_composite_dev *cdev) @@ -203,12 +209,12 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) device_desc.bcdDevice = cpu_to_le16(gcnum); else { debug("%s: controller '%s' not recognized\n",

• 	shortname, gadget->name);
  

• 	__func__, gadget->name);
  

  device_desc.bcdDevice =

__constant_cpu_to_le16(0x9999); }

debug("%s: calling usb_gadget_connect for "

• 	"controller '%s'\n", shortname,
  

gadget->name);

• 	"controller '%s'\n", __func__, gadget->name);
  

  usb_gadget_connect(gadget);

  return 0;

@@ -227,36 +233,22 @@ static struct usb_composite_driver g_dnl_driver = { .unbind = g_dnl_unbind, };

-int g_dnl_register(const char *type) +/*

• • NOTICE:
• • Registering via USB function name won't be necessary after

rewriting

• • g_dnl to support multiple USB functions.
• */

+int g_dnl_register(const char *name) {

• /* The largest function name is 4 */
• static char name[sizeof(shortname) + 4];
• int ret;
• if (!strcmp(type, "dfu")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else if (!strcmp(type, "ums")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else if (!strcmp(type, "thor")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else {

• printf("%s: unknown command: %s\n", __func__, type);
  

• return -EINVAL;
  

• }

• int ret = usb_composite_register(&g_dnl_driver);

• debug("%s: g_dnl_driver.name = %s\n", __func__, name); g_dnl_driver.name = name;

• debug("%s: g_dnl_driver.name: %s\n", __func__,

g_dnl_driver.name);

• ret = usb_composite_register(&g_dnl_driver);
• if (ret) { printf("%s: failed!, error: %d\n", __func__, ret); return ret; }
• return 0;

}

diff --git a/include/dfu.h b/include/dfu.h index f973426..9956636 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -169,12 +169,5 @@ static inline int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s) } #endif

-#ifdef CONFIG_DFU_FUNCTION int dfu_add(struct usb_configuration *c); -#else -int dfu_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __DFU_ENTITY_H_ */ diff --git a/include/g_dnl.h b/include/g_dnl.h index 8f813c2..fb20bf0 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -10,6 +10,30 @@

#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> +#include <linux/usb/composite.h> +#include <linker_lists.h>

+/*

• • @usb_fname: unescaped USB function name
• • @callback_ptr: bind callback, one per function name
• */

+#define DECLARE_GADGET_BIND_CALLBACK(usb_fname, callback_ptr) \

• ll_entry_declare(struct g_dnl_bind_callback, \

• 	__usb_function_name_##usb_fname, \
  

• 	g_dnl_bind_callbacks) = { \
  

• 		.usb_function_name = #usb_fname, \
  

• 		.fptr = callback_ptr \
  

• 	}
  

+typedef int (*g_dnl_bind_callback_f)(struct usb_configuration *);

+/* used in Gadget downloader callback linker list */ +struct g_dnl_bind_callback +{

• const char *usb_function_name;
• g_dnl_bind_callback_f fptr;

+};

int g_dnl_bind_fixup(struct usb_device_descriptor *, const char *); int g_dnl_register(const char *s); void g_dnl_unregister(void); diff --git a/include/thor.h b/include/thor.h index afeade4..5051be7 100644 --- a/include/thor.h +++ b/include/thor.h @@ -15,13 +15,5 @@

int thor_handle(void); int thor_init(void);

-#ifdef CONFIG_THOR_FUNCTION int thor_add(struct usb_configuration *c); -#else -int thor_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __THOR_H_ */ diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index 058dcf1..ed46064 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -40,13 +40,5 @@ int fsg_init(struct ums *); void fsg_cleanup(void); struct ums *ums_init(unsigned int); int fsg_main_thread(void *);

-#ifdef CONFIG_USB_GADGET_MASS_STORAGE int fsg_add(struct usb_configuration *c); -#else -int fsg_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __USB_MASS_STORAGE_H__ */

Acked-by: Lukasz Majewski l.majewski@samsung.com

Proper adjustment for supporting DFU at GONI target has been made. The s5p_goni.h file has been updated. Moreover the code for low level USB initialization has been added to GONI board code.

The malloc pool has been enlarged in order to support larger buffer sizes needed by DFU implementation.

Signed-off-by: Arkadiusz Wlodarczyk a.wlodarczyk@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com Signed-off-by: Mateusz Zalega m.zalega@samsung.com Tested-by: Arkadiusz Wlodarczyk a.wlodarczyk@samsung.com Tested-by: Mateusz Zalega m.zalega@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com --- board/samsung/goni/goni.c | 8 +++++++ include/configs/s5p_goni.h | 54 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index 61b9ece..273fa42 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -14,6 +14,8 @@ #include <asm/arch/cpu.h> #include <power/max8998_pmic.h> #include <samsung/misc.h> +#include <usb.h> +#include <usb_mass_storage.h>

DECLARE_GLOBAL_DATA_PTR;

@@ -179,6 +181,12 @@ struct s3c_plat_otg_data s5pc110_otg_data = { .regs_otg = S5PC110_OTG_BASE, .usb_phy_ctrl = S5PC110_USB_PHY_CONTROL, }; + +int board_usb_init(int index, enum usb_init_type init) +{ + debug("USB_udc_probe\n"); + return s3c_udc_probe(&s5pc110_otg_data); +} #endif

#ifdef CONFIG_MISC_INIT_R diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index b9b66c7..f97b52d 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -40,7 +40,7 @@ #define CONFIG_CMDLINE_EDITING

/* Size of malloc() pool.*/ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 80 * SZ_1M)

/* * select serial console configuration @@ -71,14 +71,18 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_REGINFO #define CONFIG_CMD_ONENAND -#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MMC +#define CONFIG_CMD_DFU

-#define CONFIG_BOOTDELAY 1 -#define CONFIG_ZERO_BOOTDELAY_CHECK +/* USB Composite download gadget - g_dnl */ +#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC

-#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS +/* USB Samsung's IDs */ +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 +#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 +#define CONFIG_G_DNL_MANUFACTURER "Samsung"

/* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ #define MTDIDS_DEFAULT "onenand0=samsung-onenand" @@ -91,7 +95,34 @@ ",12m(modem)"\ ",60m(qboot)\0"

-#define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT +#define CONFIG_BOOTDELAY 1 +#define CONFIG_ZERO_BOOTDELAY_CHECK + +/* partitions definitions */ +#define PARTS_CSA "csa-mmc" +#define PARTS_BOOTLOADER "u-boot" +#define PARTS_BOOT "boot" +#define PARTS_ROOT "platform" +#define PARTS_DATA "data" +#define PARTS_CSC "csc" +#define PARTS_UMS "ums" + +#define CONFIG_DFU_ALT \ + "u-boot raw 0x80 0x400;" \ + "uImage ext4 0 2;" \ + "exynos3-goni.dtb ext4 0 2;" \ + ""PARTS_ROOT" part 0 5\0" + +#define PARTS_DEFAULT \ + "uuid_disk=${uuid_gpt_disk};" \ + "name="PARTS_CSA",size=8MiB,uuid=${uuid_gpt_"PARTS_CSA"};" \ + "name="PARTS_BOOTLOADER",size=60MiB," \ + "uuid=${uuid_gpt_"PARTS_BOOTLOADER"};" \ + "name="PARTS_BOOT",size=100MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \ + "name="PARTS_ROOT",size=1GiB,uuid=${uuid_gpt_"PARTS_ROOT"};" \ + "name="PARTS_DATA",size=3GiB,uuid=${uuid_gpt_"PARTS_DATA"};" \ + "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \ + "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

#define CONFIG_BOOTCOMMAND "run mmcboot"

@@ -150,18 +181,18 @@ "verify=n\0" \ "rootfstype=ext4\0" \ "console=" CONFIG_DEFAULT_CONSOLE \ - "mtdparts=" MTDPARTS_DEFAULT \ "meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \ - "loaduimage=fatload mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ + "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ "mmcdev=0\0" \ "mmcbootpart=2\0" \ "mmcrootpart=5\0" \ + "partitions=" PARTS_DEFAULT \ "bootblock=9\0" \ "ubiblock=8\0" \ "ubi=enabled\0" \ - "opts=always_resume=1" + "opts=always_resume=1\0" \ + "dfu_alt_info=" CONFIG_DFU_ALT "\0"

-/* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_PROMPT "Goni # " @@ -200,6 +231,7 @@

#define CONFIG_CMD_FAT #define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE

/* write support for filesystems */ #define CONFIG_FAT_WRITE

UMS-related defines were added to Samsung Goni config header.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com --- include/configs/s5p_goni.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index c52a00a..f551c22 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -267,5 +267,7 @@ #define CONFIG_USB_GADGET_S3C_UDC_OTG #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 +#define CONFIG_CMD_USB_MASS_STORAGE +#define CONFIG_USB_GADGET_MASS_STORAGE

#endif /* __CONFIG_H */

mmc_init() doesn't call get_timer() anymore if MMC is already initialized.

Change-Id: Ib4e0f5a04316c604e6a77a0679d42ff61d5641d2 Signed-off-by: Mateusz Zalega m.zalega@samsung.com --- drivers/mmc/mmc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 8ab0bc9..9da31f5 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1279,15 +1279,18 @@ static int mmc_complete_init(struct mmc *mmc) int mmc_init(struct mmc *mmc) { int err = IN_PROGRESS; - unsigned start = get_timer(0); + unsigned start;

if (mmc->has_init) return 0; + + start = get_timer(0); + if (!mmc->init_in_progress) err = mmc_start_init(mmc); - if (!err || err == IN_PROGRESS) err = mmc_complete_init(mmc); + debug("%s: %d, time %lu\n", __func__, err, get_timer(start)); return err; }

Hi Mateusz,

In some cases MMC was still uninitialized while media capacity check, leading to broken ums command.

Tested on Samsung Goni.

Change-Id: I4b86c2c59e430fb8b55272ea14f00316d8cb3dca Signed-off-by: Mateusz Zalega m.zalega@samsung.com Tested-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com

---

board/samsung/common/ums.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index dc155ad..1375138 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -35,10 +35,10 @@ static struct ums ums_dev = { .name = "UMS disk", };

-static struct ums *ums_disk_init(struct mmc *mmc) +static struct ums *ums_disk_init(const struct mmc *mmc) {

• uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE;
• uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR;

• const uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE;
• const uint64_t ums_end_sector = UMS_NUM_SECTORS +

UMS_START_SECTOR; if (!mmc_end_sector) { error("MMC capacity is not valid"); @@ -66,11 +66,9 @@ static struct ums *ums_disk_init(struct mmc *mmc)

struct ums *ums_init(unsigned int dev_num) {

• struct mmc *mmc = NULL;

• struct mmc *mmc = find_mmc_device(dev_num);

• mmc = find_mmc_device(dev_num);
• if (!mmc)

• if (!mmc || mmc_init(mmc)) return NULL;

• return ums_disk_init(mmc);

}

Acked-by: Lukasz Majewski l.majewski@samsung.com

On Monday, March 31, 2014 at 05:49:12 PM, Mateusz Zalega wrote:

Change-Id: Id1bab29ec026d83f7e811ba82802aad33f77bea0

You samsung guys need to fix your mailers ... and you need to learn to write commit messages.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Marek Vasut marex@denx.de Cc: Tom Rini trini@ti.com

Other than that, please add this for V2:

Acked-by: Marek Vasut marex@denx.de

---

include/linker_lists.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linker_lists.h b/include/linker_lists.h index 997d149..557e627 100644 --- a/include/linker_lists.h +++ b/include/linker_lists.h @@ -228,7 +228,7 @@

• and it's name.
• Example:

• • ll_entry_declare(struct my_sub_cmd, my_sub_cmd, cmd_sub, cmd.sub) = {

• • ll_entry_declare(struct my_sub_cmd, my_sub_cmd, cmd_sub) = {

  •     .x = 3,
    

  •     .y = 4,
    

  • };

Best regards, Marek Vasut

Implementation made use of types defined in common.h, even though it wasn't #included. It worked in circumstances when .c files included every needed header (all).

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Tom Rini trini@ti.com Cc: Minkyu Kang mk7.kang@samsung.com --- include/part.h | 1 + 1 file changed, 1 insertion(+)

diff --git a/include/part.h b/include/part.h index 4beb6db..53532dc 100644 --- a/include/part.h +++ b/include/part.h @@ -8,6 +8,7 @@ #define _PART_H

#include <ide.h> +#include <common.h>

typedef struct block_dev_desc { int if_type; /* type of the interface */

mmc_init() doesn't call get_timer() anymore if MMC is already initialized.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Pantelis Antoniou panto@antoniou-consulting.com Cc: Minkyu Kang mk7.kang@samsung.com --- drivers/mmc/mmc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 16051e5..c93dc24 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1310,15 +1310,18 @@ static int mmc_complete_init(struct mmc *mmc) int mmc_init(struct mmc *mmc) { int err = IN_PROGRESS; - unsigned start = get_timer(0); + unsigned start;

if (mmc->has_init) return 0; + + start = get_timer(0); + if (!mmc->init_in_progress) err = mmc_start_init(mmc); - if (!err || err == IN_PROGRESS) err = mmc_complete_init(mmc); + debug("%s: %d, time %lu\n", __func__, err, get_timer(start)); return err; }

In some cases MMC was still uninitialized while media capacity check, leading to broken ums command.

Tested on Samsung Goni.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Tested-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com --- board/samsung/common/ums.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index dc155ad..dec2963 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -37,8 +37,8 @@ static struct ums ums_dev = {

static struct ums *ums_disk_init(struct mmc *mmc) { - uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE; - uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR; + const uint64_t mmc_end_sector = mmc->capacity / SECTOR_SIZE; + const uint64_t ums_end_sector = UMS_NUM_SECTORS + UMS_START_SECTOR;

if (!mmc_end_sector) { error("MMC capacity is not valid"); @@ -66,11 +66,9 @@ static struct ums *ums_disk_init(struct mmc *mmc)

struct ums *ums_init(unsigned int dev_num) { - struct mmc *mmc = NULL; + struct mmc *mmc = find_mmc_device(dev_num);

- mmc = find_mmc_device(dev_num); - if (!mmc) + if (!mmc || mmc_init(mmc)) return NULL; - return ums_disk_init(mmc); }

Future patches will make DFU too large to fit in this board's SPL build.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Tom Rini trini@ti.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com --- include/configs/am335x_evm.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 4147f9f..670e3f1 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -312,6 +312,7 @@ #endif

/* USB Device Firmware Update support */ +#ifndef CONFIG_SPL_BUILD #define CONFIG_DFU_FUNCTION #define CONFIG_DFU_MMC #define CONFIG_CMD_DFU @@ -354,6 +355,7 @@ DFU_ALT_INFO_MMC \ DFU_ALT_INFO_RAM \ DFU_ALT_INFO_NAND +#endif

/* * Default to using SPI for environment, etc.

Preprocessor definitions and hardcoded implementation selection in g_dnl core were replaced by a linker list made of (usb_function_name, bind_callback) pairs.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Marek Vasut marex@denx.de Cc: Minkyu Kang mk7.kang@samsung.com --- common/cmd_dfu.c | 3 +- common/cmd_thordown.c | 3 +- common/cmd_usb_mass_storage.c | 2 +- drivers/usb/gadget/f_dfu.c | 3 ++ drivers/usb/gadget/f_mass_storage.c | 3 ++ drivers/usb/gadget/f_thor.c | 2 ++ drivers/usb/gadget/g_dnl.c | 64 ++++++++++++++++--------------------- include/dfu.h | 7 ---- include/g_dnl.h | 24 ++++++++++++++ include/thor.h | 8 ----- include/usb_mass_storage.h | 8 ----- 11 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c index 5547678..a03538d 100644 --- a/common/cmd_dfu.c +++ b/common/cmd_dfu.c @@ -22,7 +22,6 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

- char *s = "dfu"; int ret, i = 0;

ret = dfu_init_env_entities(interface, simple_strtoul(devstring, @@ -38,7 +37,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int controller_index = simple_strtoul(usb_controller, NULL, 0); board_usb_init(controller_index, USB_INIT_DEVICE);

- g_dnl_register(s); + g_dnl_register("usb_dnl_dfu"); while (1) { if (dfu_reset()) /* diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index c4b3511..2dd7509 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -22,7 +22,6 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

- const char *s = "thor"; int ret;

puts("TIZEN "THOR" Downloader\n"); @@ -40,7 +39,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) goto exit; }

- g_dnl_register(s); + g_dnl_register("usb_dnl_thor");

ret = thor_init(); if (ret) { diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 2f69a53..ab10ea6 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -40,7 +40,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; }

- g_dnl_register("ums"); + g_dnl_register("usb_dnl_ums");

#ifdef CONFIG_USB_CABLE_CHECK /* Timeout unit: seconds */ diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index de75ff1..1b1e179 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -24,6 +24,7 @@ #include <linux/usb/composite.h>

#include <dfu.h> +#include <g_dnl.h> #include "f_dfu.h"

struct f_dfu { @@ -817,3 +818,5 @@ int dfu_add(struct usb_configuration *c)

return dfu_bind_config(c); } + +DECLARE_GADGET_BIND_CALLBACK(usb_dnl_dfu, dfu_add); diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index f896169..f88bb12 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -255,6 +255,7 @@ #include <linux/usb/gadget.h> #include <linux/usb/composite.h> #include <usb/lin_gadget_compat.h> +#include <g_dnl.h>

/*------------------------------------------------------------------------*/

@@ -2778,3 +2779,5 @@ int fsg_init(struct ums *ums_dev)

return 0; } + +DECLARE_GADGET_BIND_CALLBACK(usb_dnl_ums, fsg_add); diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index f5c0224..59d246d 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -999,3 +999,5 @@ int thor_add(struct usb_configuration *c) debug("%s:\n", __func__); return thor_func_init(c); } + +DECLARE_GADGET_BIND_CALLBACK(usb_dnl_thor, thor_add); diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index dd95afe..3575aca 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -41,7 +41,6 @@

#define DRIVER_VERSION "usb_dnl 2.0"

-static const char shortname[] = "usb_dnl_"; static const char product[] = "USB download gadget"; static char g_dnl_serial[MAX_STRING_SERIAL]; static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER; @@ -96,29 +95,36 @@ static int g_dnl_unbind(struct usb_composite_dev *cdev) free(cdev->config); cdev->config = NULL; debug("%s: calling usb_gadget_disconnect for " - "controller '%s'\n", shortname, gadget->name); + "controller '%s'\n", __func__, gadget->name); usb_gadget_disconnect(gadget);

return 0; }

+static inline struct g_dnl_bind_callback * g_dnl_bind_callback_first(void) +{ + return ll_entry_start(struct g_dnl_bind_callback, + g_dnl_bind_callbacks); +} + +static inline struct g_dnl_bind_callback * g_dnl_bind_callback_end(void) +{ + return ll_entry_end(struct g_dnl_bind_callback, + g_dnl_bind_callbacks); +} + static int g_dnl_do_config(struct usb_configuration *c) { const char *s = c->cdev->driver->name; - int ret = -1; + struct g_dnl_bind_callback *callback = g_dnl_bind_callback_first();

debug("%s: configuration: 0x%p composite dev: 0x%p\n", __func__, c, c->cdev);

- printf("GADGET DRIVER: %s\n", s); - if (!strcmp(s, "usb_dnl_dfu")) - ret = dfu_add(c); - else if (!strcmp(s, "usb_dnl_ums")) - ret = fsg_add(c); - else if (!strcmp(s, "usb_dnl_thor")) - ret = thor_add(c); - - return ret; + for (; callback != g_dnl_bind_callback_end(); callback++) + if (!strcmp(s, callback->usb_function_name)) + return callback->fptr(c); + return -ENODEV; }

static int g_dnl_config_register(struct usb_composite_dev *cdev) @@ -203,12 +209,12 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) device_desc.bcdDevice = cpu_to_le16(gcnum); else { debug("%s: controller '%s' not recognized\n", - shortname, gadget->name); + __func__, gadget->name); device_desc.bcdDevice = __constant_cpu_to_le16(0x9999); }

debug("%s: calling usb_gadget_connect for " - "controller '%s'\n", shortname, gadget->name); + "controller '%s'\n", __func__, gadget->name); usb_gadget_connect(gadget);

return 0; @@ -227,36 +233,22 @@ static struct usb_composite_driver g_dnl_driver = { .unbind = g_dnl_unbind, };

-int g_dnl_register(const char *type) +/* + * NOTICE: + * Registering via USB function name won't be necessary after rewriting + * g_dnl to support multiple USB functions. + */ +int g_dnl_register(const char *name) { - /* The largest function name is 4 */ - static char name[sizeof(shortname) + 4]; - int ret; - - if (!strcmp(type, "dfu")) { - strcpy(name, shortname); - strcat(name, type); - } else if (!strcmp(type, "ums")) { - strcpy(name, shortname); - strcat(name, type); - } else if (!strcmp(type, "thor")) { - strcpy(name, shortname); - strcat(name, type); - } else { - printf("%s: unknown command: %s\n", __func__, type); - return -EINVAL; - } + int ret = usb_composite_register(&g_dnl_driver);

+ debug("%s: g_dnl_driver.name = %s\n", __func__, name); g_dnl_driver.name = name;

- debug("%s: g_dnl_driver.name: %s\n", __func__, g_dnl_driver.name); - ret = usb_composite_register(&g_dnl_driver); - if (ret) { printf("%s: failed!, error: %d\n", __func__, ret); return ret; } - return 0; }

diff --git a/include/dfu.h b/include/dfu.h index dcd3215..2409168 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -168,12 +168,5 @@ static inline int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s) } #endif

-#ifdef CONFIG_DFU_FUNCTION int dfu_add(struct usb_configuration *c); -#else -int dfu_add(struct usb_configuration *c) -{ - return 0; -} -#endif #endif /* __DFU_ENTITY_H_ */ diff --git a/include/g_dnl.h b/include/g_dnl.h index 8f813c2..fb20bf0 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -10,6 +10,30 @@

#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> +#include <linux/usb/composite.h> +#include <linker_lists.h> + +/* + * @usb_fname: unescaped USB function name + * @callback_ptr: bind callback, one per function name + */ +#define DECLARE_GADGET_BIND_CALLBACK(usb_fname, callback_ptr) \ + ll_entry_declare(struct g_dnl_bind_callback, \ + __usb_function_name_##usb_fname, \ + g_dnl_bind_callbacks) = { \ + .usb_function_name = #usb_fname, \ + .fptr = callback_ptr \ + } + +typedef int (*g_dnl_bind_callback_f)(struct usb_configuration *); + +/* used in Gadget downloader callback linker list */ +struct g_dnl_bind_callback +{ + const char *usb_function_name; + g_dnl_bind_callback_f fptr; +}; + int g_dnl_bind_fixup(struct usb_device_descriptor *, const char *); int g_dnl_register(const char *s); void g_dnl_unregister(void); diff --git a/include/thor.h b/include/thor.h index afeade4..5051be7 100644 --- a/include/thor.h +++ b/include/thor.h @@ -15,13 +15,5 @@

int thor_handle(void); int thor_init(void); - -#ifdef CONFIG_THOR_FUNCTION int thor_add(struct usb_configuration *c); -#else -int thor_add(struct usb_configuration *c) -{ - return 0; -} -#endif #endif /* __THOR_H_ */ diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index 058dcf1..ed46064 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -40,13 +40,5 @@ int fsg_init(struct ums *); void fsg_cleanup(void); struct ums *ums_init(unsigned int); int fsg_main_thread(void *); - -#ifdef CONFIG_USB_GADGET_MASS_STORAGE int fsg_add(struct usb_configuration *c); -#else -int fsg_add(struct usb_configuration *c) -{ - return 0; -} -#endif #endif /* __USB_MASS_STORAGE_H__ */

Hi Mateusz,

Preprocessor definitions and hardcoded implementation selection in g_dnl core were replaced by a linker list made of (usb_function_name, bind_callback) pairs.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Marek Vasut marex@denx.de Cc: Minkyu Kang mk7.kang@samsung.com

---

common/cmd_dfu.c | 3 +- common/cmd_thordown.c | 3 +- common/cmd_usb_mass_storage.c | 2 +- drivers/usb/gadget/f_dfu.c | 3 ++ drivers/usb/gadget/f_mass_storage.c | 3 ++ drivers/usb/gadget/f_thor.c | 2 ++ drivers/usb/gadget/g_dnl.c | 64 ++++++++++++++++--------------------- include/dfu.h | 7 ---- include/g_dnl.h | 24 ++++++++++++++ include/thor.h | 8 ----- include/usb_mass_storage.h | 8 ----- 11 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c index 5547678..a03538d 100644 --- a/common/cmd_dfu.c +++ b/common/cmd_dfu.c @@ -22,7 +22,6 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

• char *s = "dfu"; int ret, i = 0;

  ret = dfu_init_env_entities(interface,

simple_strtoul(devstring, @@ -38,7 +37,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int controller_index = simple_strtoul(usb_controller, NULL, 0); board_usb_init(controller_index, USB_INIT_DEVICE);

• g_dnl_register(s);

• g_dnl_register("usb_dnl_dfu"); while (1) { if (dfu_reset()) /*

diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index c4b3511..2dd7509 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -22,7 +22,6 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *interface = argv[2]; char *devstring = argv[3];

• const char *s = "thor"; int ret;

  puts("TIZEN "THOR" Downloader\n");

@@ -40,7 +39,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) goto exit; }

• g_dnl_register(s);

• g_dnl_register("usb_dnl_thor");

  ret = thor_init(); if (ret) {

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 2f69a53..ab10ea6 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -40,7 +40,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; }

• g_dnl_register("ums");

• g_dnl_register("usb_dnl_ums");

#ifdef CONFIG_USB_CABLE_CHECK /* Timeout unit: seconds */ diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index de75ff1..1b1e179 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -24,6 +24,7 @@ #include <linux/usb/composite.h>

#include <dfu.h> +#include <g_dnl.h> #include "f_dfu.h"

struct f_dfu { @@ -817,3 +818,5 @@ int dfu_add(struct usb_configuration *c)

return dfu_bind_config(c); }

+DECLARE_GADGET_BIND_CALLBACK(usb_dnl_dfu, dfu_add); diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index f896169..f88bb12 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -255,6 +255,7 @@ #include <linux/usb/gadget.h> #include <linux/usb/composite.h> #include <usb/lin_gadget_compat.h> +#include <g_dnl.h>

/*------------------------------------------------------------------------*/

@@ -2778,3 +2779,5 @@ int fsg_init(struct ums *ums_dev)

return 0; }

+DECLARE_GADGET_BIND_CALLBACK(usb_dnl_ums, fsg_add); diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index f5c0224..59d246d 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -999,3 +999,5 @@ int thor_add(struct usb_configuration *c) debug("%s:\n", __func__); return thor_func_init(c); }

+DECLARE_GADGET_BIND_CALLBACK(usb_dnl_thor, thor_add); diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index dd95afe..3575aca 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -41,7 +41,6 @@

#define DRIVER_VERSION "usb_dnl 2.0"

-static const char shortname[] = "usb_dnl_"; static const char product[] = "USB download gadget"; static char g_dnl_serial[MAX_STRING_SERIAL]; static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER; @@ -96,29 +95,36 @@ static int g_dnl_unbind(struct usb_composite_dev *cdev) free(cdev->config); cdev->config = NULL; debug("%s: calling usb_gadget_disconnect for "

• 	"controller '%s'\n", shortname,
  

gadget->name);

• 	"controller '%s'\n", __func__, gadget->name);
  

  usb_gadget_disconnect(gadget);

  return 0;

}

+static inline struct g_dnl_bind_callback * g_dnl_bind_callback_first(void) +{

• return ll_entry_start(struct g_dnl_bind_callback,

• 		g_dnl_bind_callbacks);
  

+}

+static inline struct g_dnl_bind_callback * g_dnl_bind_callback_end(void) +{

• return ll_entry_end(struct g_dnl_bind_callback,

• 		g_dnl_bind_callbacks);
  

+}

static int g_dnl_do_config(struct usb_configuration *c) { const char *s = c->cdev->driver->name;

• int ret = -1;

• struct g_dnl_bind_callback *callback =

g_dnl_bind_callback_first(); debug("%s: configuration: 0x%p composite dev: 0x%p\n", __func__, c, c->cdev);

• printf("GADGET DRIVER: %s\n", s);
• if (!strcmp(s, "usb_dnl_dfu"))

• ret = dfu_add(c);
  

• else if (!strcmp(s, "usb_dnl_ums"))

• ret = fsg_add(c);
  

• else if (!strcmp(s, "usb_dnl_thor"))

• ret = thor_add(c);
  

• return ret;

• for (; callback != g_dnl_bind_callback_end(); callback++)

• if (!strcmp(s, callback->usb_function_name))
  

• 	return callback->fptr(c);
  

• return -ENODEV;

}

static int g_dnl_config_register(struct usb_composite_dev *cdev) @@ -203,12 +209,12 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) device_desc.bcdDevice = cpu_to_le16(gcnum); else { debug("%s: controller '%s' not recognized\n",

• 	shortname, gadget->name);
  

• 	__func__, gadget->name);
  

  device_desc.bcdDevice =

__constant_cpu_to_le16(0x9999); }

debug("%s: calling usb_gadget_connect for "

• 	"controller '%s'\n", shortname,
  

gadget->name);

• 	"controller '%s'\n", __func__, gadget->name);
  

  usb_gadget_connect(gadget);

  return 0;

@@ -227,36 +233,22 @@ static struct usb_composite_driver g_dnl_driver = { .unbind = g_dnl_unbind, };

-int g_dnl_register(const char *type) +/*

• • NOTICE:
• • Registering via USB function name won't be necessary after

rewriting

• • g_dnl to support multiple USB functions.
• */

+int g_dnl_register(const char *name) {

• /* The largest function name is 4 */
• static char name[sizeof(shortname) + 4];
• int ret;
• if (!strcmp(type, "dfu")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else if (!strcmp(type, "ums")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else if (!strcmp(type, "thor")) {

• strcpy(name, shortname);
  

• strcat(name, type);
  

• } else {

• printf("%s: unknown command: %s\n", __func__, type);
  

• return -EINVAL;
  

• }

• int ret = usb_composite_register(&g_dnl_driver);

• debug("%s: g_dnl_driver.name = %s\n", __func__, name); g_dnl_driver.name = name;

• debug("%s: g_dnl_driver.name: %s\n", __func__,

g_dnl_driver.name);

• ret = usb_composite_register(&g_dnl_driver);
• if (ret) { printf("%s: failed!, error: %d\n", __func__, ret); return ret; }
• return 0;

}

diff --git a/include/dfu.h b/include/dfu.h index dcd3215..2409168 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -168,12 +168,5 @@ static inline int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s) } #endif

-#ifdef CONFIG_DFU_FUNCTION int dfu_add(struct usb_configuration *c); -#else -int dfu_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __DFU_ENTITY_H_ */ diff --git a/include/g_dnl.h b/include/g_dnl.h index 8f813c2..fb20bf0 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -10,6 +10,30 @@

#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> +#include <linux/usb/composite.h> +#include <linker_lists.h>

+/*

• • @usb_fname: unescaped USB function name
• • @callback_ptr: bind callback, one per function name
• */

+#define DECLARE_GADGET_BIND_CALLBACK(usb_fname, callback_ptr) \

• ll_entry_declare(struct g_dnl_bind_callback, \

• 	__usb_function_name_##usb_fname, \
  

• 	g_dnl_bind_callbacks) = { \
  

• 		.usb_function_name = #usb_fname, \
  

• 		.fptr = callback_ptr \
  

• 	}
  

+typedef int (*g_dnl_bind_callback_f)(struct usb_configuration *);

+/* used in Gadget downloader callback linker list */ +struct g_dnl_bind_callback +{

• const char *usb_function_name;
• g_dnl_bind_callback_f fptr;

+};

int g_dnl_bind_fixup(struct usb_device_descriptor *, const char *); int g_dnl_register(const char *s); void g_dnl_unregister(void); diff --git a/include/thor.h b/include/thor.h index afeade4..5051be7 100644 --- a/include/thor.h +++ b/include/thor.h @@ -15,13 +15,5 @@

int thor_handle(void); int thor_init(void);

-#ifdef CONFIG_THOR_FUNCTION int thor_add(struct usb_configuration *c); -#else -int thor_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __THOR_H_ */ diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index 058dcf1..ed46064 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -40,13 +40,5 @@ int fsg_init(struct ums *); void fsg_cleanup(void); struct ums *ums_init(unsigned int); int fsg_main_thread(void *);

-#ifdef CONFIG_USB_GADGET_MASS_STORAGE int fsg_add(struct usb_configuration *c); -#else -int fsg_add(struct usb_configuration *c) -{

• return 0;

-} -#endif #endif /* __USB_MASS_STORAGE_H__ */

Acked-by: Lukasz Majewski l.majewski@samsung.com

Proper adjustment for supporting DFU at GONI target has been made. The s5p_goni.h file has been updated. Moreover the code for low level USB initialization has been added to GONI board code.

The malloc pool has been enlarged in order to support larger buffer sizes needed by DFU implementation.

Signed-off-by: Arkadiusz Wlodarczyk a.wlodarczyk@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com Signed-off-by: Mateusz Zalega m.zalega@samsung.com Tested-by: Arkadiusz Wlodarczyk a.wlodarczyk@samsung.com Tested-by: Mateusz Zalega m.zalega@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com --- board/samsung/goni/goni.c | 8 +++++++ include/configs/s5p_goni.h | 54 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index 61b9ece..273fa42 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -14,6 +14,8 @@ #include <asm/arch/cpu.h> #include <power/max8998_pmic.h> #include <samsung/misc.h> +#include <usb.h> +#include <usb_mass_storage.h>

DECLARE_GLOBAL_DATA_PTR;

@@ -179,6 +181,12 @@ struct s3c_plat_otg_data s5pc110_otg_data = { .regs_otg = S5PC110_OTG_BASE, .usb_phy_ctrl = S5PC110_USB_PHY_CONTROL, }; + +int board_usb_init(int index, enum usb_init_type init) +{ + debug("USB_udc_probe\n"); + return s3c_udc_probe(&s5pc110_otg_data); +} #endif

#ifdef CONFIG_MISC_INIT_R diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index b9b66c7..f97b52d 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -40,7 +40,7 @@ #define CONFIG_CMDLINE_EDITING

/* Size of malloc() pool.*/ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 80 * SZ_1M)

/* * select serial console configuration @@ -71,14 +71,18 @@ #define CONFIG_CMD_CACHE #define CONFIG_CMD_REGINFO #define CONFIG_CMD_ONENAND -#define CONFIG_CMD_MTDPARTS #define CONFIG_CMD_MMC +#define CONFIG_CMD_DFU

-#define CONFIG_BOOTDELAY 1 -#define CONFIG_ZERO_BOOTDELAY_CHECK +/* USB Composite download gadget - g_dnl */ +#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC

-#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS +/* USB Samsung's IDs */ +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 +#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 +#define CONFIG_G_DNL_MANUFACTURER "Samsung"

/* Actual modem binary size is 16MiB. Add 2MiB for bad block handling */ #define MTDIDS_DEFAULT "onenand0=samsung-onenand" @@ -91,7 +95,34 @@ ",12m(modem)"\ ",60m(qboot)\0"

-#define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT +#define CONFIG_BOOTDELAY 1 +#define CONFIG_ZERO_BOOTDELAY_CHECK + +/* partitions definitions */ +#define PARTS_CSA "csa-mmc" +#define PARTS_BOOTLOADER "u-boot" +#define PARTS_BOOT "boot" +#define PARTS_ROOT "platform" +#define PARTS_DATA "data" +#define PARTS_CSC "csc" +#define PARTS_UMS "ums" + +#define CONFIG_DFU_ALT \ + "u-boot raw 0x80 0x400;" \ + "uImage ext4 0 2;" \ + "exynos3-goni.dtb ext4 0 2;" \ + ""PARTS_ROOT" part 0 5\0" + +#define PARTS_DEFAULT \ + "uuid_disk=${uuid_gpt_disk};" \ + "name="PARTS_CSA",size=8MiB,uuid=${uuid_gpt_"PARTS_CSA"};" \ + "name="PARTS_BOOTLOADER",size=60MiB," \ + "uuid=${uuid_gpt_"PARTS_BOOTLOADER"};" \ + "name="PARTS_BOOT",size=100MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \ + "name="PARTS_ROOT",size=1GiB,uuid=${uuid_gpt_"PARTS_ROOT"};" \ + "name="PARTS_DATA",size=3GiB,uuid=${uuid_gpt_"PARTS_DATA"};" \ + "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \ + "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

#define CONFIG_BOOTCOMMAND "run mmcboot"

@@ -150,18 +181,18 @@ "verify=n\0" \ "rootfstype=ext4\0" \ "console=" CONFIG_DEFAULT_CONSOLE \ - "mtdparts=" MTDPARTS_DEFAULT \ "meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \ - "loaduimage=fatload mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ + "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ "mmcdev=0\0" \ "mmcbootpart=2\0" \ "mmcrootpart=5\0" \ + "partitions=" PARTS_DEFAULT \ "bootblock=9\0" \ "ubiblock=8\0" \ "ubi=enabled\0" \ - "opts=always_resume=1" + "opts=always_resume=1\0" \ + "dfu_alt_info=" CONFIG_DFU_ALT "\0"

-/* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ #define CONFIG_SYS_PROMPT "Goni # " @@ -200,6 +231,7 @@

#define CONFIG_CMD_FAT #define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE

/* write support for filesystems */ #define CONFIG_FAT_WRITE

UMS-related defines were added to Samsung Goni config header.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com --- include/configs/s5p_goni.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index c52a00a..f551c22 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -267,5 +267,7 @@ #define CONFIG_USB_GADGET_S3C_UDC_OTG #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 +#define CONFIG_CMD_USB_MASS_STORAGE +#define CONFIG_USB_GADGET_MASS_STORAGE

#endif /* __CONFIG_H */

Structure definition used type block_dev_desc_t, defined in part.h, which wasn't included in mmc.h. It worked only in circumstances when common.h, or another header using part.h was incuded in implementation files.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com Cc: Pantelis Antoniou panto@antoniou-consulting.com --- Changes since v1: - none --- include/mmc.h | 1 + 1 file changed, 1 insertion(+)

diff --git a/include/mmc.h b/include/mmc.h index 42d0125..bc11f45 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -12,6 +12,7 @@

#include <linux/list.h> #include <linux/compiler.h> +#include <part.h>

#define SD_VERSION_SD 0x20000 #define SD_VERSION_3 (SD_VERSION_SD | 0x300)

Hi Lukasz,

On Apr 30, 2014, at 11:35 AM, Lukasz Majewski wrote:

Hi Pantelis,

...

Structure definition used type block_dev_desc_t, defined in part.h, which wasn't included in mmc.h. It worked only in circumstances when common.h, or another header using part.h was incuded in implementation files.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com Cc: Pantelis Antoniou panto@antoniou-consulting.com

---

Changes since v1:

• none

---

include/mmc.h | 1 + 1 file changed, 1 insertion(+)

diff --git a/include/mmc.h b/include/mmc.h index 42d0125..bc11f45 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -12,6 +12,7 @@

#include <linux/list.h> #include <linux/compiler.h> +#include <part.h>

#define SD_VERSION_SD 0x20000 #define SD_VERSION_3 (SD_VERSION_SD | 0x300)

I've agreed with Marek Vasut about those patches. I will take them to u-boot-dfu tree and send PR to Marek.

Since this is a cleanup patch (not connected to DFU/USB) I would like to take it to the u-boot-dfu to prevent it from being vanished on the ML.

OK, please go ahead.

Pantelis, could you ACK this patch? And then I will add it to u-boot-dfu.

-- Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Acked-by: Pantelis Antoniou panto@antoniou-consulting.com

Implementation made use of types defined in common.h, even though it wasn't #included. It worked in circumstances when .c files included every needed header (all).

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Tom Rini trini@ti.com Cc: Minkyu Kang mk7.kang@samsung.com --- Changes since v1: - none --- include/part.h | 1 + 1 file changed, 1 insertion(+)

diff --git a/include/part.h b/include/part.h index 4beb6db..53532dc 100644 --- a/include/part.h +++ b/include/part.h @@ -8,6 +8,7 @@ #define _PART_H

#include <ide.h> +#include <common.h>

typedef struct block_dev_desc { int if_type; /* type of the interface */

When user attempted to perform a raw write using DFU (vide dfu_fill_entity_mmc) with MMC interface not initialized before, get_mmc_blk_size() reported invalid (zero) block size - it wasn't possible to write ie. a new u-boot image.

This commit fixes that by initializing MMC device before use in dfu_fill_entity_mmc().

While fixing initialization sequence, I had to change about half of dfu_fill_entity_mmc's body, so I refactored it on the way to make it, IMHO, considerably more comprehensible.

Being left as dead code, get_mmc_blk_size() was removed.

Tested on Samsung Goni.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com Acked-by: Lukasz Majewski l.majewski@samsung.com Acked-by: Tom Rini trini@ti.com Cc: Minkyu Kang mk7.kang@samsung.com --- Changes since v4: - added more detailed commit message - converted to C90-style - split into two patches: write fix and offset interpretation change --- drivers/dfu/dfu_mmc.c | 105 +++++++++++++++++++++++++++++++------------------- include/dfu.h | 5 --- 2 files changed, 65 insertions(+), 45 deletions(-)

diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index 651cfff..b41785d 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -184,66 +184,91 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf, return ret; }

+/* + * @param s Parameter string containing space-separated arguments: + * 1st: + * raw (raw read/write) + * fat (files) + * ext4 (^) + * part (partition image) + * 2nd and 3rd: + * lba_start and lba_size, for raw write + * mmc_dev and mmc_part, for filesystems and part + */ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s) { - int dev, part; - struct mmc *mmc; - block_dev_desc_t *blk_dev; - disk_partition_t partinfo; - char *st; + const char *entity_type; + size_t second_arg; + size_t third_arg;

- dfu->dev_type = DFU_DEV_MMC; - st = strsep(&s, " "); - if (!strcmp(st, "mmc")) { - dfu->layout = DFU_RAW_ADDR; - dfu->data.mmc.lba_start = simple_strtoul(s, &s, 16); - dfu->data.mmc.lba_size = simple_strtoul(++s, &s, 16); - dfu->data.mmc.lba_blk_size = get_mmc_blk_size(dfu->dev_num); - } else if (!strcmp(st, "fat")) { - dfu->layout = DFU_FS_FAT; - } else if (!strcmp(st, "ext4")) { - dfu->layout = DFU_FS_EXT4; - } else if (!strcmp(st, "part")) { - - dfu->layout = DFU_RAW_ADDR; + struct mmc *mmc;

- dev = simple_strtoul(s, &s, 10); - s++; - part = simple_strtoul(s, &s, 10); + const char *argv[3]; + const char **parg = argv;

- mmc = find_mmc_device(dev); - if (mmc == NULL || mmc_init(mmc)) { - printf("%s: could not find mmc device #%d!\n", - __func__, dev); + for (; parg < argv + sizeof(argv) / sizeof(*argv); ++parg) { + *parg = strsep(&s, " "); + if (*parg == NULL) { + error("Invalid number of arguments.\n"); return -ENODEV; } + }

- blk_dev = &mmc->block_dev; - if (get_partition_info(blk_dev, part, &partinfo) != 0) { - printf("%s: could not find partition #%d on mmc device #%d!\n", - __func__, part, dev); + entity_type = argv[0]; + second_arg = simple_strtoul(argv[1], NULL, 16); + third_arg = simple_strtoul(argv[2], NULL, 16); + + mmc = find_mmc_device(dfu->dev_num); + if (mmc == NULL) { + error("Couldn't find MMC device no. %d.\n", dfu->dev_num); + return -ENODEV; + } + + if (mmc_init(mmc)) { + error("Couldn't init MMC device.\n"); + return -ENODEV; + } + + if (!strcmp(entity_type, "raw")) { + dfu->layout = DFU_RAW_ADDR; + dfu->data.mmc.lba_start = second_arg; + dfu->data.mmc.lba_size = third_arg; + dfu->data.mmc.lba_blk_size = mmc->read_bl_len; + } else if (!strcmp(entity_type, "part")) { + disk_partition_t partinfo; + block_dev_desc_t *blk_dev = &mmc->block_dev; + int mmcdev = second_arg; + int mmcpart = third_arg; + + if (get_partition_info(blk_dev, mmcpart, &partinfo) != 0) { + error("Couldn't find part #%d on mmc device #%d\n", + mmcpart, mmcdev); return -ENODEV; }

- dfu->data.mmc.lba_start = partinfo.start; - dfu->data.mmc.lba_size = partinfo.size; - dfu->data.mmc.lba_blk_size = partinfo.blksz; - + dfu->layout = DFU_RAW_ADDR; + dfu->data.mmc.lba_start = partinfo.start; + dfu->data.mmc.lba_size = partinfo.size; + dfu->data.mmc.lba_blk_size = partinfo.blksz; + } else if (!strcmp(entity_type, "fat")) { + dfu->layout = DFU_FS_FAT; + } else if (!strcmp(entity_type, "ext4")) { + dfu->layout = DFU_FS_EXT4; } else { - printf("%s: Memory layout (%s) not supported!\n", __func__, st); + error("Memory layout (%s) not supported!\n", entity_type); return -ENODEV; }

- if (dfu->layout == DFU_FS_EXT4 || dfu->layout == DFU_FS_FAT) { - dfu->data.mmc.dev = simple_strtoul(s, &s, 10); - dfu->data.mmc.part = simple_strtoul(++s, &s, 10); + /* if it's NOT a raw write */ + if (strcmp(entity_type, "raw")) { + dfu->data.mmc.dev = second_arg; + dfu->data.mmc.part = third_arg; }

+ dfu->dev_type = DFU_DEV_MMC; dfu->read_medium = dfu_read_medium_mmc; dfu->write_medium = dfu_write_medium_mmc; dfu->flush_medium = dfu_flush_medium_mmc; - - /* initial state */ dfu->inited = 0;

return 0; diff --git a/include/dfu.h b/include/dfu.h index 6c71ecb..dcd3215 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -64,11 +64,6 @@ struct ram_internal_data { unsigned int size; };

-static inline unsigned int get_mmc_blk_size(int dev) -{ - return find_mmc_device(dev)->read_bl_len; -} - #define DFU_NAME_SIZE 32 #define DFU_CMD_BUF_SIZE 128 #ifndef CONFIG_SYS_DFU_DATA_BUF_SIZE

Previously offsets handled by dfu_fill_entity_mmc(), defined in boards' CONFIG_DFU_ALT were treated as hexadecimal regardless of their prefix, which sometimes led to confusion. This patch forces usage of explicit numerical base prefixes.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Cc: Lukasz Majewski l.majewski@samsung.com Cc: Tom Rini trini@ti.com Cc: Minkyu Kang mk7.kang@samsung.com --- Introduced in v5. --- drivers/dfu/dfu_mmc.c | 8 ++++++-- include/configs/am335x_evm.h | 8 ++++---- include/configs/trats.h | 2 +- include/configs/trats2.h | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index b41785d..5e10ea7 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -215,8 +215,12 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s) }

entity_type = argv[0]; - second_arg = simple_strtoul(argv[1], NULL, 16); - third_arg = simple_strtoul(argv[2], NULL, 16); + /* + * Base 0 means we'll accept (prefixed with 0x or 0) base 16, 8, + * with default 10. + */ + second_arg = simple_strtoul(argv[1], NULL, 0); + third_arg = simple_strtoul(argv[2], NULL, 0);

mmc = find_mmc_device(dfu->dev_num); if (mmc == NULL) { diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index ea9e758..4147f9f 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -320,10 +320,10 @@ "boot part 0 1;" \ "rootfs part 0 2;" \ "MLO fat 0 1;" \ - "MLO.raw mmc 100 100;" \ - "u-boot.img.raw mmc 300 400;" \ - "spl-os-args.raw mmc 80 80;" \ - "spl-os-image.raw mmc 900 2000;" \ + "MLO.raw mmc 0x100 0x100;" \ + "u-boot.img.raw mmc 0x300 0x400;" \ + "spl-os-args.raw mmc 0x80 0x80;" \ + "spl-os-image.raw mmc 0x900 0x2000;" \ "spl-os-args fat 0 1;" \ "spl-os-image fat 0 1;" \ "u-boot.img fat 0 1;" \ diff --git a/include/configs/trats.h b/include/configs/trats.h index 5d8bd60..8461343 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -101,7 +101,7 @@ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

#define CONFIG_DFU_ALT \ - "u-boot mmc 80 400;" \ + "u-boot raw 0x80 0x400;" \ "uImage ext4 0 2;" \ "modem.bin ext4 0 2;" \ "exynos4210-trats.dtb ext4 0 2;" \ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 53d449c..03e88ee 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -91,7 +91,7 @@ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \

#define CONFIG_DFU_ALT \ - "u-boot mmc 80 800;" \ + "u-boot raw 0x80 0x800;" \ "uImage ext4 0 2;" \ "modem.bin ext4 0 2;" \ "exynos4412-trats2.dtb ext4 0 2;" \

In cases when MMC hadn't been initialized before, ie. by the user or other subsystem, it was still uninitialized while UMS media capacity check, leading to broken ums command.

UMS has to initialize resources it uses.

Tested on Samsung Goni.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Tested-by: Mateusz Zalega m.zalega@samsung.com Acked-by: Lukasz Majewski l.majewski@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com --- Changes since v3: - Added const attribute of ums_disk_init introduced type warnings. It would take a lot of changes to MMC core code to fix it, so it was dropped, even though ums_disk_init shouldn't and doesn't change struct mmc it is passed. Changes since v4: - added slightly more detailed commit message --- board/samsung/common/ums.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index dc155ad..cebabe9 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -66,11 +66,9 @@ static struct ums *ums_disk_init(struct mmc *mmc)

struct ums *ums_init(unsigned int dev_num) { - struct mmc *mmc = NULL; + struct mmc *mmc = find_mmc_device(dev_num);

- mmc = find_mmc_device(dev_num); - if (!mmc) + if (!mmc || mmc_init(mmc)) return NULL; - return ums_disk_init(mmc); }

Hi Mateusz,

In cases when MMC hadn't been initialized before, ie. by the user or other subsystem, it was still uninitialized while UMS media capacity check, leading to broken ums command.

UMS has to initialize resources it uses.

Tested on Samsung Goni.

Signed-off-by: Mateusz Zalega m.zalega@samsung.com Tested-by: Mateusz Zalega m.zalega@samsung.com Acked-by: Lukasz Majewski l.majewski@samsung.com Cc: Minkyu Kang mk7.kang@samsung.com

Applied to u-boot-dfu. THanks,

---

Changes since v3:

• Added const attribute of ums_disk_init introduced type warnings. It

would take a lot of changes to MMC core code to fix it, so it was dropped, even though ums_disk_init shouldn't and doesn't change struct mmc it is passed. Changes since v4:

• added slightly more detailed commit message

---

board/samsung/common/ums.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/board/samsung/common/ums.c b/board/samsung/common/ums.c index dc155ad..cebabe9 100644 --- a/board/samsung/common/ums.c +++ b/board/samsung/common/ums.c @@ -66,11 +66,9 @@ static struct ums *ums_disk_init(struct mmc *mmc)

struct ums *ums_init(unsigned int dev_num) {

• struct mmc *mmc = NULL;

• struct mmc *mmc = find_mmc_device(dev_num);

• mmc = find_mmc_device(dev_num);
• if (!mmc)

• if (!mmc || mmc_init(mmc)) return NULL;

• return ums_disk_init(mmc);

}