Commit c5cf0ffa authored by Jason Gaston's avatar Jason Gaston Committed by Jeff Garzik
Browse files

ata_piix: IDE mode SATA patch for Intel Tolapai 



Resend trying to remove 8-bit characters in the email.

This patch adds the Intel Tolapai IDE mode SATA controller DID's.

Signed-off-by: default avatarJason Gaston <jason.d.gaston@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 18b2466c

drivers/ata/ata_piix.c

+27 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ enum { 
	ich6m_sata_ahci		= 8,

	ich8_sata_ahci		= 9,

	piix_pata_mwdma		= 10,	/* PIIX3 MWDMA only */

	tolapai_sata_ahci	= 11,



	/* constants for mapping table */

	P0			= 0,  /* port 0 */
@@ -253,6 +254,8 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },

	/* SATA Controller IDE (ICH9M) */

	{ 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 },



	{ }	/* terminate list */

};
@@ -441,12 +444,25 @@ static const struct piix_map_db ich8_map_db = { 
	},

};



static const struct piix_map_db tolapai_map_db = {

        .mask = 0x3,

        .port_enable = 0x3,

        .map = {

                /* PM   PS   SM   SS       MAP */

                {  P0,  NA,  P1,  NA }, /* 00b */

                {  RV,  RV,  RV,  RV }, /* 01b */

                {  RV,  RV,  RV,  RV }, /* 10b */

                {  RV,  RV,  RV,  RV },

        },

};



static const struct piix_map_db *piix_map_db_table[] = {

	[ich5_sata]		= &ich5_map_db,

	[ich6_sata]		= &ich6_map_db,

	[ich6_sata_ahci]	= &ich6_map_db,

	[ich6m_sata_ahci]	= &ich6m_map_db,

	[ich8_sata_ahci]	= &ich8_map_db,

	[tolapai_sata_ahci]	= &tolapai_map_db,

};



static struct ata_port_info piix_port_info[] = {
@@ -560,6 +576,17 @@ static struct ata_port_info piix_port_info[] = { 
		.mwdma_mask	= 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */

		.port_ops	= &piix_pata_ops,

	},



	/* tolapai_sata_ahci: 11: */

	{

		.sht		= &piix_sht,

		.flags		= PIIX_SATA_FLAGS | PIIX_FLAG_SCR |

				  PIIX_FLAG_AHCI,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0x07, /* mwdma0-2 */

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &piix_sata_ops,

	},

};



static struct pci_bits piix_enable_bits[] = {