From cfe2e180caa194da294b13b64f2478e4c82e6ba2 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Mon, 6 Aug 2012 15:23:55 +0300
Subject: [PATCH] --- yaml --- r: 324303 b: refs/heads/master c:
 9a123f19832702753805afe0e93db26799b91b07 h: refs/heads/master i:   324301:
 27fdf75f32818bf2174b460e4e25b30d40d07003   324299:
 dbbea79188b6b122d03742c02756785186ae3569   324295:
 12bd6465a9e488b69f74c84ee9e203d5d29e6549   324287:
 901c993e8d23bee55176756b2a22f263e49f8ace v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/misc/mei/main.c | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 91f17ac2f163..693fdd075aee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07b509b7943e5594f3f228e5b62a49cf6a033709
+refs/heads/master: 9a123f19832702753805afe0e93db26799b91b07
diff --git a/trunk/drivers/misc/mei/main.c b/trunk/drivers/misc/mei/main.c
index b0903bd44bf7..86b73e596263 100644
--- a/trunk/drivers/misc/mei/main.c
+++ b/trunk/drivers/misc/mei/main.c
@@ -905,6 +905,27 @@ static struct miscdevice  mei_misc_device = {
 		.minor = MISC_DYNAMIC_MINOR,
 };
 
+/**
+ * mei_quirk_probe - probe for devices that doesn't valid ME interface
+ * @pdev: PCI device structure
+ * @ent: entry into pci_device_table
+ *
+ * returns true if ME Interface is valid, false otherwise
+ */
+static bool __devinit mei_quirk_probe(struct pci_dev *pdev,
+				const struct pci_device_id *ent)
+{
+	u32 reg;
+	if (ent->device == MEI_DEV_ID_PBG_1) {
+		pci_read_config_dword(pdev, 0x48, &reg);
+		/* make sure that bit 9 is up and bit 10 is down */
+		if ((reg & 0x600) == 0x200) {
+			dev_info(&pdev->dev, "Device doesn't have valid ME Interface\n");
+			return false;
+		}
+	}
+	return true;
+}
 /**
  * mei_probe - Device Initialization Routine
  *
@@ -920,6 +941,12 @@ static int __devinit mei_probe(struct pci_dev *pdev,
 	int err;
 
 	mutex_lock(&mei_mutex);
+
+	if (!mei_quirk_probe(pdev, ent)) {
+		err = -ENODEV;
+		goto end;
+	}
+
 	if (mei_device) {
 		err = -EEXIST;
 		goto end;