Patchwork [RESEND] ahci: Add JMicron 362 device IDs

login
register
mail settings
Submitter Ben Hutchings
Date Sept. 10, 2012, 12:09 a.m.
Message ID <1347235744.5134.14.camel@deadeye.wl.decadent.org.uk>
Download mbox | patch
Permalink /patch/182760/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Ben Hutchings - Sept. 10, 2012, 12:09 a.m.
The JMicron JMB362 controller supports AHCI only, but some revisions
use the IDE class code.  These need to be matched by device ID.

These additions have apparently been included by QNAP in their NAS
devices using these controllers.

References: http://bugs.debian.org/634180
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
Previously sent last year(!); please respond...

Ben.

 drivers/ata/ahci.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Jonathan Nieder - Sept. 10, 2012, 12:39 a.m.
Hi,

Ben Hutchings wrote:

> The JMicron JMB362 controller supports AHCI only, but some revisions
> use the IDE class code.  These need to be matched by device ID.
[...]
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
[...]
>  drivers/ata/ahci.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
[...]
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -263,6 +263,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
>  	/* JMicron 360/1/3/5/6, match class to avoid IDE function */
>  	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
>  	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },
> +	/* JMicron 362B and 362C have an AHCI function with IDE class code */
> +	{ PCI_VDEVICE(JMICRON, 0x2362), board_ahci_ign_iferr },
> +	{ PCI_VDEVICE(JMICRON, 0x236f), board_ahci_ign_iferr },

Should this go to stable kernels as well?

Thanks,
Jonathan
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ben Hutchings - Sept. 10, 2012, 1:06 a.m.
On Sun, 2012-09-09 at 17:39 -0700, Jonathan Nieder wrote:
> Hi,
> 
> Ben Hutchings wrote:
> 
> > The JMicron JMB362 controller supports AHCI only, but some revisions
> > use the IDE class code.  These need to be matched by device ID.
> [...]
> > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> [...]
> >  drivers/ata/ahci.c |    3 +++
> >  1 files changed, 3 insertions(+), 0 deletions(-)
> [...]
> > --- a/drivers/ata/ahci.c
> > +++ b/drivers/ata/ahci.c
> > @@ -263,6 +263,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
> >  	/* JMicron 360/1/3/5/6, match class to avoid IDE function */
> >  	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
> >  	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },
> > +	/* JMicron 362B and 362C have an AHCI function with IDE class code */
> > +	{ PCI_VDEVICE(JMICRON, 0x2362), board_ahci_ign_iferr },
> > +	{ PCI_VDEVICE(JMICRON, 0x236f), board_ahci_ign_iferr },
> 
> Should this go to stable kernels as well?

I suppose so, yes.

Ben.

Patch

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index fd318ac..67dbd6a 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -263,6 +263,9 @@  static const struct pci_device_id ahci_pci_tbl[] = {
 	/* JMicron 360/1/3/5/6, match class to avoid IDE function */
 	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
 	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },
+	/* JMicron 362B and 362C have an AHCI function with IDE class code */
+	{ PCI_VDEVICE(JMICRON, 0x2362), board_ahci_ign_iferr },
+	{ PCI_VDEVICE(JMICRON, 0x236f), board_ahci_ign_iferr },
 
 	/* ATI */
 	{ PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */