moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: usb: gadget: f_mass_storage: Make CD-ROM emulation works with Windows OS

Browse Source 
Add read TOC with format 1 to support CD-ROM emulation with
Windows OS.
This patch is tested on Windows OS Server 2019.

Bug: 254441685
Fixes: 89ada0fe669a ("usb: gadget: f_mass_storage: Make CD-ROM emulation work with Mac OS-X")
Reviewed-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Neal Liu <neal_liu@aspeedtech.com>
Link: https://lore.kernel.org/r/20220628021436.3252262-1-neal_liu@aspeedtech.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 3b91edd624ab1ab694deef513a45eb9e9d49d75f)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Iad85b404c78f9c70a813160c6da36f75234085b9
This commit is contained in:
Neal Liu
2022-06-28 10:14:36 +08:00
committed by Treehugger Robot
parent 83a34b0ab8
commit 76da48e11b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/usb/gadget/function/f_mass_storage.c
View File

@@ -1159,13 +1159,14 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh)
u8 format; u8 format;
int i, len; int i, len;
format = common->cmnd[2] & 0xf;
if ((common->cmnd[1] & ~0x02) != 0 || /* Mask away MSF */ if ((common->cmnd[1] & ~0x02) != 0 || /* Mask away MSF */
start_track > 1) { (start_track > 1 && format != 0x1)) {
curlun->sense_data = SS_INVALID_FIELD_IN_CDB; curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
return -EINVAL; return -EINVAL;
} }
format = common->cmnd[2] & 0xf;
/* /*
* Check if CDB is old style SFF-8020i * Check if CDB is old style SFF-8020i
* i.e. format is in 2 MSBs of byte 9 * i.e. format is in 2 MSBs of byte 9
@@ -1175,8 +1176,8 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh)
format = (common->cmnd[9] >> 6) & 0x3; format = (common->cmnd[9] >> 6) & 0x3;
switch (format) { switch (format) {
case 0: case 0: /* Formatted TOC */
/* Formatted TOC */ case 1: /* Multi-session info */
len = 4 + 2*8; /* 4 byte header + 2 descriptors */ len = 4 + 2*8; /* 4 byte header + 2 descriptors */
memset(buf, 0, len); memset(buf, 0, len);
buf[1] = len - 2; /* TOC Length excludes length field */ buf[1] = len - 2; /* TOC Length excludes length field */
@@ -1217,7 +1218,7 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh)
return len; return len;
default: default:
/* Multi-session, PMA, ATIP, CD-TEXT not supported/required */ /* PMA, ATIP, CD-TEXT not supported/required */
curlun->sense_data = SS_INVALID_FIELD_IN_CDB; curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
return -EINVAL; return -EINVAL;
} }