Patchwork [1/1] ata_piix: IDE mode SATA patch for Intel ICH10 DeviceID's

login
register
mail settings
Submitter Andy Whitcroft
Date Dec. 22, 2010, 2:43 p.m.
Message ID <1293029012-31937-2-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/76414/
State Accepted
Headers show

Comments

Andy Whitcroft - Dec. 22, 2010, 2:43 p.m.
From: Jason Gaston <jason.d.gaston@intel.com>

This patch adds the Intel ICH10 IDE mode SATA Controller DeviceID's.

Signed-off-by:  Jason Gaston <jason.d.gaston@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

(cherry-picked from bf7f22b9cac74a1e3d8b8e77350db2baca2c35be upstream)
BugLink: http://bugs.launchpad.net/bugs/693401
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 drivers/ata/ata_piix.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
Tim Gardner - Dec. 22, 2010, 2:52 p.m.
On 12/22/2010 07:43 AM, Andy Whitcroft wrote:
> From: Jason Gaston<jason.d.gaston@intel.com>
>
> This patch adds the Intel ICH10 IDE mode SATA Controller DeviceID's.
>
> Signed-off-by:  Jason Gaston<jason.d.gaston@intel.com>
> Signed-off-by: Jeff Garzik<jeff@garzik.org>
>
> (cherry-picked from bf7f22b9cac74a1e3d8b8e77350db2baca2c35be upstream)
> BugLink: http://bugs.launchpad.net/bugs/693401
> Signed-off-by: Andy Whitcroft<apw@canonical.com>
> ---
>   drivers/ata/ata_piix.c |    8 ++++++++
>   1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
> index 4d769b8..9746b64 100644
> --- a/drivers/ata/ata_piix.c
> +++ b/drivers/ata/ata_piix.c
> @@ -263,6 +263,14 @@ static const struct pci_device_id piix_pci_tbl[] = {
>   	{ 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
>   	/* SATA Controller IDE (Tolapai) */
>   	{ 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
>
>   	{ }	/* terminate list */
>   };

Acked-by: Tim Gardner <tim.gardner@canonical.com>
Stefan Bader - Jan. 3, 2011, 9:40 a.m.
On 12/22/2010 03:43 PM, Andy Whitcroft wrote:

Only adding definitions to an existing table. Regression for working hardware
not to be expected.

> From: Jason Gaston <jason.d.gaston@intel.com>
> 
> This patch adds the Intel ICH10 IDE mode SATA Controller DeviceID's.
> 
> Signed-off-by:  Jason Gaston <jason.d.gaston@intel.com>
> Signed-off-by: Jeff Garzik <jeff@garzik.org>
> 
> (cherry-picked from bf7f22b9cac74a1e3d8b8e77350db2baca2c35be upstream)
> BugLink: http://bugs.launchpad.net/bugs/693401
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  drivers/ata/ata_piix.c |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
> index 4d769b8..9746b64 100644
> --- a/drivers/ata/ata_piix.c
> +++ b/drivers/ata/ata_piix.c
> @@ -263,6 +263,14 @@ static const struct pci_device_id piix_pci_tbl[] = {
>  	{ 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
>  	/* SATA Controller IDE (Tolapai) */
>  	{ 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
>  
>  	{ }	/* terminate list */
>  };
Stefan Bader - Jan. 3, 2011, 3:47 p.m.
Applied to master-next in Hardy. Waiting for test build to finish before pushing.
Brad Figg - Jan. 10, 2011, 9:11 p.m.
On 12/22/2010 08:43 AM, Andy Whitcroft wrote:
> From: Jason Gaston<jason.d.gaston@intel.com>
>
> This patch adds the Intel ICH10 IDE mode SATA Controller DeviceID's.
>
> Signed-off-by:  Jason Gaston<jason.d.gaston@intel.com>
> Signed-off-by: Jeff Garzik<jeff@garzik.org>
>
> (cherry-picked from bf7f22b9cac74a1e3d8b8e77350db2baca2c35be upstream)
> BugLink: http://bugs.launchpad.net/bugs/693401
> Signed-off-by: Andy Whitcroft<apw@canonical.com>
> ---
>   drivers/ata/ata_piix.c |    8 ++++++++
>   1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
> index 4d769b8..9746b64 100644
> --- a/drivers/ata/ata_piix.c
> +++ b/drivers/ata/ata_piix.c
> @@ -263,6 +263,14 @@ static const struct pci_device_id piix_pci_tbl[] = {
>   	{ 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
>   	/* SATA Controller IDE (Tolapai) */
>   	{ 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
> +	/* SATA Controller IDE (ICH10) */
> +	{ 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
>
>   	{ }	/* terminate list */
>   };

Acked-by: Brad Figg<brad.figg@canonical.com>
Steve Conklin - Jan. 11, 2011, 2:07 p.m.
On Mon, 2011-01-10 at 15:11 -0600, Brad Figg wrote:
> On 12/22/2010 08:43 AM, Andy Whitcroft wrote:
> > From: Jason Gaston<jason.d.gaston@intel.com>
> >
> > This patch adds the Intel ICH10 IDE mode SATA Controller DeviceID's.
> >
> > Signed-off-by:  Jason Gaston<jason.d.gaston@intel.com>
> > Signed-off-by: Jeff Garzik<jeff@garzik.org>
> >
> > (cherry-picked from bf7f22b9cac74a1e3d8b8e77350db2baca2c35be upstream)
> > BugLink: http://bugs.launchpad.net/bugs/693401
> > Signed-off-by: Andy Whitcroft<apw@canonical.com>
> > ---
> >   drivers/ata/ata_piix.c |    8 ++++++++
> >   1 files changed, 8 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
> > index 4d769b8..9746b64 100644
> > --- a/drivers/ata/ata_piix.c
> > +++ b/drivers/ata/ata_piix.c
> > @@ -263,6 +263,14 @@ static const struct pci_device_id piix_pci_tbl[] = {
> >   	{ 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
> >   	/* SATA Controller IDE (Tolapai) */
> >   	{ 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci },
> > +	/* SATA Controller IDE (ICH10) */
> > +	{ 0x8086, 0x3a00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
> > +	/* SATA Controller IDE (ICH10) */
> > +	{ 0x8086, 0x3a06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
> > +	/* SATA Controller IDE (ICH10) */
> > +	{ 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
> > +	/* SATA Controller IDE (ICH10) */
> > +	{ 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
> >
> >   	{ }	/* terminate list */
> >   };
> 
> Acked-by: Brad Figg<brad.figg@canonical.com>

Acked-by: Steve Conklin<sconklin@canonical.com>

Patch

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 4d769b8..9746b64 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -263,6 +263,14 @@  static const struct pci_device_id piix_pci_tbl[] = {
 	{ 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
 	/* SATA Controller IDE (Tolapai) */
 	{ 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci },
+	/* SATA Controller IDE (ICH10) */
+	{ 0x8086, 0x3a00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
+	/* SATA Controller IDE (ICH10) */
+	{ 0x8086, 0x3a06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+	/* SATA Controller IDE (ICH10) */
+	{ 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
+	/* SATA Controller IDE (ICH10) */
+	{ 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
 
 	{ }	/* terminate list */
 };