From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 5/9] x86/quirks: Convert DMI matching to use a table
Date: Mon, 20 Jan 2020 18:07:57 +0200 [thread overview]
Message-ID: <20200120160801.53089-6-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200120160801.53089-1-andriy.shevchenko@linux.intel.com>
In order to extend the DMI based quirks, convert them to a table.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/kernel/quirks.c | 33 +++++++++++++++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 6c122f35508a..78846a8dc88b 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -658,8 +658,37 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2083, quirk_intel_purley_xeon_ras
bool x86_apple_machine;
EXPORT_SYMBOL(x86_apple_machine);
+static const struct dmi_system_id x86_machine_table[] __initconst = {
+ {
+ .ident = "x86 Apple Macintosh",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+ },
+ .driver_data = &x86_apple_machine,
+ },
+ {
+ .ident = "x86 Apple Macintosh",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Apple Computer, Inc."),
+ },
+ .driver_data = &x86_apple_machine,
+ },
+ {}
+};
+
+static void __init early_platfrom_detect_quirk(void)
+{
+ const struct dmi_system_id *id;
+
+ id = dmi_first_match(x86_machine_table);
+ if (!id)
+ return;
+
+ printk(KERN_DEBUG "Detected %s platform\n", id->ident);
+ *((bool *)id->driver_data) = true;
+}
+
void __init early_platform_quirks(void)
{
- x86_apple_machine = dmi_match(DMI_SYS_VENDOR, "Apple Inc.") ||
- dmi_match(DMI_SYS_VENDOR, "Apple Computer, Inc.");
+ early_platfrom_detect_quirk();
}
--
2.24.1
next prev parent reply other threads:[~2020-01-20 16:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 16:07 [PATCH v2 0/9] x86: Easy way of detecting MS Surface 3 Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 1/9] x86/platform: Rename x86/apple.h -> x86/machine.h Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 2/9] x86/quirks: Add missed include to satisfy static checker Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 3/9] x86/quirks: Introduce hpet_dev_print_force_hpet_address() helper Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 4/9] x86/quirks: Join string literals back Andy Shevchenko
2020-01-20 16:07 ` Andy Shevchenko [this message]
2020-01-21 11:51 ` [PATCH v2 5/9] x86/quirks: Convert DMI matching to use a table Jonathan McDowell
2020-01-21 15:20 ` Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 6/9] x86/quirks: Add a DMI quirk for Microsoft Surface 3 Andy Shevchenko
2020-01-20 16:07 ` [PATCH v2 7/9] platform/x86: surface3_wmi: Switch DMI table match to a test of variable Andy Shevchenko
2020-01-20 16:08 ` [PATCH v2 8/9] ASoC: rt5645: " Andy Shevchenko
2020-01-20 17:46 ` Mark Brown
2020-01-20 16:08 ` [PATCH v2 9/9] ASoC: Intel: " Andy Shevchenko
2020-01-20 17:55 ` Mark Brown
2020-01-21 15:20 ` Andy Shevchenko
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=20200120160801.53089-6-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bp@alien8.de \
--cc=broonie@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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;
as well as URLs for NNTP newsgroup(s).