Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp263350pxx; Wed, 28 Oct 2020 04:26:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOCV0DQff2bg5cj/RGaK4YfVSDWZIkEkuwTwzwwy3wB4D6n5mDpxZEKg9u7dGLfBACyN5b X-Received: by 2002:a17:906:48c:: with SMTP id f12mr7428672eja.467.1603884415686; Wed, 28 Oct 2020 04:26:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603884415; cv=none; d=google.com; s=arc-20160816; b=LbyPedRRJQx0qjbKQDNZSf12ZnFaPy7BWrUIIDjGgRSJFlb0NKsNNmShcg/ILuNR0y sJDu+AJiyRAqCb6fuAaUoz9FAmccUcp5Z6iiW94rNh2QbLP0nsZi0MqVGNHZgtvAEBRT 9gJWJWOhjKrFV4t2CBS7wBcoTFdgRlnwY2bDmOgmerPPNKS50899OGESWJwWFCTuXlgA b6Nu3X/mNrUzjysi2eYZm/jUf+w/XkTX9W86EI1Nem1SpmKdbOXXf4dTN+9/QE/5EO0d 4aX7G7I3WxYC9O5EDq8gGNDAEpF26aYp0umpi4CM+7ifB0Z90e8rRn2LwXmUvDSeTJ8K OjyQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IxPYX6B3sXCoZ6pT6SOYN3aS5t1D597vrCUfmoUyxxA=; b=XdaW3UVAmXYa/e2NH5nPYKZAI+ylN09KEqJDiOVtGCP+TicLbJCuRZv+GwdNM2UR8u q4FNAzagYjnQr20QGKPpshQ34DEYNy1uu8OQtCNwcft83teevqFviC1UL2k5II6GVCBF EJ/TENn1Hkj+yszsaCi85Lwzr9zHliCW746nTdWPl6ZBvDMTab2sIwhpX4rDVoDrBQaC ap8gK2hT8Z/2I6dbtLXgN2UweM0zrVE+qkfAvgNo9kc6z0mOb8Ncd8aAsDj0uW4vDe8b glwbwEnCMIM0juiGL7kXIbWsGIBhonfR8I5Vy/qtCUqTlA+7IdjO8ZtxqUSg5fDKzqab KjFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nhR84d1y; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d2si2953320edn.245.2020.10.28.04.26.33; Wed, 28 Oct 2020 04:26:55 -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=default header.b=nhR84d1y; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1790269AbgJ0PEQ (ORCPT + 99 others); Tue, 27 Oct 2020 11:04:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:35268 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1788945AbgJ0PB0 (ORCPT ); Tue, 27 Oct 2020 11:01:26 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 239F622284; Tue, 27 Oct 2020 15:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810885; bh=/tjv9XXeftNbeS+TgYPo9QlogmLSUzz/8u5bVbnUNPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nhR84d1yKJ2YaPr6qpuEmCPl+MGgi6fQQNv/dQ8miOZl1EA51sKnbZgs+xKtBsTko tWAVcm0isnCgW4OFXS5twQA4fCs6p225bo9jehqC3CULPjBHEp913D9yI+3xQ22wHa udiII3s8EWqPmmDePTBR6u3dq+Vuq/Uh8eHA6gPU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , Lorenzo Colitti , Felipe Balbi , Sasha Levin Subject: [PATCH 5.8 297/633] usb: gadget: f_ncm: fix ncm_bitrate for SuperSpeed and above. Date: Tue, 27 Oct 2020 14:50:40 +0100 Message-Id: <20201027135536.605024899@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lorenzo Colitti [ Upstream commit 986499b1569af980a819817f17238015b27793f6 ] Currently, SuperSpeed NCM gadgets report a speed of 851 Mbps in USB_CDC_NOTIFY_SPEED_CHANGE. But the calculation appears to assume 16 packets per microframe, and USB 3 and above no longer use microframes. Maximum speed is actually much higher. On a direct connection, theoretical throughput is at most 3.86 Gbps for gen1x1 and 9.36 Gbps for gen2x1, and I have seen gadget->host iperf throughput of >2 Gbps for gen1x1 and >4 Gbps for gen2x1. Unfortunately the ConnectionSpeedChange defined in the CDC spec only uses 32-bit values, so we can't report accurate numbers for 10Gbps and above. So, report 3.75Gbps for SuperSpeed (which is roughly maximum theoretical performance) and 4.25Gbps for SuperSpeed Plus (which is close to the maximum that we can report in a 32-bit unsigned integer). This results in: [50879.191272] cdc_ncm 2-2:1.0 enx228b127e050c: renamed from usb0 [50879.234778] cdc_ncm 2-2:1.0 enx228b127e050c: 3750 mbit/s downlink 3750 mbit/s uplink on SuperSpeed and: [50798.434527] cdc_ncm 8-2:1.0 enx228b127e050c: renamed from usb0 [50798.524278] cdc_ncm 8-2:1.0 enx228b127e050c: 4250 mbit/s downlink 4250 mbit/s uplink on SuperSpeed Plus. Fixes: 1650113888fe ("usb: gadget: f_ncm: add SuperSpeed descriptors for CDC NCM") Reviewed-by: Maciej Żenczykowski Signed-off-by: Lorenzo Colitti Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- drivers/usb/gadget/function/f_ncm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c index 1f638759a9533..7672fa25085b0 100644 --- a/drivers/usb/gadget/function/f_ncm.c +++ b/drivers/usb/gadget/function/f_ncm.c @@ -85,8 +85,10 @@ static inline struct f_ncm *func_to_ncm(struct usb_function *f) /* peak (theoretical) bulk transfer rate in bits-per-second */ static inline unsigned ncm_bitrate(struct usb_gadget *g) { - if (gadget_is_superspeed(g) && g->speed == USB_SPEED_SUPER) - return 13 * 1024 * 8 * 1000 * 8; + if (gadget_is_superspeed(g) && g->speed >= USB_SPEED_SUPER_PLUS) + return 4250000000U; + else if (gadget_is_superspeed(g) && g->speed == USB_SPEED_SUPER) + return 3750000000U; else if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH) return 13 * 512 * 8 * 1000 * 8; else -- 2.25.1