libata-dev.git rebased

libata-dev.git rebased

[Jeff Garzik]

After updating libata-dev.git to 2.6.18-rc5, I rebased all branches 
except #upstream.  This means branches ALL, pata-drivers, 
promise-sata-pata, and sii-lbt must be re-downloaded.

(this takes effect as soon as master.kernel.org is back online, and 
pushes stuff out)

	Jeff

libata-dev.git rebased

[Jeff Garzik]

I rebased all branches of libata-dev.git except #master and #upstream.

	Jeff

libata-dev.git rebased

[Jeff Garzik]

I just rebased all branches of libata-dev.git, and there was a bit of 
fallout:

1) Dan, I'll have to ask you to resend your sata_vsc MSI patch yet 
again, this time against 2.6.19.  Since it was against 
drivers/scsi/sata_vsc.c, that caused some cross-directory-move related 
problems.

2) Tejun, I'll have to ask you to rebase your 'upstream' branch again.

Here are the commits, so that you know when it has mirrored out to the 
kernel.org farm successfully:

[jgarzik@pretzel libata-dev]$ cat .git/refs/heads/upstream 
.git/refs/heads/ALL
664e8503fee2f299d0f96eaab0f5f8fae8fad325
f2e07d8e550dd4e6155ee8bf6b691c323ffb729f

Re: libata-dev.git rebased

[Tejun Heo]

Jeff Garzik wrote:
> 2) Tejun, I'll have to ask you to rebase your 'upstream' branch again.

No problem.  It's at the usual location.

  http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-upstream
  git://htj.dyndns.org/libata-tj tj-upstream

Also, the following patch really should go in.

  [PATCH] pata_cs5535: add missing comma in pci_driver initializer
  http://article.gmane.org/gmane.linux.ide/14283

And, the following fix is critical on many machines.  After determining
how to do it and some testing, this should go into 2.6.19.X, IMO.

  [PATCH] ahci: do not powerdown during initialization
  http://thread.gmane.org/gmane.linux.ide/14138/focus=14138

Thanks.

-- 
tejun

Re: libata-dev.git rebased

[Dan Williams]

On 12/1/06, Jeff Garzik <jeff@garzik.org> wrote:
> I just rebased all branches of libata-dev.git, and there was a bit of
> fallout:
>
> 1) Dan, I'll have to ask you to resend your sata_vsc MSI patch yet
> again, this time against 2.6.19.  Since it was against
> drivers/scsi/sata_vsc.c, that caused some cross-directory-move related
> problems.
I've copied Dan Wolstenholme.

Regards,
Dan Williams

Re: libata-dev.git rebased

[daniel]

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

Jeff,

Here's my rebased patch.  Let me know if there's a problem with it.

Thanks,
Dan

>On 12/1/06, Jeff Garzik <jeff@garzik.org> wrote:
>> I just rebased all branches of libata-dev.git, and there was a bit of
>> fallout:
>>
>> 1) Dan, I'll have to ask you to resend your sata_vsc MSI patch yet
>> again, this time against 2.6.19.  Since it was against
>> drivers/scsi/sata_vsc.c, that caused some cross-directory-move related
>> problems.
>I've copied Dan Wolstenholme.
>
>Regards,
>Dan Williams


[-- Attachment #2: patch.sata_vsc.2.6.19 --]
[-- Type: APPLICATION/OCTET-STREAM, Size: 3204 bytes --]

diff -uprN a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
--- a/drivers/ata/sata_vsc.c	2006-11-29 14:57:37.000000000 -0700
+++ b/drivers/ata/sata_vsc.c	2006-12-05 12:34:44.000000000 -0700
@@ -94,8 +94,14 @@ enum {
 			      VSC_SATA_INT_ERROR_P    | VSC_SATA_INT_ERROR_R | \
 			      VSC_SATA_INT_ERROR_E    | VSC_SATA_INT_ERROR_M | \
 			      VSC_SATA_INT_PHY_CHANGE),
+
+	/* Host private flags (hp_flags) */
+	VSC_SATA_HP_FLAG_MSI    = (1 << 0),
 };
 
+struct vsc_sata_host_priv {
+	u32	hp_flags;
+};
 
 #define is_vsc_sata_int_err(port_idx, int_status) \
 	 (int_status & (VSC_SATA_INT_ERROR << (8 * port_idx)))
@@ -118,6 +124,20 @@ static void vsc_sata_scr_write (struct a
 }
 
 
+static void vsc_sata_host_stop(struct ata_host_set *host_set)
+{
+	struct vsc_sata_host_priv *hpriv = host_set->private_data;
+	struct pci_dev *pdev = to_pci_dev(host_set->dev);
+
+	if (hpriv->hp_flags & VSC_SATA_HP_FLAG_MSI)
+		pci_disable_msi(pdev);
+	else
+		pci_intx(pdev, 0);
+	kfree (hpriv);
+	ata_pci_host_stop(host_set);
+}
+
+
 static void vsc_intr_mask_update(struct ata_port *ap, u8 ctl)
 {
 	void __iomem *mask_addr;
@@ -307,7 +327,7 @@ static const struct ata_port_operations 
 	.scr_write		= vsc_sata_scr_write,
 	.port_start		= ata_port_start,
 	.port_stop		= ata_port_stop,
-	.host_stop		= ata_pci_host_stop,
+	.host_stop		= vsc_sata_host_stop,
 };
 
 static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned long base)
@@ -336,6 +356,7 @@ static int __devinit vsc_sata_init_one (
 {
 	static int printed_version;
 	struct ata_probe_ent *probe_ent = NULL;
+	struct vsc_sata_host_priv *hpriv;
 	unsigned long base;
 	int pci_dev_busy = 0;
 	void __iomem *mmio_base;
@@ -377,6 +398,7 @@ static int __devinit vsc_sata_init_one (
 		rc = -ENOMEM;
 		goto err_out_regions;
 	}
+
 	memset(probe_ent, 0, sizeof(*probe_ent));
 	probe_ent->dev = pci_dev_to_dev(pdev);
 	INIT_LIST_HEAD(&probe_ent->node);
@@ -388,19 +410,33 @@ static int __devinit vsc_sata_init_one (
 	}
 	base = (unsigned long) mmio_base;
 
+	hpriv = kmalloc(sizeof(*hpriv), GFP_KERNEL);
+	if (!hpriv) {
+		rc = -ENOMEM;
+		goto err_out_iounmap;
+	}
+	memset(hpriv, 0, sizeof(*hpriv));
+
 	/*
 	 * Due to a bug in the chip, the default cache line size can't be used
 	 */
 	pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x80);
 
+	if (pci_enable_msi(pdev) == 0) {
+		hpriv->hp_flags |= VSC_SATA_HP_FLAG_MSI;
+		pci_intx(pdev, 0);
+	}
+	else
+		probe_ent->irq_flags = IRQF_SHARED;
+
 	probe_ent->sht = &vsc_sata_sht;
 	probe_ent->port_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 				ATA_FLAG_MMIO;
 	probe_ent->port_ops = &vsc_sata_ops;
 	probe_ent->n_ports = 4;
 	probe_ent->irq = pdev->irq;
-	probe_ent->irq_flags = IRQF_SHARED;
 	probe_ent->mmio_base = mmio_base;
+	probe_ent->private_data = hpriv;
 
 	/* We don't care much about the PIO/UDMA masks, but the core won't like us
 	 * if we don't fill these
@@ -427,10 +463,12 @@ static int __devinit vsc_sata_init_one (
 
 	/* FIXME: check ata_device_add return value */
 	ata_device_add(probe_ent);
-	kfree(probe_ent);
 
+	kfree(probe_ent);
 	return 0;
 
+err_out_iounmap:
+	pci_iounmap(pdev, mmio_base);
 err_out_free_ent:
 	kfree(probe_ent);
 err_out_regions:

Re: libata-dev.git rebased

[Jeff Garzik]

daniel@wolstenholme.net wrote:
> Jeff,
> 
> Here's my rebased patch.  Let me know if there's a problem with it.

ACK receiving, will apply soon

Re: libata-dev.git rebased

[Jeff Garzik]

daniel@wolstenholme.net wrote:
> Jeff,
> 
> Here's my rebased patch.  Let me know if there's a problem with it.

applied (again), thanks for your patience

libata-dev.git rebased

[Jeff Garzik]

Just a quick note...  jgarzik/libata-dev.git#upstream was rebased.

	Jeff