From patchwork Wed Dec 13 01:56:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 121718 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4921976qgn; Tue, 12 Dec 2017 18:47:36 -0800 (PST) X-Google-Smtp-Source: ACJfBotMGdEwJmIFS9UEi7YDgW0KDaEMFOLlQZjg33faip4Qm4Bv7AeS2TEgU7hZJflkb4cHynTw X-Received: by 10.99.133.200 with SMTP id u191mr3939637pgd.327.1513133256023; Tue, 12 Dec 2017 18:47:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513133256; cv=none; d=google.com; s=arc-20160816; b=1DmGh6ODdFAw74W6EmjJ+KmKXcMEDt05i1ul3n7KYgA6YcWPhiL7RrjUlilx5SEF1q eW4jz3mbVenNVW8u7eSIW8kao+sw92ngyuyrtQUXeUnJOng5pX7iy4KNFbnJ1QQUCoVb cGmfVn1L97paeruxrf+wR+Y7qwXoeciffsTuHSSHKCtDQ3fIVY2YmNhVsjwtDAArzEEc KC8zIozFmrgJN8525mh7TnbAA6pO/66y1zBVwyGwNYdBy7besVpD+H6Ph6CFwZ049H7A Wy3FYPs+JKjOyUNvi4nPaj71NEd9PdGge4NG56DcNV7TxSw47bHkRNriX8TLmu2WEqbA 1iww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:to:cc:from:dkim-signature :dkim-signature:dkim-signature:arc-authentication-results; bh=smGfVVaRN5yqe3wQgISFv1wd9lo36MwAmWyBQjYXAes=; b=mY8yiX6QftsNXsXPlXQIbUvYixbu2YA1CPJtuDbg5gPDumx2iF615BL/bP0/VgP+CG E2PvfPxmiddlj4CIX5/ndjIZvn47twL8m5Oy8y68gZOUqZS/kNMNSjbyzZN8QCekR3rF xwRXAHi4+8ALQD+NKhGpxAU7CJzKuKkItIGjPut1FOudrtmGQ+CfgxdTgSafi/h2Gbjt R587sb/Bvzvq/R/NjMnbj1fkNuNzS4CrmQyfQ+b6rezbJjaOjnZPqCW4cOfBLNqUbncd ANzngIHlfTwbJ8pO50jcwKxEkLyKA7ED9KQE7pmpTSe0HXa+Se6GSnphfiHFwnwzzFQj ez4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@verizon.com header.s=corp header.b=u5pJemwN; dkim=fail header.i=@verizon.com header.s=corp header.b=auqrfzV2; dkim=fail header.i=@verizon.com header.s=corp header.b=N8gCyRgy; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a68si494278pli.345.2017.12.12.18.47.35; Tue, 12 Dec 2017 18:47:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@verizon.com header.s=corp header.b=u5pJemwN; dkim=fail header.i=@verizon.com header.s=corp header.b=auqrfzV2; dkim=fail header.i=@verizon.com header.s=corp header.b=N8gCyRgy; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752295AbdLMCra (ORCPT + 10 others); Tue, 12 Dec 2017 21:47:30 -0500 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:57985 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752883AbdLMB5N (ORCPT ); Tue, 12 Dec 2017 20:57:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1513130233; x=1544666233; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=BpMT5s1xg91Ju7KkYtSIeZaeeodl64HJm4Vn6V6LbBg=; b=u5pJemwNGiQp8al7mIlyh6xf8ku55ErwVSnhjTNmraPkngAZh1U12DG8 FZmNoIbPD3/tSrEDUgVcL9wYznlud5PEHtP6XJ/opv5hZi0qr80xiRh1v SVrQNt4LMpG7dvrroQ+twUYoWOfnTVRSATOddH8H9+HxpBEUTVDsuCcKW s=; Received: from unknown (HELO fldsmtpi02.verizon.com) ([166.68.71.144]) by fldsmtpe03.verizon.com with ESMTP; 13 Dec 2017 01:57:03 +0000 Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO apollo.verizonwireless.com) ([10.255.192.101]) by fldsmtpi02.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Dec 2017 01:57:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1513130223; x=1544666223; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=BpMT5s1xg91Ju7KkYtSIeZaeeodl64HJm4Vn6V6LbBg=; b=auqrfzV2tvc4JlTIc4LdtGuViu4Tb3kM9fvXOI9aM46tJA6MSkmf+IYc O3bnWG0RjXri91fH6nloBZBWyIgdeIc/W2olllQ+EIrW2zxYG55jsAH4d 2FzGPlFf0kqFDdhfR3+k85nBUEmRsXBftQzFij2cpFUt4VsYAjCCno/pj g=; Received: from mariner.tdc.vzwcorp.com (HELO eris.verizonwireless.com) ([10.254.88.84]) by apollo.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 12 Dec 2017 20:57:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1513130223; x=1544666223; h=to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from:cc; bh=BpMT5s1xg91Ju7KkYtSIeZaeeodl64HJm4Vn6V6LbBg=; b=N8gCyRgy2+SAt/hWt8wrE0WHheFhOk56r14siV0b/xwOl1BYZd4HrxYY fMIO/FtUx2lT9+CBk2GKNC7ugwA+7xOYeqyG8knY7LLgBOqxVQrigsNVf b/t3TMVNfoJGL6YmC2jx3qzE84XJ06s1U+cj9ci20QzucEzuczcLEWvHx Y=; From: alexander.levin@verizon.com Cc: Roger Quadros , Felipe Balbi , alexander.levin@verizon.com X-Host: mariner.tdc.vzwcorp.com Received: from ohtwi1exh001.uswin.ad.vzwcorp.com ([10.144.218.43]) by eris.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 13 Dec 2017 01:57:03 +0000 Received: from tbwexch20apd.uswin.ad.vzwcorp.com (153.114.162.44) by OHTWI1EXH001.uswin.ad.vzwcorp.com (10.144.218.43) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 12 Dec 2017 20:57:03 -0500 Received: from OMZP1LUMXCA12.uswin.ad.vzwcorp.com (144.8.22.187) by tbwexch20apd.uswin.ad.vzwcorp.com (153.114.162.44) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 12 Dec 2017 20:57:02 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA12.uswin.ad.vzwcorp.com (144.8.22.187) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Tue, 12 Dec 2017 19:57:01 -0600 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1263.000; Tue, 12 Dec 2017 19:57:01 -0600 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH AUTOSEL for 4.9 021/100] usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed Thread-Topic: [PATCH AUTOSEL for 4.9 021/100] usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed Thread-Index: AQHTc7WRg1tf4rsbf0eFXZZlc6EUuA== Date: Wed, 13 Dec 2017 01:56:19 +0000 Message-ID: <20171213015606.6568-21-alexander.levin@verizon.com> References: <20171213015606.6568-1-alexander.levin@verizon.com> In-Reply-To: <20171213015606.6568-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Roger Quadros [ Upstream commit 16bb05d98c904a4f6c5ce7e2d992299f794acbf2 ] As per USB3.0 Specification "Table 9-20. Standard Endpoint Descriptor", for interrupt and isochronous endpoints, wMaxPacketSize must be set to 1024 if the endpoint defines bMaxBurst to be greater than zero. Reviewed-by: Laurent Pinchart Signed-off-by: Roger Quadros Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/f_uvc.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.11.0 diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index c7689d05356c..f8a1881609a2 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -594,6 +594,14 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f) opts->streaming_maxpacket = clamp(opts->streaming_maxpacket, 1U, 3072U); opts->streaming_maxburst = min(opts->streaming_maxburst, 15U); + /* For SS, wMaxPacketSize has to be 1024 if bMaxBurst is not 0 */ + if (opts->streaming_maxburst && + (opts->streaming_maxpacket % 1024) != 0) { + opts->streaming_maxpacket = roundup(opts->streaming_maxpacket, 1024); + INFO(cdev, "overriding streaming_maxpacket to %d\n", + opts->streaming_maxpacket); + } + /* Fill in the FS/HS/SS Video Streaming specific descriptors from the * module parameters. *