apex: Updated to version 1.5.4
[openwrt/svn-archive/archive.git] / target / linux / ixp4xx-2.6 / patches / 160-nas100d_artop_temp_fix.patch
1 From: Alan Cox <alan@redhat.com>
2 To: Alessandro Zummo <alessandro.zummo@towertech.it>
3 Cc: Jeff Garzik <jgarzik@redhat.com>, Alan Cox <alan@redhat.com>
4 Subject: Re: drivers/ata/pata_artop.c
5 Date: Sun, 15 Oct 2006 14:25:16 -0400
6 User-Agent: Mutt/1.4.1i
7
8 On Sun, Oct 15, 2006 at 07:18:31PM +0200, Alessandro Zummo wrote:
9 > In the discovery phase there's a lot of time spent in the detection
10 > of the second port.
11
12 The error recovery is a bit determined right now - Tejun's been doing some
13 work on SRST behaviour and also for the worst cases polled detect so it
14 should come out ok
15
16 > What's the correct way to inform the driver
17 > to avoid checking the second port?
18
19 Set the number of ports to 1 in your own tree for now. The real fix is
20 not to go poking at pata ports if the ret is 0xFF
21
22 ---
23 drivers/ata/pata_artop.c | 6 ++++++
24 1 file changed, 6 insertions(+)
25
26 Index: linux-2.6.19/drivers/ata/pata_artop.c
27 ===================================================================
28 --- linux-2.6.19.orig/drivers/ata/pata_artop.c
29 +++ linux-2.6.19/drivers/ata/pata_artop.c
30 @@ -26,6 +26,7 @@
31 #include <scsi/scsi_host.h>
32 #include <linux/libata.h>
33 #include <linux/ata.h>
34 +#include <asm/mach-types.h>
35
36 #define DRV_NAME "pata_artop"
37 #define DRV_VERSION "0.4.2"
38 @@ -469,6 +470,11 @@ static int artop_init_one (struct pci_de
39 pci_read_config_byte(pdev, 0x4a, &reg);
40 pci_write_config_byte(pdev, 0x4a, (reg & ~0x01) | 0x80);
41
42 + /* NAS100D workaround */
43 +#ifdef CONFIG_MACH_NAS100D
44 + if (machine_is_nas100d())
45 + ports = 1;
46 +#endif
47 }
48
49 BUG_ON(info == NULL);