All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ben Dooks <ben-linux@fluff.org>
To: linux-usb@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org, Ben Dooks <ben-linux@fluff.org>
Subject: [PATCH 02/11] USB: s3c-hsotg: The NPTX/PTX FIFO sizes are in words, not bytes
Date: Wed,  7 Jul 2010 01:02:14 +0100	[thread overview]
Message-ID: <1278460943-16224-3-git-send-email-ben-linux@fluff.org> (raw)
In-Reply-To: <1278460943-16224-1-git-send-email-ben-linux@fluff.org>

Fix a problem where we have been underestimating the space available in
the IN PTX/NPTX FIFOs by assuming that they where simply word aligned
instead of in number-of-words. This means all length calculations need
to be multiplied-by-4.

Note, we do not change the information about fifo size or start addresses
available to userspace as we assume the user can multiply by four easily
and is already knows these values are in words.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
 drivers/usb/gadget/s3c-hsotg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 81f62da..4a25145 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -505,6 +505,7 @@ static int s3c_hsotg_write_fifo(struct s3c_hsotg *hsotg,
 		}
 
 		can_write = S3C_GNPTXSTS_NPTxFSpcAvail_GET(gnptxsts);
+		can_write *= 4;	/* fifo size is in 32bit quantities. */
 	}
 
 	dev_dbg(hsotg->dev, "%s: GNPTXSTS=%08x, can=%d, to=%d, mps %d\n",
@@ -2732,7 +2733,7 @@ static void __devinit s3c_hsotg_initep(struct s3c_hsotg *hsotg,
 	 */
 
 	ptxfifo = readl(hsotg->regs + S3C_DPTXFSIZn(epnum));
-	hs_ep->fifo_size = S3C_DPTXFSIZn_DPTxFSize_GET(ptxfifo);
+	hs_ep->fifo_size = S3C_DPTXFSIZn_DPTxFSize_GET(ptxfifo) * 4;
 
 	/* if we're using dma, we need to set the next-endpoint pointer
 	 * to be something valid.
-- 
1.7.0.4

  parent reply	other threads:[~2010-07-07 11:57 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-07  0:02 s3c-hsotg patches Ben Dooks
2010-07-07  0:02 ` [PATCH 01/11] USB: s3c-hsotg: Increase TX fifo limit Ben Dooks
2010-07-07  0:02 ` Ben Dooks [this message]
2010-07-07  0:02 ` [PATCH 03/11] USB: s3c-hsotg: Avoid overwriting contents of perodic in 'fifo' Ben Dooks
2010-07-07  0:02 ` [PATCH 05/11] USB: s3c-hsotg: Add initial detection and setup for dedicated FIFO mode Ben Dooks
2010-07-07  0:02 ` [PATCH 07/11] USB: s3c-hsotg: Check for new request before enqueing new setup Ben Dooks
     [not found] ` <1278460943-16224-1-git-send-email-ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
2010-07-07  0:02   ` [PATCH 04/11] USB: s3c-hsotg: Re-initialise all FIFOs on USB bus reset Ben Dooks
2010-07-07  0:02   ` [PATCH 06/11] USB: s3c-hsotg: Only load packet per fifo write Ben Dooks
2010-07-09 10:48     ` Sergei Shtylyov
2010-07-07  0:02   ` [PATCH 08/11] USB: s3c-hsotg: Fix max EP0 IN request length Ben Dooks
2010-07-07  0:02 ` [PATCH 09/11] USB: s3c-hsotg: Fix the OUT EP0 limit Ben Dooks
2010-07-07  0:02 ` [PATCH 10/11] USB: s3c-hsotg: Fix OUT packet request retry Ben Dooks
2010-07-07  0:02 ` [PATCH 11/11] USB: s3c-hsotg: Add support for external USB clock Ben Dooks
2010-07-07 15:12 ` s3c-hsotg patches Greg KH
2010-07-14  9:39   ` Marek Szyprowski
     [not found]     ` <00c401cb2338$84a3f730$8debe590$%szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2010-07-14 15:10       ` Greg KH
     [not found]         ` <20100714151026.GD24104-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2010-07-15  9:02           ` Ben Dooks
     [not found]             ` <20100715090222.GD16584-SMNkleLxa3Z6Wcw2j4pizdi2O/JbrIOy@public.gmane.org>
2010-07-15 10:05               ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2010-07-19  8:40 S3C HSOTG fixes Ben Dooks
2010-07-19  8:40 ` [PATCH 02/11] USB: s3c-hsotg: The NPTX/PTX FIFO sizes are in words, not bytes Ben Dooks

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=1278460943-16224-3-git-send-email-ben-linux@fluff.org \
    --to=ben-linux@fluff.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.