rpms/kernel/F-10 linux-2.6-acpi-dock-avoid-check-sta-method.patch, NONE, 1.1 linux-2.6-acpi-dock-fix-eject-request-process.patch, NONE, 1.1 kernel.spec, 1.1124, 1.1125

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-acpi-dock-avoid-check-sta-method.patch 
	linux-2.6-acpi-dock-fix-eject-request-process.patch 
Log Message:
Fix ACPI dock bugs (#470321)

linux-2.6-acpi-dock-avoid-check-sta-method.patch:

--- NEW FILE linux-2.6-acpi-dock-avoid-check-sta-method.patch ---
From: Shaohua Li <shaohua.li at intel.com>
Date: Thu, 28 Aug 2008 02:02:03 +0000 (+0800)
Subject: ACPI: dock: avoid check _STA method
X-Git-Tag: v2.6.28-rc1~26^2~20^2~12
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8b59560a3baf2e7c24e0fb92ea5d09eca92805db

ACPI: dock: avoid check _STA method

In some BIOSes, every _STA method call will send a notification again,
this cause freeze. And in some BIOSes, it appears _STA should be called
after _DCK. This tries to avoid calls _STA, and still keep the device
present check.

http://bugzilla.kernel.org/show_bug.cgi?id=10431

Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 7d2edf1..25d2161 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -604,14 +604,17 @@ static int handle_eject_request(struct dock_station *ds, u32 event)
 static void dock_notify(acpi_handle handle, u32 event, void *data)
 {
 	struct dock_station *ds = data;
+	struct acpi_device *tmp;
 
 	switch (event) {
 	case ACPI_NOTIFY_BUS_CHECK:
-		if (!dock_in_progress(ds) && dock_present(ds)) {
+		if (!dock_in_progress(ds) && acpi_bus_get_device(ds->handle,
+		   &tmp)) {
 			begin_dock(ds);
 			dock(ds);
 			if (!dock_present(ds)) {
 				printk(KERN_ERR PREFIX "Unable to dock!\n");
+				complete_dock(ds);
 				break;
 			}
 			atomic_notifier_call_chain(&dock_notifier_list,

linux-2.6-acpi-dock-fix-eject-request-process.patch:

--- NEW FILE linux-2.6-acpi-dock-fix-eject-request-process.patch ---
From: Shaohua Li <shaohua.li at intel.com>
Date: Thu, 28 Aug 2008 02:02:41 +0000 (+0800)
Subject: dock: fix eject request process (2.6.27-rc1 regression)
X-Git-Tag: v2.6.28-rc1~26^2~20^2~11
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=82545394e0690aaef446cb262aa5dac0f9c7156e

dock: fix eject request process (2.6.27-rc1 regression)

commit 2a7feab28d3fc060d320eaba192e49dad1079b7e introduces a bug.
My thinkpad actually will send an eject_request and we should follow the
eject process to finish the eject, otherwise system still thinks the bay
is present.

Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
---

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 25d2161..78d27ce 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -575,11 +575,6 @@ static int handle_eject_request(struct dock_station *ds, u32 event)
 	 */
 	dock_event(ds, event, UNDOCK_EVENT);
 
-	if (!dock_present(ds)) {
-		complete_undock(ds);
-		return -ENODEV;
-	}
-
 	hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);
 	undock(ds);
 	eject_dock(ds);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1124
retrieving revision 1.1125
diff -u -r1.1124 -r1.1125
--- kernel.spec	8 Nov 2008 04:49:47 -0000	1.1124
+++ kernel.spec	9 Nov 2008 07:22:43 -0000	1.1125
@@ -613,8 +613,12 @@
 Patch381: linux-2.6-pciehp-update.patch
 Patch382: linux-2.6-defaults-pciehp.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
+
 Patch391: linux-2.6-acpi-video-dos.patch
 Patch394: linux-2.6-acpi-handle-ec-init-failure.patch
+Patch395: linux-2.6-acpi-dock-avoid-check-sta-method.patch
+Patch396: linux-2.6-acpi-dock-fix-eject-request-process.patch
+
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch420: linux-2.6-squashfs.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
@@ -1156,6 +1160,9 @@
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
 ApplyPatch linux-2.6-acpi-handle-ec-init-failure.patch
+# fix dock bugs
+ApplyPatch linux-2.6-acpi-dock-avoid-check-sta-method.patch
+ApplyPatch linux-2.6-acpi-dock-fix-eject-request-process.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1890,6 +1897,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Nov 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-89
+- Fix ACPI dock bugs (#470321)
+
 * Sat Nov 08 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-88
 - radeon modesetting - fix mouse on second head and 3 second hangs hopefully