From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933515AbcBCMmZ (ORCPT ); Wed, 3 Feb 2016 07:42:25 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:34541 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933406AbcBCMmR (ORCPT ); Wed, 3 Feb 2016 07:42:17 -0500 X-AuditID: cbfee61b-f793c6d00000236c-7b-56b1f59c252a From: Robert Baldyga To: balbi@ti.com Cc: gregkh@linuxfoundation.org, andrzej.p@samsung.com, m.szyprowski@samsung.com, b.zolnierkie@samsung.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Baldyga Subject: [PATCH v4 37/43] usb: gadget: f_mass_storage: conversion to new API Date: Wed, 03 Feb 2016 13:39:45 +0100 Message-id: <1454503191-11796-38-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1454503191-11796-1-git-send-email-r.baldyga@samsung.com> References: <1454503191-11796-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprKLMWRmVeSWpSXmKPExsVy+t9jQd05XzeGGZx6xWMx62U7i8XGGetZ LQ7er7doXryezeLyrjlsFouWtTJbrD1yl93iweGd7A4cHvvnrmH36NuyitHj+I3tTB6fN8kF sERx2aSk5mSWpRbp2yVwZWxecISp4JRfxfH/vWwNjIecuhg5OSQETCRmbLnJAmGLSVy4t56t i5GLQ0hgFqPE+eOH2EESQgI/GSVWd5SA2GwCOhJbvk9gBLFFBAQk1r+4xA7SwCxwjlHi4Z02 sISwgI/Ev7XLwZpZBFQlVj/+ARbnFXCT+LX5MzvENjmJk8cms3YxcnBwAsUfHnOA2OUqsav1 O+MERt4FjAyrGCVSC5ILipPSc43yUsv1ihNzi0vz0vWS83M3MYID65n0DsbDu9wPMQpwMCrx 8Eb82hAmxJpYVlyZe4hRgoNZSYTX6PPGMCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8j/+vCxMS SE8sSc1OTS1ILYLJMnFwSjUwGjLNnnnD+oxmu2DpzQ3rpkZpX7V0czuoF9G12M+u67JoxLey 3b/NlNPXVmyI/dDydYkMS9RtUYfHWYJST17O1nzhvmhyM4t1/cQjX0KWuvYp+3/6Ztrjx73i XJ1FBpOYbc7nNYxzP240Wj87qPnYTDXnpjNBcUKaGXunT96+OrNcIun0olOWSizFGYmGWsxF xYkA8fR8zCgCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Generate descriptors in new format and attach them to USB function in prep_descs(). Change set_alt() implementation and implement clear_alt() operation. Remove boilerplate code. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/function/f_mass_storage.c | 91 +++++++++------------------- drivers/usb/gadget/function/storage_common.c | 29 --------- drivers/usb/gadget/function/storage_common.h | 3 - 3 files changed, 29 insertions(+), 94 deletions(-) diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c index 223ccf8..fa2326f 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -233,6 +233,17 @@ static const char fsg_string_interface[] = "Mass Storage"; #include "storage_common.h" #include "f_mass_storage.h" +USB_COMPOSITE_ENDPOINT(ep_in, &fsg_fs_bulk_in_desc, &fsg_hs_bulk_in_desc, + &fsg_ss_bulk_in_desc, &fsg_ss_bulk_in_comp_desc); +USB_COMPOSITE_ENDPOINT(ep_out, &fsg_fs_bulk_out_desc, &fsg_hs_bulk_out_desc, + &fsg_ss_bulk_out_desc, &fsg_ss_bulk_out_comp_desc); + +USB_COMPOSITE_ALTSETTING(intf0alt0, &fsg_intf_desc, &ep_in, &ep_out); + +USB_COMPOSITE_INTERFACE(intf0, &intf0alt0); + +USB_COMPOSITE_DESCRIPTORS(fsg_descs, &intf0); + /* Static strings, in UTF-8 (for simplicity we use only ASCII characters) */ static struct usb_string fsg_strings[] = { {FSG_STRING_INTERFACE, fsg_string_interface}, @@ -325,8 +336,6 @@ struct fsg_dev { struct usb_gadget *gadget; /* Copy of cdev->gadget */ struct fsg_common *common; - u16 interface_number; - unsigned int bulk_in_enabled:1; unsigned int bulk_out_enabled:1; @@ -522,7 +531,7 @@ static int fsg_setup(struct usb_function *f, if (ctrl->bRequestType != (USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE)) break; - if (w_index != fsg->interface_number || w_value != 0 || + if (w_index != usb_get_interface_id(f, 0) || w_value != 0 || w_length != 0) return -EDOM; @@ -538,7 +547,7 @@ static int fsg_setup(struct usb_function *f, if (ctrl->bRequestType != (USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE)) break; - if (w_index != fsg->interface_number || w_value != 0 || + if (w_index != usb_get_interface_id(f, 0) || w_value != 0 || w_length != 1) return -EDOM; VDBG(fsg, "get max LUN\n"); @@ -2328,19 +2337,27 @@ reset: static int fsg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) { struct fsg_dev *fsg = fsg_from_func(f); + + fsg->bulk_in = usb_function_get_ep(f, intf, 0); + if (!fsg->bulk_in) + return -ENODEV; + + fsg->bulk_out = usb_function_get_ep(f, intf, 1); + if (!fsg->bulk_out) + return -ENODEV; + fsg->common->new_fsg = fsg; raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE); return USB_GADGET_DELAYED_STATUS; } -static void fsg_disable(struct usb_function *f) +static void fsg_clear_alt(struct usb_function *f, unsigned intf, unsigned alt) { struct fsg_dev *fsg = fsg_from_func(f); fsg->common->new_fsg = NULL; raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE); } - /*-------------------------------------------------------------------------*/ static void handle_exception(struct fsg_common *common) @@ -3025,13 +3042,11 @@ static void fsg_common_release(struct kref *ref) /*-------------------------------------------------------------------------*/ -static int fsg_bind(struct usb_configuration *c, struct usb_function *f) +static int fsg_prep_descs(struct usb_function *f) { struct fsg_dev *fsg = fsg_from_func(f); struct fsg_common *common = fsg->common; - struct usb_gadget *gadget = c->cdev->gadget; - int i; - struct usb_ep *ep; + struct usb_gadget *gadget = f->config->cdev->gadget; unsigned max_burst; int ret; struct fsg_opts *opts; @@ -3045,7 +3060,7 @@ static int fsg_bind(struct usb_configuration *c, struct usb_function *f) opts = fsg_opts_from_func_inst(f->fi); if (!opts->no_configfs) { - ret = fsg_common_set_cdev(fsg->common, c->cdev, + ret = fsg_common_set_cdev(fsg->common, f->config->cdev, fsg->common->can_stall); if (ret) return ret; @@ -3057,58 +3072,12 @@ static int fsg_bind(struct usb_configuration *c, struct usb_function *f) fsg->gadget = gadget; - /* New interface */ - i = usb_interface_id(c, f); - if (i < 0) - goto fail; - fsg_intf_desc.bInterfaceNumber = i; - fsg->interface_number = i; - - /* Find all the endpoints we will use */ - ep = usb_ep_autoconfig(gadget, &fsg_fs_bulk_in_desc); - if (!ep) - goto autoconf_fail; - fsg->bulk_in = ep; - - ep = usb_ep_autoconfig(gadget, &fsg_fs_bulk_out_desc); - if (!ep) - goto autoconf_fail; - fsg->bulk_out = ep; - - /* Assume endpoint addresses are the same for both speeds */ - fsg_hs_bulk_in_desc.bEndpointAddress = - fsg_fs_bulk_in_desc.bEndpointAddress; - fsg_hs_bulk_out_desc.bEndpointAddress = - fsg_fs_bulk_out_desc.bEndpointAddress; - /* Calculate bMaxBurst, we know packet size is 1024 */ max_burst = min_t(unsigned, FSG_BUFLEN / 1024, 15); - - fsg_ss_bulk_in_desc.bEndpointAddress = - fsg_fs_bulk_in_desc.bEndpointAddress; fsg_ss_bulk_in_comp_desc.bMaxBurst = max_burst; - - fsg_ss_bulk_out_desc.bEndpointAddress = - fsg_fs_bulk_out_desc.bEndpointAddress; fsg_ss_bulk_out_comp_desc.bMaxBurst = max_burst; - ret = usb_assign_descriptors(f, fsg_fs_function, fsg_hs_function, - fsg_ss_function); - if (ret) - goto autoconf_fail; - - return 0; - -autoconf_fail: - ERROR(fsg, "unable to autoconfigure all endpoints\n"); - i = -ENOTSUPP; -fail: - /* terminate the thread */ - if (fsg->common->state != FSG_STATE_TERMINATED) { - raise_exception(fsg->common, FSG_STATE_EXIT); - wait_for_completion(&fsg->common->thread_notifier); - } - return i; + return usb_function_set_descs(f, &fsg_descs); } /****************************** ALLOCATE FUNCTION *************************/ @@ -3125,8 +3094,6 @@ static void fsg_unbind(struct usb_configuration *c, struct usb_function *f) /* FIXME: make interruptible or killable somehow? */ wait_event(common->fsg_wait, common->fsg != fsg); } - - usb_free_all_descriptors(&fsg->function); } static inline struct fsg_lun_opts *to_fsg_lun_opts(struct config_item *item) @@ -3529,11 +3496,11 @@ static struct usb_function *fsg_alloc(struct usb_function_instance *fi) mutex_unlock(&opts->lock); fsg->function.name = FSG_DRIVER_DESC; - fsg->function.bind = fsg_bind; + fsg->function.prep_descs = fsg_prep_descs; fsg->function.unbind = fsg_unbind; fsg->function.setup = fsg_setup; fsg->function.set_alt = fsg_set_alt; - fsg->function.disable = fsg_disable; + fsg->function.clear_alt = fsg_clear_alt; fsg->function.free_func = fsg_free; fsg->common = common; diff --git a/drivers/usb/gadget/function/storage_common.c b/drivers/usb/gadget/function/storage_common.c index d626830..94f23814 100644 --- a/drivers/usb/gadget/function/storage_common.c +++ b/drivers/usb/gadget/function/storage_common.c @@ -70,15 +70,6 @@ struct usb_endpoint_descriptor fsg_fs_bulk_out_desc = { }; EXPORT_SYMBOL_GPL(fsg_fs_bulk_out_desc); -struct usb_descriptor_header *fsg_fs_function[] = { - (struct usb_descriptor_header *) &fsg_intf_desc, - (struct usb_descriptor_header *) &fsg_fs_bulk_in_desc, - (struct usb_descriptor_header *) &fsg_fs_bulk_out_desc, - NULL, -}; -EXPORT_SYMBOL_GPL(fsg_fs_function); - - /* * USB 2.0 devices need to expose both high speed and full speed * descriptors, unless they only run at full speed. @@ -108,15 +99,6 @@ struct usb_endpoint_descriptor fsg_hs_bulk_out_desc = { }; EXPORT_SYMBOL_GPL(fsg_hs_bulk_out_desc); - -struct usb_descriptor_header *fsg_hs_function[] = { - (struct usb_descriptor_header *) &fsg_intf_desc, - (struct usb_descriptor_header *) &fsg_hs_bulk_in_desc, - (struct usb_descriptor_header *) &fsg_hs_bulk_out_desc, - NULL, -}; -EXPORT_SYMBOL_GPL(fsg_hs_function); - struct usb_endpoint_descriptor fsg_ss_bulk_in_desc = { .bLength = USB_DT_ENDPOINT_SIZE, .bDescriptorType = USB_DT_ENDPOINT, @@ -153,17 +135,6 @@ struct usb_ss_ep_comp_descriptor fsg_ss_bulk_out_comp_desc = { }; EXPORT_SYMBOL_GPL(fsg_ss_bulk_out_comp_desc); -struct usb_descriptor_header *fsg_ss_function[] = { - (struct usb_descriptor_header *) &fsg_intf_desc, - (struct usb_descriptor_header *) &fsg_ss_bulk_in_desc, - (struct usb_descriptor_header *) &fsg_ss_bulk_in_comp_desc, - (struct usb_descriptor_header *) &fsg_ss_bulk_out_desc, - (struct usb_descriptor_header *) &fsg_ss_bulk_out_comp_desc, - NULL, -}; -EXPORT_SYMBOL_GPL(fsg_ss_function); - - /*-------------------------------------------------------------------------*/ /* diff --git a/drivers/usb/gadget/function/storage_common.h b/drivers/usb/gadget/function/storage_common.h index c3544e6..f5d9146 100644 --- a/drivers/usb/gadget/function/storage_common.h +++ b/drivers/usb/gadget/function/storage_common.h @@ -190,17 +190,14 @@ extern struct usb_interface_descriptor fsg_intf_desc; extern struct usb_endpoint_descriptor fsg_fs_bulk_in_desc; extern struct usb_endpoint_descriptor fsg_fs_bulk_out_desc; -extern struct usb_descriptor_header *fsg_fs_function[]; extern struct usb_endpoint_descriptor fsg_hs_bulk_in_desc; extern struct usb_endpoint_descriptor fsg_hs_bulk_out_desc; -extern struct usb_descriptor_header *fsg_hs_function[]; extern struct usb_endpoint_descriptor fsg_ss_bulk_in_desc; extern struct usb_ss_ep_comp_descriptor fsg_ss_bulk_in_comp_desc; extern struct usb_endpoint_descriptor fsg_ss_bulk_out_desc; extern struct usb_ss_ep_comp_descriptor fsg_ss_bulk_out_comp_desc; -extern struct usb_descriptor_header *fsg_ss_function[]; void fsg_lun_close(struct fsg_lun *curlun); int fsg_lun_open(struct fsg_lun *curlun, const char *filename); -- 1.9.1