From patchwork Thu Nov 26 18:02:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 333035 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp1516741ilb; Thu, 26 Nov 2020 10:04:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9i0ZFH6GNLB3xMXXL11qs++ecI/e65In97OCVChMB/E1whGWkYfJ7i+OtL94m03AMFPfc X-Received: by 2002:a17:906:8282:: with SMTP id h2mr3741922ejx.50.1606413877542; Thu, 26 Nov 2020 10:04:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606413877; cv=none; d=google.com; s=arc-20160816; b=u1XAMWAerQiHuc+crvnPpnXX4uA2zZf3w/mHbPg0xh3MccKOoP856SFV7H+ii+6h5x CIBZxwQ/FQof4ejGNZfKY/iU0CVo9ITUXYJUKC1lxlCyNASf/6CTH2rlL0cgR6zHNEPC DvM5/HtE6L9FZOfA5wlxqjR9bXt7fg6gCqZ20zDnb7CnJx0uHPaZkgB+D4WhFsNAWZFz S0iGYkOc6PzGqFImj78+BrRTnN4Jkh8OaIaHYgspwobU9ozLNht6sNU5DrCUwv+kR7c8 IEXOOQB3gAJriv4NGoUMr0WZT8WUYraacDNmaLyoQNQj4UcnRz9NN7TDeym+4Ksr1T0J gEDg== 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; bh=3BbYB8jyVtVzmYukMQTJC6VVQm7K3N+IaNm1izmdICk=; b=rEojoHsXX12pgXM7yCUilKhDY+N7rCKYAAjmKlobfjfMZ36rkWPe1BaFDXm1CbJc98 tw0Krf9iBf++NOs2ojXvgisjOSBEjuRwSI5OSM+gK11/0R/5i6Fe7Bq3A72w1sCMueYT wBtnYtBv97ZgCkm2CBrbWTxSt+6kNBPMgiCbWKyT8EC3BrBBX2WvQ09RHIBi1K1QghPw u52lK09I8QMSUeMF+zoPX13K4Dv6VShc06T3iYJmme2lJv1JOaHKH//Zct5AeA0EqQNq uVx8eD7cV/lpgRJnOOHtniPpVLIXAuvOa/vlwzs/JYnCan5FNOTGDbYtDgSNZGCXslB+ CO1g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s3si3505960ejc.65.2020.11.26.10.04.37; Thu, 26 Nov 2020 10:04:37 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404630AbgKZSCu (ORCPT + 14 others); Thu, 26 Nov 2020 13:02:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:52918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404528AbgKZSCu (ORCPT ); Thu, 26 Nov 2020 13:02:50 -0500 Received: from localhost (82-217-20-185.cable.dynamic.v4.ziggo.nl [82.217.20.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3C73B21D81; Thu, 26 Nov 2020 18:02:49 +0000 (UTC) From: Greg Kroah-Hartman To: balbi@kernel.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, "taehyun.cho" , Peter Chen , stable , Will McVicker , Greg Kroah-Hartman Subject: [PATCH 3/4] USB: gadget: f_fs: add SuperSpeed Plus support Date: Thu, 26 Nov 2020 19:02:34 +0100 Message-Id: <20201126180235.254523-3-gregkh@google.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201126180235.254523-1-gregkh@google.com> References: <20201126180235.254523-1-gregkh@google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "taehyun.cho" Setup the descriptors for SuperSpeed Plus for f_fs. This allows the gadget to work properly without crashing at SuperSpeed rates. Cc: Felipe Balbi Cc: Peter Chen Cc: stable Signed-off-by: taehyun.cho Signed-off-by: Will McVicker Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/function/f_fs.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.29.2 diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 046f770a76da..a34a7c96a1ab 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -1327,6 +1327,7 @@ static long ffs_epfile_ioctl(struct file *file, unsigned code, struct usb_endpoint_descriptor *desc; switch (epfile->ffs->gadget->speed) { + case USB_SPEED_SUPER_PLUS: case USB_SPEED_SUPER: desc_idx = 2; break; @@ -3222,6 +3223,10 @@ static int _ffs_func_bind(struct usb_configuration *c, func->function.os_desc_n = c->cdev->use_os_string ? ffs->interfaces_count : 0; + if (likely(super)) { + func->function.ssp_descriptors = + usb_copy_descriptors(func->function.ss_descriptors); + } /* And we're done */ ffs_event_add(ffs, FUNCTIONFS_BIND); return 0;