rpms/kernel/F-8 linux-2.6-acpi-dont-init-ec-early-with-no-ini.patch, NONE, 1.1 linux-2.6-libata-ahci-enable-ahci-mode-before-reset.patch, NONE, 1.1 kernel.spec, 1.290, 1.291
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Fri Dec 7 00:41:09 UTC 2007
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31869
Modified Files:
kernel.spec
Added Files:
linux-2.6-acpi-dont-init-ec-early-with-no-ini.patch
linux-2.6-libata-ahci-enable-ahci-mode-before-reset.patch
Log Message:
* Thu Dec 06 2007 Chuck Ebbert <cebbert at redhat.com>
- libata: fix AHCI controller reset (#411171)
- ACPI: don't init EC early if it has no _INI method (#334781)
linux-2.6-acpi-dont-init-ec-early-with-no-ini.patch:
--- NEW FILE linux-2.6-acpi-dont-init-ec-early-with-no-ini.patch ---
bz 334781
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5870a8cd23181703cc76f88f630372f8602c7648
Commit: 5870a8cd23181703cc76f88f630372f8602c7648
Parent: 2ffbb8377c7a0713baf6644e285adc27a5654582
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
AuthorDate: Thu Nov 15 21:52:47 2007 +0300
Committer: Len Brown <len.brown at intel.com>
CommitDate: Mon Nov 19 12:20:48 2007 -0500
ACPI: EC: Don't init EC early if it has no _INI
Option to init EC early inserted to handle #8598 ASUS problem,
introduced several others.
EC driver in this particular case has fake _INI method, not present on
other machines, which don't need or break from this workaround, so lets use
its presence as a flag for early init.
http://bugzilla.kernel.org/show_bug.cgi?id=9262
http://bugzilla.kernel.org/show_bug.cgi?id=8598
https://bugzilla.novell.com/show_bug.cgi?id=334806
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
---
drivers/acpi/ec.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 06b78e5..56afe13 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -881,12 +881,20 @@ int __init acpi_ec_ecdt_probe(void)
boot_ec->gpe = ecdt_ptr->gpe;
boot_ec->handle = ACPI_ROOT_OBJECT;
} else {
+ /* This workaround is needed only on some broken machines,
+ * which require early EC, but fail to provide ECDT */
+ acpi_handle x;
printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
boot_ec, NULL);
/* Check that acpi_get_devices actually find something */
if (ACPI_FAILURE(status) || !boot_ec->handle)
goto error;
+ /* We really need to limit this workaround, the only ASUS,
+ * which needs it, has fake EC._INI method, so use it as flag.
+ */
+ if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
+ goto error;
}
ret = ec_install_handlers(boot_ec);
linux-2.6-libata-ahci-enable-ahci-mode-before-reset.patch:
--- NEW FILE linux-2.6-libata-ahci-enable-ahci-mode-before-reset.patch ---
Combined patch:
bz 411171
Commit: 3cc3eb1148e4b2dfabf7a1dcf36fd8be1331ca95
Parent: b90fe23bd51c6b1c298159591c833bdd24f55002
Author: Jeff Garzik <jeff at garzik.org>
AuthorDate: Wed Sep 26 00:02:41 2007 -0400
Committer: Jeff Garzik <jeff at garzik.org>
CommitDate: Fri Oct 12 14:55:42 2007 -0400
[libata] AHCI: enable AHCI mode, before using AHCI reset
Commit: ab6fc95f609b372a19e18ea689986846ab1ba29c
Parent: 360737a982b1ae09e1659e0bb27085c03f02f404
Author: Jeff Garzik <jeff at garzik.org>
AuthorDate: Mon Oct 29 10:43:55 2007 -0400
Committer: Jeff Garzik <jeff at garzik.org>
CommitDate: Mon Oct 29 10:43:55 2007 -0400
[libata] AHCI: fix newly introduced host-reset bug
---
drivers/ata/ahci.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
--- linux-2.6.23.noarch.orig/drivers/ata/ahci.c
+++ linux-2.6.23.noarch/drivers/ata/ahci.c
@@ -872,8 +872,16 @@ static int ahci_reset_controller(struct
void __iomem *mmio = host->iomap[AHCI_PCI_BAR];
u32 tmp;
- /* global controller reset */
+ /* we must be in AHCI mode, before using anything
+ * AHCI-specific, such as HOST_RESET.
+ */
tmp = readl(mmio + HOST_CTL);
+ if (!(tmp & HOST_AHCI_EN)) {
+ tmp |= HOST_AHCI_EN;
+ writel(tmp, mmio + HOST_CTL);
+ }
+
+ /* global controller reset */
if ((tmp & HOST_RESET) == 0) {
writel(tmp | HOST_RESET, mmio + HOST_CTL);
readl(mmio + HOST_CTL); /* flush */
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- kernel.spec 5 Dec 2007 22:58:25 -0000 1.290
+++ kernel.spec 7 Dec 2007 00:40:35 -0000 1.291
@@ -677,6 +677,7 @@
Patch672: linux-2.6-libata-work-around-drq-1-err-1-for-tapes.patch
Patch673: linux-2.6-libata-use-stuck-err-for-tapes.patch
Patch674: linux-2.6-libata-scsi-allow-short-commands.patch
+Patch675: linux-2.6-libata-ahci-enable-ahci-mode-before-reset.patch
Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
@@ -705,6 +706,7 @@
Patch780: linux-2.6-acpi-cpuidle-0-upstream.patch
Patch781: linux-2.6-acpi-cpuidle-1-fix-C3-for-no-bm-ctrl.patch
Patch782: linux-2.6-acpi-cpuidle-2-fix-HP-nx6125-regression.patch
+Patch783: linux-2.6-acpi-dont-init-ec-early-with-no-ini.patch
Patch800: linux-2.6-wakeups-hdaps.patch
Patch801: linux-2.6-wakeups.patch
Patch820: linux-2.6-compile-fixes.patch
@@ -1286,6 +1288,8 @@
ApplyPatch linux-2.6-libata-use-stuck-err-for-tapes.patch
# allow 12-byte SCSI commands for ATAPI devices
ApplyPatch linux-2.6-libata-scsi-allow-short-commands.patch
+# fix ahci reset
+ApplyPatch linux-2.6-libata-ahci-enable-ahci-mode-before-reset.patch
# wireless patches headed for 2.6.24
ApplyPatch linux-2.6-wireless.patch
@@ -1333,6 +1337,8 @@
ApplyPatch linux-2.6-acpi-cpuidle-0-upstream.patch
ApplyPatch linux-2.6-acpi-cpuidle-1-fix-C3-for-no-bm-ctrl.patch
ApplyPatch linux-2.6-acpi-cpuidle-2-fix-HP-nx6125-regression.patch
+# fix EC init
+ApplyPatch linux-2.6-acpi-dont-init-ec-early-with-no-ini.patch
# Fix excessive wakeups
# Make hdaps timer only tick when in use.
@@ -2002,6 +2008,10 @@
%changelog
+* Thu Dec 06 2007 Chuck Ebbert <cebbert at redhat.com>
+- libata: fix AHCI controller reset (#411171)
+- ACPI: don't init EC early if it has no _INI method (#334781)
+
* Wed Dec 05 2007 Chuck Ebbert <cebbert at redhat.com>
- Fix some cpuidle bugs, should fix hangs on startup.
More information about the fedora-extras-commits
mailing list