mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Felipe F. Tonello" <eu@felipetonello.com>
To: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Felipe Balbi <balbi@kernel.org>,
	Michal Nazarewicz <mina86@mina86.com>
Subject: [PATCH v3 1/9] usb: gadget: fix usb_ep_align_maybe endianness and new usb_ep_align
Date: Fri,  5 Aug 2016 19:34:53 +0100	[thread overview]
Message-ID: <20160805183501.11993-2-eu@felipetonello.com> (raw)
In-Reply-To: <20160805183501.11993-1-eu@felipetonello.com>

USB spec specifies wMaxPacketSize to be little endian (as other properties),
so when using this variable in the driver we should convert to the current
CPU endianness if necessary.

This patch also introduces usb_ep_align() which does always returns the
aligned buffer size for an endpoint. This is useful to be used by USB requests
allocator functions.

Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
---
 include/linux/usb/gadget.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 612dbdfa388e..3cc93237ff98 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -418,8 +418,20 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev)
 	list_for_each_entry(tmp, &(gadget)->ep_list, ep_list)
 
 /**
+ * usb_ep_align - returns @len aligned to ep's maxpacketsize.
+ * @ep: the endpoint whose maxpacketsize is used to align @len
+ * @len: buffer size's length to align to @ep's maxpacketsize
+ *
+ * This helper is used to align buffer's size to an ep's maxpacketsize.
+ */
+static inline size_t usb_ep_align(struct usb_ep *ep, size_t len)
+{
+	return round_up(len, (size_t)le16_to_cpu(ep->desc->wMaxPacketSize));
+}
+
+/**
  * usb_ep_align_maybe - returns @len aligned to ep's maxpacketsize if gadget
- *	requires quirk_ep_out_aligned_size, otherwise reguens len.
+ *	requires quirk_ep_out_aligned_size, otherwise returns len.
  * @g: controller to check for quirk
  * @ep: the endpoint whose maxpacketsize is used to align @len
  * @len: buffer size's length to align to @ep's maxpacketsize
@@ -430,8 +442,7 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev)
 static inline size_t
 usb_ep_align_maybe(struct usb_gadget *g, struct usb_ep *ep, size_t len)
 {
-	return !g->quirk_ep_out_aligned_size ? len :
-			round_up(len, (size_t)ep->desc->wMaxPacketSize);
+	return g->quirk_ep_out_aligned_size ? usb_ep_align(ep, len) : len;
 }
 
 /**
-- 
2.9.0

  reply	other threads:[~2016-08-05 18:43 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-05 18:34 [PATCH v3 0/9] Gadget endpoint request allocation and MIDI Felipe F. Tonello
2016-08-05 18:34 ` Felipe F. Tonello [this message]
2016-08-06  2:03   ` [PATCH v3 1/9] usb: gadget: fix usb_ep_align_maybe endianness and new usb_ep_align Michal Nazarewicz
2016-08-05 18:34 ` [PATCH v3 2/9] usb: gadget: align buffer size when allocating for OUT endpoint Felipe F. Tonello
2016-08-05 19:15   ` kbuild test robot
2016-08-08 17:09     ` Felipe Ferreri Tonello
2016-08-05 18:34 ` [PATCH v3 3/9] usb: gadget: f_midi: remove alignment code " Felipe F. Tonello
2016-08-05 18:34 ` [PATCH v3 4/9] usb: gadget: f_midi: defaults buflen sizes to 512 Felipe F. Tonello
2016-08-06  2:04   ` Michal Nazarewicz
2016-08-05 18:34 ` [PATCH v3 5/9] usb: gadget: f_midi: refactor state machine Felipe F. Tonello
2016-08-05 18:34 ` [PATCH v3 6/9] usb: gadget: f_midi: drop substreams when disabling endpoint Felipe F. Tonello
2016-08-05 18:34 ` [PATCH v3 7/9] usb: gadget: remove useless parameter in alloc_ep_req() Felipe F. Tonello
2016-08-05 18:35 ` [PATCH v3 8/9] usb: gadget: f_hid: use free_ep_req() Felipe F. Tonello
2016-08-05 18:35 ` [PATCH v3 9/9] usb: gadget: f_hid: use alloc_ep_req() Felipe F. Tonello

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=20160805183501.11993-2-eu@felipetonello.com \
    --to=eu@felipetonello.com \
    --cc=balbi@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mina86@mina86.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

Powered by JetHome