Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Tejun Heo]

[-- Attachment #1: Type: text/plain, Size: 473 bytes --]

[cc'ing linux-ide]

(this is regarding vt6421 failing to detect devices on boot after EH udpate)

Thierry Vignaud wrote:
> I think I have (but I was so tired I won't 100% claim to).
> I'll retest tonight.

Hello, again.

Can you please test two patches attached in this mail?  Just quick 
result will be enough.  If both don't work, I'll go ahead and create a 
third one - which emulates the old phy hardreset exactly as I did for 
softreset of vt6420.

Thanks.

-- 
tejun

[-- Attachment #2: via-alt0.patch --]
[-- Type: text/x-patch, Size: 5691 bytes --]

Index: work-c3/drivers/scsi/sata_via.c
===================================================================
--- work-c3.orig/drivers/scsi/sata_via.c	2006-08-22 23:17:36.000000000 +0900
+++ work-c3/drivers/scsi/sata_via.c	2006-08-23 01:08:48.000000000 +0900
@@ -74,6 +74,8 @@ enum {
 static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
 static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
+static void vt6420_error_handler(struct ata_port *ap);
+static void vt6421_error_handler(struct ata_port *ap);
 
 static const struct pci_device_id svia_pci_tbl[] = {
 	{ 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
@@ -107,7 +109,7 @@ static struct scsi_host_template svia_sh
 	.bios_param		= ata_std_bios_param,
 };
 
-static const struct ata_port_operations svia_sata_ops = {
+static const struct ata_port_operations vt6420_sata_ops = {
 	.port_disable		= ata_port_disable,
 
 	.tf_load		= ata_tf_load,
@@ -127,7 +129,38 @@ static const struct ata_port_operations 
 
 	.freeze			= ata_bmdma_freeze,
 	.thaw			= ata_bmdma_thaw,
-	.error_handler		= ata_bmdma_error_handler,
+	.error_handler		= vt6420_error_handler,
+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,
+
+	.irq_handler		= ata_interrupt,
+	.irq_clear		= ata_bmdma_irq_clear,
+
+	.port_start		= ata_port_start,
+	.port_stop		= ata_port_stop,
+	.host_stop		= ata_host_stop,
+};
+
+static const struct ata_port_operations vt6421_sata_ops = {
+	.port_disable		= ata_port_disable,
+
+	.tf_load		= ata_tf_load,
+	.tf_read		= ata_tf_read,
+	.check_status		= ata_check_status,
+	.exec_command		= ata_exec_command,
+	.dev_select		= ata_std_dev_select,
+
+	.bmdma_setup            = ata_bmdma_setup,
+	.bmdma_start            = ata_bmdma_start,
+	.bmdma_stop		= ata_bmdma_stop,
+	.bmdma_status		= ata_bmdma_status,
+
+	.qc_prep		= ata_qc_prep,
+	.qc_issue		= ata_qc_issue_prot,
+	.data_xfer		= ata_pio_data_xfer,
+
+	.freeze			= ata_bmdma_freeze,
+	.thaw			= ata_bmdma_thaw,
+	.error_handler		= vt6421_error_handler,
 	.post_internal_cmd	= ata_bmdma_post_internal_cmd,
 
 	.irq_handler		= ata_interrupt,
@@ -141,13 +174,13 @@ static const struct ata_port_operations 
 	.host_stop		= ata_host_stop,
 };
 
-static struct ata_port_info svia_port_info = {
+static struct ata_port_info vt6420_port_info = {
 	.sht		= &svia_sht,
 	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
 	.pio_mask	= 0x1f,
 	.mwdma_mask	= 0x07,
 	.udma_mask	= 0x7f,
-	.port_ops	= &svia_sata_ops,
+	.port_ops	= &vt6420_sata_ops,
 };
 
 MODULE_AUTHOR("Jeff Garzik");
@@ -170,6 +203,87 @@ static void svia_scr_write (struct ata_p
 	outl(val, ap->ioaddr.scr_addr + (4 * sc_reg));
 }
 
+/**
+ *	vt6420_prereset - prereset for vt6420
+ *	@ap: target ATA port
+ *
+ *	SCR registers on vt6420 are pieces of shit and may hang the
+ *	whole machine completely if accessed with the wrong timing.
+ *	To avoid such catastrophe, vt6420 doesn't provide generic SCR
+ *	access operations, but uses SStatus and SControl only during
+ *	boot probing in controlled way.
+ *
+ *	As the old (pre EH update) probing code is proven to work, we
+ *	strictly follow the access pattern.
+ *
+ *	LOCKING:
+ *	Kernel thread context (may sleep)
+ *
+ *	RETURNS:
+ *	0 on success, -errno otherwise.
+ */
+static int vt6420_prereset(struct ata_port *ap)
+{
+	struct ata_eh_context *ehc = &ap->eh_context;
+	unsigned long timeout = jiffies + (HZ * 5);
+	u32 sstatus, scontrol;
+	int online;
+
+	/* don't do any SCR stuff if we're not loading */
+	if (!ATA_PFLAG_LOADING)
+		goto skip_scr;
+
+	/* Resume phy.  This is the old resume sequence from
+	 * __sata_phy_reset().
+	 */
+	svia_scr_write(ap, SCR_CONTROL, 0x300);
+	svia_scr_read(ap, SCR_CONTROL); /* flush */
+
+	/* wait for phy to become ready, if necessary */
+	do {
+		msleep(200);
+		if ((svia_scr_read(ap, SCR_STATUS) & 0xf) != 1)
+			break;
+	} while (time_before(jiffies, timeout));
+
+	/* open code sata_print_link_status() */
+	sstatus = svia_scr_read(ap, SCR_STATUS);
+	scontrol = svia_scr_read(ap, SCR_CONTROL);
+
+	online = (sstatus & 0xf) == 0x3;
+
+	ata_port_printk(ap, KERN_INFO,
+			"SATA link %s 1.5 Gbps (SStatus %X SControl %X)\n",
+			online ? "up" : "down", sstatus, scontrol);
+
+	/* SStatus is read one more time */
+	svia_scr_read(ap, SCR_STATUS);
+
+	if (!online) {
+		/* tell EH to bail */
+		ehc->i.action &= ~ATA_EH_RESET_MASK;
+		return 0;
+	}
+
+ skip_scr:
+	/* wait for !BSY */
+	ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+
+	return 0;
+}
+
+static void vt6420_error_handler(struct ata_port *ap)
+{
+	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
+				  NULL, ata_std_postreset);
+}
+
+static void vt6421_error_handler(struct ata_port *ap)
+{
+	return ata_bmdma_drive_eh(ap, ata_std_prereset, NULL,
+				  sata_std_hardreset, ata_std_postreset);
+}
+
 static const unsigned int svia_bar_sizes[] = {
 	8, 4, 8, 4, 16, 256
 };
@@ -210,7 +324,7 @@ static void vt6421_init_addrs(struct ata
 static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev)
 {
 	struct ata_probe_ent *probe_ent;
-	struct ata_port_info *ppi = &svia_port_info;
+	struct ata_port_info *ppi = &vt6420_port_info;
 
 	probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
 	if (!probe_ent)
@@ -239,7 +353,7 @@ static struct ata_probe_ent *vt6421_init
 
 	probe_ent->sht		= &svia_sht;
 	probe_ent->host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY;
-	probe_ent->port_ops	= &svia_sata_ops;
+	probe_ent->port_ops	= &vt6421_sata_ops;
 	probe_ent->n_ports	= N_PORTS;
 	probe_ent->irq		= pdev->irq;
 	probe_ent->irq_flags	= IRQF_SHARED;

[-- Attachment #3: via-alt1.patch --]
[-- Type: text/x-patch, Size: 5689 bytes --]

Index: work-c3/drivers/scsi/sata_via.c
===================================================================
--- work-c3.orig/drivers/scsi/sata_via.c	2006-08-23 01:24:55.000000000 +0900
+++ work-c3/drivers/scsi/sata_via.c	2006-08-23 01:25:45.000000000 +0900
@@ -74,6 +74,8 @@ enum {
 static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
 static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
+static void vt6420_error_handler(struct ata_port *ap);
+static void vt6421_error_handler(struct ata_port *ap);
 
 static const struct pci_device_id svia_pci_tbl[] = {
 	{ 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
@@ -107,7 +109,7 @@ static struct scsi_host_template svia_sh
 	.bios_param		= ata_std_bios_param,
 };
 
-static const struct ata_port_operations svia_sata_ops = {
+static const struct ata_port_operations vt6420_sata_ops = {
 	.port_disable		= ata_port_disable,
 
 	.tf_load		= ata_tf_load,
@@ -127,7 +129,38 @@ static const struct ata_port_operations 
 
 	.freeze			= ata_bmdma_freeze,
 	.thaw			= ata_bmdma_thaw,
-	.error_handler		= ata_bmdma_error_handler,
+	.error_handler		= vt6420_error_handler,
+	.post_internal_cmd	= ata_bmdma_post_internal_cmd,
+
+	.irq_handler		= ata_interrupt,
+	.irq_clear		= ata_bmdma_irq_clear,
+
+	.port_start		= ata_port_start,
+	.port_stop		= ata_port_stop,
+	.host_stop		= ata_host_stop,
+};
+
+static const struct ata_port_operations vt6421_sata_ops = {
+	.port_disable		= ata_port_disable,
+
+	.tf_load		= ata_tf_load,
+	.tf_read		= ata_tf_read,
+	.check_status		= ata_check_status,
+	.exec_command		= ata_exec_command,
+	.dev_select		= ata_std_dev_select,
+
+	.bmdma_setup            = ata_bmdma_setup,
+	.bmdma_start            = ata_bmdma_start,
+	.bmdma_stop		= ata_bmdma_stop,
+	.bmdma_status		= ata_bmdma_status,
+
+	.qc_prep		= ata_qc_prep,
+	.qc_issue		= ata_qc_issue_prot,
+	.data_xfer		= ata_pio_data_xfer,
+
+	.freeze			= ata_bmdma_freeze,
+	.thaw			= ata_bmdma_thaw,
+	.error_handler		= vt6421_error_handler,
 	.post_internal_cmd	= ata_bmdma_post_internal_cmd,
 
 	.irq_handler		= ata_interrupt,
@@ -141,13 +174,13 @@ static const struct ata_port_operations 
 	.host_stop		= ata_host_stop,
 };
 
-static struct ata_port_info svia_port_info = {
+static struct ata_port_info vt6420_port_info = {
 	.sht		= &svia_sht,
 	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
 	.pio_mask	= 0x1f,
 	.mwdma_mask	= 0x07,
 	.udma_mask	= 0x7f,
-	.port_ops	= &svia_sata_ops,
+	.port_ops	= &vt6420_sata_ops,
 };
 
 MODULE_AUTHOR("Jeff Garzik");
@@ -170,6 +203,87 @@ static void svia_scr_write (struct ata_p
 	outl(val, ap->ioaddr.scr_addr + (4 * sc_reg));
 }
 
+/**
+ *	vt6420_prereset - prereset for vt6420
+ *	@ap: target ATA port
+ *
+ *	SCR registers on vt6420 are pieces of shit and may hang the
+ *	whole machine completely if accessed with the wrong timing.
+ *	To avoid such catastrophe, vt6420 doesn't provide generic SCR
+ *	access operations, but uses SStatus and SControl only during
+ *	boot probing in controlled way.
+ *
+ *	As the old (pre EH update) probing code is proven to work, we
+ *	strictly follow the access pattern.
+ *
+ *	LOCKING:
+ *	Kernel thread context (may sleep)
+ *
+ *	RETURNS:
+ *	0 on success, -errno otherwise.
+ */
+static int vt6420_prereset(struct ata_port *ap)
+{
+	struct ata_eh_context *ehc = &ap->eh_context;
+	unsigned long timeout = jiffies + (HZ * 5);
+	u32 sstatus, scontrol;
+	int online;
+
+	/* don't do any SCR stuff if we're not loading */
+	if (!ATA_PFLAG_LOADING)
+		goto skip_scr;
+
+	/* Resume phy.  This is the old resume sequence from
+	 * __sata_phy_reset().
+	 */
+	svia_scr_write(ap, SCR_CONTROL, 0x300);
+	svia_scr_read(ap, SCR_CONTROL); /* flush */
+
+	/* wait for phy to become ready, if necessary */
+	do {
+		msleep(200);
+		if ((svia_scr_read(ap, SCR_STATUS) & 0xf) != 1)
+			break;
+	} while (time_before(jiffies, timeout));
+
+	/* open code sata_print_link_status() */
+	sstatus = svia_scr_read(ap, SCR_STATUS);
+	scontrol = svia_scr_read(ap, SCR_CONTROL);
+
+	online = (sstatus & 0xf) == 0x3;
+
+	ata_port_printk(ap, KERN_INFO,
+			"SATA link %s 1.5 Gbps (SStatus %X SControl %X)\n",
+			online ? "up" : "down", sstatus, scontrol);
+
+	/* SStatus is read one more time */
+	svia_scr_read(ap, SCR_STATUS);
+
+	if (!online) {
+		/* tell EH to bail */
+		ehc->i.action &= ~ATA_EH_RESET_MASK;
+		return 0;
+	}
+
+ skip_scr:
+	/* wait for !BSY */
+	ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+
+	return 0;
+}
+
+static void vt6420_error_handler(struct ata_port *ap)
+{
+	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
+				  NULL, ata_std_postreset);
+}
+
+static void vt6421_error_handler(struct ata_port *ap)
+{
+	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
+				  NULL, ata_std_postreset);
+}
+
 static const unsigned int svia_bar_sizes[] = {
 	8, 4, 8, 4, 16, 256
 };
@@ -210,7 +324,7 @@ static void vt6421_init_addrs(struct ata
 static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev)
 {
 	struct ata_probe_ent *probe_ent;
-	struct ata_port_info *ppi = &svia_port_info;
+	struct ata_port_info *ppi = &vt6420_port_info;
 
 	probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
 	if (!probe_ent)
@@ -239,7 +353,7 @@ static struct ata_probe_ent *vt6421_init
 
 	probe_ent->sht		= &svia_sht;
 	probe_ent->host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY;
-	probe_ent->port_ops	= &svia_sata_ops;
+	probe_ent->port_ops	= &vt6421_sata_ops;
 	probe_ent->n_ports	= N_PORTS;
 	probe_ent->irq		= pdev->irq;
 	probe_ent->irq_flags	= IRQF_SHARED;

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Thierry Vignaud]

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

Tejun Heo <htejun@gmail.com> writes:

> [cc'ing linux-ide]
> 
> (this is regarding vt6421 failing to detect devices on boot after EH udpate)
> 
> > I think I have (but I was so tired I won't 100% claim to).
> > I'll retest tonight.

The following one-liner on top of your previous patch fixed detecting
disks on vt6421 with 2.6.18-rc4-mm1 (sorry for the delay, I was
offline due to illness). (s!/scsi!/ata! b/c of alan changes in -mm)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: work1.diff --]
[-- Type: text/x-patch, Size: 480 bytes --]

fix detecting devices on vt6421 SATA controller
("ATA: abnormal status 0x7F on port 0xB007"):
--- drivers/ata/sata_via.c.tv6	2006-08-20 16:37:41.000000000 +0200
+++ drivers/ata/sata_via.c	2006-08-20 17:20:23.000000000 +0200
@@ -244,7 +244,7 @@
 
 static void vt6421_error_handler(struct ata_port *ap)
 {
-	return ata_bmdma_drive_eh(ap, ata_std_prereset, NULL,
+	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
 				  sata_std_hardreset, ata_std_postreset);
 }
 

[-- Attachment #3: Type: text/plain, Size: 632 bytes --]

 
> Can you please test two patches attached in this mail?  Just quick
> result will be enough.  If both don't work, I'll go ahead and create
> a third one - which emulates the old phy hardreset exactly as I did
> for softreset of vt6420.

I'll.

As, I've tested that using:
- ata_std_prereset + ata_std_softreset didn't work
- vt6420_prereset + ata_std_softreset worked
- vt6420_prereset w/o ata_std_softreset didn't work

I simple interdiff between your two patches makes me think the odds're
higher the second will succeed but you've done some extra changes
since your previous patch.
I'll you tell you more about this tomorrow.

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Thierry Vignaud]

Thierry Vignaud <tvignaud@mandriva.com> writes:

> > Can you please test two patches attached in this mail?  Just quick
> > result will be enough.  If both don't work, I'll go ahead and
> > create a third one - which emulates the old phy hardreset exactly
> > as I did for softreset of vt6420.
> 
> I'll.
> 
> As, I've tested that using:
> - ata_std_prereset + ata_std_softreset didn't work
> - vt6420_prereset + ata_std_softreset worked
> - vt6420_prereset w/o ata_std_softreset didn't work
> 
> I simple interdiff between your two patches makes me think the odds're
> higher the second will succeed but you've done some extra changes
> since your previous patch.
> I'll you tell you more about this tomorrow.

none of both these patches worked :-(

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Tejun Heo]

Thierry Vignaud wrote:
> Thierry Vignaud <tvignaud@mandriva.com> writes:
> 
>>> Can you please test two patches attached in this mail?  Just quick
>>> result will be enough.  If both don't work, I'll go ahead and
>>> create a third one - which emulates the old phy hardreset exactly
>>> as I did for softreset of vt6420.
>> I'll.
>>
>> As, I've tested that using:
>> - ata_std_prereset + ata_std_softreset didn't work
>> - vt6420_prereset + ata_std_softreset worked
>> - vt6420_prereset w/o ata_std_softreset didn't work
>>
>> I simple interdiff between your two patches makes me think the odds're
>> higher the second will succeed but you've done some extra changes
>> since your previous patch.
>> I'll you tell you more about this tomorrow.
> 
> none of both these patches worked :-(

The second didn't work?  But you said the following one liner worked.

--- drivers/ata/sata_via.c.tv6	2006-08-20 16:37:41.000000000 +0200
+++ drivers/ata/sata_via.c	2006-08-20 17:20:23.000000000 +0200
@@ -244,7 +244,7 @@

  static void vt6421_error_handler(struct ata_port *ap)
  {
-	return ata_bmdma_drive_eh(ap, ata_std_prereset, NULL,
+	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
  				  sata_std_hardreset, ata_std_postreset);
  }

The second patch is essentially identical to what you did the one liner. 
  Can you please check it once more?  I'll prepare old-sequence 
hardreset in the meantime.

Thanks.

-- 
tejun

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Tejun Heo]

On Fri, Aug 25, 2006 at 09:16:41PM +0900, Tejun Heo wrote:
> Thierry Vignaud wrote:
> >Thierry Vignaud <tvignaud@mandriva.com> writes:
> >
> >>>Can you please test two patches attached in this mail?  Just quick
> >>>result will be enough.  If both don't work, I'll go ahead and
> >>>create a third one - which emulates the old phy hardreset exactly
> >>>as I did for softreset of vt6420.
> >>I'll.
> >>
> >>As, I've tested that using:
> >>- ata_std_prereset + ata_std_softreset didn't work
> >>- vt6420_prereset + ata_std_softreset worked
> >>- vt6420_prereset w/o ata_std_softreset didn't work
> >>
> >>I simple interdiff between your two patches makes me think the odds're
> >>higher the second will succeed but you've done some extra changes
> >>since your previous patch.
> >>I'll you tell you more about this tomorrow.
> >
> >none of both these patches worked :-(
> 
> The second didn't work?  But you said the following one liner worked.
> 
> --- drivers/ata/sata_via.c.tv6	2006-08-20 16:37:41.000000000 +0200
> +++ drivers/ata/sata_via.c	2006-08-20 17:20:23.000000000 +0200
> @@ -244,7 +244,7 @@
> 
>  static void vt6421_error_handler(struct ata_port *ap)
>  {
> -	return ata_bmdma_drive_eh(ap, ata_std_prereset, NULL,
> +	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
>  				  sata_std_hardreset, ata_std_postreset);
>  }
> 
> The second patch is essentially identical to what you did the one liner. 
>  Can you please check it once more?  I'll prepare old-sequence 
> hardreset in the meantime.

Okay, here's the old-sequence hardreset patch.  This should have the
highest chance of working.  This patch should be applied on top of the
vt6420 patch.

Thanks.

Index: work-c3/drivers/scsi/sata_via.c
===================================================================
--- work-c3.orig/drivers/scsi/sata_via.c	2006-08-25 22:53:32.000000000 +0900
+++ work-c3/drivers/scsi/sata_via.c	2006-08-25 22:53:34.000000000 +0900
@@ -75,6 +75,7 @@ static int svia_init_one (struct pci_dev
 static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
 static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static void vt6420_error_handler(struct ata_port *ap);
+static void vt6421_error_handler(struct ata_port *ap);
 
 static const struct pci_device_id svia_pci_tbl[] = {
 	{ 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
@@ -159,15 +160,12 @@ static const struct ata_port_operations 
 
 	.freeze			= ata_bmdma_freeze,
 	.thaw			= ata_bmdma_thaw,
-	.error_handler		= ata_bmdma_error_handler,
+	.error_handler		= vt6421_error_handler,
 	.post_internal_cmd	= ata_bmdma_post_internal_cmd,
 
 	.irq_handler		= ata_interrupt,
 	.irq_clear		= ata_bmdma_irq_clear,
 
-	.scr_read		= svia_scr_read,
-	.scr_write		= svia_scr_write,
-
 	.port_start		= ata_port_start,
 	.port_stop		= ata_port_stop,
 	.host_stop		= ata_host_stop,
@@ -203,35 +201,28 @@ static void svia_scr_write (struct ata_p
 }
 
 /**
- *	vt6420_prereset - prereset for vt6420
+ *	svia_link_resume - custom link resume
  *	@ap: target ATA port
  *
- *	SCR registers on vt6420 are pieces of shit and may hang the
- *	whole machine completely if accessed with the wrong timing.
- *	To avoid such catastrophe, vt6420 doesn't provide generic SCR
- *	access operations, but uses SStatus and SControl only during
- *	boot probing in controlled way.
- *
- *	As the old (pre EH update) probing code is proven to work, we
- *	strictly follow the access pattern.
+ *	SCR registers on these controllers are pieces of shit and may
+ *	hang the whole machine completely or cause device detection
+ *	failure if accessed with the wrong timing.  To avoid such
+ *	catastrophe, generic SCR access operations aren't provided,
+ *	but SStatus and SControl are used only during boot probing in
+ *	controlled way.
  *
  *	LOCKING:
- *	Kernel thread context (may sleep)
+ *	Kernel thread context (may sleep).
  *
  *	RETURNS:
- *	0 on success, -errno otherwise.
+ *	1 if link is online, 0 otherwise.
  */
-static int vt6420_prereset(struct ata_port *ap)
+static int svia_link_resume(struct ata_port *ap)
 {
-	struct ata_eh_context *ehc = &ap->eh_context;
 	unsigned long timeout = jiffies + (HZ * 5);
 	u32 sstatus, scontrol;
 	int online;
 
-	/* don't do any SCR stuff if we're not loading */
-	if (!ATA_PFLAG_LOADING)
-		goto skip_scr;
-
 	/* Resume phy.  This is the old resume sequence from
 	 * __sata_phy_reset().
 	 */
@@ -258,13 +249,37 @@ static int vt6420_prereset(struct ata_po
 	/* SStatus is read one more time */
 	svia_scr_read(ap, SCR_STATUS);
 
-	if (!online) {
-		/* tell EH to bail */
-		ehc->i.action &= ~ATA_EH_RESET_MASK;
-		return 0;
+	return online;
+}
+
+/**
+ *	vt6420_prereset - prereset for vt6420
+ *	@ap: target ATA port
+ *
+ *	Prereset for vt6420.  SCR registers on vt6420 can lock the
+ *	whole system up if accessed with the wrong timing.  Allow
+ *	controlled SCR access only for link resume while loading.
+ *	This keeps the code act almost identically to pre-EH code.
+ *
+ *	LOCKING:
+ *	Kernel thread context (may sleep).
+ *
+ *	RETURNS:
+ *	0 on sucees, -errno otherwise.
+ */
+static int vt6420_prereset(struct ata_port *ap)
+{
+	struct ata_eh_context *ehc = &ap->eh_context;
+
+	/* resume PHY iff we're loading */
+	if (ap->flags & ATA_PFLAG_LOADING) {
+		if (!svia_link_resume(ap)) {
+			/* tell EH to bail */
+			ehc->i.action &= ~ATA_EH_RESET_MASK;
+			return 0;
+		}
 	}
 
- skip_scr:
 	/* wait for !BSY */
 	ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
 
@@ -277,6 +292,64 @@ static void vt6420_error_handler(struct 
 				  NULL, ata_std_postreset);
 }
 
+/**
+ *	vt6421_hardreset - hardreset for vt6421
+ *	@ap: target ATA port
+ *	@class: resulting class of attached device
+ *
+ *	Hardreset for vt6421.  vt6421 fails to detect attached device
+ *	if SCR registers are accessed with the wrong timing.  Allow
+ *	controlled SCR access only during hardreset.  This keeps the
+ *	code act almost identically to pre-EH code.
+ *
+ *	LOCKING:
+ *	Kernel thread context (may sleep)
+ *
+ *	RETURNS:
+ *	0 on success, -errno otherwise.
+ */
+static int vt6421_hardreset(struct ata_port *ap, unsigned int *class)
+{
+	struct ata_taskfile tf;
+
+	/* issue reset */
+	svia_scr_write(ap, SCR_CONTROL, 0x301);
+	svia_scr_read(ap, SCR_CONTROL); /* flush */
+	msleep(1);
+
+	/* resume link */
+	if (!(svia_link_resume(ap))) {
+		*class = ATA_DEV_NONE;
+		return 0;
+	}
+
+	/* wait for device to become ready */
+	if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
+		ata_port_printk(ap, KERN_ERR,
+				"COMRESET failed (device not ready)\n");
+		return -EIO;
+	}
+
+	/* classify */
+	memset(&tf, 0, sizeof(tf));
+	ap->ops->dev_select(ap, 0);
+	ata_tf_read(ap, &tf);
+
+	*class = ata_dev_classify(&tf);
+	if (*class == ATA_DEV_UNKNOWN)
+		*class = ATA_DEV_NONE;
+	else if ((*class == ATA_DEV_ATA) && (ata_chk_status(ap) == 0))
+		*class = ATA_DEV_NONE;
+
+	return 0;
+}
+
+static void vt6421_error_handler(struct ata_port *ap)
+{
+	return ata_bmdma_drive_eh(ap, NULL, NULL, vt6421_hardreset,
+				  ata_std_postreset);
+}
+
 static const unsigned int svia_bar_sizes[] = {
 	8, 4, 8, 4, 16, 256
 };

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Thierry Vignaud]

Tejun Heo <htejun@gmail.com> writes:

> >>> Can you please test two patches attached in this mail?  Just
> >>> quick result will be enough.  If both don't work, I'll go ahead
> >>> and create a third one - which emulates the old phy hardreset
> >>> exactly as I did for softreset of vt6420.
> >> I'll.
> >>
> >> As, I've tested that using:
> >> - ata_std_prereset + ata_std_softreset didn't work
> >> - vt6420_prereset + ata_std_softreset worked
> >> - vt6420_prereset w/o ata_std_softreset didn't work
> >>
> >> I simple interdiff between your two patches makes me think the
> >> odds're higher the second will succeed but you've done some extra
> >> changes since your previous patch.
> >> I'll you tell you more about this tomorrow.
> > none of both these patches worked :-(
> 
> The second didn't work?  But you said the following one liner
> worked.

Worked on top of *your original patch*.

What's more,
 
> +	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
>   				  sata_std_hardreset, ata_std_postreset);

is different from:

+	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
+				  NULL, ata_std_postreset);

Note also that I tested my one liner on top of 2.6.18-rc4-mm1 + your
patch whereas I tested your latest patches on top of 2.6.18-rc4-mm2
                                                               //\\

Can this make a difference?

> The second patch is essentially identical to what you did the one
> liner. Can you please check it once more?  I'll prepare old-sequence
> hardreset in the meantime.

I'll.
You won't have any answer before monday though.

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Thierry Vignaud]

[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]

Thierry Vignaud <tvignaud@mandriva.com> writes:

> > > none of both these patches worked :-(
> > 
> > The second didn't work?  But you said the following one liner
> > worked.
> 
> Worked on top of *your original patch*.
> 
> What's more,
>  
> > +	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
> >   				  sata_std_hardreset, ata_std_postreset);
> 
> is different from:
> 
> +	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
> +				  NULL, ata_std_postreset);
> 
> Note also that I tested my one liner on top of 2.6.18-rc4-mm1 + your
> patch whereas I tested your latest patches on top of 2.6.18-rc4-mm2
>                                                                //\\
> 
> Can this make a difference?
> 
> > The second patch is essentially identical to what you did the one
> > liner. Can you please check it once more?  I'll prepare old-sequence
> > hardreset in the meantime.

an btw, "the second patch is essentially identical to what you did the
one liner" doesn't *accuratly* describe the differences between your
last week patch and the second of other day patch.  There're actually
a *little* more than my one-liner :-) :

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: s.diff --]
[-- Type: text/x-patch, Size: 3230 bytes --]

--- ./sata_via.c.1	2006-08-25 15:59:10.000000000 +0200
+++ ./sata_via.c	2006-08-25 15:59:20.000000000 +0200
@@ -135,9 +135,6 @@
 	.irq_handler		= ata_interrupt,
 	.irq_clear		= ata_bmdma_irq_clear,
 
-	.scr_read		= svia_scr_read,
-	.scr_write		= svia_scr_write,
-
 	.port_start		= ata_port_start,
 	.port_stop		= ata_port_stop,
 	.host_stop		= ata_host_stop,
@@ -206,30 +203,69 @@
 	outl(val, ap->ioaddr.scr_addr + (4 * sc_reg));
 }
 
+/**
+ *	vt6420_prereset - prereset for vt6420
+ *	@ap: target ATA port
+ *
+ *	SCR registers on vt6420 are pieces of shit and may hang the
+ *	whole machine completely if accessed with the wrong timing.
+ *	To avoid such catastrophe, vt6420 doesn't provide generic SCR
+ *	access operations, but uses SStatus and SControl only during
+ *	boot probing in controlled way.
+ *
+ *	As the old (pre EH update) probing code is proven to work, we
+ *	strictly follow the access pattern.
+ *
+ *	LOCKING:
+ *	Kernel thread context (may sleep)
+ *
+ *	RETURNS:
+ *	0 on success, -errno otherwise.
+ */
 static int vt6420_prereset(struct ata_port *ap)
 {
 	struct ata_eh_context *ehc = &ap->eh_context;
 	unsigned long timeout = jiffies + (HZ * 5);
-	u32 sstatus;
+	u32 sstatus, scontrol;
+	int online;
 
-	/* if we're about to do hardreset, nothing more to do */
-	if (ehc->i.action & ATA_EH_HARDRESET)
-		return 0;
+	/* don't do any SCR stuff if we're not loading */
+	if (!ATA_PFLAG_LOADING)
+		goto skip_scr;
 
-	/* Resume phy.  SCR registers in vt6420 are super-fragile and
-	 * can cause system lock up depending on how it's accessed.
-	 * Use the old resume sequence from __sata_phy_reset().
+	/* Resume phy.  This is the old resume sequence from
+	 * __sata_phy_reset().
 	 */
-	sata_scr_write_flush(ap, SCR_CONTROL, 0x300);
+	svia_scr_write(ap, SCR_CONTROL, 0x300);
+	svia_scr_read(ap, SCR_CONTROL); /* flush */
 
 	/* wait for phy to become ready, if necessary */
 	do {
 		msleep(200);
-		sata_scr_read(ap, SCR_STATUS, &sstatus);
-		if ((sstatus & 0xf) != 1)
+		if ((svia_scr_read(ap, SCR_STATUS) & 0xf) != 1)
 			break;
 	} while (time_before(jiffies, timeout));
 
+	/* open code sata_print_link_status() */
+	sstatus = svia_scr_read(ap, SCR_STATUS);
+	scontrol = svia_scr_read(ap, SCR_CONTROL);
+
+	online = (sstatus & 0xf) == 0x3;
+
+	ata_port_printk(ap, KERN_INFO,
+			"SATA link %s 1.5 Gbps (SStatus %X SControl %X)\n",
+			online ? "up" : "down", sstatus, scontrol);
+
+	/* SStatus is read one more time */
+	svia_scr_read(ap, SCR_STATUS);
+
+	if (!online) {
+		/* tell EH to bail */
+		ehc->i.action &= ~ATA_EH_RESET_MASK;
+		return 0;
+	}
+
+ skip_scr:
 	/* wait for !BSY */
 	ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
 
@@ -239,13 +275,13 @@
 static void vt6420_error_handler(struct ata_port *ap)
 {
 	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
-				  sata_std_hardreset, ata_std_postreset);
+				  NULL, ata_std_postreset);
 }
 
 static void vt6421_error_handler(struct ata_port *ap)
 {
-	return ata_bmdma_drive_eh(ap, ata_std_prereset, NULL,
-				  sata_std_hardreset, ata_std_postreset);
+	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
+				  NULL, ata_std_postreset);
 }
 
 static const unsigned int svia_bar_sizes[] = {

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Thierry Vignaud]

Tejun Heo <htejun@gmail.com> writes:

> > >none of both these patches worked :-(
> > 
> > The second didn't work?  But you said the following one liner worked.
> > 
> > --- drivers/ata/sata_via.c.tv6	2006-08-20 16:37:41.000000000 +0200
> > +++ drivers/ata/sata_via.c	2006-08-20 17:20:23.000000000 +0200
> > @@ -244,7 +244,7 @@
> > 
> >  static void vt6421_error_handler(struct ata_port *ap)
> >  {
> > -	return ata_bmdma_drive_eh(ap, ata_std_prereset, NULL,
> > +	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
> >  				  sata_std_hardreset, ata_std_postreset);
> >  }
> > 
> > The second patch is essentially identical to what you did the one liner. 
> >  Can you please check it once more?  I'll prepare old-sequence 
> > hardreset in the meantime.
> 
> Okay, here's the old-sequence hardreset patch.  This should have the
> highest chance of working.  This patch should be applied on top of the
> vt6420 patch.

On top of which patch?
I just tried to apply it on top of:
- your last week patch
- your two patches of this week

and it does *not* apply on top of anyone...

Couldn't you either check first your patch or (better) just send a
patch against vanilla 2.6.18-rc4-mm2?

Thanks

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Tejun Heo]

[-- Attachment #1: Type: text/plain, Size: 1718 bytes --]

Thierry Vignaud wrote:
> Thierry Vignaud <tvignaud@mandriva.com> writes:
> 
>>>> none of both these patches worked :-(
>>> The second didn't work?  But you said the following one liner
>>> worked.
>> Worked on top of *your original patch*.
>>
>> What's more,
>>  
>>> +	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
>>>   				  sata_std_hardreset, ata_std_postreset);
>> is different from:
>>
>> +	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
>> +				  NULL, ata_std_postreset);
>>
>> Note also that I tested my one liner on top of 2.6.18-rc4-mm1 + your
>> patch whereas I tested your latest patches on top of 2.6.18-rc4-mm2
>>                                                                //\\
>>
>> Can this make a difference?
>>
>>> The second patch is essentially identical to what you did the one
>>> liner. Can you please check it once more?  I'll prepare old-sequence
>>> hardreset in the meantime.
> 
> an btw, "the second patch is essentially identical to what you did the
> one liner" doesn't *accuratly* describe the differences between your
> last week patch and the second of other day patch.  There're actually
> a *little* more than my one-liner :-) :

Heh heh this is really getting out of hand with all those different 
patches.  Anyways, the stuff I've added recently shouldn't make too much 
difference.  The additional codes are taken from sata_phy_reset to make 
it more similar to the original code.

Anyways, I'll just attach my current sata_via.c to this mail as the 
confusion level seems to be pretty high at this point.  If this version 
works, everything is fine.  I'll submit split patches to Jeff.

Sorry about the confusion.

Thanks.

-- 
tejun

[-- Attachment #2: sata_via.c --]
[-- Type: text/x-csrc, Size: 15064 bytes --]

/*
 *  sata_via.c - VIA Serial ATA controllers
 *
 *  Maintained by:  Jeff Garzik <jgarzik@pobox.com>
 * 		   Please ALWAYS copy linux-ide@vger.kernel.org
 		   on emails.
 *
 *  Copyright 2003-2004 Red Hat, Inc.  All rights reserved.
 *  Copyright 2003-2004 Jeff Garzik
 *
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2, or (at your option)
 *  any later version.
 *
 *  This program is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program; see the file COPYING.  If not, write to
 *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 *
 *  libata documentation is available via 'make {ps|pdf}docs',
 *  as Documentation/DocBook/libata.*
 *
 *  Hardware documentation available under NDA.
 *
 *
 *  To-do list:
 *  - VT6421 PATA support
 *
 */

#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <scsi/scsi_host.h>
#include <linux/libata.h>
#include <asm/io.h>

#define DRV_NAME	"sata_via"
#define DRV_VERSION	"2.0"

enum board_ids_enum {
	vt6420,
	vt6421,
};

enum {
	SATA_CHAN_ENAB		= 0x40, /* SATA channel enable */
	SATA_INT_GATE		= 0x41, /* SATA interrupt gating */
	SATA_NATIVE_MODE	= 0x42, /* Native mode enable */
	SATA_PATA_SHARING	= 0x49, /* PATA/SATA sharing func ctrl */

	PORT0			= (1 << 1),
	PORT1			= (1 << 0),
	ALL_PORTS		= PORT0 | PORT1,
	N_PORTS			= 2,

	NATIVE_MODE_ALL		= (1 << 7) | (1 << 6) | (1 << 5) | (1 << 4),

	SATA_EXT_PHY		= (1 << 6), /* 0==use PATA, 1==ext phy */
	SATA_2DEV		= (1 << 5), /* SATA is master/slave */
};

static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
static void vt6420_error_handler(struct ata_port *ap);
static void vt6421_error_handler(struct ata_port *ap);

static const struct pci_device_id svia_pci_tbl[] = {
	{ 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
	{ 0x1106, 0x3249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6421 },

	{ }	/* terminate list */
};

static struct pci_driver svia_pci_driver = {
	.name			= DRV_NAME,
	.id_table		= svia_pci_tbl,
	.probe			= svia_init_one,
	.remove			= ata_pci_remove_one,
};

static struct scsi_host_template svia_sht = {
	.module			= THIS_MODULE,
	.name			= DRV_NAME,
	.ioctl			= ata_scsi_ioctl,
	.queuecommand		= ata_scsi_queuecmd,
	.can_queue		= ATA_DEF_QUEUE,
	.this_id		= ATA_SHT_THIS_ID,
	.sg_tablesize		= LIBATA_MAX_PRD,
	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,
	.emulated		= ATA_SHT_EMULATED,
	.use_clustering		= ATA_SHT_USE_CLUSTERING,
	.proc_name		= DRV_NAME,
	.dma_boundary		= ATA_DMA_BOUNDARY,
	.slave_configure	= ata_scsi_slave_config,
	.slave_destroy		= ata_scsi_slave_destroy,
	.bios_param		= ata_std_bios_param,
};

static const struct ata_port_operations vt6420_sata_ops = {
	.port_disable		= ata_port_disable,

	.tf_load		= ata_tf_load,
	.tf_read		= ata_tf_read,
	.check_status		= ata_check_status,
	.exec_command		= ata_exec_command,
	.dev_select		= ata_std_dev_select,

	.bmdma_setup            = ata_bmdma_setup,
	.bmdma_start            = ata_bmdma_start,
	.bmdma_stop		= ata_bmdma_stop,
	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,
	.qc_issue		= ata_qc_issue_prot,
	.data_xfer		= ata_pio_data_xfer,

	.freeze			= ata_bmdma_freeze,
	.thaw			= ata_bmdma_thaw,
	.error_handler		= vt6420_error_handler,
	.post_internal_cmd	= ata_bmdma_post_internal_cmd,

	.irq_handler		= ata_interrupt,
	.irq_clear		= ata_bmdma_irq_clear,

	.port_start		= ata_port_start,
	.port_stop		= ata_port_stop,
	.host_stop		= ata_host_stop,
};

static const struct ata_port_operations vt6421_sata_ops = {
	.port_disable		= ata_port_disable,

	.tf_load		= ata_tf_load,
	.tf_read		= ata_tf_read,
	.check_status		= ata_check_status,
	.exec_command		= ata_exec_command,
	.dev_select		= ata_std_dev_select,

	.bmdma_setup            = ata_bmdma_setup,
	.bmdma_start            = ata_bmdma_start,
	.bmdma_stop		= ata_bmdma_stop,
	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,
	.qc_issue		= ata_qc_issue_prot,
	.data_xfer		= ata_pio_data_xfer,

	.freeze			= ata_bmdma_freeze,
	.thaw			= ata_bmdma_thaw,
	.error_handler		= vt6421_error_handler,
	.post_internal_cmd	= ata_bmdma_post_internal_cmd,

	.irq_handler		= ata_interrupt,
	.irq_clear		= ata_bmdma_irq_clear,

	.port_start		= ata_port_start,
	.port_stop		= ata_port_stop,
	.host_stop		= ata_host_stop,
};

static struct ata_port_info vt6420_port_info = {
	.sht		= &svia_sht,
	.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
	.pio_mask	= 0x1f,
	.mwdma_mask	= 0x07,
	.udma_mask	= 0x7f,
	.port_ops	= &vt6420_sata_ops,
};

MODULE_AUTHOR("Jeff Garzik");
MODULE_DESCRIPTION("SCSI low-level driver for VIA SATA controllers");
MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, svia_pci_tbl);
MODULE_VERSION(DRV_VERSION);

static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg)
{
	if (sc_reg > SCR_CONTROL)
		return 0xffffffffU;
	return inl(ap->ioaddr.scr_addr + (4 * sc_reg));
}

static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
{
	if (sc_reg > SCR_CONTROL)
		return;
	outl(val, ap->ioaddr.scr_addr + (4 * sc_reg));
}

/**
 *	svia_link_resume - custom link resume
 *	@ap: target ATA port
 *
 *	SCR registers on these controllers are pieces of shit and may
 *	hang the whole machine completely or cause device detection
 *	failure if accessed with the wrong timing.  To avoid such
 *	catastrophe, generic SCR access operations aren't provided,
 *	but SStatus and SControl are used only during boot probing in
 *	controlled way.
 *
 *	LOCKING:
 *	Kernel thread context (may sleep).
 *
 *	RETURNS:
 *	1 if link is online, 0 otherwise.
 */
static int svia_link_resume(struct ata_port *ap)
{
	unsigned long timeout = jiffies + (HZ * 5);
	u32 sstatus, scontrol;
	int online;

	/* Resume phy.  This is the old resume sequence from
	 * __sata_phy_reset().
	 */
	svia_scr_write(ap, SCR_CONTROL, 0x300);
	svia_scr_read(ap, SCR_CONTROL); /* flush */

	/* wait for phy to become ready, if necessary */
	do {
		msleep(200);
		if ((svia_scr_read(ap, SCR_STATUS) & 0xf) != 1)
			break;
	} while (time_before(jiffies, timeout));

	/* open code sata_print_link_status() */
	sstatus = svia_scr_read(ap, SCR_STATUS);
	scontrol = svia_scr_read(ap, SCR_CONTROL);

	online = (sstatus & 0xf) == 0x3;

	ata_port_printk(ap, KERN_INFO,
			"SATA link %s 1.5 Gbps (SStatus %X SControl %X)\n",
			online ? "up" : "down", sstatus, scontrol);

	/* SStatus is read one more time */
	svia_scr_read(ap, SCR_STATUS);

	return online;
}

/**
 *	vt6420_prereset - prereset for vt6420
 *	@ap: target ATA port
 *
 *	Prereset for vt6420.  SCR registers on vt6420 can lock the
 *	whole system up if accessed with the wrong timing.  Allow
 *	controlled SCR access only for link resume while loading.
 *	This keeps the code act almost identically to pre-EH code.
 *
 *	LOCKING:
 *	Kernel thread context (may sleep).
 *
 *	RETURNS:
 *	0 on sucees, -errno otherwise.
 */
static int vt6420_prereset(struct ata_port *ap)
{
	struct ata_eh_context *ehc = &ap->eh_context;

	/* resume PHY iff we're loading */
	if (ap->flags & ATA_PFLAG_LOADING) {
		if (!svia_link_resume(ap)) {
			/* tell EH to bail */
			ehc->i.action &= ~ATA_EH_RESET_MASK;
			return 0;
		}
	}

	/* wait for !BSY */
	ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);

	return 0;
}

static void vt6420_error_handler(struct ata_port *ap)
{
	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
				  NULL, ata_std_postreset);
}

/**
 *	vt6421_hardreset - hardreset for vt6421
 *	@ap: target ATA port
 *	@class: resulting class of attached device
 *
 *	Hardreset for vt6421.  vt6421 fails to detect attached device
 *	if SCR registers are accessed with the wrong timing.  Allow
 *	controlled SCR access only during hardreset.  This keeps the
 *	code act almost identically to pre-EH code.
 *
 *	LOCKING:
 *	Kernel thread context (may sleep)
 *
 *	RETURNS:
 *	0 on success, -errno otherwise.
 */
static int vt6421_hardreset(struct ata_port *ap, unsigned int *class)
{
	struct ata_taskfile tf;

	/* issue reset */
	svia_scr_write(ap, SCR_CONTROL, 0x301);
	svia_scr_read(ap, SCR_CONTROL); /* flush */
	msleep(1);

	/* resume link */
	if (!(svia_link_resume(ap))) {
		*class = ATA_DEV_NONE;
		return 0;
	}

	/* wait for device to become ready */
	if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
		ata_port_printk(ap, KERN_ERR,
				"COMRESET failed (device not ready)\n");
		return -EIO;
	}

	/* classify */
	memset(&tf, 0, sizeof(tf));
	ap->ops->dev_select(ap, 0);
	ata_tf_read(ap, &tf);

	*class = ata_dev_classify(&tf);
	if (*class == ATA_DEV_UNKNOWN)
		*class = ATA_DEV_NONE;
	else if ((*class == ATA_DEV_ATA) && (ata_chk_status(ap) == 0))
		*class = ATA_DEV_NONE;

	return 0;
}

static void vt6421_error_handler(struct ata_port *ap)
{
	return ata_bmdma_drive_eh(ap, NULL, NULL, vt6421_hardreset,
				  ata_std_postreset);
}

static const unsigned int svia_bar_sizes[] = {
	8, 4, 8, 4, 16, 256
};

static const unsigned int vt6421_bar_sizes[] = {
	16, 16, 16, 16, 32, 128
};

static unsigned long svia_scr_addr(unsigned long addr, unsigned int port)
{
	return addr + (port * 128);
}

static unsigned long vt6421_scr_addr(unsigned long addr, unsigned int port)
{
	return addr + (port * 64);
}

static void vt6421_init_addrs(struct ata_probe_ent *probe_ent,
			      struct pci_dev *pdev,
			      unsigned int port)
{
	unsigned long reg_addr = pci_resource_start(pdev, port);
	unsigned long bmdma_addr = pci_resource_start(pdev, 4) + (port * 8);
	unsigned long scr_addr;

	probe_ent->port[port].cmd_addr = reg_addr;
	probe_ent->port[port].altstatus_addr =
	probe_ent->port[port].ctl_addr = (reg_addr + 8) | ATA_PCI_CTL_OFS;
	probe_ent->port[port].bmdma_addr = bmdma_addr;

	scr_addr = vt6421_scr_addr(pci_resource_start(pdev, 5), port);
	probe_ent->port[port].scr_addr = scr_addr;

	ata_std_ports(&probe_ent->port[port]);
}

static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev)
{
	struct ata_probe_ent *probe_ent;
	struct ata_port_info *ppi = &vt6420_port_info;

	probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
	if (!probe_ent)
		return NULL;

	probe_ent->port[0].scr_addr =
		svia_scr_addr(pci_resource_start(pdev, 5), 0);
	probe_ent->port[1].scr_addr =
		svia_scr_addr(pci_resource_start(pdev, 5), 1);

	return probe_ent;
}

static struct ata_probe_ent *vt6421_init_probe_ent(struct pci_dev *pdev)
{
	struct ata_probe_ent *probe_ent;
	unsigned int i;

	probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);
	if (!probe_ent)
		return NULL;

	memset(probe_ent, 0, sizeof(*probe_ent));
	probe_ent->dev = pci_dev_to_dev(pdev);
	INIT_LIST_HEAD(&probe_ent->node);

	probe_ent->sht		= &svia_sht;
	probe_ent->host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY;
	probe_ent->port_ops	= &vt6421_sata_ops;
	probe_ent->n_ports	= N_PORTS;
	probe_ent->irq		= pdev->irq;
	probe_ent->irq_flags	= IRQF_SHARED;
	probe_ent->pio_mask	= 0x1f;
	probe_ent->mwdma_mask	= 0x07;
	probe_ent->udma_mask	= 0x7f;

	for (i = 0; i < N_PORTS; i++)
		vt6421_init_addrs(probe_ent, pdev, i);

	return probe_ent;
}

static void svia_configure(struct pci_dev *pdev)
{
	u8 tmp8;

	pci_read_config_byte(pdev, PCI_INTERRUPT_LINE, &tmp8);
	dev_printk(KERN_INFO, &pdev->dev, "routed to hard irq line %d\n",
	       (int) (tmp8 & 0xf0) == 0xf0 ? 0 : tmp8 & 0x0f);

	/* make sure SATA channels are enabled */
	pci_read_config_byte(pdev, SATA_CHAN_ENAB, &tmp8);
	if ((tmp8 & ALL_PORTS) != ALL_PORTS) {
		dev_printk(KERN_DEBUG, &pdev->dev,
			   "enabling SATA channels (0x%x)\n",
		           (int) tmp8);
		tmp8 |= ALL_PORTS;
		pci_write_config_byte(pdev, SATA_CHAN_ENAB, tmp8);
	}

	/* make sure interrupts for each channel sent to us */
	pci_read_config_byte(pdev, SATA_INT_GATE, &tmp8);
	if ((tmp8 & ALL_PORTS) != ALL_PORTS) {
		dev_printk(KERN_DEBUG, &pdev->dev,
			   "enabling SATA channel interrupts (0x%x)\n",
		           (int) tmp8);
		tmp8 |= ALL_PORTS;
		pci_write_config_byte(pdev, SATA_INT_GATE, tmp8);
	}

	/* make sure native mode is enabled */
	pci_read_config_byte(pdev, SATA_NATIVE_MODE, &tmp8);
	if ((tmp8 & NATIVE_MODE_ALL) != NATIVE_MODE_ALL) {
		dev_printk(KERN_DEBUG, &pdev->dev,
			   "enabling SATA channel native mode (0x%x)\n",
		           (int) tmp8);
		tmp8 |= NATIVE_MODE_ALL;
		pci_write_config_byte(pdev, SATA_NATIVE_MODE, tmp8);
	}
}

static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
{
	static int printed_version;
	unsigned int i;
	int rc;
	struct ata_probe_ent *probe_ent;
	int board_id = (int) ent->driver_data;
	const int *bar_sizes;
	int pci_dev_busy = 0;
	u8 tmp8;

	if (!printed_version++)
		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");

	rc = pci_enable_device(pdev);
	if (rc)
		return rc;

	rc = pci_request_regions(pdev, DRV_NAME);
	if (rc) {
		pci_dev_busy = 1;
		goto err_out;
	}

	if (board_id == vt6420) {
		pci_read_config_byte(pdev, SATA_PATA_SHARING, &tmp8);
		if (tmp8 & SATA_2DEV) {
			dev_printk(KERN_ERR, &pdev->dev,
				   "SATA master/slave not supported (0x%x)\n",
		       		   (int) tmp8);
			rc = -EIO;
			goto err_out_regions;
		}

		bar_sizes = &svia_bar_sizes[0];
	} else {
		bar_sizes = &vt6421_bar_sizes[0];
	}

	for (i = 0; i < ARRAY_SIZE(svia_bar_sizes); i++)
		if ((pci_resource_start(pdev, i) == 0) ||
		    (pci_resource_len(pdev, i) < bar_sizes[i])) {
			dev_printk(KERN_ERR, &pdev->dev,
				"invalid PCI BAR %u (sz 0x%llx, val 0x%llx)\n",
				i,
			        (unsigned long long)pci_resource_start(pdev, i),
			        (unsigned long long)pci_resource_len(pdev, i));
			rc = -ENODEV;
			goto err_out_regions;
		}

	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
	if (rc)
		goto err_out_regions;
	rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK);
	if (rc)
		goto err_out_regions;

	if (board_id == vt6420)
		probe_ent = vt6420_init_probe_ent(pdev);
	else
		probe_ent = vt6421_init_probe_ent(pdev);

	if (!probe_ent) {
		dev_printk(KERN_ERR, &pdev->dev, "out of memory\n");
		rc = -ENOMEM;
		goto err_out_regions;
	}

	svia_configure(pdev);

	pci_set_master(pdev);

	/* FIXME: check ata_device_add return value */
	ata_device_add(probe_ent);
	kfree(probe_ent);

	return 0;

err_out_regions:
	pci_release_regions(pdev);
err_out:
	if (!pci_dev_busy)
		pci_disable_device(pdev);
	return rc;
}

static int __init svia_init(void)
{
	return pci_module_init(&svia_pci_driver);
}

static void __exit svia_exit(void)
{
	pci_unregister_driver(&svia_pci_driver);
}

module_init(svia_init);
module_exit(svia_exit);

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Tejun Heo]

Thierry Vignaud wrote:
> Tejun Heo <htejun@gmail.com> writes:
> 
>>>> none of both these patches worked :-(
>>> The second didn't work?  But you said the following one liner worked.
>>>
>>> --- drivers/ata/sata_via.c.tv6	2006-08-20 16:37:41.000000000 +0200
>>> +++ drivers/ata/sata_via.c	2006-08-20 17:20:23.000000000 +0200
>>> @@ -244,7 +244,7 @@
>>>
>>>  static void vt6421_error_handler(struct ata_port *ap)
>>>  {
>>> -	return ata_bmdma_drive_eh(ap, ata_std_prereset, NULL,
>>> +	return ata_bmdma_drive_eh(ap, vt6420_prereset, ata_std_softreset,
>>>  				  sata_std_hardreset, ata_std_postreset);
>>>  }
>>>
>>> The second patch is essentially identical to what you did the one liner. 
>>>  Can you please check it once more?  I'll prepare old-sequence 
>>> hardreset in the meantime.
>> Okay, here's the old-sequence hardreset patch.  This should have the
>> highest chance of working.  This patch should be applied on top of the
>> vt6420 patch.
> 
> On top of which patch?
> I just tried to apply it on top of:
> - your last week patch
> - your two patches of this week
> 
> and it does *not* apply on top of anyone...

Arghh... Sorry.  I sent the wrong version.  This patch is against 
#upstream while I should have sent the one against #upstream-fixes.

> Couldn't you either check first your patch or (better) just send a
> patch against vanilla 2.6.18-rc4-mm2?

I've attached whole sata_via.c to the other mail.  I think that should 
do the trick.

thanks.

-- 
tejun

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Thierry Vignaud]

Tejun Heo <htejun@gmail.com> writes:

> > Couldn't you either check first your patch or (better) just send a
> > patch against vanilla 2.6.18-rc4-mm2?
> 
> I've attached whole sata_via.c to the other mail.  I think that
> should do the trick.

I'll test and report back to you monday sarg' :-)

Have a nice week end and thank you for trying to solve that issue.

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Thierry Vignaud]

Tejun Heo <htejun@gmail.com> writes:

> > > > The second patch is essentially identical to what you did the
> > > > one liner.  Can you please check it once more?  I'll prepare
> > > > old-sequence hardreset in the meantime.
> > >
> > > Okay, here's the old-sequence hardreset patch.  This should have
> > > the highest chance of working.  This patch should be applied on
> > > top of the vt6420 patch.
> >
> > On top of which patch?
> > I just tried to apply it on top of:
> > - your last week patch
> > - your two patches of this week
> > and it does *not* apply on top of anyone...
> 
> Arghh... Sorry.  I sent the wrong version.  This patch is against
> #upstream while I should have sent the one against #upstream-fixes.
> 
> > Couldn't you either check first your patch or (better) just send a
> > patch against vanilla 2.6.18-rc4-mm2?
> 
> I've attached whole sata_via.c to the other mail.  I think that should
> do the trick.

It didn't (tested by overwriting 2.6.18-rc4-mm2's driver).
I tried a few reset methods combinations w/os success.
Like in other faillure cases, the driver saw the two links but failed
to see the hd attached to the second sata link.

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Tejun Heo]

Thierry Vignaud wrote:
> Tejun Heo <htejun@gmail.com> writes:
> 
>>>>> The second patch is essentially identical to what you did the
>>>>> one liner.  Can you please check it once more?  I'll prepare
>>>>> old-sequence hardreset in the meantime.
>>>> Okay, here's the old-sequence hardreset patch.  This should have
>>>> the highest chance of working.  This patch should be applied on
>>>> top of the vt6420 patch.
>>> On top of which patch?
>>> I just tried to apply it on top of:
>>> - your last week patch
>>> - your two patches of this week
>>> and it does *not* apply on top of anyone...
>> Arghh... Sorry.  I sent the wrong version.  This patch is against
>> #upstream while I should have sent the one against #upstream-fixes.
>>
>>> Couldn't you either check first your patch or (better) just send a
>>> patch against vanilla 2.6.18-rc4-mm2?
>> I've attached whole sata_via.c to the other mail.  I think that should
>> do the trick.
> 
> It didn't (tested by overwriting 2.6.18-rc4-mm2's driver).
> I tried a few reset methods combinations w/os success.
> Like in other faillure cases, the driver saw the two links but failed
> to see the hd attached to the second sata link.

Hmmm.. That's very weird.  The detection sequence is almost identical to 
the original code.  Argh.....  Any ideas?

-- 
tejun

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Thierry Vignaud]

Tejun Heo <htejun@gmail.com> writes:

> >>>>> The second patch is essentially identical to what you did the
> >>>>> one liner.  Can you please check it once more?  I'll prepare
> >>>>> old-sequence hardreset in the meantime.
> >>>> Okay, here's the old-sequence hardreset patch.  This should
> >>>> have the highest chance of working.  This patch should be
> >>>> applied on top of the vt6420 patch.
> >>> On top of which patch?
> >>> I just tried to apply it on top of:
> >>> - your last week patch
> >>> - your two patches of this week
> >>> and it does *not* apply on top of anyone...
> >> Arghh... Sorry.  I sent the wrong version.  This patch is against
> >> #upstream while I should have sent the one against
> >> #upstream-fixes.
> >>
> >>> Couldn't you either check first your patch or (better) just send
> >>> a patch against vanilla 2.6.18-rc4-mm2?
> >> I've attached whole sata_via.c to the other mail.  I think that
> >> should do the trick.
> > It didn't (tested by overwriting 2.6.18-rc4-mm2's driver).
> > I tried a few reset methods combinations w/os success.
> > Like in other faillure cases, the driver saw the two links but
> > failed to see the hd attached to the second sata link.
> 
> Hmmm.. That's very weird.  The detection sequence is almost
> identical to the original code.  Argh.....  Any ideas?

It looks like the error managment has effects on the disc discovering.
You wrote "vt6421 fails to detect attached device if SCR registers are
accessed with the wrong timing".
Maybe should we increase the timing?

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Thierry Vignaud]

Tejun Heo <htejun@gmail.com> writes:

> >>>>> The second patch is essentially identical to what you did the
> >>>>> one liner.  Can you please check it once more?  I'll prepare
> >>>>> old-sequence hardreset in the meantime.
> >>>> Okay, here's the old-sequence hardreset patch.  This should have
> >>>> the highest chance of working.  This patch should be applied on
> >>>> top of the vt6420 patch.
> >>> On top of which patch?
> >>> I just tried to apply it on top of:
> >>> - your last week patch
> >>> - your two patches of this week
> >>> and it does *not* apply on top of anyone...
> >> Arghh... Sorry.  I sent the wrong version.  This patch is against
> >> #upstream while I should have sent the one against #upstream-fixes.
> >>
> >>> Couldn't you either check first your patch or (better) just send a
> >>> patch against vanilla 2.6.18-rc4-mm2?
> >> I've attached whole sata_via.c to the other mail.  I think that should
> >> do the trick.
> > It didn't (tested by overwriting 2.6.18-rc4-mm2's driver).
> > I tried a few reset methods combinations w/os success.
> > Like in other faillure cases, the driver saw the two links but failed
> > to see the hd attached to the second sata link.
> 
> Hmmm.. That's very weird.  The detection sequence is almost
> identical to the original code.  Argh.....  Any ideas?

now that the defective bits have hitten the mainstream kernel, I've
entered the bug into http://bugzilla.kernel.org/show_bug.cgi?id=7255

Re: [Fwd: [BUG] sata_via doesn't detect anymore my disks (broken between rc1 and rc3)]

[Thierry Vignaud]

Tejun Heo <htejun@gmail.com> writes:

> >>>>> The second patch is essentially identical to what you did the
> >>>>> one liner.  Can you please check it once more?  I'll prepare
> >>>>> old-sequence hardreset in the meantime.
> >>>> Okay, here's the old-sequence hardreset patch.  This should have
> >>>> the highest chance of working.  This patch should be applied on
> >>>> top of the vt6420 patch.
> >>> On top of which patch?
> >>> I just tried to apply it on top of:
> >>> - your last week patch
> >>> - your two patches of this week
> >>> and it does *not* apply on top of anyone...
> >> Arghh... Sorry.  I sent the wrong version.  This patch is against
> >> #upstream while I should have sent the one against #upstream-fixes.
> >>
> >>> Couldn't you either check first your patch or (better) just send a
> >>> patch against vanilla 2.6.18-rc4-mm2?
> >> I've attached whole sata_via.c to the other mail.  I think that should
> >> do the trick.
> > It didn't (tested by overwriting 2.6.18-rc4-mm2's driver).
> > I tried a few reset methods combinations w/os success.
> > Like in other faillure cases, the driver saw the two links but failed
> > to see the hd attached to the second sata link.
> 
> Hmmm.. That's very weird.  The detection sequence is almost identical
> to the original code.  Argh.....  Any ideas?

btw, I tried again with rc1 and rc2.
here, the diff on sata-via against 2.6.18 are trivials and irrelevant
so it looks like the issue is introduce by core changes in libata
(that maybe uncover a previously hidded issue in sata-via?)