[PATCH] ich6m-pciid-piix.patch

[PATCH] ich6m-pciid-piix.patch

[Erik Slagter]

[-- Attachment #1.1: Type: text/plain, Size: 1989 bytes --]

Hi,

I am not sure someone already did this one, but it doesn't seem to be in
git nor mm at the moment.

This adds ICH6M to the pci ids of the (standard) piix ide driver. This
makes it possible to use the standard ide driver for this chipset and
enable udma.

The other way is to use the libata driver, but this has too many
drawback for the moment (no hdparm/smart/atapi support, with
patch/#define it does, but doesn't work for me and crashes). Also pata
harddisks are assigned incorrectly sda device names.

This look okay to me, having said this, I must admit I don't know ***
from this source file ;-)

Thx.

diff -ur a/drivers/ide/pci/piix.c linux-2.6.12/drivers/ide/pci/piix.c
--- a/drivers/ide/pci/piix.c	2005-06-17 21:48:29.000000000 +0200
+++ b/drivers/ide/pci/piix.c	2005-07-02 12:37:43.000000000 +0200
@@ -133,6 +133,7 @@
 		case PCI_DEVICE_ID_INTEL_82801EB_11:
 		case PCI_DEVICE_ID_INTEL_ESB_2:
 		case PCI_DEVICE_ID_INTEL_ICH6_19:
+		case PCI_DEVICE_ID_INTEL_ICH6_5:
 		case PCI_DEVICE_ID_INTEL_ICH7_21:
 		case PCI_DEVICE_ID_INTEL_ESB2_18:
 			mode = 3;
@@ -447,6 +448,7 @@
 		case PCI_DEVICE_ID_INTEL_82801E_11:
 		case PCI_DEVICE_ID_INTEL_ESB_2:
 		case PCI_DEVICE_ID_INTEL_ICH6_19:
+		case PCI_DEVICE_ID_INTEL_ICH6_5:
 		case PCI_DEVICE_ID_INTEL_ICH7_21:
 		case PCI_DEVICE_ID_INTEL_ESB2_18:
 		{
@@ -575,6 +577,7 @@
 	/* 21 */ DECLARE_PIIX_DEV("ICH7"),
 	/* 22 */ DECLARE_PIIX_DEV("ICH4"),
 	/* 23 */ DECLARE_PIIX_DEV("ESB2"),
+	/* 24 */ DECLARE_PIIX_DEV("ICH6M"),
 };
 
 /**
@@ -651,6 +654,7 @@
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 21},
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_1, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 22},
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_18, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 23},
+ 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_5, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 24},
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, piix_pci_tbl);


[-- Attachment #1.2: ich6m-pciid-piix.patch --]
[-- Type: text/x-patch, Size: 1350 bytes --]

diff -ur a/drivers/ide/pci/piix.c linux-2.6.12/drivers/ide/pci/piix.c
--- a/drivers/ide/pci/piix.c	2005-06-17 21:48:29.000000000 +0200
+++ b/drivers/ide/pci/piix.c	2005-07-02 12:37:43.000000000 +0200
@@ -133,6 +133,7 @@
 		case PCI_DEVICE_ID_INTEL_82801EB_11:
 		case PCI_DEVICE_ID_INTEL_ESB_2:
 		case PCI_DEVICE_ID_INTEL_ICH6_19:
+		case PCI_DEVICE_ID_INTEL_ICH6_5:
 		case PCI_DEVICE_ID_INTEL_ICH7_21:
 		case PCI_DEVICE_ID_INTEL_ESB2_18:
 			mode = 3;
@@ -447,6 +448,7 @@
 		case PCI_DEVICE_ID_INTEL_82801E_11:
 		case PCI_DEVICE_ID_INTEL_ESB_2:
 		case PCI_DEVICE_ID_INTEL_ICH6_19:
+		case PCI_DEVICE_ID_INTEL_ICH6_5:
 		case PCI_DEVICE_ID_INTEL_ICH7_21:
 		case PCI_DEVICE_ID_INTEL_ESB2_18:
 		{
@@ -575,6 +577,7 @@
 	/* 21 */ DECLARE_PIIX_DEV("ICH7"),
 	/* 22 */ DECLARE_PIIX_DEV("ICH4"),
 	/* 23 */ DECLARE_PIIX_DEV("ESB2"),
+	/* 24 */ DECLARE_PIIX_DEV("ICH6M"),
 };
 
 /**
@@ -651,6 +654,7 @@
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21},
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 22},
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_18, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 23},
+ 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 24},
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, piix_pci_tbl);

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

RE: [PATCH] ich6m-pciid-piix.patch

[Gaston, Jason D]

Please do not apply this patch.  The ICH6M SATA DID is all ready being used in the SATA ata_piix.c and ahci.c drivers.  Adding the ICH6M SATA DID to the PATA piix.c driver will conflict.  This patch would add the ICH6M SATA controller DID 0x2653 to the PATA piix.c driver.

Thanks,

Jason Gaston


> Message: 224
> Date: Sat, 02 Jul 2005 12:57:54 +0200
> From: Erik Slagter <erik@slagter.name>
> Subject: [PATCH] ich6m-pciid-piix.patch
> To: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,    Andrew
>         Morton <akpm@osdl.org>
> Message-ID: <1120301874.4300.35.camel@localhost.localdomain>
> Content-Type: text/plain; charset="us-ascii"
>
> Hi,
>
> I am not sure someone already did this one, but it doesn't seem to be in
> git nor mm at the moment.
>
> This adds ICH6M to the pci ids of the (standard) piix ide driver. This
> makes it possible to use the standard ide driver for this chipset and
> enable udma.
>
> The other way is to use the libata driver, but this has too many
> drawback for the moment (no hdparm/smart/atapi support, with
> patch/#define it does, but doesn't work for me and crashes). Also pata
> harddisks are assigned incorrectly sda device names.
>
> This look okay to me, having said this, I must admit I don't know ***
> from this source file ;-);-)
>
> Thx.
>
> diff -ur a/drivers/ide/pci/piix.c linux-2.6.12/drivers/ide/pci/piix.c
> --- a/drivers/ide/pci/piix.c    2005-06-17 21:48:29.000000000 +0200
> +++ b/drivers/ide/pci/piix.c    2005-07-02 12:37:43.000000000 +0200
> @@ -133,6 +133,7 @@
>                 case PCI_DEVICE_ID_INTEL_82801EB_11:
>                 case PCI_DEVICE_ID_INTEL_ESB_2:
>                 case PCI_DEVICE_ID_INTEL_ICH6_19:
> +               case PCI_DEVICE_ID_INTEL_ICH6_5:
>                 case PCI_DEVICE_ID_INTEL_ICH7_21:
>                 case PCI_DEVICE_ID_INTEL_ESB2_18:
>                         mode = 3;
> @@ -447,6 +448,7 @@
>                 case PCI_DEVICE_ID_INTEL_82801E_11:
>                 case PCI_DEVICE_ID_INTEL_ESB_2:
>                 case PCI_DEVICE_ID_INTEL_ICH6_19:
> +               case PCI_DEVICE_ID_INTEL_ICH6_5:
>                 case PCI_DEVICE_ID_INTEL_ICH7_21:
>                 case PCI_DEVICE_ID_INTEL_ESB2_18:
>                 {
> @@ -575,6 +577,7 @@
>         /* 21 */ DECLARE_PIIX_DEV("ICH7"),
>         /* 22 */ DECLARE_PIIX_DEV("ICH4"),
>         /* 23 */ DECLARE_PIIX_DEV("ESB2"),
> +       /* 24 */ DECLARE_PIIX_DEV("ICH6M"),
>  };
>
>  /**
> @@ -651,6 +654,7 @@
>         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID,
> PCI_ANY_ID, 0, 0, 21},
>         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_1, PCI_ANY_ID,
> PCI_ANY_ID, 0, 0, 22},
>         { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_18, PCI_ANY_ID,
> PCI_ANY_ID, 0, 0, 23},
> +       { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_5, PCI_ANY_ID,
> PCI_ANY_ID, 0, 0, 24},
>         { 0, },
>  };
>  MODULE_DEVICE_TABLE(pci, piix_pci_tbl);

RE: [PATCH] ich6m-pciid-piix.patch

[Erik Slagter]

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

[cc-ing to list now, sorry, forgot that]

On Sat, 2005-07-02 at 11:44 -0700, Gaston, Jason D wrote:
> Please do not apply this patch.  The ICH6M SATA DID is all ready being used in the SATA ata_piix.c and ahci.c drivers.  Adding the ICH6M SATA DID to the PATA piix.c driver will conflict.  This patch would add the ICH6M SATA controller DID 0x2653 to the PATA piix.c driver.

That why you either enable piix support from the standard ide driver xor
from libsata. The comments in the configure script even mention this
fact!

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

RE: [PATCH] ich6m-pciid-piix.patch

[Erik Slagter]

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

On Sat, 2005-07-02 at 17:23 -0700, Gaston, Jason D wrote:

>>> Please do not apply this patch.  The ICH6M SATA DID is all ready
>>> being used in the SATA ata_piix.c and ahci.c drivers.  Adding the
>>> ICH6M SATA DID to the PATA piix.c driver will conflict.  This patch
>>> would add the ICH6M >SATA controller DID 0x2653 to the PATA
>>> piix.c driver.

> > That's why you either enable piix support from the standard ide driver
> > xor from libsata. The comments in the configure script even mention this
> > fact!

> You need to have support for both at the same time if you want to run in
> enhanced mode and have full access to your PATA and SATA controllers and
> drives.

Hmmm. I guess this would be in the (imho unlikely) situation where you
have both PATA and SATA drives connected to the ICH6M.

I do see the problem, though. It's a "works for me(r)" solution ;-)

> I suggest you try to place your BIOS in Enhanced mode for the SATA/PATA
> controllers so that you have both the PATA and SATA DID's and
> controllers showing up.  Then your PATA drive will show up as an IDE
> device and use the piix driver.

Bzzzt! Nice theory, but in practise, MANY bioses (including mine) don't
offer the choice to put the controller in whatever mode. Add to that,
that if you only have pata drives attached, it doesn't make much sense
to drive it with libata.

I'd be happy to drive my ICH6M with libata, but it just doesn't work
well. No smart&hdparm (the corresponding patch freezes the kernel every
now and then) support, drives show up as scsi drives..., no atapi
(unless #defined, but also not yet bugfree).

Well anyway, this is just my $0.02 I guess it won't make it into the
kernel, but you never know how might be able to use it.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]