diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2015-09-10 03:18:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-20 22:30:10 -0400 |
| commit | b26864cad1c9f66f4966726ba7bc81d2b9b8f990 (patch) | |
| tree | 544ef475f227b687056807d396677c124217824a /scripts/mod | |
| parent | 40b7320ee413d0d1cc89c32c2a757fda56d27708 (diff) | |
mei: bus: add client protocol version to the device alias
The device alias now looks like mei:S:uuid:N:*
In that way we can bind different drivers to clients with
different protocol versions if required.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/mod')
| -rw-r--r-- | scripts/mod/devicetable-offsets.c | 1 | ||||
| -rw-r--r-- | scripts/mod/file2alias.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c index e70fcd12eeeb..5a6edacc85d9 100644 --- a/scripts/mod/devicetable-offsets.c +++ b/scripts/mod/devicetable-offsets.c | |||
| @@ -185,6 +185,7 @@ int main(void) | |||
| 185 | DEVID(mei_cl_device_id); | 185 | DEVID(mei_cl_device_id); |
| 186 | DEVID_FIELD(mei_cl_device_id, name); | 186 | DEVID_FIELD(mei_cl_device_id, name); |
| 187 | DEVID_FIELD(mei_cl_device_id, uuid); | 187 | DEVID_FIELD(mei_cl_device_id, uuid); |
| 188 | DEVID_FIELD(mei_cl_device_id, version); | ||
| 188 | 189 | ||
| 189 | DEVID(rio_device_id); | 190 | DEVID(rio_device_id); |
| 190 | DEVID_FIELD(rio_device_id, did); | 191 | DEVID_FIELD(rio_device_id, did); |
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index fa79d113f34c..9bc2cfe0ee37 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
| @@ -1202,16 +1202,18 @@ static int do_cpu_entry(const char *filename, void *symval, char *alias) | |||
| 1202 | } | 1202 | } |
| 1203 | ADD_TO_DEVTABLE("cpu", cpu_feature, do_cpu_entry); | 1203 | ADD_TO_DEVTABLE("cpu", cpu_feature, do_cpu_entry); |
| 1204 | 1204 | ||
| 1205 | /* Looks like: mei:S:uuid */ | 1205 | /* Looks like: mei:S:uuid:N:* */ |
| 1206 | static int do_mei_entry(const char *filename, void *symval, | 1206 | static int do_mei_entry(const char *filename, void *symval, |
| 1207 | char *alias) | 1207 | char *alias) |
| 1208 | { | 1208 | { |
| 1209 | DEF_FIELD_ADDR(symval, mei_cl_device_id, name); | 1209 | DEF_FIELD_ADDR(symval, mei_cl_device_id, name); |
| 1210 | DEF_FIELD_ADDR(symval, mei_cl_device_id, uuid); | 1210 | DEF_FIELD_ADDR(symval, mei_cl_device_id, uuid); |
| 1211 | DEF_FIELD(symval, mei_cl_device_id, version); | ||
| 1211 | 1212 | ||
| 1212 | sprintf(alias, MEI_CL_MODULE_PREFIX); | 1213 | sprintf(alias, MEI_CL_MODULE_PREFIX); |
| 1213 | sprintf(alias + strlen(alias), "%s:", (*name)[0] ? *name : "*"); | 1214 | sprintf(alias + strlen(alias), "%s:", (*name)[0] ? *name : "*"); |
| 1214 | add_uuid(alias, *uuid); | 1215 | add_uuid(alias, *uuid); |
| 1216 | ADD(alias, ":", version != MEI_CL_VERSION_ANY, version); | ||
| 1215 | 1217 | ||
| 1216 | strcat(alias, ":*"); | 1218 | strcat(alias, ":*"); |
| 1217 | 1219 | ||
