xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mei: bus: report also uuid in module alias

Browse Source 
In order to automate modules matching add device uuid
which is reported in client enumeration, keep also
the name that is needed in for nfc distinguishing radio vendor

Report mei:name:uuid

Cc: linux-api@vger.kernel.org
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tomas Winkler
2015-05-07 15:54:02 +03:00
committed by Greg Kroah-Hartman
parent 41c95b0438
commit c93b76b34b
9 changed files with 72 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/mod/devicetable-offsets.c
View File

@@ -182,6 +182,7 @@ int main(void)
DEVID(mei_cl_device_id);
DEVID_FIELD(mei_cl_device_id, name);
DEVID_FIELD(mei_cl_device_id, uuid);
DEVID(rio_device_id);
DEVID_FIELD(rio_device_id, did);

18
scripts/mod/file2alias.c
View File

@@ -131,6 +131,15 @@ static inline void add_wildcard(char *str)
strcat(str + len, "*");
}
static inline void add_uuid(char *str, __u8 uuid[16])
{
int len = strlen(str);
int i;
for (i = 0; i < 16; i++)
sprintf(str + len + (i << 1), "%02x", uuid[i]);
}
/**
* Check that sizeof(device_id type) are consistent with size of section
* in .o file. If in-consistent then userspace and kernel does not agree
@@ -1160,13 +1169,18 @@ static int do_cpu_entry(const char *filename, void *symval, char *alias)
}
ADD_TO_DEVTABLE("cpu", cpu_feature, do_cpu_entry);
/* Looks like: mei:S */
/* Looks like: mei:S:uuid */
static int do_mei_entry(const char *filename, void *symval,
char *alias)
{
DEF_FIELD_ADDR(symval, mei_cl_device_id, name);
DEF_FIELD_ADDR(symval, mei_cl_device_id, uuid);
sprintf(alias, MEI_CL_MODULE_PREFIX "%s", *name);
sprintf(alias, MEI_CL_MODULE_PREFIX);
sprintf(alias + strlen(alias), "%s:", (*name)[0] ? *name : "*");
add_uuid(alias, *uuid);
strcat(alias, ":*");
return 1;
}