evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: gadget: f_diag: Update serial_number with dload_cookie

Browse source 
USB DIAG function driver updates dload_cookie with USB PID and serial
number to avoid port-hopping for DIAG port with bootloader. Now
composite_driver doesn't get updated strings as android.c is
deprecated and configfs is used. Hence use composite device based
strings to find required serial number.

CRs-Fixed: 1010715
Change-Id: I076928436a8b1b4d1c3ee7e48db9b3314ec1fc05
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
This commit is contained in:
Mayank Rana 2016-04-29 17:09:50 -07:00 • committed by Jeevan Shriram
parent 1e08f835b4
commit d8d6f4a1fd
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/usb/gadget/function/f_diag.c
View file

@ -204,8 +204,9 @@ static void diag_context_release(struct kref *kref)
static void diag_update_pid_and_serial_num(struct diag_context *ctxt)
{
struct usb_composite_dev *cdev = ctxt->cdev;
struct usb_gadget_strings *table;
struct usb_gadget_strings **table;
struct usb_string *s;
struct usb_gadget_string_container *uc;
struct dload_struct local_diag_dload = { 0 };
/*
@ -223,30 +224,26 @@ static void diag_update_pid_and_serial_num(struct diag_context *ctxt)
/* update pid */
local_diag_dload.magic_struct.pid = PID_MAGIC_ID;
local_diag_dload.pid = cdev->desc.idProduct;
local_diag_dload.magic_struct.serial_num = SERIAL_NUM_MAGIC_ID;
/* pass on product id and serial number to dload */
if (!cdev->desc.iSerialNumber) {
/*
* Serial number is filled by the composite driver. So
* it is fair enough to assume that it will always be
* found at first table of strings.
*/
table = *(cdev->driver->strings);
list_for_each_entry(uc, &cdev->gstrings, list) {
table = (struct usb_gadget_strings **)uc->stash;
if (!table) {
pr_err("%s: can't update dload cookie\n", __func__);
return;
break;
}
for (s = table->strings; s && s->s; s++) {
for (s = (*table)->strings; s && s->s; s++) {
if (s->id == cdev->desc.iSerialNumber) {
local_diag_dload.magic_struct.serial_num =
SERIAL_NUM_MAGIC_ID;
strlcpy(local_diag_dload.serial_number, s->s,
SERIAL_NUMBER_LENGTH);
break;
goto update_dload;
}
}
}
update_dload:
pr_debug("%s: dload:%p pid:%x serial_num:%s\n",
__func__, diag_dload, local_diag_dload.pid,
local_diag_dload.serial_number);