lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 139/139] usb: gadget: f_ncm: allow using NCM in SuperSpeed Plus gadgets.
    Date
    From: Lorenzo Colitti <lorenzo@google.com>

    [ Upstream commit 7974ecd7d3c0f42a98566f281e44ea8573a2ad88 ]

    Currently, enabling f_ncm at SuperSpeed Plus speeds results in an
    oops in config_ep_by_speed because ncm_set_alt passes in NULL
    ssp_descriptors. Fix this by re-using the SuperSpeed descriptors.
    This is safe because usb_assign_descriptors calls
    usb_copy_descriptors.

    Tested: enabled f_ncm on a dwc3 gadget and 10Gbps link, ran iperf
    Reviewed-by: Maciej Żenczykowski <maze@google.com>
    Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
    Signed-off-by: Felipe Balbi <balbi@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/gadget/function/f_ncm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
    index ba8fa97a62cfd..4395ea07c1bb4 100644
    --- a/drivers/usb/gadget/function/f_ncm.c
    +++ b/drivers/usb/gadget/function/f_ncm.c
    @@ -1548,7 +1548,7 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f)
    fs_ncm_notify_desc.bEndpointAddress;

    status = usb_assign_descriptors(f, ncm_fs_function, ncm_hs_function,
    - ncm_ss_function, NULL);
    + ncm_ss_function, ncm_ss_function);
    if (status)
    goto fail;

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 15:39    [W:4.163 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site