From patchwork Thu Mar 1 15:22:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130239 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2933506edc; Thu, 1 Mar 2018 07:23:59 -0800 (PST) X-Google-Smtp-Source: AG47ELsy7MXCQ9LMnyLf1+GhaMV9szdYISv3tf8UkvojRO87wUa86/fl5S2+2UOjv4mQXp1q+AxW X-Received: by 10.99.42.207 with SMTP id q198mr1795856pgq.186.1519917839537; Thu, 01 Mar 2018 07:23:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519917839; cv=none; d=google.com; s=arc-20160816; b=oqKH/zXVnlZADx6/VPoBuNvkIQX3vio4img9xZFAPK97EGGXreO4GVi6mFDoXoHZk7 Su0tCbDLjbINAV43XR50GfD6tM1UBBVKP6CVPaJJaHqHFBAPc/rdR1+U5BjSnreKNLAQ 0n/nlfG44AnRXHNWfADT3aYsDur5iAI6sT7g4rxbjrTOwkrH9C4fIg8MCO+oVHev1fCQ ltM5a+hbPGqWpSPAffVpZlJQbYOyu14siqc70eA90/yCf8n/UctWvgmJvxPoKV/acP8l veYVimbKvJlPz7B/NsmOH5j7AuOGtnHapNYUgdDIoVPHONRHBumIk0ZH8ZCShZHsqBHr K1yw== 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=hFpJ3ZFQs9RgTuLX6df7BYwuG8qj0m+7b5ZJow3hUxk=; b=DzcUi8bAw4tTw90aHuS/n85F6MQ9Xz77ITXqKtUUyOdn9QRngBoFwXDzVe7penEe9i zIoi1XcuFzZYulkGnNuHmbk6mlTwSYhfcJzii0PXKbe1W7EkR1Ulm5zm8VLhJKGu0BD1 6YVNE0N5r97hjiNsJPzN4kPqYWudxRE31VxTHoI0Z+YTziY/bnPjCkXTL1aIn9G13v3R gDNaC7qYBMvSFWVsu6X4qF3wt7x9w+f28R4pATw3vv0x1PvtwAkjA9qDOQVvBvqbYXCf Wise/51zZUzzJtTm+RY8IVtkGttt5hH/azgQe8Dgk7OpO8J1GAcCabeQZBqbNNBArub3 ybng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=MzThmcKn; 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 b72si3177910pfk.10.2018.03.01.07.23.59; Thu, 01 Mar 2018 07:23:59 -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=MzThmcKn; 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 S1031882AbeCAPX5 (ORCPT + 10 others); Thu, 1 Mar 2018 10:23:57 -0500 Received: from mail-sn1nam02on0106.outbound.protection.outlook.com ([104.47.36.106]:44032 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031889AbeCAPXd (ORCPT ); Thu, 1 Mar 2018 10:23:33 -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=hFpJ3ZFQs9RgTuLX6df7BYwuG8qj0m+7b5ZJow3hUxk=; b=MzThmcKnUukdLhbXRRz7lcIEHPz2pGkv48E5wMKlspnveegcT4Ij+svIduS9j4tb498jmtl+lM160UwYO5j8eG1N0+lS9rCwaEI/K9at8HN+EcTMS0nlyiyTlkygfzkFdGuUcWlRESCuh6HlnssAiuSeSSo8+BdK0xx4y/5kelQ= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1112.namprd21.prod.outlook.com (52.132.133.139) 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:23:32 +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:23:32 +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 4.1 stable tree] usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed Thread-Topic: [added to the 4.1 stable tree] usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed Thread-Index: AQHTsXEj5mKWrP1XTESMcIwPMoYg4g== Date: Thu, 1 Mar 2018 15:22:40 +0000 Message-ID: <20180301152116.1486-22-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-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; DM5PR2101MB1112; 7:Nd1OS7ssreas58jacDIZ2Rs18VQj1Ad2Qqyt073Fn/zAqCz/9SEGxAs5EcgZHmClGWfNim8rKba4LI44LVYVFmklbR6oAQ7UcXGALSxMPUq4C3ZaTliEb7zfywI0fZw8ejw5uMVW4vE+f72P3rPaB3n9V8hzcydxELPBD4R3VR5w5LO4u3ca6jBkVnTXFOAeQrijk5McSIM0HfjL1Ed3wEjgHA9XOZhw5m4HjUUZ49qL8CS0mEioiytXkVDm2nyb x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: d66a16ab-a6cb-4ba2-a6cd-08d57f886482 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1112; x-ms-traffictypediagnostic: DM5PR2101MB1112: 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)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231220)(944501228)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1112; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1112; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(396003)(376002)(39860400002)(39380400002)(189003)(199004)(72206003)(2900100001)(86612001)(6346003)(107886003)(3280700002)(3846002)(106356001)(86362001)(6436002)(22452003)(3660700001)(305945005)(68736007)(4326008)(2950100002)(186003)(105586002)(6506007)(8676002)(6666003)(6116002)(26005)(102836004)(5660300001)(7736002)(76176011)(25786009)(99286004)(1076002)(81156014)(81166006)(10090500001)(6486002)(478600001)(2906002)(53936002)(14454004)(316002)(97736004)(5250100002)(36756003)(54906003)(110136005)(66066001)(2501003)(10290500003)(6512007)(8936002)(22906009)(145543001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1112; 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: DlP4pXpk7DtuOESk5a5Hrb5eRJGtLebqYMb4I6yHI6b9dm1gYx32z6wH0ChK6eMgDC08oM7fy7TjvFkstERd7sRYUqmy2Cc04DB/3bptAtjZy82kWVJPDei7n4bZFVIh2Ig5ilt6Avd9RpMlVzqCN5fUXM8FW8Td/ci8XMrcbc8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: d66a16ab-a6cb-4ba2-a6cd-08d57f886482 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:22:40.4950 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1112 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 4.1 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. *