From: Michal Nazarewicz <mina86@mina86.com>
To: Robert Baldyga <r.baldyga@samsung.com>, balbi@ti.com
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, m.szyprowski@samsung.com,
andrzej.p@samsung.com, k.opasiak@samsung.com,
Robert Baldyga <r.baldyga@samsung.com>
Subject: Re: [PATCH v5 2/3] usb: gadget: f_fs: add ioctl returning ep descriptor
Date: Sun, 24 Aug 2014 16:27:38 +0200 [thread overview]
Message-ID: <xa1tppfqufmt.fsf@mina86.com> (raw)
In-Reply-To: <1408622959-4096-3-git-send-email-r.baldyga@samsung.com>
On Thu, Aug 21 2014, Robert Baldyga <r.baldyga@samsung.com> wrote:
> This patch introduces ioctl named FUNCTIONFS_ENDPOINT_DESC, which
> returns endpoint descriptor to userspace. It works only if function
> is active.
>
> Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
With the change described below:
Acked-by: Michal Nazarewicz <mina86@mina86.com>
> ---
> drivers/usb/gadget/function/f_fs.c | 21 +++++++++++++++++++++
> include/uapi/linux/usb/functionfs.h | 6 ++++++
> 2 files changed, 27 insertions(+)
>
> diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
> index 8096f22..ac7b16d 100644
> --- a/drivers/usb/gadget/function/f_fs.c
> +++ b/drivers/usb/gadget/function/f_fs.c
> @@ -1032,6 +1032,27 @@ static long ffs_epfile_ioctl(struct file *file, unsigned code,
> case FUNCTIONFS_ENDPOINT_REVMAP:
> ret = epfile->ep->num;
> break;
> + case FUNCTIONFS_ENDPOINT_DESC:
> + {
> + int desc_idx;
> + struct usb_endpoint_descriptor *desc;
> +
> + switch (epfile->ffs->gadget->speed) {
> + case USB_SPEED_SUPER:
> + desc_idx = 2;
> + break;
> + case USB_SPEED_HIGH:
> + desc_idx = 1;
> + break;
> + default:
> + desc_idx = 0;
> + }
> + desc = epfile->ep->descs[desc_idx];
> + ret = copy_to_user((void *)value, desc, sizeof(*desc));
This is called under a spin lock, so nope… The simplest will be to just
unlock prior to copying and then return instead of breaking from the switch:
+ struct usb_endpoint_descriptor desc;
…
+ desc = *epfile->ep->descs[desc_idx];
+ spin_unlock_irq(&epfile->ffs->eps_lock);
+ ret = copy_to_user((void *)value, &desc, sizeof(desc));
+ return ret ? -EFAULT : 0;
> + if (ret)
> + ret = -EFAULT;
> + break;
> + }
> default:
> ret = -ENOTTY;
> }
--
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o
..o | Computer Science, Michał “mina86” Nazarewicz (o o)
ooo +--<mpn@google.com>--<xmpp:mina86@jabber.org>--ooO--(_)--Ooo--
next prev parent reply other threads:[~2014-08-24 14:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-21 12:09 [PATCH v5 0/3] usb: gadget: f_fs: userspace API fixes and improvements Robert Baldyga
2014-08-21 12:09 ` [PATCH v5 1/3] usb: gadget: f_fs: fix the redundant ep files problem Robert Baldyga
2014-08-24 14:14 ` Michal Nazarewicz
2014-08-25 8:08 ` Robert Baldyga
2014-08-21 12:09 ` [PATCH v5 2/3] usb: gadget: f_fs: add ioctl returning ep descriptor Robert Baldyga
2014-08-24 14:27 ` Michal Nazarewicz [this message]
2014-08-21 12:09 ` [PATCH v5 3/3] usb: gadget: f_fs: virtual endpoint address mapping Robert Baldyga
2014-08-24 14:31 ` Michal Nazarewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xa1tppfqufmt.fsf@mina86.com \
--to=mina86@mina86.com \
--cc=andrzej.p@samsung.com \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=k.opasiak@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=r.baldyga@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).