From patchwork Thu Mar 1 15:20:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130232 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2929408edc; Thu, 1 Mar 2018 07:20:26 -0800 (PST) X-Google-Smtp-Source: AG47ELv7cOCHhypoHizC4/ARapptzVqkUOnNmOpVRj9JSUAyxdQYEVzs/tljDOoTQMBj3H7gfVzY X-Received: by 10.98.134.10 with SMTP id x10mr2318139pfd.78.1519917626078; Thu, 01 Mar 2018 07:20:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519917626; cv=none; d=google.com; s=arc-20160816; b=pUF8ugMAnZ+JcHpYRhwOK74DXmEU2oct6v+uGHJjed0+sr7J6zFXA2JISrEuGObChI BVDf6KvTevaak4dWYXmD64CDBrJ7f+G2jGZZPmo/9144QHIwGIPqKXteR2YDPewvfKA6 FH0FJT6KAwFuHr8cm0R/78ZbaeuiNkzs4u0fCkxdLAlfZwVArGxyGIbaDzgFET0qI1N4 lNgmu7leYPrv++OtXCQiby+hqlzU8Mr/reZRoYMT/g7QtD2BFbgseOGJY06OfU8MxE8I Waru8G6WOWFOHg9r3uorQgOVlmE43V5eDmfchGH1oCt340y4sZaTM7wnWPEdFDlgk/nm vPsw== 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 :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=xjc/p9nWHnaynzqNWTxku3yvZmedFNJHVNOnNNC5DC4=; b=0jCtKcqjJuxykIIaAxohTot3Dggs/BxwmawkaQhiJCemlN9gjcYjvr3gA8PoMFE/p8 b79IbXsBak07HfAuE1haQiwFXNz22wO4NlIFxeaI/PTi0y9jZftOXi/fVCaQ7VbuHnmW OA3y5DLBxQyrGZbqjhDqsAphbHyFgy5Dp/W2TL+QMc1MSa4Hz91io30G8gmQQg87b1cr MpzCyxDZqTL3GSFi9ifvuZqIKmtV3rTq3YLs+e4qyrxd6H3mrK4CnD8s1mA6Nx/qILYf F4bHXsdfyhJubc+H0U2RmjFf9WFnPCKkccU1VTNut7G4Y392dZwvOf5i08K/RWh3pTb6 EqdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=MACu+e9Y; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o2si2229365pgq.750.2018.03.01.07.20.25; Thu, 01 Mar 2018 07:20:26 -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=pass header.i=@microsoft.com header.s=selector1 header.b=MACu+e9Y; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031834AbeCAPUY (ORCPT + 10 others); Thu, 1 Mar 2018 10:20:24 -0500 Received: from mail-bl2nam02on0102.outbound.protection.outlook.com ([104.47.38.102]:36616 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031825AbeCAPUT (ORCPT ); Thu, 1 Mar 2018 10:20:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=xjc/p9nWHnaynzqNWTxku3yvZmedFNJHVNOnNNC5DC4=; b=MACu+e9YyYdGMawkLYA7DpMi5Rijp/ga7oNqG4FHvpXjhRZ169zPQ4aB6C5kLPBn98sTD0WgnHg36lDD8+MfeeDp5W/FtqFxcD3pjD8GMl9axecojStMmSwvROfUTe6Wd954Lzat/7UTctAaGd2c43G8zfNJB3H14zK13L5strY= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1061.namprd21.prod.outlook.com (52.132.128.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:20:12 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:20:12 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Roger Quadros , Felipe Balbi , Sasha Levin Subject: [added to the stable tree] usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed Thread-Topic: [added to the stable tree] usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed Thread-Index: AQHTsXDEP+F5EiCHek+KO4IwIRmDTw== Date: Thu, 1 Mar 2018 15:20:01 +0000 Message-ID: <20180301151857.721-22-alexander.levin@microsoft.com> References: <20180301151857.721-1-alexander.levin@microsoft.com> In-Reply-To: <20180301151857.721-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1061; 7:t3P2JMqlj7w2ZubFS3B/+oGF5djyIL/NHps/XxzBxqhDBFIXJ7N4g8EXcHnOmswo4A+KkYloycdEI0VHt+gruxyMcCm31o4SfPhASOCufNC3AXsPaUDx/sKTzHKGXlntMj6ze2K+WRjfFE3HjiS5JoCrmhKuT/xtc6pP8V50qwpboyUUgNkFPhq7B/rQecf/k3i8VyIH/lCJF5LA/DPDpFNqwPof13mFsHmAIjweoN7YOIT2NpnR0vNSL3g5WIyd x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: d31a8a86-5716-4ec5-96d6-08d57f87edad x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1061; x-ms-traffictypediagnostic: DM5PR2101MB1061: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(31051911155226)(89211679590171)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(3231220)(944501226)(52105095)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1061; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1061; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(189003)(199004)(6506007)(66066001)(99286004)(2501003)(5250100002)(14454004)(3660700001)(6436002)(97736004)(106356001)(6116002)(3846002)(36756003)(4326008)(6486002)(6512007)(68736007)(102836004)(186003)(86612001)(72206003)(7736002)(8936002)(81166006)(81156014)(22452003)(2900100001)(305945005)(76176011)(25786009)(6346003)(53936002)(110136005)(105586002)(54906003)(8676002)(2950100002)(316002)(26005)(1076002)(478600001)(107886003)(10290500003)(10090500001)(3280700002)(86362001)(2906002)(6666003)(5660300001)(22906009)(145543001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1061; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: qE+LmOAqrNkdQaq50l62UsvypwRCtioC872iKYdgNMKroK1ZY8pu//pYf26JSRCYp3IWWNeVEW7NCZ+m6ZtyI9vdL4AeZmQzaf0GasumC1GaeG4rYmGv4lf04KncHWTuXOFZSxb5hlpjOvZWHKOVeYPDghOQmYVptKC6XaIF3So= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: d31a8a86-5716-4ec5-96d6-08d57f87edad X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:20:01.6273 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1061 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Roger Quadros This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ 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(+) diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index 7405ce32a690..0e704a857115 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -611,6 +611,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. *