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;
Received-SPF: Pass (protection.outlook.com: domain of cadence.com designates
 64.207.220.244 as permitted sender) receiver=protection.outlook.com;
 client-ip=64.207.220.244; helo=wcmailrelayl01.cadence.com;
X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com
Received: from maileu3.global.cadence.com (10.160.88.99) by
 maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id
 15.0.1497.2; Mon, 8 Mar 2021 13:53:49 +0100
Received: from gli-login.cadence.com (10.187.128.100) by
 maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id
 15.0.1497.2 via Frontend Transport; Mon, 8 Mar 2021 13:53:49 +0100
Received: from gli-login.cadence.com (localhost [127.0.0.1])
        by gli-login.cadence.com (8.14.4/8.14.4) with ESMTP id 128Crneb005348;
        Mon, 8 Mar 2021 13:53:49 +0100
Received: (from pawell@localhost)
        by gli-login.cadence.com (8.14.4/8.14.4/Submit) id 128CrmxF005299;
        Mon, 8 Mar 2021 13:53:48 +0100
From:   Pawel Laszczak <pawell@cadence.com>
To:     <balbi@kernel.org>
CC:     <laurent.pinchart@ideasonboard.com>, <gregkh@linuxfoundation.org>,
        <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <peter.chen@kernel.org>, <kurahul@cadence.com>,
        Pawel Laszczak <pawell@cadence.com>
Subject: [PATCH v2] usb: gadget: uvc: add bInterval checking for HS mode
Date:   Mon, 8 Mar 2021 13:53:38 +0100
Message-ID: <20210308125338.4824-1-pawell@gli-login.cadence.com>
X-Mailer: git-send-email 2.18.0
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
X-OrganizationHeadersPreserved: maileu3.global.cadence.com
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 25459351-c254-4bfb-9f37-08d8e2313a0b
X-MS-TrafficTypeDiagnostic: BYAPR07MB5640:
X-Microsoft-Antispam-PRVS: <BYAPR07MB56401A7AF1870A9293F9855CDD939@BYAPR07MB5640.namprd07.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:3631;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: eI0otCkSzZcJnL60Mad0+1QjVi+V+uabbaLAOdZkUix4C0vKgWq8mo4S5I3cW1wxtwdlEgVSAavfTGpZGFnqcvctyCMYRKJu3/SOvu7/3bgmb4vWA0ZS7dohA8uZBNCZTIMmZCCSRkw53W42xpCVYSGblTEEQbP6em7yc/p8qV3eoo17UUMN2Xd+l0ZtY0FugZuOyqDx6hEf6VZSJ18TNiPKLiOyozH45YezcQU3RZ0Rvb/cEeYmDpmew+G11pV6P3Y+dIKbjkq5e9Gg0eGoJmz/kO5AKVywFj2xCBOTQx+W2kBtWaOn/Shdu7zIZagda9ytLl4iu85IUvw8lNmg+LU7ryz7w9dmo0JVnvCY9M99P7QR/T2CAeeb4DbN0JZQHe5J85brgL6uonlquW/YSPXfsHaZQD3szEaTkGH71VXluAlXfK8bs8VPC93O1qofry3RTHa5eW/OagrjPYeWiyvkxx+MhlumGMq9gkR9SyAD63FrcOvMyGmEUuHZ2r9MOj034nCpc23u52Aapcr/yO9v5f+Lytb5LuJN/xfP6je06vt2pZ6C3Xlpgddr7H6J0sa2iUYT9sCHMSm8wioY9iEs6ZjBMnSlVMZC8qh7tvI9lBcF/mP6Jfdz2ZyXp/KLVoJbpdbuft/vujZoIta7E9NYsuwRNabTjZle3qDVOdrGYE1yDDw4zih/c4f+aUhT/UI9W2FCysCaXUwta3VE/A==
X-Forefront-Antispam-Report: CIP:64.207.220.244;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:wcmailrelayl01.cadence.com;PTR:ErrorRetry;CAT:NONE;SFS:(4636009)(346002)(136003)(376002)(396003)(39860400002)(36092001)(46966006)(36840700001)(6916009)(356005)(36860700001)(8936002)(6666004)(5660300002)(86362001)(81166007)(82740400003)(186003)(4326008)(47076005)(426003)(26005)(83380400001)(70206006)(478600001)(70586007)(1076003)(336012)(82310400003)(107886003)(8676002)(54906003)(42186006)(316002)(2906002)(36900700001);DIR:OUT;SFP:1101;
X-OriginatorOrg: cadence.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2021 12:53:52.6581
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 25459351-c254-4bfb-9f37-08d8e2313a0b
X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9;Ip=[64.207.220.244];Helo=[wcmailrelayl01.cadence.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM12FT034.eop-nam12.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB5640
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.761
 definitions=2021-03-08_08:2021-03-08,2021-03-08 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0
 lowpriorityscore=0 mlxscore=0 suspectscore=0 spamscore=0 clxscore=1015
 adultscore=0 phishscore=0 malwarescore=0 bulkscore=0 priorityscore=1501
 impostorscore=0 mlxlogscore=641 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.12.0-2009150000 definitions=main-2103080068
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Pawel Laszczak <pawell@cadence.com>

Patch adds extra checking for bInterval passed by configfs.
The 5.6.4 chapter of USB Specification (rev. 2.0) say:
"A high-bandwidth endpoint must specify a period of 1x125 µs
(i.e., a bInterval value of 1)."

The issue was observed during testing UVC class on CV.
I treat this change as improvement because we can control
bInterval by configfs.

Signed-off-by: Pawel Laszczak <pawell@cadence.com>

---
Changlog:
v2:
- removed duplicated assignment

 drivers/usb/gadget/function/f_uvc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index 44b4352a2676..ed77a126a74f 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -633,7 +633,12 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
 
 	uvc_hs_streaming_ep.wMaxPacketSize =
 		cpu_to_le16(max_packet_size | ((max_packet_mult - 1) << 11));
-	uvc_hs_streaming_ep.bInterval = opts->streaming_interval;
+
+	/* A high-bandwidth endpoint must specify a bInterval value of 1 */
+	if (max_packet_mult > 1)
+		uvc_hs_streaming_ep.bInterval = 1;
+	else
+		uvc_hs_streaming_ep.bInterval = opts->streaming_interval;
 
 	uvc_ss_streaming_ep.wMaxPacketSize = cpu_to_le16(max_packet_size);
 	uvc_ss_streaming_ep.bInterval = opts->streaming_interval;
-- 
2.25.1