[PATCH] add delay around sl82c105_reset_engine calls

[PATCH] add delay around sl82c105_reset_engine calls

[Olaf Hering]

The hald media changed polling does really confuse things.
Noone knows why the delays are needed, but they give us access to the CD.

An udelay(50) will give reliable access to the drive, but there is still
one (or more) EH reset. The drive works without EH resets with udelay(100).

Signed-off-by: Olaf Hering <olaf@aepfle.de>

---
 drivers/ata/pata_sl82c105.c |    3 +++
 1 file changed, 3 insertions(+)

Index: linux-2.6/drivers/ata/pata_sl82c105.c
===================================================================
--- linux-2.6.orig/drivers/ata/pata_sl82c105.c
+++ linux-2.6/drivers/ata/pata_sl82c105.c
@@ -187,7 +187,9 @@ static void sl82c105_bmdma_start(struct 
 {
 	struct ata_port *ap = qc->ap;
 
+	udelay(100);
 	sl82c105_reset_engine(ap);
+	udelay(100);
 
 	/* Set the clocks for DMA */
 	sl82c105_configure_dmamode(ap, qc->dev);
@@ -216,6 +218,7 @@ static void sl82c105_bmdma_stop(struct a
 
 	ata_bmdma_stop(qc);
 	sl82c105_reset_engine(ap);
+	udelay(100);
 
 	/* This will redo the initial setup of the DMA device to matching
 	   PIO timings */

Re: [PATCH] add delay around sl82c105_reset_engine calls

[Jeff Garzik]

Olaf Hering wrote:
> The hald media changed polling does really confuse things.
> Noone knows why the delays are needed, but they give us access to the CD.
> 
> An udelay(50) will give reliable access to the drive, but there is still
> one (or more) EH reset. The drive works without EH resets with udelay(100).
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> ---
>  drivers/ata/pata_sl82c105.c |    3 +++
>  1 file changed, 3 insertions(+)

applied

[PATCH] use winbond libata instead of ide driver for pseries CD drives

[Olaf Hering]

Change the default for the built-in IDE on p610/p615/p630 from
ide to libata. libata has better error handling and the drive can
recover when hald does its CD media polling.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

---
 arch/powerpc/configs/ppc64_defconfig   |    4 ++--
 arch/powerpc/configs/pseries_defconfig |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6.20/arch/powerpc/configs/ppc64_defconfig
===================================================================
--- linux-2.6.20.orig/arch/powerpc/configs/ppc64_defconfig
+++ linux-2.6.20/arch/powerpc/configs/ppc64_defconfig
@@ -500,7 +500,7 @@ CONFIG_BLK_DEV_AMD74XX=y
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_SVWKS is not set
 # CONFIG_BLK_DEV_SIIMAGE is not set
-CONFIG_BLK_DEV_SL82C105=y
+# CONFIG_BLK_DEV_SL82C105 is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -646,7 +646,7 @@ CONFIG_SATA_SVW=y
 # CONFIG_PATA_SIL680 is not set
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
+CONFIG_PATA_WINBOND=y
 
 #
 # Multi-device support (RAID and LVM)
Index: linux-2.6.20/arch/powerpc/configs/pseries_defconfig
===================================================================
--- linux-2.6.20.orig/arch/powerpc/configs/pseries_defconfig
+++ linux-2.6.20/arch/powerpc/configs/pseries_defconfig
@@ -483,7 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_SVWKS is not set
 # CONFIG_BLK_DEV_SIIMAGE is not set
-CONFIG_BLK_DEV_SL82C105=y
+# CONFIG_BLK_DEV_SL82C105 is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -628,7 +628,7 @@ CONFIG_ATA=y
 # CONFIG_PATA_SIL680 is not set
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
+CONFIG_PATA_WINBOND=y
 
 #
 # Multi-device support (RAID and LVM)

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Sergei Shtylyov]

Hello.

Olaf Hering wrote:
> Change the default for the built-in IDE on p610/p615/p630 from
> ide to libata. libata has better error handling and the drive can
> recover when hald does its CD media polling.

> Signed-off-by: Olaf Hering <olaf@aepfle.de>

> ---
>  arch/powerpc/configs/ppc64_defconfig   |    4 ++--
>  arch/powerpc/configs/pseries_defconfig |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> Index: linux-2.6.20/arch/powerpc/configs/ppc64_defconfig
> ===================================================================
> --- linux-2.6.20.orig/arch/powerpc/configs/ppc64_defconfig
> +++ linux-2.6.20/arch/powerpc/configs/ppc64_defconfig
> @@ -500,7 +500,7 @@ CONFIG_BLK_DEV_AMD74XX=y
>  # CONFIG_BLK_DEV_PDC202XX_NEW is not set
>  # CONFIG_BLK_DEV_SVWKS is not set
>  # CONFIG_BLK_DEV_SIIMAGE is not set
> -CONFIG_BLK_DEV_SL82C105=y
> +# CONFIG_BLK_DEV_SL82C105 is not set
>  # CONFIG_BLK_DEV_SLC90E66 is not set
>  # CONFIG_BLK_DEV_TRM290 is not set
>  # CONFIG_BLK_DEV_VIA82CXXX is not set
> @@ -646,7 +646,7 @@ CONFIG_SATA_SVW=y
>  # CONFIG_PATA_SIL680 is not set
>  # CONFIG_PATA_SIS is not set
>  # CONFIG_PATA_VIA is not set
> -# CONFIG_PATA_WINBOND is not set
> +CONFIG_PATA_WINBOND=y
>  
>  #
>  # Multi-device support (RAID and LVM)
> Index: linux-2.6.20/arch/powerpc/configs/pseries_defconfig
> ===================================================================
> --- linux-2.6.20.orig/arch/powerpc/configs/pseries_defconfig
> +++ linux-2.6.20/arch/powerpc/configs/pseries_defconfig
> @@ -483,7 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y
>  # CONFIG_BLK_DEV_PDC202XX_NEW is not set
>  # CONFIG_BLK_DEV_SVWKS is not set
>  # CONFIG_BLK_DEV_SIIMAGE is not set
> -CONFIG_BLK_DEV_SL82C105=y
> +# CONFIG_BLK_DEV_SL82C105 is not set
>  # CONFIG_BLK_DEV_SLC90E66 is not set
>  # CONFIG_BLK_DEV_TRM290 is not set
>  # CONFIG_BLK_DEV_VIA82CXXX is not set
> @@ -628,7 +628,7 @@ CONFIG_ATA=y
>  # CONFIG_PATA_SIL680 is not set
>  # CONFIG_PATA_SIS is not set
>  # CONFIG_PATA_VIA is not set
> -# CONFIG_PATA_WINBOND is not set
> +CONFIG_PATA_WINBOND=y

    I'm sorry, how those 2 drivers can be equivalent?! The pata_winbond driver 
is for VLB only, sl81c105 was for PCI only -- you certainly want to use 
pata_sl82c105 (indeed better version of sl82c105 driver).

WBR, Sergei

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Bartlomiej Zolnierkiewicz]

Hi,

On Friday 16 February 2007 10:20, Olaf Hering wrote:
> 
> Change the default for the built-in IDE on p610/p615/p630 from
> ide to libata. libata has better error handling and the drive can
> recover when hald does its CD media polling.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>

Does IDE sl82c105 need the same udelay() fix patch as done for
pata_winbond?

Bart

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Sergei Shtylyov]

Hello, I wrote:

>>Change the default for the built-in IDE on p610/p615/p630 from
>>ide to libata. libata has better error handling and the drive can
>>recover when hald does its CD media polling.

>>Signed-off-by: Olaf Hering <olaf@aepfle.de>

>>Index: linux-2.6.20/arch/powerpc/configs/ppc64_defconfig
>>===================================================================
>>--- linux-2.6.20.orig/arch/powerpc/configs/ppc64_defconfig
>>+++ linux-2.6.20/arch/powerpc/configs/ppc64_defconfig
>>@@ -500,7 +500,7 @@ CONFIG_BLK_DEV_AMD74XX=y
>> # CONFIG_BLK_DEV_PDC202XX_NEW is not set
>> # CONFIG_BLK_DEV_SVWKS is not set
>> # CONFIG_BLK_DEV_SIIMAGE is not set
>>-CONFIG_BLK_DEV_SL82C105=y
>>+# CONFIG_BLK_DEV_SL82C105 is not set
>> # CONFIG_BLK_DEV_SLC90E66 is not set
>> # CONFIG_BLK_DEV_TRM290 is not set
>> # CONFIG_BLK_DEV_VIA82CXXX is not set
>>@@ -646,7 +646,7 @@ CONFIG_SATA_SVW=y
>> # CONFIG_PATA_SIL680 is not set
>> # CONFIG_PATA_SIS is not set
>> # CONFIG_PATA_VIA is not set
>>-# CONFIG_PATA_WINBOND is not set
>>+CONFIG_PATA_WINBOND=y
>> 
>> #
>> # Multi-device support (RAID and LVM)
>>Index: linux-2.6.20/arch/powerpc/configs/pseries_defconfig
>>===================================================================
>>--- linux-2.6.20.orig/arch/powerpc/configs/pseries_defconfig
>>+++ linux-2.6.20/arch/powerpc/configs/pseries_defconfig
>>@@ -483,7 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y
>> # CONFIG_BLK_DEV_PDC202XX_NEW is not set
>> # CONFIG_BLK_DEV_SVWKS is not set
>> # CONFIG_BLK_DEV_SIIMAGE is not set
>>-CONFIG_BLK_DEV_SL82C105=y
>>+# CONFIG_BLK_DEV_SL82C105 is not set
>> # CONFIG_BLK_DEV_SLC90E66 is not set
>> # CONFIG_BLK_DEV_TRM290 is not set
>> # CONFIG_BLK_DEV_VIA82CXXX is not set
>>@@ -628,7 +628,7 @@ CONFIG_ATA=y
>> # CONFIG_PATA_SIL680 is not set
>> # CONFIG_PATA_SIS is not set
>> # CONFIG_PATA_VIA is not set
>>-# CONFIG_PATA_WINBOND is not set
>>+CONFIG_PATA_WINBOND=y

>     I'm sorry, how those 2 drivers can be equivalent?! The pata_winbond driver 

    Sorry indeed -- I didn't realize PATA_WINBOND correscponds to 
pata_sl82c105 (somewhat confusing, isn't it?).

WBR, Sergei

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Bartlomiej Zolnierkiewicz]

On Friday 16 February 2007 15:46, Bartlomiej Zolnierkiewicz wrote:
> 
> Hi,
> 
> On Friday 16 February 2007 10:20, Olaf Hering wrote:
> > 
> > Change the default for the built-in IDE on p610/p615/p630 from
> > ide to libata. libata has better error handling and the drive can
> > recover when hald does its CD media polling.
> > 
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> Does IDE sl82c105 need the same udelay() fix patch as done for
> pata_winbond?

s/pata_winbond/pata_sl82c105/ of course

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Bartlomiej Zolnierkiewicz]

On Friday 16 February 2007 14:52, Sergei Shtylyov wrote:

>     I'm sorry, how those 2 drivers can be equivalent?! The pata_winbond driver 
> is for VLB only, sl81c105 was for PCI only -- you certainly want to use 
> pata_sl82c105 (indeed better version of sl82c105 driver).

I was under the impression that with your fixes these drivers
(sl82c105 and pata_sl82c105) are functionally equivalent.

Did I miss something (i.e. some patches)?

Bart

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Sergei Shtylyov]

Hello.

Bartlomiej Zolnierkiewicz wrote:

>>    I'm sorry, how those 2 drivers can be equivalent?! The pata_winbond driver 
>>is for VLB only, sl81c105 was for PCI only -- you certainly want to use 
>>pata_sl82c105 (indeed better version of sl82c105 driver).

> I was under the impression that with your fixes these drivers
> (sl82c105 and pata_sl82c105) are functionally equivalent.

    They're not yet equivalent. pata_sl82c105 supports all MWDMA modes, 
sl82c105 still supports only MWDMA2.

WBR, Sergei

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Sergei Shtylyov]

Hello.

Bartlomiej Zolnierkiewicz wrote:

>>>>   I'm sorry, how those 2 drivers can be equivalent?! The pata_winbond driver 
>>>>is for VLB only, sl81c105 was for PCI only -- you certainly want to use 
>>>>pata_sl82c105 (indeed better version of sl82c105 driver).

>>>I was under the impression that with your fixes these drivers
>>>(sl82c105 and pata_sl82c105) are functionally equivalent.

>>    They're not yet equivalent. pata_sl82c105 supports all MWDMA modes, 
>>sl82c105 still supports only MWDMA2.

> Indeed and it seems that IDE core needs ->dma_mode to fix this.

    Not really.  It just needs the proper DMA timings to be set by adding the 
missing speedproc() method (and also DMA timings possibly merged with PIO like 
libata does generally -- except in this driver).

> Thanks,
> Bart

MBR, Sergei

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Bartlomiej Zolnierkiewicz]

On Friday 16 February 2007 15:55, Sergei Shtylyov wrote:
> Hello.
> 
> Bartlomiej Zolnierkiewicz wrote:
> 
> >>    I'm sorry, how those 2 drivers can be equivalent?! The pata_winbond driver 
> >>is for VLB only, sl81c105 was for PCI only -- you certainly want to use 
> >>pata_sl82c105 (indeed better version of sl82c105 driver).
> 
> > I was under the impression that with your fixes these drivers
> > (sl82c105 and pata_sl82c105) are functionally equivalent.
> 
>     They're not yet equivalent. pata_sl82c105 supports all MWDMA modes, 
> sl82c105 still supports only MWDMA2.

Indeed and it seems that IDE core needs ->dma_mode to fix this.

Thanks,
Bart

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Sergei Shtylyov]

Hello, I wrote:

>>>>>  I'm sorry, how those 2 drivers can be equivalent?! The pata_winbond driver 
>>>>>is for VLB only, sl81c105 was for PCI only -- you certainly want to use 
>>>>>pata_sl82c105 (indeed better version of sl82c105 driver).

>>>>I was under the impression that with your fixes these drivers
>>>>(sl82c105 and pata_sl82c105) are functionally equivalent.

>>>   They're not yet equivalent. pata_sl82c105 supports all MWDMA modes, 
>>>sl82c105 still supports only MWDMA2.

>>Indeed and it seems that IDE core needs ->dma_mode to fix this.

>     Not really.  It just needs the proper DMA timings to be set by adding the 
> missing speedproc() method (and also DMA timings possibly merged with PIO like 
> libata does generally -- except in this driver).

    By "this driver" I meant pata_sl82c105 of course. :-)

>>Thanks,
>>Bart

MBR, Sergei

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Olaf Hering]

On Fri, Feb 16, Bartlomiej Zolnierkiewicz wrote:

> 
> Hi,
> 
> On Friday 16 February 2007 10:20, Olaf Hering wrote:
> > 
> > Change the default for the built-in IDE on p610/p615/p630 from
> > ide to libata. libata has better error handling and the drive can
> > recover when hald does its CD media polling.
> > 
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> Does IDE sl82c105 need the same udelay() fix patch as done for
> pata_winbond?

I dont know, but I suspect a delay is required somewhere.

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Benjamin Herrenschmidt]

On Fri, 2007-02-16 at 17:55 +0300, Sergei Shtylyov wrote:
> Hello.
> 
> Bartlomiej Zolnierkiewicz wrote:
> 
> >>    I'm sorry, how those 2 drivers can be equivalent?! The pata_winbond driver 
> >>is for VLB only, sl81c105 was for PCI only -- you certainly want to use 
> >>pata_sl82c105 (indeed better version of sl82c105 driver).
> 
> > I was under the impression that with your fixes these drivers
> > (sl82c105 and pata_sl82c105) are functionally equivalent.
> 
>     They're not yet equivalent. pata_sl82c105 supports all MWDMA modes, 
> sl82c105 still supports only MWDMA2.

BTW, the "old ide" sl82c105 currently upstream produces warnings on 64
bits platforms about conversion between int and pointers of different
sizes. I didn't have time to look closely yesterday though, could be
harmless.

Ben.

Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives

[Jeff Garzik]

Olaf Hering wrote:
> Change the default for the built-in IDE on p610/p615/p630 from
> ide to libata. libata has better error handling and the drive can
> recover when hald does its CD media polling.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> ---
>  arch/powerpc/configs/ppc64_defconfig   |    4 ++--
>  arch/powerpc/configs/pseries_defconfig |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)

ACK the patch.  I presume Paul will apply it, as its within his file 
hierarchy