[kernel/f17] Change patch to resolve libata hotplug (rhbz 807632)

[Josh Boyer]

commit 861ec4fcf60c52526823d3fdc9424d4cc9ab0838
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Apr 18 13:54:46 2012 -0400

    Change patch to resolve libata hotplug (rhbz 807632)

 kernel.spec                                        |   11 +-
 ...-disable-runtime-pm-for-hotpluggable-port.patch |  180 --------------------
 libata-forbid-port-runtime-pm-by-default.patch     |   24 +++
 3 files changed, 31 insertions(+), 184 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 0a14346..e6d346b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -771,8 +771,8 @@ Patch21371: iwlwifi-do-not-nulify-ctx-vif-on-reset.patch
 #rhbz 808603
 Patch21380: wimax-i2400m-prevent-a-possible-kernel-bug-due-to-mi.patch
 
-#rhbz 806676 807632
-Patch21385: libata-disable-runtime-pm-for-hotpluggable-port.patch
+#rhbz 807632
+Patch21385: libata-forbid-port-runtime-pm-by-default.patch
 
 #rhbz 809014
 Patch21390: x86-Use-correct-byte-sized-register-constraint-in-__xchg_op.patch
@@ -1530,8 +1530,8 @@ ApplyPatch KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch
 #rhbz 808603
 ApplyPatch wimax-i2400m-prevent-a-possible-kernel-bug-due-to-mi.patch
 
-#rhbz 806676 807632
-ApplyPatch libata-disable-runtime-pm-for-hotpluggable-port.patch
+#rhbz 807632
+ApplyPatch libata-forbid-port-runtime-pm-by-default.patch
 
 #rhbz 809014
 ApplyPatch x86-Use-correct-byte-sized-register-constraint-in-__xchg_op.patch
@@ -2395,6 +2395,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Wed Apr 18 2012 Josh Boyer <jwboyer at redhat.com>
+- Change patch to resolve libata hotplug (rhbz 807632)
+
 * Tue Apr 17 2012 Josh Boyer <jwboyer at redhat.com>
 - Move the dlm module to modules-extra (rhbz 811547)
 - Fix oops in nfs_have_delegation (rhbz 811138)
diff --git a/libata-forbid-port-runtime-pm-by-default.patch b/libata-forbid-port-runtime-pm-by-default.patch
new file mode 100644
index 0000000..0d93a19
--- /dev/null
+++ b/libata-forbid-port-runtime-pm-by-default.patch
@@ -0,0 +1,24 @@
+From: Lin Ming <ming.m.lin at xxxxxxxxx>
+Date: Wed, 18 Apr 2012 09:13:41 +0800
+Subject: [PATCH] libata: forbid port runtime pm by default
+
+Forbid port runtime pm by default because it has known hotplug issue.
+User can allow it by, for example
+
+echo auto > /sys/devices/pci0000:00/0000:00:1f.2/ata2/power/control
+
+Signed-off-by: Lin Ming <ming.m.lin at xxxxxxxxx>
+---
+ drivers/ata/libata-transport.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+--- linux-3.3.noarch.orig/drivers/ata/libata-transport.c
++++ linux-3.3.noarch/drivers/ata/libata-transport.c
+@@ -294,6 +294,7 @@ int ata_tport_add(struct device *parent,
+ 	device_enable_async_suspend(dev);
+ 	pm_runtime_set_active(dev);
+ 	pm_runtime_enable(dev);
++	pm_runtime_forbid(dev);
+ 
+ 	transport_add_device(dev);
+ 	transport_configure_device(dev);