2012-06-25 13:07:20

by Takashi Iwai

[permalink] [raw]
Subject: [PATCH] intel_ips: blacklist HP ProBook laptops

intel_ips driver spews the warning message
"ME failed to update for more than 1s, likely hung"
at each second endlessly on HP ProBook laptops with IronLake.

As this has never worked, better to blacklist the driver for now.

Cc: <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
---
drivers/platform/x86/intel_ips.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index 0ffdb3c..9af4257 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -72,6 +72,7 @@
#include <linux/string.h>
#include <linux/tick.h>
#include <linux/timer.h>
+#include <linux/dmi.h>
#include <drm/i915_drm.h>
#include <asm/msr.h>
#include <asm/processor.h>
@@ -1485,6 +1486,24 @@ static DEFINE_PCI_DEVICE_TABLE(ips_id_table) = {

MODULE_DEVICE_TABLE(pci, ips_id_table);

+static int ips_blacklist_callback(const struct dmi_system_id *id)
+{
+ pr_info("Blacklisted intel_ips for %s\n", id->ident);
+ return 1;
+}
+
+static const struct dmi_system_id ips_blacklist[] = {
+ {
+ .callback = ips_blacklist_callback,
+ .ident = "HP ProBook",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "HP ProBook"),
+ },
+ },
+ { } /* terminating entry */
+};
+
static int ips_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
u64 platform_info;
@@ -1494,6 +1513,9 @@ static int ips_probe(struct pci_dev *dev, const struct pci_device_id *id)
u16 htshi, trc, trc_required_mask;
u8 tse;

+ if (dmi_check_system(ips_blacklist))
+ return -ENODEV;
+
ips = kzalloc(sizeof(struct ips_driver), GFP_KERNEL);
if (!ips)
return -ENOMEM;
--
1.7.10.4


2012-06-25 16:15:24

by Jesse Barnes

[permalink] [raw]
Subject: Re: [PATCH] intel_ips: blacklist HP ProBook laptops

On Mon, 25 Jun 2012 15:07:17 +0200
Takashi Iwai <[email protected]> wrote:

> intel_ips driver spews the warning message
> "ME failed to update for more than 1s, likely hung"
> at each second endlessly on HP ProBook laptops with IronLake.
>
> As this has never worked, better to blacklist the driver for now.

Sounds like this ME doesn't support the feature. It would be nice to
have a better way of detecting this, but unless we hear a bunch more
noise like this a one off is fine with me.

Acked-by: Jesse Barnes <[email protected]>

2012-06-26 18:39:33

by Matthew Garrett

[permalink] [raw]
Subject: Re: [PATCH] intel_ips: blacklist HP ProBook laptops

Applied, thanks.

--
Matthew Garrett | [email protected]