Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp517439pxb; Thu, 9 Sep 2021 06:17:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjQnelcJQTqG8dUlso+MUZU2kYu2Yde3tXzNOeJeaxU8J+pErnQ6cy4h6Cxbl3/wqHit/v X-Received: by 2002:a02:620e:: with SMTP id d14mr2716769jac.91.1631193434667; Thu, 09 Sep 2021 06:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631193434; cv=none; d=google.com; s=arc-20160816; b=gnKI5lxmql9kUFec8NOjwq2sBKjM4/dsCS8vYcHlBhJPU2Wcbdhh+ZD2RXgnznKtVP 6RBG1Nbh12teO1O+fThTNXSQHWnSbCmMWd6N2RqQYJ49BqYooKSZq/AFrGhVwNEflBbG 8D1Q6a8jPclA/NRbOOJ3+ZOj6FavnVzc6XJMaFPVWodHvGrpXYrBBXqyD7TbkEZ6UZ5W RBU43E4rP+wOldOsVjLMpdDQ6LoA+sQ0mi4LA+sMxYFC/8eQiNwYFEQgxrzWMLYuHZnw 6RJh4DqiM++5B5H2gyADKHicgu2YbHGTYtqEgRTrsWRWZS3A5uwKI6PLNVU0gMxg9pxM Onrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=//xY2jEiy3GFsJCK52XA6UbZQ+wrm2yuZhU+awRGalo=; b=eUlGJKRnpA6Rl9v40Owxjxw/csb7i1igeUEq5wmA8gm3+6FVvSpAiAfNrJ3NUIPxGG ZsySD3yV7UR7efSrf1dQgKa/exqFEbQgE2yYjkihh2XCoBLLnm/Nxm+UVrwAAsDM2K+R K4vruB5REl5RgPh8NKsQCykp+PDKfyfRhFMBuyYmxjgrWRUweOQtbt2w8y+3VFcGAJzK zqT1vhVfBFbuQB+hdbliKYkejE7bpi8jthHFWhkB5ewHxY1CfgbTWSust0F5ekGYYKme BaASdgaTPYf4QsDu4mvuXJ+i0n3kHEs0urwX14PgPqgBTDoYNtpgw5hZYlMeaRupdFPt emhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IIR0bpDV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q17si1921568ilj.164.2021.09.09.06.16.57; Thu, 09 Sep 2021 06:17:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IIR0bpDV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359280AbhIINQo (ORCPT + 99 others); Thu, 9 Sep 2021 09:16:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:42444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357489AbhIINBD (ORCPT ); Thu, 9 Sep 2021 09:01:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 578CD613D1; Thu, 9 Sep 2021 11:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188752; bh=CY71r+NTD1SPdVZRbJumo3tdI7iwjstJ8isvjopW9/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IIR0bpDV2mcAHSNt29qWRTkHIBhJzFJSaoeX5Rv24iwNIXOsVoKDNMzrRAAh1+iqW Vo4UjaH4x5M+GPJqaUiCX97IFfDep1slMlOSmrIYjKRn7IXR9m9dkS41mr1+Dx8K43 pAd/ss7REfHgF0oxna+Db5g3OmaOunEd+Sq+vWxbs30ASaQI1XsQYB/jd4arJU/fKe 2EyofnR+cPphjbmu+7sPhoHYFLt6fh0VV6dhVkGHk483qspoQeIyrszCN1bhiztRVY 3dkC4Z5DTVEGimBy3MCTIqIxCncTw07LhLoFjvkJDbzZDN5cTsdqVx3MqZqFC4APIY iCQBY8UMcjczA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kelly Devilliv , Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 09/59] usb: host: fotg210: fix the endpoint's transactional opportunities calculation Date: Thu, 9 Sep 2021 07:58:10 -0400 Message-Id: <20210909115900.149795-9-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115900.149795-1-sashal@kernel.org> References: <20210909115900.149795-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kelly Devilliv [ 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 Link: https://lore.kernel.org/r/20210627125747.127646-3-kelly.devilliv@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- 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