From 614e81b8cdb100aa9481bc10891aa7ae44967ddb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 9 Apr 2013 15:51:07 -0700 Subject: [PATCH] 3.8-stable patches added patches: ata_piix-fix-dvd-not-dectected-at-some-haswell-platforms.patch --- ...-dectected-at-some-haswell-platforms.patch | 75 +++++++++++++++++++ queue-3.8/series | 1 + 2 files changed, 76 insertions(+) create mode 100644 queue-3.8/ata_piix-fix-dvd-not-dectected-at-some-haswell-platforms.patch diff --git a/queue-3.8/ata_piix-fix-dvd-not-dectected-at-some-haswell-platforms.patch b/queue-3.8/ata_piix-fix-dvd-not-dectected-at-some-haswell-platforms.patch new file mode 100644 index 00000000000..d8ebc97ae31 --- /dev/null +++ b/queue-3.8/ata_piix-fix-dvd-not-dectected-at-some-haswell-platforms.patch @@ -0,0 +1,75 @@ +From b55f84e2d527182e7c611d466cd0bb6ddce201de Mon Sep 17 00:00:00 2001 +From: Youquan Song +Date: Wed, 6 Mar 2013 10:49:05 -0500 +Subject: ata_piix: Fix DVD not dectected at some Haswell platforms + +From: Youquan Song + +commit b55f84e2d527182e7c611d466cd0bb6ddce201de upstream. + +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 +Signed-off-by: Youquan Song +Signed-off-by: Jeff Garzik +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/ata/ata_piix.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +--- 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 { +@@ -304,7 +305,7 @@ static const struct pci_device_id piix_p + /* 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) */ +@@ -439,6 +440,7 @@ static const struct piix_map_db *piix_ma + [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 pci_bits piix_enable_bits[] = { +@@ -1240,6 +1242,16 @@ static struct ata_port_info piix_port_in + .pio_mask = ATA_PIO4, + .mwdma_mask = ATA_MWDMA2, + .udma_mask = ATA_UDMA6, ++ .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, + }, + }; diff --git a/queue-3.8/series b/queue-3.8/series index 92306ae3693..d6fc6900ab9 100644 --- a/queue-3.8/series +++ b/queue-3.8/series @@ -28,3 +28,4 @@ mips-unbreak-function-tracer-for-64-bit-kernel.patch alpha-add-irongate_io-to-pci-bus-resources.patch pci-acpi-always-resume-devices-on-acpi-wakeup-notifications.patch pci-pm-disable-runtime-pm-of-pcie-ports.patch +ata_piix-fix-dvd-not-dectected-at-some-haswell-platforms.patch -- 2.47.3