* [PATCH] 2.4.34 - Add some ahci pci ids
@ 2007-06-01 9:21 Filippo Carletti
2007-06-01 11:40 ` Jeff Garzik
0 siblings, 1 reply; 7+ messages in thread
From: Filippo Carletti @ 2007-06-01 9:21 UTC (permalink / raw)
To: Willy Tarreau; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
This patch adds support for some chipsets in ahci driver.
The list comes from a patch for redhat kernel 2.6.9-34.
I only tested ICH8.
The original patch contained also this lines (that I omitted):
+ /* JMicron-specific fixup: make sure we're in AHCI mode */
+ if (pdev->vendor == 0x197b)
+ pci_write_config_byte(pdev, 0x41, 0xa1);
+
Ciao,
Filippo
[-- Attachment #2: linux-2.4.34_ahci.patch --]
[-- Type: text/x-patch, Size: 1149 bytes --]
--- drivers/scsi/ahci.c.orig 2006-12-23 20:34:20.000000000 +0000
+++ drivers/scsi/ahci.c 2007-05-11 22:11:52.000000000 +0000
@@ -275,6 +275,24 @@
board_ahci }, /* ESB2 */
{ PCI_VENDOR_ID_INTEL, 0x27c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_ahci }, /* ICH7-M DH */
+ { PCI_VENDOR_ID_INTEL, 0x2821, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* ICH8 */
+ { PCI_VENDOR_ID_INTEL, 0x2822, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* ICH8 */
+ { PCI_VENDOR_ID_INTEL, 0x2824, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* ICH8 */
+ { PCI_VENDOR_ID_INTEL, 0x2829, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* ICH8M */
+ { PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* ICH8M */
+ { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* JMicron JMB360 */
+ { 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* JMicron JMB363 */
+ { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* ATI SB600 non-raid */
+ { PCI_VENDOR_ID_ATI, 0x4381, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* ATI SB600 raid */
{ } /* terminate list */
};
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] 2.4.34 - Add some ahci pci ids 2007-06-01 9:21 [PATCH] 2.4.34 - Add some ahci pci ids Filippo Carletti @ 2007-06-01 11:40 ` Jeff Garzik 2007-06-06 5:43 ` Willy Tarreau 0 siblings, 1 reply; 7+ messages in thread From: Jeff Garzik @ 2007-06-01 11:40 UTC (permalink / raw) To: Filippo Carletti; +Cc: Willy Tarreau, linux-kernel Filippo Carletti wrote: > This patch adds support for some chipsets in ahci driver. > The list comes from a patch for redhat kernel 2.6.9-34. > I only tested ICH8. > > The original patch contained also this lines (that I omitted): > + /* JMicron-specific fixup: make sure we're in AHCI mode */ > + if (pdev->vendor == 0x197b) > + pci_write_config_byte(pdev, 0x41, 0xa1); NAK. Don't omit obviously needed lines, if you are going to add JMicron PCI IDs. Jeff ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] 2.4.34 - Add some ahci pci ids 2007-06-01 11:40 ` Jeff Garzik @ 2007-06-06 5:43 ` Willy Tarreau 2007-06-06 20:16 ` Filippo Carletti 0 siblings, 1 reply; 7+ messages in thread From: Willy Tarreau @ 2007-06-06 5:43 UTC (permalink / raw) To: Jeff Garzik, Filippo Carletti; +Cc: linux-kernel On Fri, Jun 01, 2007 at 07:40:54AM -0400, Jeff Garzik wrote: > Filippo Carletti wrote: > >This patch adds support for some chipsets in ahci driver. > >The list comes from a patch for redhat kernel 2.6.9-34. > >I only tested ICH8. > > > >The original patch contained also this lines (that I omitted): > >+ /* JMicron-specific fixup: make sure we're in AHCI mode */ > >+ if (pdev->vendor == 0x197b) > >+ pci_write_config_byte(pdev, 0x41, 0xa1); > > NAK. Don't omit obviously needed lines, if you are going to add JMicron > PCI IDs. Filippo, would you please resend your patch including the lines you have omitted ? Jeff is right, those lines are explicitly labelled as a fixup, so either we merge the complete patch, or nothing at all. I expect to release 2.4.35 around the end of this month, so if you can provide me with an acceptable patch in time so that I can run at least one -rc with it, I'm OK to merge it (provided that Jeff has no objection of course). I will merge your other patch (VIA) at the same time. Thanks in advance, Willy ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] 2.4.34 - Add some ahci pci ids 2007-06-06 5:43 ` Willy Tarreau @ 2007-06-06 20:16 ` Filippo Carletti 2007-06-06 20:57 ` Willy Tarreau 0 siblings, 1 reply; 7+ messages in thread From: Filippo Carletti @ 2007-06-06 20:16 UTC (permalink / raw) To: Willy Tarreau; +Cc: Jeff Garzik, linux-kernel [-- Attachment #1: Type: text/plain, Size: 708 bytes --] >>> The original patch contained also this lines (that I omitted): >>> + /* JMicron-specific fixup: make sure we're in AHCI mode */ >>> + if (pdev->vendor == 0x197b) >>> + pci_write_config_byte(pdev, 0x41, 0xa1); >> NAK. Don't omit obviously needed lines, if you are going to add JMicron >> PCI IDs. > > Filippo, > > would you please resend your patch including the lines you have omitted ? > Jeff is right, those lines are explicitly labelled as a fixup, so either > we merge the complete patch, or nothing at all. I'm attaching a revised patch that includes JMicron fixup I missed earlier. The patch applies but it's not tested because I lack appropriate hw. Ciao, Filippo [-- Attachment #2: linux-2.4.34_ahci.patch --] [-- Type: text/x-patch, Size: 1431 bytes --] --- drivers/scsi/ahci.c.orig 2006-12-23 20:34:20.000000000 +0000 +++ drivers/scsi/ahci.c 2007-05-11 22:11:52.000000000 +0000 @@ -275,6 +275,24 @@ board_ahci }, /* ESB2 */ { PCI_VENDOR_ID_INTEL, 0x27c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, board_ahci }, /* ICH7-M DH */ + { PCI_VENDOR_ID_INTEL, 0x2821, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ICH8 */ + { PCI_VENDOR_ID_INTEL, 0x2822, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ICH8 */ + { PCI_VENDOR_ID_INTEL, 0x2824, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ICH8 */ + { PCI_VENDOR_ID_INTEL, 0x2829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ICH8M */ + { PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ICH8M */ + { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* JMicron JMB360 */ + { 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* JMicron JMB363 */ + { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ATI SB600 non-raid */ + { PCI_VENDOR_ID_ATI, 0x4381, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_ahci }, /* ATI SB600 raid */ { } /* terminate list */ }; @@ -1085,6 +1085,10 @@ if (have_msi) hpriv->flags |= AHCI_FLAG_MSI; + /* JMicron-specific fixup: make sure we're in AHCI mode */ + if (pdev->vendor == 0x197b) + pci_write_config_byte(pdev, 0x41, 0xa1); + /* initialize adapter */ rc = ahci_host_init(probe_ent); if (rc) ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] 2.4.34 - Add some ahci pci ids 2007-06-06 20:16 ` Filippo Carletti @ 2007-06-06 20:57 ` Willy Tarreau 2007-06-06 21:02 ` Filippo Carletti 0 siblings, 1 reply; 7+ messages in thread From: Willy Tarreau @ 2007-06-06 20:57 UTC (permalink / raw) To: Filippo Carletti; +Cc: Jeff Garzik, linux-kernel On Wed, Jun 06, 2007 at 10:16:14PM +0200, Filippo Carletti wrote: > >>> The original patch contained also this lines (that I omitted): > >>> + /* JMicron-specific fixup: make sure we're in AHCI mode */ > >>> + if (pdev->vendor == 0x197b) > >>> + pci_write_config_byte(pdev, 0x41, 0xa1); > >> NAK. Don't omit obviously needed lines, if you are going to add JMicron > >> PCI IDs. > > > > Filippo, > > > > would you please resend your patch including the lines you have omitted ? > > Jeff is right, those lines are explicitly labelled as a fixup, so either > > we merge the complete patch, or nothing at all. > > I'm attaching a revised patch that includes JMicron fixup I missed earlier. Thanks for your quick reply Filippo. > The patch applies but it's not tested because I lack appropriate hw. Just for information, have you built it already ? Jeff, does this one look good to you ? Thanks, Willy > --- drivers/scsi/ahci.c.orig 2006-12-23 20:34:20.000000000 +0000 > +++ drivers/scsi/ahci.c 2007-05-11 22:11:52.000000000 +0000 > @@ -275,6 +275,24 @@ > board_ahci }, /* ESB2 */ > { PCI_VENDOR_ID_INTEL, 0x27c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, > board_ahci }, /* ICH7-M DH */ > + { PCI_VENDOR_ID_INTEL, 0x2821, PCI_ANY_ID, PCI_ANY_ID, 0, 0, > + board_ahci }, /* ICH8 */ > + { PCI_VENDOR_ID_INTEL, 0x2822, PCI_ANY_ID, PCI_ANY_ID, 0, 0, > + board_ahci }, /* ICH8 */ > + { PCI_VENDOR_ID_INTEL, 0x2824, PCI_ANY_ID, PCI_ANY_ID, 0, 0, > + board_ahci }, /* ICH8 */ > + { PCI_VENDOR_ID_INTEL, 0x2829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, > + board_ahci }, /* ICH8M */ > + { PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, > + board_ahci }, /* ICH8M */ > + { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, > + board_ahci }, /* JMicron JMB360 */ > + { 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0, > + board_ahci }, /* JMicron JMB363 */ > + { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0, > + board_ahci }, /* ATI SB600 non-raid */ > + { PCI_VENDOR_ID_ATI, 0x4381, PCI_ANY_ID, PCI_ANY_ID, 0, 0, > + board_ahci }, /* ATI SB600 raid */ > { } /* terminate list */ > }; > > @@ -1085,6 +1085,10 @@ > if (have_msi) > hpriv->flags |= AHCI_FLAG_MSI; > > + /* JMicron-specific fixup: make sure we're in AHCI mode */ > + if (pdev->vendor == 0x197b) > + pci_write_config_byte(pdev, 0x41, 0xa1); > + > /* initialize adapter */ > rc = ahci_host_init(probe_ent); > if (rc) ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] 2.4.34 - Add some ahci pci ids 2007-06-06 20:57 ` Willy Tarreau @ 2007-06-06 21:02 ` Filippo Carletti 2007-06-06 21:09 ` Willy Tarreau 0 siblings, 1 reply; 7+ messages in thread From: Filippo Carletti @ 2007-06-06 21:02 UTC (permalink / raw) To: Willy Tarreau; +Cc: Jeff Garzik, linux-kernel > Just for information, have you built it already ? I successfully built the kernel but I haven't tested it because I have only an ICH8 based mb. Ciao, Filippo ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] 2.4.34 - Add some ahci pci ids 2007-06-06 21:02 ` Filippo Carletti @ 2007-06-06 21:09 ` Willy Tarreau 0 siblings, 0 replies; 7+ messages in thread From: Willy Tarreau @ 2007-06-06 21:09 UTC (permalink / raw) To: Filippo Carletti; +Cc: Jeff Garzik, linux-kernel On Wed, Jun 06, 2007 at 11:02:45PM +0200, Filippo Carletti wrote: > > Just for information, have you built it already ? > > I successfully built the kernel but I haven't tested it because I have > only an ICH8 based mb. OK fine. It will save me a build then. I do not have the hardware either. I remember seeing one in a machine recently, but I cannot recall where :-( I'll have to search. Thanks, Willy ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-06-06 21:10 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-06-01 9:21 [PATCH] 2.4.34 - Add some ahci pci ids Filippo Carletti 2007-06-01 11:40 ` Jeff Garzik 2007-06-06 5:43 ` Willy Tarreau 2007-06-06 20:16 ` Filippo Carletti 2007-06-06 20:57 ` Willy Tarreau 2007-06-06 21:02 ` Filippo Carletti 2007-06-06 21:09 ` Willy Tarreau
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox