rpms/kernel/F-9 linux-2.6-cdrom-door-status.patch, NONE, 1.1 kernel.spec, 1.883, 1.884

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27447

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-cdrom-door-status.patch 
Log Message:
Fix the CDROM door status (from rawhide)

linux-2.6-cdrom-door-status.patch:

--- NEW FILE linux-2.6-cdrom-door-status.patch ---
>From e85e03d7f680b62bb8d4d037fdde6dd94c9582a3 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Wed, 8 Oct 2008 15:10:39 -0400
Subject: [PATCH] make sr_mod report more accurate drive status after closing the door.

So, what's happening here is that the drive is reporting a sense of
2/4/1 ("logical unit is becoming ready") from sr_test_unit_ready(), and
then we ask for the media event notification before checking that result
at all.  The check_media_event_descriptor() call isn't getting a check
condition, but it's also reporting that the tray is closed and that
there's no media.  In actuality it doesn't yet know if there's media or
not, but there's no way to express that in the media event status field.

My current thought is that if it told us the device isn't yet ready, we
should return that immediately, since there's nothing that'll tell us
any more data than that reliably.
---
 drivers/scsi/sr_ioctl.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index ae87d08..7ee51ff 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -309,6 +309,11 @@ int sr_drive_status(struct cdrom_device_info *cdi, int slot)
 	if (0 == sr_test_unit_ready(cd->device, &sshdr))
 		return CDS_DISC_OK;
 
+	/* SK/ASC/ASCQ of 2/4/1 means "unit is becoming ready" */
+	if (scsi_sense_valid(&sshdr) && sshdr.sense_key == NOT_READY
+			&& sshdr.asc == 0x04 && sshdr.ascq == 0x01)
+		return CDS_DRIVE_NOT_READY;
+
 	if (!cdrom_get_media_event(cdi, &med)) {
 		if (med.media_present)
 			return CDS_DISC_OK;
-- 
1.6.0.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.883
retrieving revision 1.884
diff -u -r1.883 -r1.884
--- kernel.spec	15 Dec 2008 16:34:28 -0000	1.883
+++ kernel.spec	16 Dec 2008 16:36:40 -0000	1.884
@@ -701,6 +701,10 @@
 Patch1515: linux-2.6.27-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
 
+# Fix the return code CD accesses when the CDROM drive door is closed
+# but the drive isn't yet ready.
+Patch1550: linux-2.6-cdrom-door-status.patch
+
 # nouveau + drm fixes
 Patch1801: drm-fedora9-rollup.patch
 Patch1802: drm-mm-readd-nopfn.patch
@@ -1288,6 +1292,10 @@
 ApplyPatch linux-2.6.27-lirc.patch
 ApplyPatch linux-2.6-hdpvr.patch
 
+# Fix the return code CD accesses when the CDROM drive door is closed
+# but the drive isn't yet ready.
+ApplyPatch linux-2.6-cdrom-door-status.patch
+
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 ApplyPatch linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch
@@ -1920,6 +1928,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Tue Dec 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-71
+- Fix the CDROM door status (from rawhide)
+
 * Mon Dec 15 2008 John W. Linville <linville at redhat.com> 2.6.27.9-70
 - iwlagn: fix RX skb alignment