mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-10-31 16:48:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

HID: intel-ish-hid: add support for MODULE_DEVICE_TABLE()

Browse source 
This allows to selectively autoload drivers for ISH devices.
Currently all ISH drivers are loaded for all systems having any ISH
device.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Thomas Weißschuh 2021-10-29 17:28:56 +02:00 committed by Jiri Kosina
parent 5af06603c4
commit fa443bc3c1
3 changed files with 40 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

13
include/linux/mod_devicetable.h
View file

@ -895,4 +895,17 @@ struct dfl_device_id {
kernel_ulong_t driver_data; kernel_ulong_t driver_data;
}; };
/* ISHTP (Integrated Sensor Hub Transport Protocol) */
#define ISHTP_MODULE_PREFIX "ishtp:"
/**
* struct ishtp_device_id - ISHTP device identifier
* @guid_string: 36 char string of the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba
* @context: pointer to driver specific data
*/
struct ishtp_device_id {
guid_t guid;
};
#endif /* LINUX_MOD_DEVICETABLE_H */ #endif /* LINUX_MOD_DEVICETABLE_H */

3
scripts/mod/devicetable-offsets.c
View file

@ -259,5 +259,8 @@ int main(void)
DEVID_FIELD(dfl_device_id, type); DEVID_FIELD(dfl_device_id, type);
DEVID_FIELD(dfl_device_id, feature_id); DEVID_FIELD(dfl_device_id, feature_id);
DEVID(ishtp_device_id);
DEVID_FIELD(ishtp_device_id, guid);
return 0; return 0;
} }

24
scripts/mod/file2alias.c
View file

@ -115,6 +115,17 @@ static inline void add_uuid(char *str, uuid_le uuid)
uuid.b[12], uuid.b[13], uuid.b[14], uuid.b[15]); uuid.b[12], uuid.b[13], uuid.b[14], uuid.b[15]);
} }
static inline void add_guid(char *str, guid_t guid)
{
int len = strlen(str);
sprintf(str + len, "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X",
guid.b[3], guid.b[2], guid.b[1], guid.b[0],
guid.b[5], guid.b[4], guid.b[7], guid.b[6],
guid.b[8], guid.b[9], guid.b[10], guid.b[11],
guid.b[12], guid.b[13], guid.b[14], guid.b[15]);
}
/** /**
* Check that sizeof(device_id type) are consistent with size of section * 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 * in .o file. If in-consistent then userspace and kernel does not agree
@ -1380,6 +1391,18 @@ static int do_mhi_entry(const char *filename, void *symval, char *alias)
return 1; return 1;
} }
/* Looks like: ishtp:{guid} */
static int do_ishtp_entry(const char *filename, void *symval, char *alias)
{
DEF_FIELD(symval, ishtp_device_id, guid);
strcpy(alias, ISHTP_MODULE_PREFIX "{");
add_guid(alias, guid);
strcat(alias, "}");
return 1;
}
static int do_auxiliary_entry(const char *filename, void *symval, char *alias) static int do_auxiliary_entry(const char *filename, void *symval, char *alias)
{ {
DEF_FIELD_ADDR(symval, auxiliary_device_id, name); DEF_FIELD_ADDR(symval, auxiliary_device_id, name);
@ -1499,6 +1522,7 @@ static const struct devtable devtable[] = {
{"auxiliary", SIZE_auxiliary_device_id, do_auxiliary_entry}, {"auxiliary", SIZE_auxiliary_device_id, do_auxiliary_entry},
{"ssam", SIZE_ssam_device_id, do_ssam_entry}, {"ssam", SIZE_ssam_device_id, do_ssam_entry},
{"dfl", SIZE_dfl_device_id, do_dfl_entry}, {"dfl", SIZE_dfl_device_id, do_dfl_entry},
{"ishtp", SIZE_ishtp_device_id, do_ishtp_entry},
}; };
/* Create MODULE_ALIAS() statements. /* Create MODULE_ALIAS() statements.