From: Hans de Goede <hdegoede@redhat.com>
To: Adrian Hunter <adrian.hunter@intel.com>,
Ulf Hansson <ulf.hansson@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>, Takashi Iwai <tiwai@suse.de>,
linux-mmc@vger.kernel.org
Subject: [PATCH v2 3/3] mmc: sdhci-acpi: Add DMI fix_up_power_blacklist
Date: Wed, 5 Apr 2017 15:00:07 +0200 [thread overview]
Message-ID: <20170405130007.5826-3-hdegoede@redhat.com> (raw)
In-Reply-To: <20170405130007.5826-1-hdegoede@redhat.com>
Add a DMI based blacklist for systems where calling
acpi_device_fix_up_power() is harmful.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
-Adjust for changes in mmc: sdhci-acpi: Add fix_up_power_blacklist module option
-Only use a single fix_up_power_dmi_blacklist for the GPDwin further testing
has shown that the DMI strings are unique enough that we do not need the
bios-date in there
---
drivers/mmc/host/sdhci-acpi.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index 5a73174..ba9e688 100644
--- a/drivers/mmc/host/sdhci-acpi.c
+++ b/drivers/mmc/host/sdhci-acpi.c
@@ -36,6 +36,7 @@
#include <linux/pm.h>
#include <linux/pm_runtime.h>
#include <linux/delay.h>
+#include <linux/dmi.h>
#include <linux/mmc/host.h>
#include <linux/mmc/pm.h>
@@ -384,6 +385,27 @@ static const struct acpi_device_id sdhci_acpi_ids[] = {
};
MODULE_DEVICE_TABLE(acpi, sdhci_acpi_ids);
+static const struct dmi_system_id fix_up_power_dmi_blacklist[] = {
+ {
+ /*
+ * Match for the GPDwin which unfortunately uses somewhat
+ * generic dmi strings, which is why we test for 4 strings.
+ * Comparing against 15 other byt/cht boards, board_vendor
+ * and board_name are unique to the GPDwin, where as only one
+ * other board has the same board_serial and 2 others have
+ * the same default product_name.
+ */
+ .driver_data = "80860F14:2",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
+ DMI_MATCH(DMI_BOARD_NAME, "Default string"),
+ DMI_MATCH(DMI_BOARD_SERIAL, "Default string"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),
+ },
+ },
+ { }
+};
+
static const struct sdhci_acpi_slot *sdhci_acpi_get_slot(const char *hid,
const char *uid)
{
@@ -407,6 +429,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
const char *fix_up_power_bl = fix_up_power_blacklist;
bool fix_up_power = true;
struct acpi_device *device, *child;
+ const struct dmi_system_id *dmi_id;
struct sdhci_acpi_host *c;
struct sdhci_host *host;
struct resource *iomem;
@@ -421,6 +444,12 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
hid = acpi_device_hid(device);
uid = device->pnp.unique_id;
+ if (!fix_up_power_bl) {
+ dmi_id = dmi_first_match(fix_up_power_dmi_blacklist);
+ if (dmi_id)
+ fix_up_power_bl = dmi_id->driver_data;
+ }
+
if (sdhci_acpi_compare_hid_uid(fix_up_power_bl, hid, uid))
fix_up_power = false;
--
2.9.3
next prev parent reply other threads:[~2017-04-05 13:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-05 13:00 [PATCH v2 1/3] mmc: sdhci-acpi: Remove unneeded acpi_bus_get_status() call Hans de Goede
2017-04-05 13:00 ` [PATCH v2 2/3] mmc: sdhci-acpi: Add fix_up_power_blacklist module option Hans de Goede
2017-04-12 13:07 ` Adrian Hunter
2017-04-12 13:26 ` Hans de Goede
2017-04-05 13:00 ` Hans de Goede [this message]
2017-04-12 13:16 ` [PATCH v2 3/3] mmc: sdhci-acpi: Add DMI fix_up_power_blacklist Adrian Hunter
2017-04-12 13:45 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170405130007.5826-3-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=linux-mmc@vger.kernel.org \
--cc=tiwai@suse.de \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox