firmware: dmi_scan: Add DMI_OEM_STRING support to dmi_matches

OEM strings are defined by each OEM and they contain customized and
useful OEM information. Supporting it provides more flexible uses of
the dmi_matches function.

Signed-off-by: Alex Hung <alex.hung@canonical.com>
Signed-off-by: Jean Delvare <jdelvare@suse.de>

diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index c3be8ef9243f60c81f0a03cb2a6d18524b4de291..2c915a8471580585ab3b1b771c17b98da3acb30b 100644 (file)
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -775,7 +775,15 @@ static bool dmi_matches(const struct dmi_system_id *dmi)
                int s = dmi->matches[i].slot;
                if (s == DMI_NONE)
                        break;
-               if (dmi_ident[s]) {
+               if (s == DMI_OEM_STRING) {
+                       /* DMI_OEM_STRING must be exact match */
+                       const struct dmi_device *valid;
+
+                       valid = dmi_find_device(DMI_DEV_TYPE_OEM_STRING,
+                                               dmi->matches[i].substr, NULL);
+                       if (valid)
+                               continue;
+               } else if (dmi_ident[s]) {
                        if (dmi->matches[i].exact_match) {
                                if (!strcmp(dmi_ident[s],
                                            dmi->matches[i].substr))

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 48fb2b43c35aad6012089f45e88c514de3d2c4f3..7d361be2e24f4f428a1167efe04f79ebe0a3fde5 100644 (file)
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -502,6 +502,7 @@ enum dmi_field {
        DMI_CHASSIS_SERIAL,
        DMI_CHASSIS_ASSET_TAG,
        DMI_STRING_MAX,
+       DMI_OEM_STRING, /* special case - will not be in dmi_ident */
 };
 
 struct dmi_strmatch {