leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: gadget: Fix controller index in UMS

Browse Source 
The usb mass storage (f_mass_storage.c) uses fixed usb index 0,
this causes problem while CDNS3 USB controller index is 1.
Modify the API of fsg to pass the controller index.

Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Ye Li 2020-06-29 10:12:26 +08:00 committed by Marek Vasut
parent 3a41086f6a
commit 213fa47dac
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/usb_mass_storage.c
View File

@ -170,7 +170,7 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag,
goto cleanup_ums_init; goto cleanup_ums_init;
} }
rc = fsg_init(ums, ums_count); rc = fsg_init(ums, ums_count, controller_index);
if (rc) { if (rc) {
pr_err("fsg_init failed\n"); pr_err("fsg_init failed\n");
rc = CMD_RET_FAILURE; rc = CMD_RET_FAILURE;

6
drivers/usb/gadget/f_mass_storage.c
View File

@ -435,6 +435,7 @@ static void set_bulk_out_req_length(struct fsg_common *common,
static struct ums *ums; static struct ums *ums;
static int ums_count; static int ums_count;
static struct fsg_common *the_fsg_common; static struct fsg_common *the_fsg_common;
static unsigned int controller_index;
static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep) static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep)
{ {
@ -679,7 +680,7 @@ static int sleep_thread(struct fsg_common *common)
k = 0; k = 0;
} }
usb_gadget_handle_interrupts(0); usb_gadget_handle_interrupts(controller_index);
} }
common->thread_wakeup_needed = 0; common->thread_wakeup_needed = 0;
return rc; return rc;
@ -2764,10 +2765,11 @@ int fsg_add(struct usb_configuration *c)
return fsg_bind_config(c->cdev, c, fsg_common); return fsg_bind_config(c->cdev, c, fsg_common);
} }
int fsg_init(struct ums *ums_devs, int count) int fsg_init(struct ums *ums_devs, int count, unsigned int controller_idx)
{ {
ums = ums_devs; ums = ums_devs;
ums_count = count; ums_count = count;
controller_index = controller_idx;
return 0; return 0;
} }

2
include/usb_mass_storage.h
View File

@ -25,7 +25,7 @@ struct ums {
struct blk_desc block_dev; struct blk_desc block_dev;
}; };
int fsg_init(struct ums *ums_devs, int count); int fsg_init(struct ums *ums_devs, int count, unsigned int controller_idx);
void fsg_cleanup(void); void fsg_cleanup(void);
int fsg_main_thread(void *); int fsg_main_thread(void *);
int fsg_add(struct usb_configuration *c); int fsg_add(struct usb_configuration *c);