Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

dmi: add support for exact DMI matches in addition to substring matching

Browse Source 
dmi_match() considers a substring match to be a successful match.  This is
not always sufficient to distinguish between DMI data for different
systems.  Add support for exact string matching using strcmp() in addition
to the substring matching using strstr().

The specific use case in the i915 driver is to allow us to use an exact
match for D510MO, without also incorrectly matching D510MOV:

  {
	.ident = "Intel D510MO",
	.matches = {
		DMI_MATCH(DMI_BOARD_VENDOR, "Intel"),
		DMI_EXACT_MATCH(DMI_BOARD_NAME, "D510MO"),
	},
  }

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Cc: <annndddrr@gmail.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Cornel Panceac <cpanceac@gmail.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jani Nikula 2013-07-03 15:05:02 -07:00 committed by Linus Torvalds
parent 45c64940c8
commit 5017b28513
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/firmware/dmi_scan.c
View File

@ -551,9 +551,15 @@ static bool dmi_matches(const struct dmi_system_id *dmi)
int s = dmi->matches[i].slot; int s = dmi->matches[i].slot;
if (s == DMI_NONE) if (s == DMI_NONE)
break; break;
if (dmi_ident[s] if (dmi_ident[s]) {
&& strstr(dmi_ident[s], dmi->matches[i].substr)) if (!dmi->matches[i].exact_match &&
continue; strstr(dmi_ident[s], dmi->matches[i].substr))
continue;
else if (dmi->matches[i].exact_match &&
!strcmp(dmi_ident[s], dmi->matches[i].substr))
continue;
}
/* No match */ /* No match */
return false; return false;
} }

6
include/linux/mod_devicetable.h
View File

@ -456,7 +456,8 @@ enum dmi_field {
}; };
struct dmi_strmatch { struct dmi_strmatch {
unsigned char slot; unsigned char slot:7;
unsigned char exact_match:1;
char substr[79]; char substr[79];
}; };
@ -474,7 +475,8 @@ struct dmi_system_id {
*/ */
#define dmi_device_id dmi_system_id #define dmi_device_id dmi_system_id
#define DMI_MATCH(a, b) { a, b } #define DMI_MATCH(a, b) { .slot = a, .substr = b }
#define DMI_EXACT_MATCH(a, b) { .slot = a, .substr = b, .exact_match = 1 }
#define PLATFORM_NAME_SIZE 20 #define PLATFORM_NAME_SIZE 20
#define PLATFORM_MODULE_PREFIX "platform:" #define PLATFORM_MODULE_PREFIX "platform:"