From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752622AbbFEUJN (ORCPT ); Fri, 5 Jun 2015 16:09:13 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:38775 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752542AbbFEUJI (ORCPT ); Fri, 5 Jun 2015 16:09:08 -0400 From: Pali =?utf-8?q?Roh=C3=A1r?= To: balbi@ti.com Subject: Re: [PATCH] usb: gadget: nokia: Add mass storage driver to g_nokia Date: Fri, 5 Jun 2015 22:09:03 +0200 User-Agent: KMail/1.13.7 (Linux/3.13.0-53-generic; KDE/4.14.2; x86_64; ; ) Cc: Krzysztof Opasiak , "Greg Kroah-Hartman" , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Pavel Machek , Sebastian Reichel , Aaro Koskinen , Ivaylo Dimitrov References: <1422698010-2907-1-git-send-email-pali.rohar@gmail.com> <201505282340.07878@pali> <20150529165706.GH2026@saruman.tx.rr.com> In-Reply-To: <20150529165706.GH2026@saruman.tx.rr.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1799803.hyNdcJCHjL"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <201506052209.03655@pali> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --nextPart1799803.hyNdcJCHjL Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Friday 29 May 2015 18:57:06 Felipe Balbi wrote: > All right, I tried merging it and it added build breaks to the tree. > I'll wait for another version for v4.3 merge window. >=20 > cheers Hello, version below compiles fine on top of linus tree. Please apply: diff --git a/drivers/usb/gadget/legacy/Kconfig b/drivers/usb/gadget/legacy/= Kconfig index d5a7102..ddef41f 100644 =2D-- a/drivers/usb/gadget/legacy/Kconfig +++ b/drivers/usb/gadget/legacy/Kconfig @@ -346,6 +346,7 @@ config USB_G_NOKIA select USB_F_OBEX select USB_F_PHONET select USB_F_ECM + select USB_F_MASS_STORAGE help The Nokia composite gadget provides support for acm, obex and phonet in only one composite gadget driver. diff --git a/drivers/usb/gadget/legacy/nokia.c b/drivers/usb/gadget/legacy/= nokia.c index 4bb498a..021c8d9 100644 =2D-- a/drivers/usb/gadget/legacy/nokia.c +++ b/drivers/usb/gadget/legacy/nokia.c @@ -24,6 +24,7 @@ #include "u_phonet.h" #include "u_ecm.h" #include "gadget_chips.h" +#include "f_mass_storage.h" =20 /* Defines */ =20 @@ -34,6 +35,29 @@ USB_GADGET_COMPOSITE_OPTIONS(); =20 USB_ETHERNET_MODULE_PARAMETERS(); =20 +static struct fsg_module_parameters fsg_mod_data =3D { + .stall =3D 0, + .luns =3D 2, + .removable_count =3D 2, + .removable =3D { 1, 1, }, +}; + +FSG_MODULE_PARAMETERS(/* no prefix */, fsg_mod_data); + +#ifdef CONFIG_USB_GADGET_DEBUG_FILES + +static unsigned int fsg_num_buffers =3D CONFIG_USB_GADGET_STORAGE_NUM_BUFF= ERS; + +#else + +/* + * Number of buffers we will use. + * 2 is usually enough for good buffering pipeline + */ +#define fsg_num_buffers CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS + +#endif /* CONFIG_USB_DEBUG */ + #define NOKIA_VENDOR_ID 0x0421 /* Nokia */ #define NOKIA_PRODUCT_ID 0x01c8 /* Nokia Gadget */ =20 @@ -94,6 +118,8 @@ static struct usb_function *f_obex1_cfg2; static struct usb_function *f_obex2_cfg2; static struct usb_function *f_phonet_cfg1; static struct usb_function *f_phonet_cfg2; +static struct usb_function *f_msg_cfg1; +static struct usb_function *f_msg_cfg2; =20 =20 static struct usb_configuration nokia_config_500ma_driver =3D { @@ -117,6 +143,7 @@ static struct usb_function_instance *fi_ecm; static struct usb_function_instance *fi_obex1; static struct usb_function_instance *fi_obex2; static struct usb_function_instance *fi_phonet; +static struct usb_function_instance *fi_msg; =20 static int nokia_bind_config(struct usb_configuration *c) { @@ -125,6 +152,8 @@ static int nokia_bind_config(struct usb_configuration *= c) struct usb_function *f_obex1 =3D NULL; struct usb_function *f_ecm; struct usb_function *f_obex2 =3D NULL; + struct usb_function *f_msg; + struct fsg_opts *fsg_opts; int status =3D 0; int obex1_stat =3D -1; int obex2_stat =3D -1; @@ -160,6 +189,12 @@ static int nokia_bind_config(struct usb_configuration = *c) goto err_get_ecm; } =20 + f_msg =3D usb_get_function(fi_msg); + if (IS_ERR(f_msg)) { + status =3D PTR_ERR(f_msg); + goto err_get_msg; + } + if (!IS_ERR_OR_NULL(f_phonet)) { phonet_stat =3D usb_add_function(c, f_phonet); if (phonet_stat) @@ -187,21 +222,36 @@ static int nokia_bind_config(struct usb_configuration= *c) pr_debug("could not bind ecm config %d\n", status); goto err_ecm; } + + fsg_opts =3D fsg_opts_from_func_inst(fi_msg); + + status =3D fsg_common_run_thread(fsg_opts->common); + if (status) + goto err_msg; + + status =3D usb_add_function(c, f_msg); + if (status) + goto err_msg; + if (c =3D=3D &nokia_config_500ma_driver) { f_acm_cfg1 =3D f_acm; f_ecm_cfg1 =3D f_ecm; f_phonet_cfg1 =3D f_phonet; f_obex1_cfg1 =3D f_obex1; f_obex2_cfg1 =3D f_obex2; + f_msg_cfg1 =3D f_msg; } else { f_acm_cfg2 =3D f_acm; f_ecm_cfg2 =3D f_ecm; f_phonet_cfg2 =3D f_phonet; f_obex1_cfg2 =3D f_obex1; f_obex2_cfg2 =3D f_obex2; + f_msg_cfg2 =3D f_msg; } =20 return status; +err_msg: + usb_remove_function(c, f_ecm); err_ecm: usb_remove_function(c, f_acm); err_conf: @@ -211,6 +261,8 @@ err_conf: usb_remove_function(c, f_obex1); if (!phonet_stat) usb_remove_function(c, f_phonet); + usb_put_function(f_msg); +err_get_msg: usb_put_function(f_ecm); err_get_ecm: usb_put_function(f_acm); @@ -227,6 +279,8 @@ err_get_acm: static int nokia_bind(struct usb_composite_dev *cdev) { struct usb_gadget *gadget =3D cdev->gadget; + struct fsg_opts *fsg_opts; + struct fsg_config fsg_config; int status; =20 status =3D usb_string_ids_tab(cdev, strings_dev); @@ -267,11 +321,46 @@ static int nokia_bind(struct usb_composite_dev *cdev) goto err_acm_inst; } =20 + fi_msg =3D usb_get_function_instance("mass_storage"); + if (IS_ERR(fi_msg)) { + status =3D PTR_ERR(fi_msg); + goto err_ecm_inst; + } + + /* set up mass storage function */ + fsg_config_from_params(&fsg_config, &fsg_mod_data, fsg_num_buffers); + fsg_config.vendor_name =3D "Nokia"; + fsg_config.product_name =3D "N900"; + + fsg_opts =3D fsg_opts_from_func_inst(fi_msg); + fsg_opts->no_configfs =3D true; + + status =3D fsg_common_set_num_buffers(fsg_opts->common, fsg_num_buffers); + if (status) + goto err_msg_inst; + + status =3D fsg_common_set_nluns(fsg_opts->common, fsg_config.nluns); + if (status) + goto err_msg_buf; + + status =3D fsg_common_set_cdev(fsg_opts->common, cdev, fsg_config.can_sta= ll); + if (status) + goto err_msg_set_nluns; + + fsg_common_set_sysfs(fsg_opts->common, true); + + status =3D fsg_common_create_luns(fsg_opts->common, &fsg_config); + if (status) + goto err_msg_set_nluns; + + fsg_common_set_inquiry_string(fsg_opts->common, fsg_config.vendor_name, + fsg_config.product_name); + /* finally register the configuration */ status =3D usb_add_config(cdev, &nokia_config_500ma_driver, nokia_bind_config); if (status < 0) =2D goto err_ecm_inst; + goto err_msg_set_cdev; =20 status =3D usb_add_config(cdev, &nokia_config_100ma_driver, nokia_bind_config); @@ -292,6 +381,14 @@ err_put_cfg1: if (!IS_ERR_OR_NULL(f_phonet_cfg1)) usb_put_function(f_phonet_cfg1); usb_put_function(f_ecm_cfg1); +err_msg_set_cdev: + fsg_common_remove_luns(fsg_opts->common); +err_msg_set_nluns: + fsg_common_free_luns(fsg_opts->common); +err_msg_buf: + fsg_common_free_buffers(fsg_opts->common); +err_msg_inst: + usb_put_function_instance(fi_msg); err_ecm_inst: usb_put_function_instance(fi_ecm); err_acm_inst: @@ -325,7 +422,10 @@ static int nokia_unbind(struct usb_composite_dev *cdev) usb_put_function(f_acm_cfg2); usb_put_function(f_ecm_cfg1); usb_put_function(f_ecm_cfg2); + usb_put_function(f_msg_cfg1); + usb_put_function(f_msg_cfg2); =20 + usb_put_function_instance(fi_msg); usb_put_function_instance(fi_ecm); if (!IS_ERR(fi_obex2)) usb_put_function_instance(fi_obex2); =2D-=20 Pali Roh=C3=A1r pali.rohar@gmail.com --nextPart1799803.hyNdcJCHjL Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAlVyAd8ACgkQi/DJPQPkQ1I4vwCgxnO91TfSUFhqcVse9E0f6kWs GxEAoJN+QaBUJvEW5EW07hsp3ALjr/uf =nWXA -----END PGP SIGNATURE----- --nextPart1799803.hyNdcJCHjL--