2.4.XX ICH7 PATA UDMA Support

2.4.XX ICH7 PATA UDMA Support

[ivaylo]

Hello,

I have ASUS P5LD2-VM mobo with Intel ICH7 PATA IDE. It works only
in PIO mode, so I changed piix driver in 2.4.35 to support UDMA modes - 
patch is bellow.

I'm a little bit confused about the specifications of ICH7 PATA, from ASUS
say it is UDMA 100, but from Intel and in 2.6.XX kernel tree it is as UDMA 
133. My confusion became stronger and from bios ide SATA/PATA options of 
my mobo.

Anyway, the patch works for me and it should work for all mobos with 945 
chipset, but need to be tested. If there are any volunteers to apply patch 
and test it will be good.

Please report the results and play around with mobo bios SATA/PATA IDE 
setings.

Best Regards,
Ivaylo Josifov


diff -ru a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
--- a/drivers/ide/pci/piix.c    2007-07-26 23:53:41.000000000 +0300
+++ b/drivers/ide/pci/piix.c    2007-08-10 20:08:13.000000000 +0300
@@ -155,6 +155,7 @@
                         case PCI_DEVICE_ID_INTEL_82801E_11:
                         case PCI_DEVICE_ID_INTEL_ESB_2:
                         case PCI_DEVICE_ID_INTEL_ICH6_2:
+                       case PCI_DEVICE_ID_INTEL_ICH7_21:
                                 p += sprintf(p, "PIIX4 Ultra 100 ");
                                 break;
                         case PCI_DEVICE_ID_INTEL_82372FB_1:
@@ -294,6 +295,7 @@
                 case PCI_DEVICE_ID_INTEL_82801EB_11:
                 case PCI_DEVICE_ID_INTEL_ESB_2:
                 case PCI_DEVICE_ID_INTEL_ICH6_2:
+               case PCI_DEVICE_ID_INTEL_ICH7_21:
                         mode = 3;
                         break;
                 /* UDMA 66 capable */
@@ -683,6 +685,7 @@
                 case PCI_DEVICE_ID_INTEL_82801E_11:
                 case PCI_DEVICE_ID_INTEL_ESB_2:
                 case PCI_DEVICE_ID_INTEL_ICH6_2:
+               case PCI_DEVICE_ID_INTEL_ICH7_21:
                 {
                         unsigned int extra = 0;
                         pci_read_config_dword(dev, 0x54, &extra);
@@ -882,6 +885,7 @@
  #endif
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19},
         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20},
+       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21},
         { 0, },
  };

diff -ru a/drivers/ide/pci/piix.h b/drivers/ide/pci/piix.h
--- a/drivers/ide/pci/piix.h    2007-07-26 23:53:41.000000000 +0300
+++ b/drivers/ide/pci/piix.h    2007-08-10 20:21:02.000000000 +0300
@@ -333,6 +333,20 @@
                 .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
                 .bootable       = ON_BOARD,
                 .extra          = 0,
+       },{     /* 21 */
+               .vendor         = PCI_VENDOR_ID_INTEL,
+               .device         = PCI_DEVICE_ID_INTEL_ICH7_21,
+               .name           = "ICH7",
+               .init_setup     = init_setup_piix,
+               .init_chipset   = init_chipset_piix,
+               .init_iops      = NULL,
+               .init_hwif      = init_hwif_piix,
+               .init_dma       = init_dma_piix,
+               .channels       = 1,
+               .autodma        = AUTODMA,
+               .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+               .bootable       = ON_BOARD,
+               .extra          = 0,
         },{
                 .vendor         = 0,
                 .device         = 0,

diff -ru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h   2007-07-26 23:53:41.000000000 +0300
+++ b/include/linux/pci_ids.h   2007-08-10 20:11:13.000000000 +0300
@@ -1978,6 +1978,7 @@
  #define PCI_DEVICE_ID_INTEL_ICH6_1     0x2641
  #define PCI_DEVICE_ID_INTEL_ICH6_2     0x266f
  #define PCI_DEVICE_ID_INTEL_ICH6_18    0x266e
+#define PCI_DEVICE_ID_INTEL_ICH7_21    0x27df
  #define PCI_DEVICE_ID_INTEL_82850_HB   0x2530
  #define PCI_DEVICE_ID_INTEL_82845G_HB  0x2560
  #define PCI_DEVICE_ID_INTEL_SMCH       0x3590

ICH9 AHCI support on 2.4.XX

[ivaylo]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 976 bytes --]


Hello,

I Have Intel motherboard model DG33BU. It is with G33 chipset. There 
is, Intel Corporation 82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA AHCI Controller,
on it. So I make small patch to support this controler in kernel (see 
bellow or the attached file). Probably it will work and on the 
other mobos with same chipset.


diff -ru a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
--- a/drivers/scsi/ahci.c       2008-01-01 14:06:40.000000000 +0200
+++ b/drivers/scsi/ahci.c       2008-05-02 01:35:49.000000000 +0300
@@ -285,6 +285,8 @@
           board_ahci }, /* ICH8M */
         { PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_ahci }, /* ICH8M */
+       { PCI_VENDOR_ID_INTEL, 0x2922, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+         board_ahci }, /* ICH9 */
         { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
           board_ahci }, /* JMicron JMB360 */
         { 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,




Best Regards,
Ivaylo Josifov

[-- Attachment #2: Type: APPLICATION/octet-stream, Size: 252 bytes --]

Marvel IDE 88SE6101 2.4.XX support

[ivaylo]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2422 bytes --]


Another one small patch to support Marvel IDE 88SE6101 controler. I have 
one on Intel DG33BU motherboard. It is detect as
02:00.0 IDE interface: Marvell Technology Group Ltd. 88SE6101 single-port 
PATA133 interface (rev b2)

I add it in kernel as generic IDE. This patch and the other which is to 
support ICH9 AHCI works for me from few month.

The patch is in attached file and I post it bellow:


diff -ru a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
--- a/drivers/ide/pci/generic.c 2008-01-01 14:06:40.000000000 +0200
+++ b/drivers/ide/pci/generic.c 2008-05-02 02:57:28.000000000 +0300
@@ -144,6 +144,7 @@
         { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_1,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10},
         { PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_2,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11},
         { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_20363,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12},
+       { PCI_VENDOR_ID_MARVEL,  PCI_DEVICE_ID_MARVEL_6101,        PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13},
         { 0, },
  };


diff -ru a/drivers/ide/pci/generic.h b/drivers/ide/pci/generic.h
--- a/drivers/ide/pci/generic.h 2008-01-01 14:06:40.000000000 +0200
+++ b/drivers/ide/pci/generic.h 2008-05-02 02:58:18.000000000 +0300
@@ -167,6 +167,16 @@
                 .channels       = 1,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
+       },{     /* 13 */
+               .vendor         = PCI_VENDOR_ID_MARVEL,
+               .device         = PCI_DEVICE_ID_MARVEL_6101,
+               .name           = "MARVEL_6101",
+               .init_chipset   = init_chipset_generic,
+               .init_hwif      = init_hwif_generic,
+               .init_dma       = init_dma_generic,
+               .channels       = 1,
+               .autodma        = NOAUTODMA,
+               .bootable       = ON_BOARD,
         },{
                 .vendor         = 0,
                 .device         = 0,


diff -ru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h   2008-01-01 14:06:40.000000000 +0200
+++ b/include/linux/pci_ids.h   2008-05-02 02:52:41.000000000 +0300
@@ -2105,3 +2105,6 @@
  #define PCI_VENDOR_ID_JMICRON          0x197b
  #define PCI_DEVICE_ID_JMICRON_20363    0x2363

+#define PCI_VENDOR_ID_MARVEL           0x11ab
+#define PCI_DEVICE_ID_MARVEL_6101      0x6101
+




Best Regards,
Ivaylo Josifov

[-- Attachment #2: Type: APPLICATION/octet-stream, Size: 556 bytes --]

Re: Marvel IDE 88SE6101 2.4.XX support

[Alan Cox]

On Thu, 4 Sep 2008 21:26:12 +0300 (EEST)
ivaylo@bglans.net wrote:

> 
> Another one small patch to support Marvel IDE 88SE6101 controler. I have 
> one on Intel DG33BU motherboard. It is detect as
> 02:00.0 IDE interface: Marvell Technology Group Ltd. 88SE6101 single-port 
> PATA133 interface (rev b2)

Its a pretty generic device - see drivers/ata/pata_marvell.c so IDE
generic will probably do roughly the right things. The pata_marvell
driver documents how to do cable detect, which you may want to add and
make it its own driver.

Alan

Re: ICH9 AHCI support on 2.4.XX

[Willy Tarreau]

Hello Ivaylo,

On Thu, Sep 04, 2008 at 09:07:49PM +0300, ivaylo@bglans.net wrote:
> 
> Hello,
> 
> I Have Intel motherboard model DG33BU. It is with G33 chipset. There 
> is, Intel Corporation 82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA AHCI 
> Controller,
> on it. So I make small patch to support this controler in kernel (see 
> bellow or the attached file). Probably it will work and on the 
> other mobos with same chipset.

Thanks for this update. I have already got it (and queued for .37-rc1).
I've not published it yet because I wanted to perform a few preliminary
tests, as I too have the same controller but did not have any SATA disk.

Thanks!
Willy

Re: Marvel IDE 88SE6101 2.4.XX support

[Willy Tarreau]

Hi Alan,

On Thu, Sep 04, 2008 at 07:36:25PM +0100, Alan Cox wrote:
> On Thu, 4 Sep 2008 21:26:12 +0300 (EEST)
> ivaylo@bglans.net wrote:
> 
> > 
> > Another one small patch to support Marvel IDE 88SE6101 controler. I have 
> > one on Intel DG33BU motherboard. It is detect as
> > 02:00.0 IDE interface: Marvell Technology Group Ltd. 88SE6101 single-port 
> > PATA133 interface (rev b2)
> 
> Its a pretty generic device - see drivers/ata/pata_marvell.c so IDE
> generic will probably do roughly the right things. The pata_marvell
> driver documents how to do cable detect, which you may want to add and
> make it its own driver.

Indeed, your driver is clear enough to serve as a doc. Looking at
ata_piix.c in 2.4, I see that the libata core has evolved a lot,
but backporting your work should not be hard at all. Among other
things, the driver needs to set ap->cbl itself during reset, for
instance.

However, I wonder if it's really worth doing it if the IDE generic
driver already works. The PATA port on such motherboards today is
mostly used by CD/DVD, and I think that even if we limit ourselves
to 40-pin, it's not dramatic (all my IDE CD drives have always been
running that way for ages).

Or maybe this would be more interesting for other chips of the same
family ?

Ivaylo, if you're interested in trying to backport pata_marvell.c
from 2.6 to 2.4, that's fine for me, just inform me so that I know
I'm waiting for you. Otherwise I can merge your IDE generic patch.
In this case, could you repost your patch after fixing the name
"MARVEL" in the PCI IDs (=> "MARVELL") ?

Thanks,
Willy

Re: Marvel IDE 88SE6101 2.4.XX support

[ivaylo]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2451 bytes --]


Hello,

Thanks, Alan for your comment about Marvell PATA IDE driver.
In this time I'm a litle bit busy and do not have time to backport driver 
in 2.4 probably after a time I'll try (I'm not a profesional C programer 
and it is litle hard to me). I correct generic IDE patch and send you in 
the attached file.


I make also patch to update e1000 driver in the 2.4 kernel to e1000-7.6.5 and 
add support for:
00:19.0 Ethernet controller: Intel Corporation 82801I (ICH9 Family) 
Gigabit Ethernet Controller (rev 02)

But I'm not sure if there are any license violations and any other person 
who manage network drivers to send it to him. If you know something about 
it please tell me to send the patch for testing and e.t.c.


Best Regards,
Ivaylo Josifov



On Fri, 5 Sep 2008, Willy Tarreau wrote:

> Hi Alan,
>
> On Thu, Sep 04, 2008 at 07:36:25PM +0100, Alan Cox wrote:
>> On Thu, 4 Sep 2008 21:26:12 +0300 (EEST)
>> ivaylo@bglans.net wrote:
>>
>>>
>>> Another one small patch to support Marvel IDE 88SE6101 controler. I have
>>> one on Intel DG33BU motherboard. It is detect as
>>> 02:00.0 IDE interface: Marvell Technology Group Ltd. 88SE6101 single-port
>>> PATA133 interface (rev b2)
>>
>> Its a pretty generic device - see drivers/ata/pata_marvell.c so IDE
>> generic will probably do roughly the right things. The pata_marvell
>> driver documents how to do cable detect, which you may want to add and
>> make it its own driver.
>
> Indeed, your driver is clear enough to serve as a doc. Looking at
> ata_piix.c in 2.4, I see that the libata core has evolved a lot,
> but backporting your work should not be hard at all. Among other
> things, the driver needs to set ap->cbl itself during reset, for
> instance.
>
> However, I wonder if it's really worth doing it if the IDE generic
> driver already works. The PATA port on such motherboards today is
> mostly used by CD/DVD, and I think that even if we limit ourselves
> to 40-pin, it's not dramatic (all my IDE CD drives have always been
> running that way for ages).
>
> Or maybe this would be more interesting for other chips of the same
> family ?
>
> Ivaylo, if you're interested in trying to backport pata_marvell.c
> from 2.6 to 2.4, that's fine for me, just inform me so that I know
> I'm waiting for you. Otherwise I can merge your IDE generic patch.
> In this case, could you repost your patch after fixing the name
> "MARVEL" in the PCI IDs (=> "MARVELL") ?
>
> Thanks,
> Willy
>

[-- Attachment #2: Type: APPLICATION/octet-stream, Size: 557 bytes --]

Re: Marvel IDE 88SE6101 2.4.XX support

[Willy Tarreau]

Hello,

On Fri, Sep 05, 2008 at 01:37:35PM +0300, ivaylo@bglans.net wrote:
> 
> Hello,
> 
> Thanks, Alan for your comment about Marvell PATA IDE driver.
> In this time I'm a litle bit busy and do not have time to backport driver 
> in 2.4 probably after a time I'll try (I'm not a profesional C programer 
> and it is litle hard to me). I correct generic IDE patch and send you in 
> the attached file.

OK. BTW, next time, please post it in pure text form, so that people on
the list can easily review and comment it.

> I make also patch to update e1000 driver in the 2.4 kernel to e1000-7.6.5 
> and add support for:
> 00:19.0 Ethernet controller: Intel Corporation 82801I (ICH9 Family) 
> Gigabit Ethernet Controller (rev 02)
> 
> But I'm not sure if there are any license violations and any other person 
> who manage network drivers to send it to him. If you know something about 
> it please tell me to send the patch for testing and e.t.c.

Please contact Auke Kok and/or Jesse Brandeburg at intel. They are the
driver's maintainers, and since they still support it, I do not want to
change it without their agreement. If they want to propose an upgrade,
I'll trust them.

Regards,
Willy

Re: Marvel IDE 88SE6101 2.4.XX support

[Jeff Kirsher]

On Fri, Sep 5, 2008 at 5:33 AM, Willy Tarreau <w@1wt.eu> wrote:
> Hello,
>
> On Fri, Sep 05, 2008 at 01:37:35PM +0300, ivaylo@bglans.net wrote:
>>
>> Hello,
>>
>> Thanks, Alan for your comment about Marvell PATA IDE driver.
>> In this time I'm a litle bit busy and do not have time to backport driver
>> in 2.4 probably after a time I'll try (I'm not a profesional C programer
>> and it is litle hard to me). I correct generic IDE patch and send you in
>> the attached file.
>
> OK. BTW, next time, please post it in pure text form, so that people on
> the list can easily review and comment it.
>
>> I make also patch to update e1000 driver in the 2.4 kernel to e1000-7.6.5
>> and add support for:
>> 00:19.0 Ethernet controller: Intel Corporation 82801I (ICH9 Family)
>> Gigabit Ethernet Controller (rev 02)
>>
>> But I'm not sure if there are any license violations and any other person
>> who manage network drivers to send it to him. If you know something about
>> it please tell me to send the patch for testing and e.t.c.
>
> Please contact Auke Kok and/or Jesse Brandeburg at intel. They are the
> driver's maintainers, and since they still support it, I do not want to
> change it without their agreement. If they want to propose an upgrade,
> I'll trust them.
>
> Regards,
> Willy
>

Actually Auke is no longer a maintainer for the 10/100/1000/10000 Intel drivers.

Please send your patches to me and Jesse.


-- 
Cheers,
Jeff