Gentoo Archives: gentoo-commits

From: "Daniel Drake (dsd)" <dsd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] linux-patches r1257 - genpatches-2.6/trunk/2.6.24
Date: Tue, 26 Feb 2008 14:14:25
Message-Id: E1JU0Za-0000RN-Cg@stork.gentoo.org
1 Author: dsd
2 Date: 2008-02-26 14:14:21 +0000 (Tue, 26 Feb 2008)
3 New Revision: 1257
4
5 Added:
6 genpatches-2.6/trunk/2.6.24/1705_pegasos-vt8231-quirk.patch
7 Modified:
8 genpatches-2.6/trunk/2.6.24/0000_README
9 Log:
10 Fix 2.6.24 libata regression on Pegasos
11
12 Modified: genpatches-2.6/trunk/2.6.24/0000_README
13 ===================================================================
14 --- genpatches-2.6/trunk/2.6.24/0000_README 2008-02-24 23:37:17 UTC (rev 1256)
15 +++ genpatches-2.6/trunk/2.6.24/0000_README 2008-02-26 14:14:21 UTC (rev 1257)
16 @@ -47,6 +47,10 @@
17 From: http://bugs.gentoo.org/187175
18 Desc: Fix GCC 4.2 compile failure on alpha/ia64/ppc64
19
20 +Patch: 1705_pegasos-vt8231-quirk.patch
21 +From: http://bugs.gentoo.org/210455
22 +Desc: Fix 2.6.24 libata regression on Pegasos
23 +
24 Patch: 1900_xfs-file-readdir-oops.patch
25 From: http://bugs.gentoo.org/208404
26 Desc: Fix XFS crash condition
27
28 Added: genpatches-2.6/trunk/2.6.24/1705_pegasos-vt8231-quirk.patch
29 ===================================================================
30 --- genpatches-2.6/trunk/2.6.24/1705_pegasos-vt8231-quirk.patch (rev 0)
31 +++ genpatches-2.6/trunk/2.6.24/1705_pegasos-vt8231-quirk.patch 2008-02-26 14:14:21 UTC (rev 1257)
32 @@ -0,0 +1,39 @@
33 +From: Olaf Hering <olaf@××××××.de>
34 +Date: Mon, 21 Jan 2008 09:39:30 +0000 (+1100)
35 +Subject: [POWERPC] Revert chrp_pci_fixup_vt8231_ata devinit to fix libata on pegasos
36 +X-Git-Tag: v2.6.25-rc1~1131^2~66
37 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=092ca5bd61da6344f3b249754b337f2d48dfe08d
38 +
39 +[POWERPC] Revert chrp_pci_fixup_vt8231_ata devinit to fix libata on pegasos
40 +
41 +Commit 6d98bda79bea0e1be26c0767d0e9923ad3b72f2e changed the init order
42 +for chrp_pci_fixup_vt8231_ata().
43 +
44 +It can not work anymore because either the irq is not yet set to 14 or
45 +pci_get_device() returns nothing. At least the printk() in
46 +chrp_pci_fixup_vt8231_ata() does not trigger anymore.
47 +pata_via works again on Pegasos with the change below.
48 +
49 +Signed-off-by: Olaf Hering <olaf@××××××.de>
50 +Signed-off-by: Paul Mackerras <paulus@×××××.org>
51 +---
52 +
53 +diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
54 +index d51f83a..609c46d 100644
55 +--- a/arch/powerpc/platforms/chrp/pci.c
56 ++++ b/arch/powerpc/platforms/chrp/pci.c
57 +@@ -354,7 +354,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
58 + * mode as well. The same fixup must be done to the class-code property in
59 + * the IDE node /pci@80000000/ide@C,1
60 + */
61 +-static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
62 ++static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
63 + {
64 + u8 progif;
65 + struct pci_dev *viaisa;
66 +@@ -375,4 +375,4 @@ static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
67 +
68 + pci_dev_put(viaisa);
69 + }
70 +-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
71 ++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
72
73 --
74 gentoo-commits@l.g.o mailing list