From a8551033e46380add6666995cefe65bfb5f1ef6b Mon Sep 17 00:00:00 2001
From: Arnd Hannemann <arnd@arndnet.de>
Date: Fri, 17 Aug 2012 10:11:15 +0200
Subject: [PATCH] --- yaml --- r: 322207 b: refs/heads/master c:
 1117c811a64d948c9f88ee80a0c7f35e9fea1d69 h: refs/heads/master i:   322205:
 21ab8eb247c4c04238746b39249ec2b97ed75cd5   322203:
 7ccaa9c29ad7cacee24484a3faea9fc5b8c12d54   322199:
 befa3f4add810b4d7e624fbdbf93a9e3a0348cd2   322191:
 4965b78fa19a49c8402097d44919eb82e6d3f22f   322175:
 f9653d49122fc215c2adc1be2c3681eed50d46d3 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/ata/pata_atiixp.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2423d3440937..37ac912a5848 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbb4ab43f82adf02c8b4d0d7e7b7e79d24204b05
+refs/heads/master: 1117c811a64d948c9f88ee80a0c7f35e9fea1d69
diff --git a/trunk/drivers/ata/pata_atiixp.c b/trunk/drivers/ata/pata_atiixp.c
index 361c75cea57b..24e51056ac26 100644
--- a/trunk/drivers/ata/pata_atiixp.c
+++ b/trunk/drivers/ata/pata_atiixp.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
+#include <linux/dmi.h>
 
 #define DRV_NAME "pata_atiixp"
 #define DRV_VERSION "0.4.6"
@@ -33,11 +34,26 @@ enum {
 	ATIIXP_IDE_UDMA_MODE 	= 0x56
 };
 
+static const struct dmi_system_id attixp_cable_override_dmi_table[] = {
+	{
+		/* Board has onboard PATA<->SATA converters */
+		.ident = "MSI E350DM-E33",
+		.matches = {
+			DMI_MATCH(DMI_BOARD_VENDOR, "MSI"),
+			DMI_MATCH(DMI_BOARD_NAME, "E350DM-E33(MS-7720)"),
+		},
+	},
+	{ }
+};
+
 static int atiixp_cable_detect(struct ata_port *ap)
 {
 	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 	u8 udma;
 
+	if (dmi_check_system(attixp_cable_override_dmi_table))
+		return ATA_CBL_PATA40_SHORT;
+
 	/* Hack from drivers/ide/pci. Really we want to know how to do the
 	   raw detection not play follow the bios mode guess */
 	pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ap->port_no, &udma);