usb: gadget: f_mass_storage: Make CD-ROM emulation work with Mac OS-X
PATCH v3 1/1 usb: gadget: f_mass_storage: Make CD-ROM emulation work with Mac OS-X
From: Roger Quadros <[email protected]>
Mac OS-X expects CD-ROM TOC in raw format (i.e. format:2). It also sends the READ_TOC CDB in old style SFF8020i format. i.e. 2 format bits are encoded in MSBs of CDB byte 9.
This patch will enable CD-ROM emulation to work with Mac OS-X. Tested on Mac OS X v10.6.3.
---
v3: Updated command mask to allow for non-zero byte 2
v2: Removed Change-Id
v1: Resurrected original change [1] and consolidated into single patch
[1] https://lore.kernel.org/lkml/[email protected]/T/#u
drivers/usb/gadget/function/f_mass_storage.c | 73 ++++++++++++++++---- 1 file changed, 61 insertions(+), 12 deletions(-)
drivers/usb/gadget/function/f_mass_storage.c +61 -12
@@ -1188,6 +1188,8 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh)int msf = common->cmnd[1 ] &0x02 ;int start_track = common->cmnd[6 ];u8 *buf = (u8 *)bh->buf; +u8 format; +int i, len;if ((common->cmnd[1 ] & ~0x02 ) !=0 ||/* Mask away MSF */ start_track >1 ) {
@@ -1195,18 +1197,65 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh)return -EINVAL ; } -memset (buf,0 ,20 ); - buf[1 ] = (20 -2 );/* TOC data length */ - buf[2 ] =1 ;/* First track number */ - buf[3 ] =1 ;/* Last track number */ - buf[5 ] =0x16 ;/* Data track, copying allowed */ - buf[6 ] =0x01 ;/* Only track is number 1 */ -store_cdrom_address (&buf[8 ], msf,0 ); + format = common->cmnd[2 ] &0xf ; +/* +* Check if CDB is old style SFF-8020i +* i.e. format is in 2 MSBs of byte 9 +* Mac OS-X host sends us this. +*/ +if (format ==0 ) + format = (common->cmnd[9 ] >>6 ) &0x3 ; + +switch (format) { +case 0 : +/* Formatted TOC */ + len =4 +2 *8 ;/* 4 byte header + 2 descriptors */ +memset (buf,0 , len); + len -=2 ;/* TOC Length excludes length field */ + buf[1 ] = len;/* TOC data length */ + buf[2 ] =1 ;/* First track number */ + buf[3 ] =1 ;/* Last track number */ + buf[5 ] =0x16 ;/* Data track, copying allowed */ + buf[6 ] =0x01 ;/* Only track is number 1 */ +store_cdrom_address (&buf[8 ], msf,0 ); + + buf[13 ] =0x16 ;/* Lead-out track is data */ + buf[14 ] =0xAA ;/* Lead-out track number */ +store_cdrom_address (&buf[16 ], msf, curlun->num_sectors); +return len; + +case 2 : +/* Raw TOC */ + len =4 +3 *11 ;/* 4 byte header + 3 descriptors */ +memset (buf,0 , len);/* Header + A0, A1 & A2 descriptors */ + len -=2 ;/* TOC Length excludes length field */ + buf[1 ] = len;/* TOC data length */ + buf[2 ] =1 ;/* First complete session */ + buf[3 ] =1 ;/* Last complete session */ + + buf +=4 ; +/* fill in A0, A1 and A2 points */ +for (i =0 ; i <3 ; i++) { + buf[0 ] =1 ;/* Session number */ + buf[1 ] =0x16 ;/* Data track, copying allowed */ +/* 2 - Track number 0 -> TOC */ + buf[3 ] =0xA0 + i;/* A0, A1, A2 point */ +/* 4, 5, 6 - Min, sec, frame is zero */ + buf[8 ] =1 ;/* Pmin: last track number */ + buf +=11 ;/* go to next track descriptor */ + } + buf -=11 ;/* go back to A2 descriptor */ + +/* For A2, 7, 8, 9, 10 - zero, Pmin, Psec, Pframe of Lead out */ +store_cdrom_address (&buf[7 ], msf, curlun->num_sectors); - buf[13 ] =0x16 ;/* Lead-out track is data */ - buf[14 ] =0xAA ;/* Lead-out track number */ -store_cdrom_address (&buf[16 ], msf, curlun->num_sectors); -return 20 ; +return len; + +default : +/* Multi-session, PMA, ATIP, CD-TEXT not supported/required */ + curlun->sense_data =SS_INVALID_FIELD_IN_CDB ; +return -EINVAL ; + } }static int do_mode_sense (struct fsg_common *common,struct fsg_buffhd *bh)
@@ -1944,7 +1993,7 @@ static int do_scsi_command(struct fsg_common *common) common->data_size_from_cmnd =get_unaligned_be16 (&common->cmnd[7 ]); reply =check_command (common,10 ,DATA_DIR_TO_HOST , - (7 <<6 ) | (1 <<1 ),1 , + (0xf <<6 ) | (3 <<1 ),1 ,"READ TOC" );if (reply ==0 ) reply =do_read_toc (common, bh);
Signature · 1 line
2.24.0
Quoted 9 lines · Jack Pham
From: Roger Quadros <[email protected]>
Mac OS-X expects CD-ROM TOC in raw format (i.e. format:2). It also sends the
READ_TOCCDB in old style SFF8020i format. i.e. 2 format bits are encoded in MSBs of CDB byte 9.This patch will enable CD-ROM emulation to work with Mac OS-X. Tested on Mac OS X v10.6.3.
Quoted 8 lines
Signed-off-by Roger Quadros <[email protected]>Signed-off-by Jack Pham <[email protected]>---
v3: Updated command mask to allow for non-zero byte 2
v2: Removed Change-Id
v1: Resurrected original change [1] and consolidated into single patch
Quoted 50 lines · Jack Pham
From: Roger Quadros <[email protected]>
Mac OS-X expects CD-ROM TOC in raw format (i.e. format:2). It also sends the
READ_TOCCDB in old style SFF8020i format. i.e. 2 format bits are encoded in MSBs of CDB byte 9.This patch will enable CD-ROM emulation to work with Mac OS-X. Tested on Mac OS X v10.6.3.
Signed-off-by Roger Quadros <[email protected]>Signed-off-by Jack Pham <[email protected]>---
v3: Updated command mask to allow for non-zero byte 2
v2: Removed Change-Id
v1: Resurrected original change [1] and consolidated into single patch[1] https://lore.kernel.org/lkml/[email protected]/T/#u
drivers/usb/gadget/function/f_mass_storage.c | 73 ++++++++++++++++---- 1 file changed, 61 insertions(+), 12 deletions(-)drivers/usb/gadget/function/f_mass_storage.c +7
-7@@ -1188,6 +1188,8 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh)int msf = common->cmnd[1 ] &0x02 ;int start_track = common->cmnd[6 ];u8 *buf = (u8 *)bh->buf; +u8 format; +int i, len;if ((common->cmnd[1 ] & ~0x02 ) !=0 ||/* Mask away MSF */ start_track >1 ) {@@ -1195,18 +1197,65 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh)return -EINVAL ; } -memset (buf,0 ,20 ); - buf[1 ] = (20 -2 );/* TOC data length */ - buf[2 ] =1 ;/* First track number */ - buf[3 ] =1 ;/* Last track number */ - buf[5 ] =0x16 ;/* Data track, copying allowed */ - buf[6 ] =0x01 ;/* Only track is number 1 */ -store_cdrom_address (&buf[8 ], msf,0 ); + format = common->cmnd[2 ] &0xf ; +/* +* Check if CDB is old style SFF-8020i +* i.e. format is in 2 MSBs of byte 9 +* Mac OS-X host sends us this.
drivers/usb/gadget/function/f_mass_storage.c static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh) · line 1214
Quoted 10 lines
drivers/usb/gadget/function/f_mass_storage.c +10
-0+*/ +if (format ==0 ) + format = (common->cmnd[9 ] >>6 ) &0x3 ; + +switch (format) { +case 0 : +/* Formatted TOC */ + len =4 +2 *8 ;/* 4 byte header + 2 descriptors */ +memset (buf,0 , len); + len -=2 ;/* TOC Length excludes length field */
Length is now decremented to 18...
drivers/usb/gadget/function/f_mass_storage.c static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh) · line 1225
Quoted 11 lines
drivers/usb/gadget/function/f_mass_storage.c +11
-0+ buf[1 ] = len;/* TOC data length */ + buf[2 ] =1 ;/* First track number */ + buf[3 ] =1 ;/* Last track number */ + buf[5 ] =0x16 ;/* Data track, copying allowed */ + buf[6 ] =0x01 ;/* Only track is number 1 */ +store_cdrom_address (&buf[8 ], msf,0 ); + + buf[13 ] =0x16 ;/* Lead-out track is data */ + buf[14 ] =0xAA ;/* Lead-out track number */ +store_cdrom_address (&buf[16 ], msf, curlun->num_sectors); +return len;
... which is returned here. This should be returning 20, not 18. Indeed it's the same mistake as was pointed out in the original patch series https://lore.kernel.org/lkml/[email protected]/ so I must have inadvertently applied the wrong version of the patch.
drivers/usb/gadget/function/f_mass_storage.c static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh) · line 1231
Quoted 6 lines
drivers/usb/gadget/function/f_mass_storage.c +6
-0+ +case 2 : +/* Raw TOC */ + len =4 +3 *11 ;/* 4 byte header + 3 descriptors */ +memset (buf,0 , len);/* Header + A0, A1 & A2 descriptors */ + len -=2 ;/* TOC Length excludes length field */
Same here.
Will send out v4 with this corrected.