[PATCH] pata_amd: remove contamination added during cable_detect conversion

[PATCH] pata_amd: remove contamination added during cable_detect conversion

[Tejun Heo]

This is added by added by cff63dfceb52c564fe1ba5394d50ab7d599a11b9
 - pata: cable methods.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
---
 drivers/ata/pata_amd.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 5a77e4e..536ee89 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -639,11 +639,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	if (type == 1 && rev > 0x7)
 		type = 2;
 
-#if defined(CONFIG_ATA_ACPI)
-	/* Prefer the ACPI driver for Nvidia hardware */
-	if (pdev->vendor == PCI_VENDOR_ID_NVIDIA && ata_pata_acpi_present(pdev))
-		return -ENODEV;
-#endif
 	/* Check for AMD7411 */
 	if (type == 3)
 		/* FIFO is broken */
-- 
1.5.0.3

Re: [PATCH] pata_amd: remove contamination added during cable_detect conversion

[Alan Cox]

On Mon, 23 Apr 2007 02:04:38 +0900
Tejun Heo <htejun@gmail.com> wrote:

> This is added by added by cff63dfceb52c564fe1ba5394d50ab7d599a11b9
>  - pata: cable methods.

The Cable method fix for the Nvidia hardware if ACPI drivers are present
and usable is to use the ACPI driver, so its not a "contamination" its a
fix for the fact the Nvidia code can't do cable detect any other way

Re: [PATCH] pata_amd: remove contamination added during cable_detect conversion

[Tejun Heo]

Hello,

Alan Cox wrote:
> On Mon, 23 Apr 2007 02:04:38 +0900
> Tejun Heo <htejun@gmail.com> wrote:
> 
>> This is added by added by cff63dfceb52c564fe1ba5394d50ab7d599a11b9
>>  - pata: cable methods.
> 
> The Cable method fix for the Nvidia hardware if ACPI drivers are present
> and usable is to use the ACPI driver, so its not a "contamination" its a
> fix for the fact the Nvidia code can't do cable detect any other way

But pata_amd modifications should be merged together with pata_acpi not
separately.

Anyways, I've been testing pata_acpi and it doesn't work on my nforce
ultra machine.  Whether the cable is 40c or not, _STM happily sets UDMA
mode above 2 resulting in a series of transfer errors.  EH kicks in
eventually and drops transfer speed.

Also, ata_acpi_gtm() implementation was broken in that it skipped one
level of indirection (acpi_object, please take a look at the last patch
of just posted patchset), so it was basically returning garbage values.

I have patches to update pata_amd to use _STM/_GTM for cable detection
(a lot are taken from pata_acpi) but ACPI cable detection is just as
broken as PCI config one.

Thanks.

-- 
tejun

Re: [PATCH] pata_amd: remove contamination added during cable_detect conversion

[Alan Cox]

> I have patches to update pata_amd to use _STM/_GTM for cable detection
> (a lot are taken from pata_acpi) but ACPI cable detection is just as
> broken as PCI config one.

I'm unclear we can safely mix _STM/_GTM and direct access to the drive in
a general form. The ACPI documentation seems to be carefully very silent
on the subject.

Whatever works in this area is good.

Alan

Re: [PATCH] pata_amd: remove contamination added during cable_detect conversion

[Tejun Heo]

Alan Cox wrote:
>> I have patches to update pata_amd to use _STM/_GTM for cable detection
>> (a lot are taken from pata_acpi) but ACPI cable detection is just as
>> broken as PCI config one.
> 
> I'm unclear we can safely mix _STM/_GTM and direct access to the drive in
> a general form. The ACPI documentation seems to be carefully very silent
> on the subject.
> 
> Whatever works in this area is good.

Yeap, definitely.  Can you please retest pata_acpi with ata_acpi_gtm()
fixed?  I have an UDMA2 ODD (HL-DT-ST DVDRAM GSA-H10N) and UDMA4 HDD
(WDC WD153AA) attached to 40c cable and ACPI mode discovery doesn't work
at all.  The only thing I can get working here is storing the BIOS
setting.  :-(

-- 
tejun

Re: [PATCH] pata_amd: remove contamination added during cable_detect conversion

[Alan Cox]

> Yeap, definitely.  Can you please retest pata_acpi with ata_acpi_gtm()
> fixed?  I have an UDMA2 ODD (HL-DT-ST DVDRAM GSA-H10N) and UDMA4 HDD
> (WDC WD153AA) attached to 40c cable and ACPI mode discovery doesn't work
> at all.  The only thing I can get working here is storing the BIOS
> setting.  :-(

I'll try it next week although my BIOS worked beautifully with the
original code and without ata_acpi_gtm being fixed !

I've also seen some BIOSes which implement _gtm/_stm solely as "stuff it
back in BIOS boot up mode"

Alan

Re: [PATCH] pata_amd: remove contamination added during cable_detect conversion

[Jeff Garzik]

Tejun Heo wrote:
> This is added by added by cff63dfceb52c564fe1ba5394d50ab7d599a11b9
>  - pata: cable methods.
> 
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> ---
>  drivers/ata/pata_amd.c |    5 -----
>  1 files changed, 0 insertions(+), 5 deletions(-)

applied