Patchwork [Quantal,1/1] ata_piix: Fix DVD not dectected at some Haswell platforms

login
register
mail settings
Submitter Leann Ogasawara
Date April 19, 2013, 7:55 p.m.
Message ID <79a51d93465fad01c9758c2d4ee9dbda00d17cf6.1366400447.git.leann.ogasawara@canonical.com>
Download mbox | patch
Permalink /patch/238096/
State New
Headers show

Comments

Leann Ogasawara - April 19, 2013, 7:55 p.m.
From: Youquan Song <youquan.song@intel.com>

BugLink: http://bugs.launchpad.net/bugs/1170797

There is a quirk patch 5e5a4f5d5a08c9c504fe956391ac3dae2c66556d
"ata_piix: make DVD Drive recognisable on systems with Intel Sandybridge
 chipsets(v2)" fixing the 4 ports IDE controller 32bit PIO mode.

We've hit a problem with DVD not recognized on Haswell Desktop platform which
includes Lynx Point 2-port SATA controller.

This quirk patch disables 32bit PIO on this controller in IDE mode.

v2: Change spelling error in statememnt pointed by Sergei Shtylyov.
v3: Change comment statememnt and spliting line over 80 characters pointed by
    Libor Pechacek and also rebase the patch against 3.8-rc7 kernel.

Tested-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Youquan Song <youquan.song@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
(backported from commit b55f84e2d527182e7c611d466cd0bb6ddce201de)

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 drivers/ata/ata_piix.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
Tim Gardner - April 19, 2013, 8 p.m.

Colin King - April 21, 2013, 4:39 p.m.
On 19/04/13 20:55, leann.ogasawara@canonical.com wrote:
> From: Youquan Song <youquan.song@intel.com>
>
> BugLink: http://bugs.launchpad.net/bugs/1170797
>
> There is a quirk patch 5e5a4f5d5a08c9c504fe956391ac3dae2c66556d
> "ata_piix: make DVD Drive recognisable on systems with Intel Sandybridge
>   chipsets(v2)" fixing the 4 ports IDE controller 32bit PIO mode.
>
> We've hit a problem with DVD not recognized on Haswell Desktop platform which
> includes Lynx Point 2-port SATA controller.
>
> This quirk patch disables 32bit PIO on this controller in IDE mode.
>
> v2: Change spelling error in statememnt pointed by Sergei Shtylyov.
> v3: Change comment statememnt and spliting line over 80 characters pointed by
>      Libor Pechacek and also rebase the patch against 3.8-rc7 kernel.
>
> Tested-by: Lee, Chun-Yi <jlee@suse.com>
> Signed-off-by: Youquan Song <youquan.song@intel.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
> (backported from commit b55f84e2d527182e7c611d466cd0bb6ddce201de)
>
> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> ---
>   drivers/ata/ata_piix.c | 13 ++++++++++++-
>   1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
> index 396ff46..747f177 100644
> --- a/drivers/ata/ata_piix.c
> +++ b/drivers/ata/ata_piix.c
> @@ -150,6 +150,7 @@ enum piix_controller_ids {
>   	tolapai_sata,
>   	piix_pata_vmw,			/* PIIX4 for VMware, spurious DMA_ERR */
>   	ich8_sata_snb,
> +	ich8_2port_sata_snb,
>   };
>
>   struct piix_map_db {
> @@ -326,7 +327,7 @@ static const struct pci_device_id piix_pci_tbl[] = {
>   	/* SATA Controller IDE (Lynx Point) */
>   	{ 0x8086, 0x8c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
>   	/* SATA Controller IDE (Lynx Point) */
> -	{ 0x8086, 0x8c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
> +	{ 0x8086, 0x8c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
>   	/* SATA Controller IDE (Lynx Point) */
>   	{ 0x8086, 0x8c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
>   	/* SATA Controller IDE (Lynx Point-LP) */
> @@ -519,6 +520,7 @@ static const struct piix_map_db *piix_map_db_table[] = {
>   	[ich8m_apple_sata]	= &ich8m_apple_map_db,
>   	[tolapai_sata]		= &tolapai_map_db,
>   	[ich8_sata_snb]		= &ich8_map_db,
> +	[ich8_2port_sata_snb]	= &ich8_2port_map_db,
>   };
>
>   static struct ata_port_info piix_port_info[] = {
> @@ -660,6 +662,15 @@ static struct ata_port_info piix_port_info[] = {
>   		.port_ops	= &piix_sata_ops,
>   	},
>
> +	[ich8_2port_sata_snb] =
> +	{
> +		.flags		= PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR
> +					| PIIX_FLAG_PIO16,
> +		.pio_mask	= ATA_PIO4,
> +		.mwdma_mask	= ATA_MWDMA2,
> +		.udma_mask	= ATA_UDMA6,
> +		.port_ops	= &piix_sata_ops,
> +	},
>   };
>
>   static struct pci_bits piix_enable_bits[] = {
>
Affects specified H/W, so looks OK to me.

Acked-by: Colin Ian King <colin.king@canonical.com>
Tim Gardner - April 22, 2013, 11:58 a.m.

Patch

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 396ff46..747f177 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -150,6 +150,7 @@  enum piix_controller_ids {
 	tolapai_sata,
 	piix_pata_vmw,			/* PIIX4 for VMware, spurious DMA_ERR */
 	ich8_sata_snb,
+	ich8_2port_sata_snb,
 };
 
 struct piix_map_db {
@@ -326,7 +327,7 @@  static const struct pci_device_id piix_pci_tbl[] = {
 	/* SATA Controller IDE (Lynx Point) */
 	{ 0x8086, 0x8c01, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
 	/* SATA Controller IDE (Lynx Point) */
-	{ 0x8086, 0x8c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+	{ 0x8086, 0x8c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
 	/* SATA Controller IDE (Lynx Point) */
 	{ 0x8086, 0x8c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
 	/* SATA Controller IDE (Lynx Point-LP) */
@@ -519,6 +520,7 @@  static const struct piix_map_db *piix_map_db_table[] = {
 	[ich8m_apple_sata]	= &ich8m_apple_map_db,
 	[tolapai_sata]		= &tolapai_map_db,
 	[ich8_sata_snb]		= &ich8_map_db,
+	[ich8_2port_sata_snb]	= &ich8_2port_map_db,
 };
 
 static struct ata_port_info piix_port_info[] = {
@@ -660,6 +662,15 @@  static struct ata_port_info piix_port_info[] = {
 		.port_ops	= &piix_sata_ops,
 	},
 
+	[ich8_2port_sata_snb] =
+	{
+		.flags		= PIIX_SATA_FLAGS | PIIX_FLAG_SIDPR
+					| PIIX_FLAG_PIO16,
+		.pio_mask	= ATA_PIO4,
+		.mwdma_mask	= ATA_MWDMA2,
+		.udma_mask	= ATA_UDMA6,
+		.port_ops	= &piix_sata_ops,
+	},
 };
 
 static struct pci_bits piix_enable_bits[] = {