[PATCH] jmicron: make ide jmicron driver play nice with libata ones

[PATCH] jmicron: make ide jmicron driver play nice with libata ones

[Tejun Heo]

When libata is configured, the device is configured such that SATA and
PATA ports live in separate functions with different programming
interfaces.  pata_jmicron and ide jmicron drivers can drive only the
PATA part.

This patch makes jmicron match PCI class code such that it doesn't
attach itself to the SATA part preventing the proper ahci driver from
attaching.

This change is suggested by Bartlomiej.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 53f2550..be4fc96 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -240,12 +240,31 @@ static int __devinit jmicron_init_one(struct pci_dev *dev, const struct pci_devi
 	return 0;
 }
 
+/* If libata is configured, jmicron PCI quirk will configure it such
+ * that the SATA ports are in AHCI function while the PATA ports are
+ * in a separate IDE function.  In such cases, match device class and
+ * attach only to IDE.  If libata isn't configured, keep the old
+ * behavior for backward compatibility.
+ */
+#if defined(CONFIG_ATA) || defined(CONFIG_ATA_MODULE)
+#define JMB_CLASS	PCI_CLASS_STORAGE_IDE << 8
+#define JMB_CLASS_MASK	0xffff00
+#else
+#define JMB_CLASS	0
+#define JMB_CLASS_MASK	0
+#endif
+
 static struct pci_device_id jmicron_pci_tbl[] = {
-	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
-	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
-	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
-	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
+	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361,
+	  PCI_ANY_ID, PCI_ANY_ID, JMB_CLASS, JMB_CLASS_MASK, 0},
+	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363,
+	  PCI_ANY_ID, PCI_ANY_ID, JMB_CLASS, JMB_CLASS_MASK, 1},
+	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365,
+	  PCI_ANY_ID, PCI_ANY_ID, JMB_CLASS, JMB_CLASS_MASK, 2},
+	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366,
+	  PCI_ANY_ID, PCI_ANY_ID, JMB_CLASS, JMB_CLASS_MASK, 3},
+	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368,
+	  PCI_ANY_ID, PCI_ANY_ID, JMB_CLASS, JMB_CLASS_MASK, 4},
 	{ 0, },
 };
 

Re: [PATCH] jmicron: make ide jmicron driver play nice with libata ones

[Bartlomiej Zolnierkiewicz]

On Friday 16 March 2007, Tejun Heo wrote:
> When libata is configured, the device is configured such that SATA and
> PATA ports live in separate functions with different programming
> interfaces.  pata_jmicron and ide jmicron drivers can drive only the
> PATA part.
> 
> This patch makes jmicron match PCI class code such that it doesn't
> attach itself to the SATA part preventing the proper ahci driver from
> attaching.
> 
> This change is suggested by Bartlomiej.
> 
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

applied, thanks

Re: [PATCH] jmicron: make ide jmicron driver play nice with libata ones

[Alan Cox]

> > PATA ports live in separate functions with different programming
> > interfaces.  pata_jmicron and ide jmicron drivers can drive only the
> > PATA part.

This isn't actually true. The IDE jmicron driver can drive both the PATA
and the SATA parts in legacy mode. It cannot drive the SATA part in AHCI
mode.

Alan

Re: [PATCH] jmicron: make ide jmicron driver play nice with libata ones

[Bartlomiej Zolnierkiewicz]

On Saturday 17 March 2007, Alan Cox wrote:
> > > PATA ports live in separate functions with different programming
> > > interfaces.  pata_jmicron and ide jmicron drivers can drive only the
> > > PATA part.
> 
> This isn't actually true. The IDE jmicron driver can drive both the PATA
> and the SATA parts in legacy mode. It cannot drive the SATA part in AHCI
> mode.

Yes but the quoted sentence is missing the full context:

> When libata is configured, the device is configured such that SATA and
> PATA ports live in separate functions with different programming
> interfaces.  pata_jmicron and ide jmicron drivers can drive only the
> PATA part.

when libata is configured jmicron is _always_ programmed for native mode

Bart