[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5767b9100701090453g51448661td14e4c05a4eceb2a@mail.gmail.com>
Date: Tue, 9 Jan 2007 20:53:09 +0800
From: "Conke Hu" <conke.hu@...il.com>
To: "Bartlomiej Zolnierkiewicz" <bzolnier@...il.com>
Cc: "Linux kernel mailing list" <linux-kernel@...r.kernel.org>,
"Andrew Morton" <akpm@...l.org>, "Greg KH" <greg@...ah.com>,
linux-ide@...r.kernel.org
Subject: Re: [PATCH 3/3] atiixp.c: add cable detection support for ATI IDE
On 1/7/07, Bartlomiej Zolnierkiewicz <bzolnier@...il.com> wrote:
> On 1/6/07, Conke Hu <conke.hu@...il.com> wrote:
> > IDE HDD does not work if it uses a 40-pin PATA cable on ATI chipset.
> > This patch fixes the bug.
> >
> > Signed-off-by: Conke Hu <conke.hu@....com>
>
> Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@...il.com>
>
> [ the one is also line wrapped, please resend them ]
>
re-created.
pls apply it after the [patch 1/3] and [patch 2/3] :)
------------------------
--- linux-2.6.20-rc4/drivers/ide/pci/atiixp.c.3 2007-01-09
15:37:42.000000000 +0800
+++ linux-2.6.20-rc4/drivers/ide/pci/atiixp.c 2007-01-09
15:40:08.000000000 +0800
@@ -291,8 +291,12 @@ fast_ata_pio:
static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
{
+ u8 udma_mode = 0;
+ u8 ch = hwif->channel;
+ struct pci_dev *pdev = hwif->pci_dev;
+
if (!hwif->irq)
- hwif->irq = hwif->channel ? 15 : 14;
+ hwif->irq = ch ? 15 : 14;
hwif->autodma = 0;
hwif->tuneproc = &atiixp_tuneproc;
@@ -308,8 +312,12 @@ static void __devinit init_hwif_atiixp(i
hwif->mwdma_mask = 0x06;
hwif->swdma_mask = 0x04;
- /* FIXME: proper cable detection needed */
- hwif->udma_four = 1;
+ pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ch, &udma_mode);
+ if ((udma_mode & 0x07) >= 0x04 || (udma_mode & 0x70) >= 0x40)
+ hwif->udma_four = 1;
+ else
+ hwif->udma_four = 0;
+
hwif->ide_dma_host_on = &atiixp_ide_dma_host_on;
hwif->ide_dma_host_off = &atiixp_ide_dma_host_off;
hwif->ide_dma_check = &atiixp_dma_check;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists