Skip to contentSkip to conversation

Packet writing problems

DISCUSSION Frediano Ziglio 4 participants 12 messages Aug 16, 2004 – Aug 18, 2004

Subsystems (2)
Block layer Uniform cdrom driver
lore
Share & tools
lore

Frediano Ziglio

author
#0 lore raw

I'm trying to do packet writing with my new DVD writer.

# cat /proc/ide/hdc/model
PIONEER DVD-RW DVR-107D

dma enabled.
After some tests with 2.4 I decided to switch to 2.6.
I used Fedora Core 2 with a vanilla kernel 2.6.8.1 + patch from
http://w1.894.telia.com/~u89404340/patches/packet/2.6/, udftools with Petero patch (http://w1.894.telia.com/~u89404340/patches/packet/, same site and author).

However I get a lot of problems mount/unmounting devices...

DVD+RW
mkudffs /dev/hdc does not works... doing a strace opening /dev/hdc for read/write open returns EROFS (or similar). I tried with blockdev --setrw but still same errors... Than I used pktsetup. mkudffs with packet device (/dev/pktcdvd/test) worked so I mounted it (still /dev/hdc report readonly so I used /dev/pktcdvd/test). I copied a directory (4 MB) an deleted it. Then I unmounted device and then waited... after a while DVD led turned off and DVD spin down... umount command still not exited... I waited 20 minutes but still hangs so I restarted my PC.

DVD-RW
After a lot of tests I realized that I have to use dvd+rw-format with -force=full cause DVD was not empty. Then I used pktsetup and mkudffs (with no problem). I tried to mount my DVD but mount (not umount) hangs. Using ps it seems than mount call wait_to_buffer. After 10/15 minutes I restarted my PC...

I have also a SCSI CD recorder (Waitec WT4260) and a CDRW formatted with UDF (using 2.4.23 and an old patch from Petero site) and it works without problems... Is the problem related to IDE or to DVD ??

I'm not (still :) ? ) a linux guru and I don't know how to debug or what check should I execute... Should I send my .config ? Stop some daemons ? Work without X ?

freddy77

#1 lore raw
Quoted 12 lines · Frediano Ziglio

I'm trying to do packet writing with my new DVD writer.

# cat /proc/ide/hdc/model
PIONEER DVD-RW DVR-107D

dma enabled.
After some tests with 2.4 I decided to switch to 2.6.
I used Fedora Core 2 with a vanilla kernel 2.6.8.1 + patch from
http://w1.894.telia.com/~u89404340/patches/packet/2.6/, udftools with Petero patch (http://w1.894.telia.com/~u89404340/patches/packet/, same site and author).

Quoted 6 lines

However I get a lot of problems mount/unmounting devices...

DVD+RW
mkudffs /dev/hdc does not works... doing a strace opening /dev/hdc for read/write open returns EROFS (or similar). I tried with blockdev --setrw but still same errors...

I see two problems. The first problem is that the Mt Rainier detection can succeed when it shouldn't, because it forgets to check that the "GET CONFIGURATION" command returns the MRW feature number. On one of my drives, the command returns feature 0x2a which is DVD+RW.

This bug has nothing to do with the packet writing driver, and the patch below fixes it.

Signed-off-by Peter Osterlund <[email protected]>

---

 linux-petero/drivers/cdrom/cdrom.c |    2 ++
 1 files changed, 2 insertions(+)
drivers/cdrom/cdrom.c renamed from drivers/cdrom/cdrom.c~mrw-fix +2 -0
diff -puN drivers/cdrom/cdrom.c~mrw-fix drivers/cdrom/cdrom.c
@@ -521,6 +521,8 @@ int cdrom_is_mrw(struct cdrom_device_inf
 		return ret;
 
 	mfd = (struct mrw_feature_desc *)&buffer[sizeof(struct feature_header)];
+	if (be16_to_cpu(mfd->feature_code) != CDF_MRW)
+		return 1;
 	*write = mfd->write;
 
 	if ((ret = cdrom_mrw_probe_pc(cdi))) {

_

Signature · 2 lines
Peter Osterlund - [email protected]
http://w1.894.telia.com/~u89404340
#2 lore raw
Quoted 16 lines · Peter Osterlund
Quoted 14 lines · Frediano Ziglio

I'm trying to do packet writing with my new DVD writer.

# cat /proc/ide/hdc/model
PIONEER DVD-RW DVR-107D

dma enabled.
After some tests with 2.4 I decided to switch to 2.6.
I used Fedora Core 2 with a vanilla kernel 2.6.8.1 + patch from
http://w1.894.telia.com/~u89404340/patches/packet/2.6/, udftools with Petero patch (http://w1.894.telia.com/~u89404340/patches/packet/, same site and author).

However I get a lot of problems mount/unmounting devices...

Quoted 8 lines
Quoted 4 lines

DVD+RW
mkudffs /dev/hdc does not works... doing a strace opening /dev/hdc for read/write open returns EROFS (or similar). I tried with blockdev --setrw but still same errors...

I see two problems. The first problem is that the Mt Rainier detection can succeed when it shouldn't, because it forgets to check that the "GET CONFIGURATION" command returns the MRW feature number.

The second problem is in the dvdrw-support patch in the -mm kernel. (This patch is also included in the patch you are using.)

The problem is that some drives fail the "GET CONFIGURATION" command when asked to only return 8 bytes. This happens for example on my drive, which is identified as:

hdc: HL-DT-ST DVD+RW GCA-4040N, ATAPI CD/DVD-ROM drive

Since the cdrom_mmc3_profile() function already allocates 32 bytes for the reply buffer, this patch is enough to make the command succeed on my drive.

Signed-off-by Peter Osterlund <[email protected]>

---

 linux-petero/drivers/cdrom/cdrom.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/cdrom/cdrom.c renamed from drivers/cdrom/cdrom.c~dvd+rw-get-configuration-fix +1 -1
diff -puN drivers/cdrom/cdrom.c~dvd+rw-get-configuration-fix drivers/cdrom/cdrom.c
@@ -834,7 +834,7 @@ static void cdrom_mmc3_profile(struct cd
 	cgc.cmd[0] = GPCMD_GET_CONFIGURATION;
 	cgc.cmd[1] = 0;
 	cgc.cmd[2] = cgc.cmd[3] = 0;		/* Starting Feature Number */
-	cgc.cmd[7] = 0; cgc.cmd [8] = 8;	/* Allocation Length */
+	cgc.cmd[8] = sizeof(buffer);		/* Allocation Length */
 	cgc.quiet = 1;
 
 	if ((ret = cdi->ops->generic_packet(cdi, &cgc))) {

_

Signature · 2 lines
Peter Osterlund - [email protected]
http://w1.894.telia.com/~u89404340
author
#3 lore raw

Il lun, 2004-08-16 alle 21:09, Peter Osterlund ha scritto:

Quoted 19 lines

...

Quoted 9 lines
Quoted 5 lines

DVD+RW
mkudffs /dev/hdc does not works... doing a strace opening /dev/hdc for read/write open returns EROFS (or similar). I tried with blockdev --setrw but still same errors...

I see two problems. The first problem is that the Mt Rainier detection can succeed when it shouldn't, because it forgets to check that the "GET CONFIGURATION" command returns the MRW feature number.

The second problem is in the dvdrw-support patch in the -mm kernel. (This patch is also included in the patch you are using.)

The problem is that some drives fail the "GET CONFIGURATION" command when asked to only return 8 bytes. This happens for example on my drive, which is identified as:

Quoted 6 lines

hdc: HL-DT-ST DVD+RW GCA-4040N, ATAPI CD/DVD-ROM drive

Since the cdrom_mmc3_profile() function already allocates 32 bytes for the reply buffer, this patch is enough to make the command succeed on my drive.

With these two patch both DVD-RW and DVD+RW works !!! Thanks you very much, it's a dream coming true. It seems that DVD+RW works better (it's faster) with packet device than with direct writing (mounting /dev/hdc). When I'll get back to work (on September) I'll test your patch with USB 2 device and another DVD writer.

freddy77

author
#4 lore raw
In reply to Peter Osterlund

Il lun, 2004-08-16 alle 21:09, Peter Osterlund ha scritto:
...

Quoted 8 lines

The second problem is in the dvdrw-support patch in the -mm kernel. (This patch is also included in the patch you are using.)

The problem is that some drives fail the "GET CONFIGURATION" command when asked to only return 8 bytes. This happens for example on my drive, which is identified as:

Quoted 6 lines

hdc: HL-DT-ST DVD+RW GCA-4040N, ATAPI CD/DVD-ROM drive

Since the cdrom_mmc3_profile() function already allocates 32 bytes for the reply buffer, this patch is enough to make the command succeed on my drive.

I'm forgetting...

mounting devices it reports that disk was CD-RW and speed was 15 (DVD-RW) and 31 (DVD+RW).

freddy77

#5 lore raw
Quoted 17 lines · Frediano Ziglio

Il lun, 2004-08-16 alle 21:09, Peter Osterlund ha scritto:
...

Quoted 8 lines

The second problem is in the dvdrw-support patch in the -mm kernel. (This patch is also included in the patch you are using.)

The problem is that some drives fail the "GET CONFIGURATION" command when asked to only return 8 bytes. This happens for example on my drive, which is identified as:

Quoted 6 lines

hdc: HL-DT-ST DVD+RW GCA-4040N, ATAPI CD/DVD-ROM drive

Since the cdrom_mmc3_profile() function already allocates 32 bytes for the reply buffer, this patch is enough to make the command succeed on my drive.

Quoted 4 lines

I'm forgetting...

mounting devices it reports that disk was CD-RW and speed was 15 (DVD-RW) and 31 (DVD+RW).

That shouldn't cause any real problems, but since it's quite confusing, here is a patch to fix it. With this change, both DVD+RW and DVD-RW media is correctly identified in the kernel log, and DVD speeds are printed in kB/s.

---

 linux-petero/drivers/block/pktcdvd.c |   34 ++++++++++++++++++++--------------
 linux-petero/include/linux/pktcdvd.h |    4 ++--
 2 files changed, 22 insertions(+), 16 deletions(-)
drivers/block/pktcdvd.c renamed from drivers/block/pktcdvd.c~packet-dvd-printk-fix +20 -14
diff -puN drivers/block/pktcdvd.c~packet-dvd-printk-fix drivers/block/pktcdvd.c
@@ -483,11 +483,6 @@ static int pkt_set_speed(struct pktcdvd_
 	struct request_sense sense;
 	int ret;
 
-	write_speed = write_speed * 177; /* should be 176.4, but CD-RWs rounds down */
-	write_speed = min_t(unsigned, write_speed, MAX_SPEED);
-	read_speed = read_speed * 177;
-	read_speed = min_t(unsigned, read_speed, MAX_SPEED);
-
 	init_cdrom_command(&cgc, NULL, 0, CGC_DATA_NONE);
 	cgc.sense = &sense;
 	cgc.cmd[0] = GPCMD_SET_SPEED;

@@ -602,8 +597,8 @@ static void pkt_iosched_process_queue(st
 			pd->iosched.successive_reads = 0;
 		if (pd->iosched.successive_reads >= HI_SPEED_SWITCH) {
 			if (pd->read_speed == pd->write_speed) {
-				pd->read_speed = 0xff;
-				pkt_set_speed(pd, pd->write_speed, MAX_SPEED);
+				pd->read_speed = MAX_SPEED;
+				pkt_set_speed(pd, pd->write_speed, pd->read_speed);
 			}
 		} else {
 			if (pd->read_speed != pd->write_speed) {

@@ -1632,7 +1627,17 @@ static int pkt_probe_settings(struct pkt
 	if (pkt_good_disc(pd, &di))
 		return -ENXIO;
 
-	printk("pktcdvd: inserted media is CD-R%s\n", di.erasable ? "W" : "");
+	switch (pd->mmc3_profile) {
+		case 0x1a: /* DVD+RW */
+			printk("pktcdvd: inserted media is DVD+RW\n");
+			break;
+		case 0x13: /* DVD-RW */
+			printk("pktcdvd: inserted media is DVD-RW\n");
+			break;
+		default:
+			printk("pktcdvd: inserted media is CD-R%s\n", di.erasable ? "W" : "");
+			break;
+	}
 	pd->type = di.erasable ? PACKET_CDRW : PACKET_CDR;
 
 	track = 1; /* (di.last_track_msb << 8) | di.last_track_lsb; */

@@ -1785,7 +1790,7 @@ static int pkt_get_max_speed(struct pktc
 			offset = 34;
 	}
 
-	*write_speed = ((cap_buf[offset] << 8) | cap_buf[offset + 1]) / 0xb0;
+	*write_speed = (cap_buf[offset] << 8) | cap_buf[offset + 1];
 	return 0;
 }
 

@@ -1917,15 +1922,17 @@ static int pkt_open_write(struct pktcdvd
 	pkt_write_caching(pd, USE_WCACHING);
 
 	if ((ret = pkt_get_max_speed(pd, &write_speed)))
-		write_speed = 16;
+		write_speed = 16 * 177;
 	switch (pd->mmc3_profile) {
 		case 0x13: /* DVD-RW */
 		case 0x1a: /* DVD+RW */
+			DPRINTK("pktcdvd: write speed %ukB/s\n", write_speed);
 			break;
 		default:
 			if ((ret = pkt_media_speed(pd, &media_write_speed)))
 				media_write_speed = 16;
-			write_speed = min(write_speed, media_write_speed);
+			write_speed = min(write_speed, media_write_speed * 177);
+			DPRINTK("pktcdvd: write speed %ux\n", write_speed / 176);
 			break;
 	}
 	read_speed = write_speed;

@@ -1934,7 +1941,6 @@ static int pkt_open_write(struct pktcdvd
 		DPRINTK("pktcdvd: %s couldn't set write speed\n", pd->name);
 		return -EIO;
 	}
-	DPRINTK("pktcdvd: write speed %u\n", write_speed);
 	pd->write_speed = write_speed;
 	pd->read_speed = read_speed;
 

@@ -2310,8 +2316,8 @@ static int pkt_seq_show(struct seq_file 
 	seq_printf(m, "\nMisc:\n");
 	seq_printf(m, "\treference count:\t%d\n", pd->refcnt);
 	seq_printf(m, "\tflags:\t\t\t0x%lx\n", pd->flags);
-	seq_printf(m, "\tread speed:\t\t%ukB/s\n", pd->read_speed * 150);
-	seq_printf(m, "\twrite speed:\t\t%ukB/s\n", pd->write_speed * 150);
+	seq_printf(m, "\tread speed:\t\t%ukB/s\n", pd->read_speed);
+	seq_printf(m, "\twrite speed:\t\t%ukB/s\n", pd->write_speed);
 	seq_printf(m, "\tstart offset:\t\t%lu\n", pd->offset);
 	seq_printf(m, "\tmode page offset:\t%u\n", pd->mode_offset);
include/linux/pktcdvd.h renamed from include/linux/pktcdvd.h~packet-dvd-printk-fix +2 -2
diff -puN include/linux/pktcdvd.h~packet-dvd-printk-fix include/linux/pktcdvd.h
@@ -239,8 +239,8 @@ struct pktcdvd_device
 	struct packet_settings	settings;
 	struct packet_stats	stats;
 	int			refcnt;		/* Open count */
-	__u8			write_speed;	/* current write speed */
-	__u8			read_speed;	/* current read speed */
+	int			write_speed;	/* current write speed, kB/s */
+	int			read_speed;	/* current read speed, kB/s */
 	unsigned long		offset;		/* start offset */
 	__u8			mode_offset;	/* 0 / 8 */
 	__u8			type;

_

Signature · 2 lines
Peter Osterlund - [email protected]
http://w1.894.telia.com/~u89404340
#6 lore raw
Quoted 21 lines · Peter Osterlund
Quoted 19 lines · Frediano Ziglio

Il lun, 2004-08-16 alle 21:09, Peter Osterlund ha scritto:
...

Quoted 8 lines

The second problem is in the dvdrw-support patch in the -mm kernel. (This patch is also included in the patch you are using.)

The problem is that some drives fail the "GET CONFIGURATION" command when asked to only return 8 bytes. This happens for example on my drive, which is identified as:

Quoted 6 lines

hdc: HL-DT-ST DVD+RW GCA-4040N, ATAPI CD/DVD-ROM drive

Since the cdrom_mmc3_profile() function already allocates 32 bytes for the reply buffer, this patch is enough to make the command succeed on my drive.

I'm forgetting...

Quoted 7 lines
Quoted 2 lines

mounting devices it reports that disk was CD-RW and speed was 15 (DVD-RW) and 31 (DVD+RW).

That shouldn't cause any real problems, but since it's quite confusing, here is a patch to fix it. With this change, both DVD+RW and DVD-RW media is correctly identified in the kernel log, and DVD speeds are printed in kB/s.

I forgot to say:

Signed-off-by Peter Osterlund <[email protected]>
Signature · 2 lines
Peter Osterlund - [email protected]
http://w1.894.telia.com/~u89404340
#7 lore raw
In reply to Peter Osterlund

Peter Osterlund <[email protected]> writes:

Hello Peter,

Quoted 4 lines

That shouldn't cause any real problems, but since it's quite confusing, here is a patch to fix it. With this change, both DVD+RW and DVD-RW media is correctly identified in the kernel log, and DVD speeds are printed in kB/s.

The following patch on top of your patch adds all commonly used media types to the output and changes CD-R and CD-RW to be detected by profile type. It also reports unconforming non-standard profiles as well as profiles which have a MMC profile definition but are unknown as of the current MMC3 revision.

Please review.

drivers/block/pktcdvd.c +27 -3
@@ -1628,14 +1628,38 @@ static int pkt_probe_settings(struct pkt
 		return -ENXIO;
 
 	switch (pd->mmc3_profile) {
+	        case 0x08: /* CD-ROM */
+	                printk("pktcdvd: inserted media is CD-ROM\n");
+			break;
+	        case 0x09: /* CD-R */
+	                printk("pktcdvd: inserted media is CD-R\n");
+			break;
+	        case 0x0a: /* CD-RW */
+	                printk("pktcdvd: inserted media is CD-RW\n");
+			break;
+	        case 0x10: /* DVD-ROM */
+	                printk("pktcdvd: inserted media is DVD-ROM\n");
+			break;
+	        case 0x11: /* DVD-R */
+	                printk("pktcdvd: inserted media is DVD-R\n");
+			break;
+	        case 0x12: /* DVD-RAM */
+	                printk("pktcdvd: inserted media is DVD-RAM\n");
+			break;
+		case 0x13: /* DVD-RW restricted overwrite */
+			printk("pktcdvd: inserted media is DVD-RW with restricted overwrite\n");
+			break;
+		case 0x14: /* DVD-RW sequential recording */
+			printk("pktcdvd: inserted media is DVD-RW with sequential recording\n");
+			break;
 		case 0x1a: /* DVD+RW */
 			printk("pktcdvd: inserted media is DVD+RW\n");
 			break;
-		case 0x13: /* DVD-RW */
-			printk("pktcdvd: inserted media is DVD-RW\n");
+		case 0xffff: /* unconforming */
+			printk("pktcdvd: inserted media does not conform to a known standard\n");
 			break;
 		default:
-			printk("pktcdvd: inserted media is CD-R%s\n", di.erasable ? "W" : "");
+			printk("pktcdvd: inserted media is yet UNKNOWN by pktcdvd\n");
 			break;
 	}
 	pd->type = di.erasable ? PACKET_CDRW : PACKET_CDR;

Regards,
Julien

#8 lore raw
Quoted 9 lines · Julien Oster

Peter Osterlund <[email protected]> writes:

Hello Peter,

Quoted 4 lines

That shouldn't cause any real problems, but since it's quite confusing, here is a patch to fix it. With this change, both DVD+RW and DVD-RW media is correctly identified in the kernel log, and DVD speeds are printed in kB/s.

Quoted 7 lines

The following patch on top of your patch adds all commonly used media types to the output and changes CD-R and CD-RW to be detected by profile type. It also reports unconforming non-standard profiles as well as profiles which have a MMC profile definition but are unknown as of the current MMC3 revision.

Please review.

Will any of those printk's ever get printed? Media types that can't be handled by the packet driver aren't supposed to make it past the pkt_good_disc() test.

Signature · 2 lines
Peter Osterlund - [email protected]
http://w1.894.telia.com/~u89404340
#9 lore raw

Peter Osterlund <[email protected]> writes:

Hello Peter,

Quoted 9 lines
Quoted 5 lines

The following patch on top of your patch adds all commonly used media types to the output and changes CD-R and CD-RW to be detected by profile type. It also reports unconforming non-standard profiles as well as profiles which have a MMC profile definition but are unknown as of the current MMC3 revision.

Will any of those printk's ever get printed? Media types that can't be handled by the packet driver aren't supposed to make it past the pkt_good_disc() test.

Quickly looking through it, pkt_good_disc() does the same and drops media types with unsuitable or invalid profiles.

So my patch is really not useful at that place.

But couldn't you move the "inserted disc is..." messages to pkt_good_disc()? In the current source you basically duplicate the switch statement which checks the profile. The printks could be in the pkt_good_disc() check just as well.

There all profiles might be included and the corresponding media type printed out, so that the user knows why his disc is unsuitable (i.e. it's a CD-ROM or DVD-ROM and doesn't do any writing at all).

Regards,
Julien

#10 lore raw

Julien Oster <[email protected]> writes:

Hello,

Quoted 4 lines

But couldn't you move the "inserted disc is..." messages to pkt_good_disc()? In the current source you basically duplicate the switch statement which checks the profile. The printks could be in the pkt_good_disc() check just as well.

So here's another patch instead which does what I meant.

Additionally, it inverts the return values of pkt_good_disc, so that the condition later becomes "if (!pkt_good_disc(...))" (because actually, it is NOT a good disc then)

drivers/block/pktcdvd.c +38 -24
@@ -1564,15 +1564,40 @@ static int pkt_good_track(track_informat
 static int pkt_good_disc(struct pktcdvd_device *pd, disc_information *di)
 {
 	switch (pd->mmc3_profile) {
-		case 0x0a: /* CD-RW */
-		case 0xffff: /* MMC3 not supported */
-			break;
-		case 0x1a: /* DVD+RW */
-		case 0x13: /* DVD-RW */
+	        case 0x08: /* CD-ROM */
+	                printk("pktcdvd: inserted media is CD-ROM - no packet writing\n");
 			return 0;
-		default:
-			printk("pktcdvd: Wrong disc profile (%x)\n", pd->mmc3_profile);
+	        case 0x09: /* CD-R */
+	                printk("pktcdvd: inserted media is CD-R - no packet writing\n");
+			return 0;
+	        case 0x0a: /* CD-RW */
+	                printk("pktcdvd: inserted media is CD-RW\n");
+			return 1;
+	        case 0x10: /* DVD-ROM */
+	                printk("pktcdvd: inserted media is DVD-ROM - no packet writing\n");
+			return 0;
+	        case 0x11: /* DVD-R */
+	                printk("pktcdvd: inserted media is DVD-R - no packet writing\n");
+			return 0;
+	        case 0x12: /* DVD-RAM */
+	                printk("pktcdvd: inserted media is DVD-RAM - no packet writing\n");
+			return 0;
+		case 0x13: /* DVD-RW restricted overwrite */
+			printk("pktcdvd: inserted media is DVD-RW with restricted overwrite");
 			return 1;
+		case 0x14: /* DVD-RW sequential recording */
+			printk("pktcdvd: inserted media is DVD-RW with sequential recording"
+			       " - no packet writing\n");
+			return 0;
+		case 0x1a: /* DVD+RW */
+			printk("pktcdvd: inserted media is DVD+RW\n");
+			return 1;
+		case 0xffff: /* unconforming */
+			printk("pktcdvd: inserted media does not conform to a known standard\n");
+			break;
+		default:
+			printk("pktcdvd: inserted media is yet UNKNOWN by pktcdvd\n");
+			return 0;
 	}
 
 	/*

@@ -1581,25 +1606,25 @@ static int pkt_good_disc(struct pktcdvd_
 	 */
 	if (di->disc_type == 0xff) {
 		printk("pktcdvd: Unknown disc. No track?\n");
-		return 1;
+		return 0;
 	}
 
 	if (di->disc_type != 0x20 && di->disc_type != 0) {
 		printk("pktcdvd: Wrong disc type (%x)\n", di->disc_type);
-		return 1;
+		return 0;
 	}
 
 	if (di->erasable == 0) {
 		printk("pktcdvd: Disc not erasable\n");
-		return 1;
+		return 0;
 	}
 
 	if (di->border_status == PACKET_SESSION_RESERVED) {
 		printk("pktcdvd: Can't write to last track (reserved)\n");
-		return 1;
+		return 0;
 	}
 
-	return 0;
+	return 1;
 }
 
 static int pkt_probe_settings(struct pktcdvd_device *pd)

@@ -1624,20 +1649,9 @@ static int pkt_probe_settings(struct pkt
 		return ret;
 	}
 
-	if (pkt_good_disc(pd, &di))
+	if (!pkt_good_disc(pd, &di))
 		return -ENXIO;
 
-	switch (pd->mmc3_profile) {
-		case 0x1a: /* DVD+RW */
-			printk("pktcdvd: inserted media is DVD+RW\n");
-			break;
-		case 0x13: /* DVD-RW */
-			printk("pktcdvd: inserted media is DVD-RW\n");
-			break;
-		default:
-			printk("pktcdvd: inserted media is CD-R%s\n", di.erasable ? "W" : "");
-			break;
-	}
 	pd->type = di.erasable ? PACKET_CDRW : PACKET_CDR;
 
 	track = 1; /* (di.last_track_msb << 8) | di.last_track_lsb; */

Regards,
Julien

#11 lore raw
Quoted 5 lines · Julien Oster

So here's another patch instead which does what I meant.

Additionally, it inverts the return values of pkt_good_disc, so that the condition later becomes "if (!pkt_good_disc(...))" (because actually, it is NOT a good disc then)

I forgot to change the comment above the function definition which describes the return values. Here's a better patch. Additionally, it also reverts the return values of pkt_good_track() for convenience. (Same thing as with pkt_good_disc(), since the function is named that way it should return 'false', i.e. 0, when the disc is not a good disc for packet writing)

A quick question that came up while writing the patch: can't you packet write DVD-RAM? I never had the opportunity to handle DVD-RAMs, but the name suggests a random access memory...

drivers/block/pktcdvd.c +46 -32
@@ -1528,7 +1528,7 @@ static int pkt_set_write_settings(struct
 }
 
 /*
- * 0 -- we can write to this track, 1 -- we can't
+ * 1 -- we can write to this track, 0 -- we can't
  */
 static int pkt_good_track(track_information *ti)
 {

@@ -1540,39 +1540,64 @@ static int pkt_good_track(track_informat
 	 * FIXME: only for FP
 	 */
 	if (ti->fp == 0)
-		return 0;
+		return 1;
 
 	/*
 	 * "good" settings as per Mt Fuji.
 	 */
 	if (ti->rt == 0 && ti->blank == 0 && ti->packet == 1)
-		return 0;
+		return 1;
 
 	if (ti->rt == 0 && ti->blank == 1 && ti->packet == 1)
-		return 0;
+		return 1;
 
 	if (ti->rt == 1 && ti->blank == 0 && ti->packet == 1)
-		return 0;
+		return 1;
 
 	printk("pktcdvd: bad state %d-%d-%d\n", ti->rt, ti->blank, ti->packet);
-	return 1;
+	return 0;
 }
 
 /*
- * 0 -- we can write to this disc, 1 -- we can't
+ * 1 -- we can write to this disc, 0 -- we can't
  */
 static int pkt_good_disc(struct pktcdvd_device *pd, disc_information *di)
 {
 	switch (pd->mmc3_profile) {
-		case 0x0a: /* CD-RW */
-		case 0xffff: /* MMC3 not supported */
-			break;
-		case 0x1a: /* DVD+RW */
-		case 0x13: /* DVD-RW */
+	        case 0x08: /* CD-ROM */
+	                printk("pktcdvd: inserted media is CD-ROM - no packet writing\n");
 			return 0;
-		default:
-			printk("pktcdvd: Wrong disc profile (%x)\n", pd->mmc3_profile);
+	        case 0x09: /* CD-R */
+	                printk("pktcdvd: inserted media is CD-R - no packet writing\n");
+			return 0;
+	        case 0x0a: /* CD-RW */
+	                printk("pktcdvd: inserted media is CD-RW\n");
+			return 1;
+	        case 0x10: /* DVD-ROM */
+	                printk("pktcdvd: inserted media is DVD-ROM - no packet writing\n");
+			return 0;
+	        case 0x11: /* DVD-R */
+	                printk("pktcdvd: inserted media is DVD-R - no packet writing\n");
+			return 0;
+	        case 0x12: /* DVD-RAM */
+	                printk("pktcdvd: inserted media is DVD-RAM - no packet writing\n");
+			return 0;
+		case 0x13: /* DVD-RW restricted overwrite */
+			printk("pktcdvd: inserted media is DVD-RW with restricted overwrite");
+			return 1;
+		case 0x14: /* DVD-RW sequential recording */
+			printk("pktcdvd: inserted media is DVD-RW with sequential recording"
+			       " - no packet writing\n");
+			return 0;
+		case 0x1a: /* DVD+RW */
+			printk("pktcdvd: inserted media is DVD+RW\n");
 			return 1;
+		case 0xffff: /* unconforming */
+			printk("pktcdvd: inserted media does not conform to a known standard\n");
+			break;
+		default:
+			printk("pktcdvd: inserted media is yet UNKNOWN by pktcdvd\n");
+			return 0;
 	}
 
 	/*

@@ -1581,25 +1606,25 @@ static int pkt_good_disc(struct pktcdvd_
 	 */
 	if (di->disc_type == 0xff) {
 		printk("pktcdvd: Unknown disc. No track?\n");
-		return 1;
+		return 0;
 	}
 
 	if (di->disc_type != 0x20 && di->disc_type != 0) {
 		printk("pktcdvd: Wrong disc type (%x)\n", di->disc_type);
-		return 1;
+		return 0;
 	}
 
 	if (di->erasable == 0) {
 		printk("pktcdvd: Disc not erasable\n");
-		return 1;
+		return 0;
 	}
 
 	if (di->border_status == PACKET_SESSION_RESERVED) {
 		printk("pktcdvd: Can't write to last track (reserved)\n");
-		return 1;
+		return 0;
 	}
 
-	return 0;
+	return 1;
 }
 
 static int pkt_probe_settings(struct pktcdvd_device *pd)

@@ -1624,20 +1649,9 @@ static int pkt_probe_settings(struct pkt
 		return ret;
 	}
 
-	if (pkt_good_disc(pd, &di))
+	if (!pkt_good_disc(pd, &di))
 		return -ENXIO;
 
-	switch (pd->mmc3_profile) {
-		case 0x1a: /* DVD+RW */
-			printk("pktcdvd: inserted media is DVD+RW\n");
-			break;
-		case 0x13: /* DVD-RW */
-			printk("pktcdvd: inserted media is DVD-RW\n");
-			break;
-		default:
-			printk("pktcdvd: inserted media is CD-R%s\n", di.erasable ? "W" : "");
-			break;
-	}
 	pd->type = di.erasable ? PACKET_CDRW : PACKET_CDR;
 
 	track = 1; /* (di.last_track_msb << 8) | di.last_track_lsb; */

@@ -1646,7 +1660,7 @@ static int pkt_probe_settings(struct pkt
 		return ret;
 	}
 
-	if (pkt_good_track(&ti)) {
+	if (!pkt_good_track(&ti)) {
 		printk("pktcdvd: can't write to this track\n");
 		return -ENXIO;
 	}

Regards,
Julien