rpms/kernel/F-9 linux-2.6-libata-retry-enabling-ahci.patch, NONE, 1.1 kernel.spec, 1.688, 1.689
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Tue Jun 24 05:38:02 UTC 2008
- Previous message (by thread): rpms/openais/devel import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 openais.spec, 1.26, 1.27 sources, 1.9, 1.10 revision-1547.patch, 1.1, NONE revision-1549.patch, 1.1, NONE revision-1550.patch, 1.1, NONE revision-1552.patch, 1.1, NONE
- Next message (by thread): [pkgdb] stardict-dic-zh_TW (Fedora, 9) updated by petersen
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23651
Modified Files:
kernel.spec
Added Files:
linux-2.6-libata-retry-enabling-ahci.patch
Log Message:
* Mon Jun 23 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.8-70
- libata: retry enable of AHCI mode before reporting an error (#452595)
linux-2.6-libata-retry-enabling-ahci.patch:
--- NEW FILE linux-2.6-libata-retry-enabling-ahci.patch ---
From: Tejun Heo <htejun at gmail.com>
Date: Wed, 23 Apr 2008 11:52:58 +0000 (+0900)
Subject: ahci: retry enabling AHCI a few times before spitting out WARN_ON()
X-Git-Tag: v2.6.26-rc1~1060^2~15
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=15fe982e429e0e6b7466719acb6cfd9dbfe47f0c
ahci: retry enabling AHCI a few times before spitting out WARN_ON()
Some chips need AHCI_EN set more than once to actually set it. Try a
few times before giving up and spitting out WARN_ON().
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: Peer Chen <pchen at nvidia.com>
Cc: Volker Armin Hemmann <volker.armin.hemmann at tu-clausthal.de>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---
rhbz 452595
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 986e332..7c4f886 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -556,16 +556,27 @@ static inline void __iomem *ahci_port_base(struct ata_port *ap)
static void ahci_enable_ahci(void __iomem *mmio)
{
+ int i;
u32 tmp;
/* turn on AHCI_EN */
tmp = readl(mmio + HOST_CTL);
- if (!(tmp & HOST_AHCI_EN)) {
+ if (tmp & HOST_AHCI_EN)
+ return;
+
+ /* Some controllers need AHCI_EN to be written multiple times.
+ * Try a few times before giving up.
+ */
+ for (i = 0; i < 5; i++) {
tmp |= HOST_AHCI_EN;
writel(tmp, mmio + HOST_CTL);
tmp = readl(mmio + HOST_CTL); /* flush && sanity check */
- WARN_ON(!(tmp & HOST_AHCI_EN));
+ if (tmp & HOST_AHCI_EN)
+ return;
+ msleep(10);
}
+
+ WARN_ON(1);
}
/**
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -r1.688 -r1.689
--- kernel.spec 23 Jun 2008 17:35:34 -0000 1.688
+++ kernel.spec 24 Jun 2008 05:37:13 -0000 1.689
@@ -635,6 +635,7 @@
Patch674: linux-2.6-sata-eeepc-faster.patch
Patch675: linux-2.6-libata-acpi-handle-bay-devices-in-dock-stations.patch
Patch676: linux-2.6-libata-pata_atiixp-dont-disable.patch
+Patch677: linux-2.6-libata-retry-enabling-ahci.patch
Patch680: linux-2.6-wireless.patch
Patch681: linux-2.6-wireless-pending.patch
@@ -1199,6 +1200,8 @@
ApplyPatch linux-2.6-libata-acpi-handle-bay-devices-in-dock-stations.patch
# fix DMA disable on atiixp
ApplyPatch linux-2.6-libata-pata_atiixp-dont-disable.patch
+# retry enabling AHCI mode before reporting error
+ApplyPatch linux-2.6-libata-retry-enabling-ahci.patch
# wireless patches headed for 2.6.26
ApplyPatch linux-2.6-wireless.patch
@@ -1852,6 +1855,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
+* Mon Jun 23 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.8-70
+- libata: retry enable of AHCI mode before reporting an error (#452595)
+
* Mon Jun 23 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.8-69
- Linux 2.6.25.8
- Patches reverted from 2.6.25.8, already in Fedora:
- Previous message (by thread): rpms/openais/devel import.log, NONE, 1.1 .cvsignore, 1.8, 1.9 openais.spec, 1.26, 1.27 sources, 1.9, 1.10 revision-1547.patch, 1.1, NONE revision-1549.patch, 1.1, NONE revision-1550.patch, 1.1, NONE revision-1552.patch, 1.1, NONE
- Next message (by thread): [pkgdb] stardict-dic-zh_TW (Fedora, 9) updated by petersen
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list