lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 09/59] usb: host: fotg210: fix the endpoint's transactional opportunities calculation
    Date
    From: Kelly Devilliv <kelly.devilliv@gmail.com>

    [ Upstream commit c2e898764245c852bc8ee4857613ba4f3a6d761d ]

    Now that usb_endpoint_maxp() only returns the lowest
    11 bits from wMaxPacketSize, we should make use of the
    usb_endpoint_* helpers instead and remove the unnecessary
    max_packet()/hb_mult() macro.

    Signed-off-by: Kelly Devilliv <kelly.devilliv@gmail.com>
    Link: https://lore.kernel.org/r/20210627125747.127646-3-kelly.devilliv@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/host/fotg210-hcd.c | 36 ++++++++++++++++------------------
    1 file changed, 17 insertions(+), 19 deletions(-)

    diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
    index bbe1ea00d887..849816ab5b77 100644
    --- a/drivers/usb/host/fotg210-hcd.c
    +++ b/drivers/usb/host/fotg210-hcd.c
    @@ -2536,11 +2536,6 @@ static unsigned qh_completions(struct fotg210_hcd *fotg210,
    return count;
    }

    -/* high bandwidth multiplier, as encoded in highspeed endpoint descriptors */
    -#define hb_mult(wMaxPacketSize) (1 + (((wMaxPacketSize) >> 11) & 0x03))
    -/* ... and packet size, for any kind of endpoint descriptor */
    -#define max_packet(wMaxPacketSize) ((wMaxPacketSize) & 0x07ff)
    -
    /* reverse of qh_urb_transaction: free a list of TDs.
    * used for cleanup after errors, before HC sees an URB's TDs.
    */
    @@ -2626,7 +2621,7 @@ static struct list_head *qh_urb_transaction(struct fotg210_hcd *fotg210,
    token |= (1 /* "in" */ << 8);
    /* else it's already initted to "out" pid (0 << 8) */

    - maxpacket = max_packet(usb_maxpacket(urb->dev, urb->pipe, !is_input));
    + maxpacket = usb_maxpacket(urb->dev, urb->pipe, !is_input);

    /*
    * buffer gets wrapped in one or more qtds;
    @@ -2740,9 +2735,11 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
    gfp_t flags)
    {
    struct fotg210_qh *qh = fotg210_qh_alloc(fotg210, flags);
    + struct usb_host_endpoint *ep;
    u32 info1 = 0, info2 = 0;
    int is_input, type;
    int maxp = 0;
    + int mult;
    struct usb_tt *tt = urb->dev->tt;
    struct fotg210_qh_hw *hw;

    @@ -2757,14 +2754,15 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,

    is_input = usb_pipein(urb->pipe);
    type = usb_pipetype(urb->pipe);
    - maxp = usb_maxpacket(urb->dev, urb->pipe, !is_input);
    + ep = usb_pipe_endpoint(urb->dev, urb->pipe);
    + maxp = usb_endpoint_maxp(&ep->desc);
    + mult = usb_endpoint_maxp_mult(&ep->desc);

    /* 1024 byte maxpacket is a hardware ceiling. High bandwidth
    * acts like up to 3KB, but is built from smaller packets.
    */
    - if (max_packet(maxp) > 1024) {
    - fotg210_dbg(fotg210, "bogus qh maxpacket %d\n",
    - max_packet(maxp));
    + if (maxp > 1024) {
    + fotg210_dbg(fotg210, "bogus qh maxpacket %d\n", maxp);
    goto done;
    }

    @@ -2778,8 +2776,7 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
    */
    if (type == PIPE_INTERRUPT) {
    qh->usecs = NS_TO_US(usb_calc_bus_time(USB_SPEED_HIGH,
    - is_input, 0,
    - hb_mult(maxp) * max_packet(maxp)));
    + is_input, 0, mult * maxp));
    qh->start = NO_FRAME;

    if (urb->dev->speed == USB_SPEED_HIGH) {
    @@ -2816,7 +2813,7 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
    think_time = tt ? tt->think_time : 0;
    qh->tt_usecs = NS_TO_US(think_time +
    usb_calc_bus_time(urb->dev->speed,
    - is_input, 0, max_packet(maxp)));
    + is_input, 0, maxp));
    qh->period = urb->interval;
    if (qh->period > fotg210->periodic_size) {
    qh->period = fotg210->periodic_size;
    @@ -2879,11 +2876,11 @@ static struct fotg210_qh *qh_make(struct fotg210_hcd *fotg210, struct urb *urb,
    * to help them do so. So now people expect to use
    * such nonconformant devices with Linux too; sigh.
    */
    - info1 |= max_packet(maxp) << 16;
    + info1 |= maxp << 16;
    info2 |= (FOTG210_TUNE_MULT_HS << 30);
    } else { /* PIPE_INTERRUPT */
    - info1 |= max_packet(maxp) << 16;
    - info2 |= hb_mult(maxp) << 30;
    + info1 |= maxp << 16;
    + info2 |= mult << 30;
    }
    break;
    default:
    @@ -3953,6 +3950,7 @@ static void iso_stream_init(struct fotg210_hcd *fotg210,
    int is_input;
    long bandwidth;
    unsigned multi;
    + struct usb_host_endpoint *ep;

    /*
    * this might be a "high bandwidth" highspeed endpoint,
    @@ -3960,14 +3958,14 @@ static void iso_stream_init(struct fotg210_hcd *fotg210,
    */
    epnum = usb_pipeendpoint(pipe);
    is_input = usb_pipein(pipe) ? USB_DIR_IN : 0;
    - maxp = usb_maxpacket(dev, pipe, !is_input);
    + ep = usb_pipe_endpoint(dev, pipe);
    + maxp = usb_endpoint_maxp(&ep->desc);
    if (is_input)
    buf1 = (1 << 11);
    else
    buf1 = 0;

    - maxp = max_packet(maxp);
    - multi = hb_mult(maxp);
    + multi = usb_endpoint_maxp_mult(&ep->desc);
    buf1 |= maxp;
    maxp *= multi;

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 15:37    [W:4.171 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site