Commit 3b91edd6 authored by Neal Liu's avatar Neal Liu Committed by Greg Kroah-Hartman
Browse files

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



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

Fixes: 89ada0fe ("usb: gadget: f_mass_storage: Make CD-ROM emulation work with Mac OS-X")
Reviewed-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarNeal Liu <neal_liu@aspeedtech.com>
Link: https://lore.kernel.org/r/20220628021436.3252262-1-neal_liu@aspeedtech.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df574080

drivers/usb/gadget/function/f_mass_storage.c

+6 −5
Original line number Diff line number Diff line
@@ -1192,13 +1192,14 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh) 
	u8		format;

	int		i, len;



	format = common->cmnd[2] & 0xf;



	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;

		return -EINVAL;

	}



	format = common->cmnd[2] & 0xf;

	/*

	 * Check if CDB is old style SFF-8020i

	 * i.e. format is in 2 MSBs of byte 9
@@ -1208,8 +1209,8 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh) 
		format = (common->cmnd[9] >> 6) & 0x3;



	switch (format) {

	case 0:

		/* Formatted TOC */

	case 0:	/* Formatted TOC */

	case 1:	/* Multi-session info */

		len = 4 + 2*8;		/* 4 byte header + 2 descriptors */

		memset(buf, 0, len);

		buf[1] = len - 2;	/* TOC Length excludes length field */
@@ -1250,7 +1251,7 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh) 
		return len;



	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;

		return -EINVAL;

	}