Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp5480059iog; Wed, 22 Jun 2022 21:51:15 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sSSPxsRLQZ0m7CQqK6KqJZHAx1DepqTNtdGyOxRTTu5fWJbf3v2xEU68nmIWSAbkgPYVkI X-Received: by 2002:a05:6a00:a12:b0:51b:92d7:ec55 with SMTP id p18-20020a056a000a1200b0051b92d7ec55mr38752845pfh.85.1655959875028; Wed, 22 Jun 2022 21:51:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655959875; cv=none; d=google.com; s=arc-20160816; b=k24VjMO49ttqnay13ZTjbbIUztNKlKH3mjSBFE24ikbl2PPGDQhTii+RLLz1TMIins VB75MMhinl8GQ97FotzpXsAWTVQ309uis6pRLdNkij5AD2mEVmuRfotLBrvssuG5AAiT pq5nUyDTp6g8+9Qet7VXg88U09ZVC6qjRfbTSfL+Tm7dbDZtnvQeLJwiRM6Hok5QfNJ9 NASMl3dbaVYMFKGzNuj/Ggd7zu8k6uAeNExdyWNZawlpYVRNgALEbaomPmKTAfo8qa/c HZH2kIc/XMSdhcv4RxMsj5lyf03PL8x3hSk9CzcJaPOKPXUd7y2h0YkYt7C2jjn2LVOy yZLg== 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 :message-id:date:subject:cc:to:from; bh=DEkSIqYFabM2Gm7tPU9v0PU6tslOt2yxNEIuAY2K72Q=; b=fsy6OBt9mSIzCgIAoe0OFMoGCl6DsUo3HlsclTzLGmk09jyie5TGEUwh67nGKGPo+i cOK2BUrfkqF91nlmAm1GvOPjSJ9cvxVqSa5stJwbsMpyIB3yMXuYXcVv/4NbAR88juji usEh/UirF8smjAwQjwXkMmCHjB3x0KMNg3yvbg1z6ddqUAA3ZWUjiksdkwO1oZv/FFwd rJ5uCDMYSbGS6qCN+YazOziJIxWq9tqozjcMamI/sJz7CHaym/sMAi9c9e/YZyJO/kim MSCYBHyG+MptUJ3LR3m9dmLEEbRQTf3VkMWLEH7VTxq8YdYGuQ66qt/1VPy479dRcQAx rehQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id om17-20020a17090b3a9100b001e28e2f497fsi1965592pjb.161.2022.06.22.21.51.01; Wed, 22 Jun 2022 21:51:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231256AbiFWEsH (ORCPT + 99 others); Thu, 23 Jun 2022 00:48:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232800AbiFWDJa (ORCPT ); Wed, 22 Jun 2022 23:09:30 -0400 Received: from twspam01.aspeedtech.com (twspam01.aspeedtech.com [211.20.114.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 116C823177; Wed, 22 Jun 2022 20:09:28 -0700 (PDT) Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 25N2mScA001829; Thu, 23 Jun 2022 10:48:28 +0800 (GMT-8) (envelope-from neal_liu@aspeedtech.com) Received: from localhost.localdomain (192.168.10.10) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Jun 2022 11:04:08 +0800 From: Neal Liu To: Felipe Balbi , Greg Kroah-Hartman , Alan Stern CC: Roger Quadros , Miaohe Lin , Wesley Cheng , "Eric W . Biederman" , Matthew Wilcox , Nikita Yushchenko , Cai Huoqing , , , Subject: [PATCH RESEND] usb: gadget: f_mass_storage: Make CD-ROM emulation works with Windows OS Date: Thu, 23 Jun 2022 11:04:05 +0800 Message-ID: <20220623030405.1922980-1-neal_liu@aspeedtech.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [192.168.10.10] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 25N2mScA001829 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add read TOC with format 2 to support CD-ROM emulation with Windows OS. This patch is tested on Windows OS Server 2019. Signed-off-by: Neal Liu --- drivers/usb/gadget/function/f_mass_storage.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c index 3a77bca0ebe1..3c2a5f1e8b66 100644 --- a/drivers/usb/gadget/function/f_mass_storage.c +++ b/drivers/usb/gadget/function/f_mass_storage.c @@ -1209,6 +1209,7 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh) switch (format) { case 0: + case 1: /* Formatted TOC */ len = 4 + 2*8; /* 4 byte header + 2 descriptors */ memset(buf, 0, len); -- 2.25.1