mei: mei client bus enhancements
Subsystems (4)
cover mei: mei client bus enhancements
1. Use standard little endian UUID formatting in the device alias.
2. Add client protocol version to the device alias
Prarit Bhargava (1):
mei: make modules.alias UUID information easier to read
Tomas Winkler (7):
mei: bus: export client protocol version
mei: bus: add client protocol version to the device alias
mei: bus: export uuid and protocol version to mei_cl bus drivers
mei: bus: export mei_cldev_enabled function
mei: bus: complete variable rename of type struct mei_cl_device
mei: bus: use mei_cldev_ prefix for the API functions
mei: bus: use mei_cl_bus_ prefix consistently
Documentation/ABI/testing/sysfs-bus-mei | 7 ++ drivers/misc/mei/bus-fixup.c | 4 +- drivers/misc/mei/bus.c | 184 ++++++++++++++++++++++---------- drivers/misc/mei/client.h | 12 +++ drivers/misc/mei/mei_dev.h | 2 +- drivers/nfc/mei_phy.c | 31 +++--- drivers/nfc/mei_phy.h | 4 +- drivers/nfc/microread/mei.c | 14 +-- drivers/nfc/pn544/mei.c | 14 +-- include/linux/mei_cl_bus.h | 40 +++---- include/linux/mod_devicetable.h | 7 +- scripts/mod/devicetable-offsets.c | 1 + scripts/mod/file2alias.c | 12 ++- 13 files changed, 215 insertions(+), 117 deletions(-)
Signature · 1 line
2.4.3
PATCH 2/8 mei: bus: export client protocol version
export me client protocol version to sysfs and uevent
--- Documentation/ABI/testing/sysfs-bus-mei | 7 +++++++ drivers/misc/mei/bus.c | 18 ++++++++++++++++++ drivers/misc/mei/client.h | 12 ++++++++++++ 3 files changed, 37 insertions(+)
Documentation/ABI/testing/sysfs-bus-mei +7 -0
@@ -19,3 +19,10 @@ KernelVersion: 4.2 Contact: Tomas Winkler <[email protected]> Description: Stores mei client device uuid Format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx + +What: /sys/bus/mei/devices/.../version +Date: Aug 2015 +KernelVersion: 4.3 +Contact: Tomas Winkler <[email protected]> +Description: Stores mei client protocol version + Format: %d
drivers/misc/mei/bus.c +18 -0
@@ -590,6 +590,19 @@ static ssize_t uuid_show(struct device *dev, struct device_attribute *a, }static DEVICE_ATTR_RO (uuid); +static ssize_t version_show (struct device *dev,struct device_attribute *a, +char *buf) +{ +struct mei_cl_device *cldev =to_mei_cl_device (dev); +u8 version =mei_me_cl_ver (cldev->me_cl); +size_t len; + + len =snprintf (buf,PAGE_SIZE ,"%02X" , version); + +return (len >=PAGE_SIZE ) ? (PAGE_SIZE -1 ) : len; +} +static DEVICE_ATTR_RO (version); +static ssize_t modalias_show (struct device *dev,struct device_attribute *a,char *buf) {
@@ -605,6 +618,7 @@ static DEVICE_ATTR_RO(modalias);static struct attribute *mei_cl_dev_attrs[] = { &dev_attr_name.attr, &dev_attr_uuid.attr, + &dev_attr_version.attr, &dev_attr_modalias.attr,NULL , };
@@ -622,6 +636,10 @@ static int mei_cl_device_uevent(struct device *dev, struct kobj_uevent_env *env) {struct mei_cl_device *cldev =to_mei_cl_device (dev);const uuid_le *uuid =mei_me_cl_uuid (cldev->me_cl); +u8 version =mei_me_cl_ver (cldev->me_cl); + +if (add_uevent_var (env,"MEI_CL_VERSION=%d" , version)) +return -ENOMEM ;if (add_uevent_var (env,"MEI_CL_UUID=%pUl" , uuid))return -ENOMEM ;
drivers/misc/mei/client.h +12 -0
@@ -68,6 +68,18 @@ static inline const uuid_le *mei_me_cl_uuid(const struct mei_me_client *me_cl)return &me_cl->props.protocol_name; } +/** +* mei_me_cl_ver - return me client protocol version +* +* @me_cl: me client +* +* Return: me client protocol version +*/ +static inline u8 mei_me_cl_ver (const struct mei_me_client *me_cl) +{ +return me_cl->props.protocol_version; +} +/* * MEI IO Functions */
Signature · 1 line
2.4.3
PATCH 3/8 mei: bus: add client protocol version to the device alias
In reply to Tomas WinklerThe 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.
--- drivers/misc/mei/bus.c | 28 +++++++++++++++++++++------- drivers/nfc/microread/mei.c | 2 +- drivers/nfc/pn544/mei.c | 2 +- include/linux/mod_devicetable.h | 3 +++ scripts/mod/devicetable-offsets.c | 1 + scripts/mod/file2alias.c | 4 +++- 6 files changed, 30 insertions(+), 10 deletions(-)
drivers/misc/mei/bus.c +21 -7
@@ -453,17 +453,26 @@ struct mei_cl_device_id *mei_cl_device_find(struct mei_cl_device *cldev, {const struct mei_cl_device_id *id;const uuid_le *uuid; +u8 version; +bool match; uuid =mei_me_cl_uuid (cldev->me_cl); + version =mei_me_cl_ver (cldev->me_cl); id = cldrv->id_table;while (uuid_le_cmp (NULL_UUID_LE , id->uuid)) {if (!uuid_le_cmp (*uuid, id->uuid)) { + match = true; -if (!cldev->name[0 ]) -return id; +if (cldev->name[0 ]) +if (strncmp (cldev->name, id->name, +sizeof (id->name))) + match = false; -if (!strncmp (cldev->name, id->name,sizeof (id->name))) +if (id->version !=MEI_CL_VERSION_ANY ) +if (id->version != version) + match = false; +if (match)return id; }
@@ -647,7 +656,8 @@ static int mei_cl_device_uevent(struct device *dev, struct kobj_uevent_env *env)if (add_uevent_var (env,"MEI_CL_NAME=%s" , cldev->name))return -ENOMEM ; -if (add_uevent_var (env,"MODALIAS=mei:%s:%pUl:" , cldev->name, uuid)) +if (add_uevent_var (env,"MODALIAS=mei:%s:%pUl:%02X:" , + cldev->name, uuid, version))return -ENOMEM ;return 0 ;
@@ -737,8 +747,10 @@ static bool mei_cl_dev_setup(struct mei_device *bus,mei_cl_dev_fixup (cldev);if (cldev->do_match) -dev_set_name (&cldev->dev,"mei:%s:%pUl" , - cldev->name,mei_me_cl_uuid (cldev->me_cl)); +dev_set_name (&cldev->dev,"mei:%s:%pUl:%02X" , + cldev->name, +mei_me_cl_uuid (cldev->me_cl), +mei_me_cl_ver (cldev->me_cl));return cldev->do_match ==1 ; }
@@ -754,7 +766,9 @@ static int mei_cl_bus_dev_add(struct mei_cl_device *cldev) {int ret; -dev_dbg (cldev->bus->dev,"adding %pUL\n" ,mei_me_cl_uuid (cldev->me_cl)); +dev_dbg (cldev->bus->dev,"adding %pUL:%02X\n" , +mei_me_cl_uuid (cldev->me_cl), +mei_me_cl_ver (cldev->me_cl)); ret =device_add (&cldev->dev);if (!ret) cldev->is_added =1 ;
drivers/nfc/microread/mei.c +1 -1
@@ -67,7 +67,7 @@ static int microread_mei_remove(struct mei_cl_device *device) }static struct mei_cl_device_id microread_mei_tbl[] = { - {MICROREAD_DRIVER_NAME ,MEI_NFC_UUID }, + {MICROREAD_DRIVER_NAME ,MEI_NFC_UUID ,MEI_CL_VERSION_ANY },/* required last entry */ { }
drivers/nfc/pn544/mei.c +1 -1
@@ -67,7 +67,7 @@ static int pn544_mei_remove(struct mei_cl_device *device) }static struct mei_cl_device_id pn544_mei_tbl[] = { - {PN544_DRIVER_NAME ,MEI_NFC_UUID }, + {PN544_DRIVER_NAME ,MEI_NFC_UUID ,MEI_CL_VERSION_ANY },/* required last entry */ { }
include/linux/mod_devicetable.h +3 -0
@@ -601,11 +601,13 @@ struct ipack_device_id {#define MEI_CL_MODULE_PREFIX "mei:"#define MEI_CL_NAME_SIZE 32 +#define MEI_CL_VERSION_ANY 0xff/** * struct mei_cl_device_id - MEI client device identifier * @name: helper name * @uuid: client uuid +* @version: client protocol version * @driver_info: information used by the driver. * * identifies mei client device by uuid and name
@@ -613,6 +615,7 @@ struct ipack_device_id {struct mei_cl_device_id {char name[MEI_CL_NAME_SIZE ];uuid_le uuid; +__u8 version;kernel_ulong_t driver_info; };
scripts/mod/devicetable-offsets.c +1 -0
@@ -185,6 +185,7 @@ int main(void)DEVID (mei_cl_device_id);DEVID_FIELD (mei_cl_device_id, name);DEVID_FIELD (mei_cl_device_id, uuid); +DEVID_FIELD (mei_cl_device_id, version);DEVID (rio_device_id);DEVID_FIELD (rio_device_id, did);
scripts/mod/file2alias.c +3 -1
@@ -1202,16 +1202,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:uuid */ +/* Looks like: mei:S:uuid:N:* */ 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); +DEF_FIELD (symval, mei_cl_device_id, version);sprintf (alias,MEI_CL_MODULE_PREFIX );sprintf (alias +strlen (alias),"%s:" , (*name)[0 ] ? *name :"*" );add_uuid (alias, *uuid); +ADD (alias,":" , version !=MEI_CL_VERSION_ANY , version);strcat (alias,":*" );
Signature · 1 line
2.4.3
PATCH 4/8 mei: bus: export uuid and protocol version to mei_cl bus drivers
In reply to Tomas WinklerExport the uuid and the protocol version of the underlying me client for me client bus drivers usage.
--- drivers/misc/mei/bus.c | 26 ++++++++++++++++++++++++++ include/linux/mei_cl_bus.h | 3 +++ 2 files changed, 29 insertions(+)
drivers/misc/mei/bus.c +26 -0
@@ -342,6 +342,32 @@ void mei_cl_set_drvdata(struct mei_cl_device *cldev, void *data)EXPORT_SYMBOL_GPL (mei_cl_set_drvdata);/** +* mei_cldev_uuid - return uuid of the underlying me client +* +* @cldev: mei client device +* +* Return: me client uuid +*/ +const uuid_le *mei_cldev_uuid (const struct mei_cl_device *cldev) +{ +return mei_me_cl_uuid (cldev->me_cl); +} +EXPORT_SYMBOL_GPL (mei_cldev_uuid); + +/** +* mei_cldev_ver - return protocol version of the underlying me client +* +* @cldev: mei client device +* +* Return: me client protocol version +*/ +u8 mei_cldev_ver (const struct mei_cl_device *cldev) +{ +return mei_me_cl_ver (cldev->me_cl); +} +EXPORT_SYMBOL_GPL (mei_cldev_ver); + +/** * mei_cl_enable_device - enable me client device * create connection with me client *
include/linux/mei_cl_bus.h +3 -0
@@ -85,6 +85,9 @@ int mei_cl_register_event_cb(struct mei_cl_device *device,#define MEI_CL_EVENT_TX 1#define MEI_CL_EVENT_NOTIF 2 +const uuid_le *mei_cldev_uuid (const struct mei_cl_device *cldev); +u8 mei_cldev_ver (const struct mei_cl_device *cldev); +void *mei_cl_get_drvdata (const struct mei_cl_device *device);void mei_cl_set_drvdata (struct mei_cl_device *device,void *data);
Signature · 1 line
2.4.3
PATCH 5/8 mei: bus: export mei_cldev_enabled function
In reply to Tomas WinklerLet me client device driver query of the device is connected and hence enabled.
--- drivers/misc/mei/bus.c | 13 +++++++++++++ include/linux/mei_cl_bus.h | 1 + 2 files changed, 14 insertions(+)
drivers/misc/mei/bus.c +13 -0
@@ -368,6 +368,19 @@ u8 mei_cldev_ver(const struct mei_cl_device *cldev)EXPORT_SYMBOL_GPL (mei_cldev_ver);/** +* mei_cldev_enabled - check whether the device is enabled +* +* @cldev: mei client device +* +* Return: true if me client is initialized and connected +*/ +bool mei_cldev_enabled (struct mei_cl_device *cldev) +{ +return cldev->cl &&mei_cl_is_connected (cldev->cl); +} +EXPORT_SYMBOL_GPL (mei_cldev_enabled); + +/** * mei_cl_enable_device - enable me client device * create connection with me client *
include/linux/mei_cl_bus.h +1 -0
@@ -93,5 +93,6 @@ void mei_cl_set_drvdata(struct mei_cl_device *device, void *data);int mei_cl_enable_device (struct mei_cl_device *device);int mei_cl_disable_device (struct mei_cl_device *device); +bool mei_cldev_enabled (struct mei_cl_device *cldev);#endif /* _LINUX_MEI_CL_BUS_H */
Signature · 1 line
2.4.3
PATCH 6/8 mei: bus: complete variable rename of type struct mei_cl_device
In reply to Tomas WinklerIn the
commit 5c079ae11921 ("mei: bus: fix drivers and devices names confusion") we set the variables of type struct mei_cl_device to 'cldev' but few places were left out, namely mei_cl_bus.h header
and the mei nfc drivers.
--- drivers/nfc/mei_phy.c | 30 +++++++++++++++--------------- drivers/nfc/mei_phy.h | 4 ++-- drivers/nfc/microread/mei.c | 8 ++++---- drivers/nfc/pn544/mei.c | 8 ++++---- include/linux/mei_cl_bus.h | 29 ++++++++++++++--------------- 5 files changed, 39 insertions(+), 40 deletions(-)
drivers/nfc/mei_phy.c +15 -15
@@ -118,7 +118,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy) cmd.sub_command =MEI_NFC_SUBCMD_IF_VERSION ;MEI_DUMP_NFC_HDR ("version" , &cmd.hdr); - r =mei_cl_send (phy->device, (u8 *)&cmd,sizeof (struct mei_nfc_cmd )); + r =mei_cl_send (phy->cldev, (u8 *)&cmd,sizeof (struct mei_nfc_cmd ));if (r <0 ) {pr_err ("Could not send IF version cmd\n" );return r;
@@ -132,7 +132,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy)if (!reply)return -ENOMEM ; - bytes_recv =mei_cl_recv (phy->device, (u8 *)reply, if_version_length); + bytes_recv =mei_cl_recv (phy->cldev, (u8 *)reply, if_version_length);if (bytes_recv <0 || bytes_recv <sizeof (struct mei_nfc_reply )) {pr_err ("Could not read IF version\n" ); r = -EIO ;
@@ -186,13 +186,13 @@ static int mei_nfc_connect(struct nfc_mei_phy *phy) connect->vendor_id = phy->vendor_id;MEI_DUMP_NFC_HDR ("connect request" , &cmd->hdr); - r =mei_cl_send (phy->device, (u8 *)cmd, connect_length); + r =mei_cl_send (phy->cldev, (u8 *)cmd, connect_length);if (r <0 ) {pr_err ("Could not send connect cmd %d\n" , r); goto err; } - bytes_recv =mei_cl_recv (phy->device, (u8 *)reply, connect_resp_length); + bytes_recv =mei_cl_recv (phy->cldev, (u8 *)reply, connect_resp_length);if (bytes_recv <0 ) { r = bytes_recv;pr_err ("Could not read connect response %d\n" , r);
@@ -238,7 +238,7 @@ static int mei_nfc_send(struct nfc_mei_phy *phy, u8 *buf, size_t length)MEI_DUMP_NFC_HDR ("send" , hdr);memcpy (mei_buf +MEI_NFC_HEADER_SIZE , buf, length); - err =mei_cl_send (phy->device, mei_buf, length +MEI_NFC_HEADER_SIZE ); + err =mei_cl_send (phy->cldev, mei_buf, length +MEI_NFC_HEADER_SIZE );if (err <0 ) goto out;
@@ -278,7 +278,7 @@ static int mei_nfc_recv(struct nfc_mei_phy *phy, u8 *buf, size_t length)struct mei_nfc_hdr *hdr;int received_length; - received_length =mei_cl_recv (phy->device, buf, length); + received_length =mei_cl_recv (phy->cldev, buf, length);if (received_length <0 )return received_length;
@@ -296,7 +296,7 @@ static int mei_nfc_recv(struct nfc_mei_phy *phy, u8 *buf, size_t length) } -static void nfc_mei_event_cb (struct mei_cl_device *device,u32 events, +static void nfc_mei_event_cb (struct mei_cl_device *cldev,u32 events,void *context) {struct nfc_mei_phy *phy = context;
@@ -337,7 +337,7 @@ static int nfc_mei_phy_enable(void *phy_id)if (phy->powered ==1 )return 0 ; - r =mei_cl_enable_device (phy->device); + r =mei_cl_enable_device (phy->cldev);if (r <0 ) {pr_err ("Could not enable device %d\n" , r);return r;
@@ -355,7 +355,7 @@ static int nfc_mei_phy_enable(void *phy_id) goto err; } - r =mei_cl_register_event_cb (phy->device,BIT (MEI_CL_EVENT_RX ), + r =mei_cl_register_event_cb (phy->cldev,BIT (MEI_CL_EVENT_RX ), nfc_mei_event_cb, phy);if (r) {pr_err ("Event cb registration failed %d\n" , r);
@@ -368,7 +368,7 @@ static int nfc_mei_phy_enable(void *phy_id) err: phy->powered =0 ; -mei_cl_disable_device (phy->device); +mei_cl_disable_device (phy->cldev);return r; }
@@ -378,7 +378,7 @@ static void nfc_mei_phy_disable(void *phy_id)pr_info ("%s\n" , __func__); -mei_cl_disable_device (phy->device); +mei_cl_disable_device (phy->cldev); phy->powered =0 ; }
@@ -390,7 +390,7 @@ struct nfc_phy_ops mei_phy_ops = { };EXPORT_SYMBOL_GPL (mei_phy_ops); -struct nfc_mei_phy *nfc_mei_phy_alloc (struct mei_cl_device *device) +struct nfc_mei_phy *nfc_mei_phy_alloc (struct mei_cl_device *cldev) {struct nfc_mei_phy *phy;
@@ -398,9 +398,9 @@ struct nfc_mei_phy *nfc_mei_phy_alloc(struct mei_cl_device *device)if (!phy)return NULL ; - phy->device = device; + phy->cldev = cldev;init_waitqueue_head (&phy->send_wq); -mei_cl_set_drvdata (device, phy); +mei_cl_set_drvdata (cldev, phy);return phy; }
@@ -408,7 +408,7 @@ EXPORT_SYMBOL_GPL(nfc_mei_phy_alloc);void nfc_mei_phy_free (struct nfc_mei_phy *phy) { -mei_cl_disable_device (phy->device); +mei_cl_disable_device (phy->cldev);kfree (phy); }EXPORT_SYMBOL_GPL (nfc_mei_phy_free);
drivers/nfc/mei_phy.h +2 -2
@@ -13,7 +13,7 @@/** * struct nfc_mei_phy * -* @device: mei device +* @cldev: mei client device * @hdev: nfc hci device * @send_wq: send completion wait queue
@@ -28,7 +28,7 @@* and prevents normal operation. */ struct nfc_mei_phy { -struct mei_cl_device *device; +struct mei_cl_device *cldev;struct nfc_hci_dev *hdev;wait_queue_head_t send_wq;
drivers/nfc/microread/mei.c +4 -4
@@ -29,7 +29,7 @@#define MICROREAD_DRIVER_NAME "microread" -static int microread_mei_probe (struct mei_cl_device *device, +static int microread_mei_probe (struct mei_cl_device *cldev,const struct mei_cl_device_id *id) {struct nfc_mei_phy *phy;
@@ -37,7 +37,7 @@ static int microread_mei_probe(struct mei_cl_device *device,pr_info ("Probing NFC microread\n" ); - phy =nfc_mei_phy_alloc (device); + phy =nfc_mei_phy_alloc (cldev);if (!phy) {pr_err ("Cannot allocate memory for microread mei phy.\n" );return -ENOMEM ;
@@ -55,9 +55,9 @@ static int microread_mei_probe(struct mei_cl_device *device,return 0 ; } -static int microread_mei_remove (struct mei_cl_device *device) +static int microread_mei_remove (struct mei_cl_device *cldev) { -struct nfc_mei_phy *phy =mei_cl_get_drvdata (device); +struct nfc_mei_phy *phy =mei_cl_get_drvdata (cldev);microread_remove (phy->hdev);
drivers/nfc/pn544/mei.c +4 -4
@@ -27,7 +27,7 @@#define PN544_DRIVER_NAME "pn544" -static int pn544_mei_probe (struct mei_cl_device *device, +static int pn544_mei_probe (struct mei_cl_device *cldev,const struct mei_cl_device_id *id) {struct nfc_mei_phy *phy;
@@ -35,7 +35,7 @@ static int pn544_mei_probe(struct mei_cl_device *device,pr_info ("Probing NFC pn544\n" ); - phy =nfc_mei_phy_alloc (device); + phy =nfc_mei_phy_alloc (cldev);if (!phy) {pr_err ("Cannot allocate memory for pn544 mei phy.\n" );return -ENOMEM ;
@@ -53,9 +53,9 @@ static int pn544_mei_probe(struct mei_cl_device *device,return 0 ; } -static int pn544_mei_remove (struct mei_cl_device *device) +static int pn544_mei_remove (struct mei_cl_device *cldev) { -struct nfc_mei_phy *phy =mei_cl_get_drvdata (device); +struct nfc_mei_phy *phy =mei_cl_get_drvdata (cldev);pr_info ("Removing pn544\n" );
include/linux/mei_cl_bus.h +14 -15
@@ -8,7 +8,7 @@struct mei_cl_device ;struct mei_device ; -typedef void (*mei_cl_event_cb_t )(struct mei_cl_device *device, +typedef void (*mei_cl_event_cb_t )(struct mei_cl_device *cldev,u32 events,void *context);/**
@@ -62,22 +62,21 @@ struct mei_cl_driver {const struct mei_cl_device_id *id_table; -int (*probe)(struct mei_cl_device *dev, +int (*probe)(struct mei_cl_device *cldev,const struct mei_cl_device_id *id); -int (*remove)(struct mei_cl_device *dev); +int (*remove)(struct mei_cl_device *cldev); }; -int __mei_cl_driver_register (struct mei_cl_driver *driver, -struct module *owner); -#define mei_cl_driver_register (driver) \ - __mei_cl_driver_register(driver, THIS_MODULE) +int __mei_cl_driver_register (struct mei_cl_driver *cldrv,struct module *owner); +#define mei_cl_driver_register (cldrv) \ + __mei_cl_driver_register(cldrv, THIS_MODULE) -void mei_cl_driver_unregister (struct mei_cl_driver *driver); +void mei_cl_driver_unregister (struct mei_cl_driver *cldrv); -ssize_t mei_cl_send (struct mei_cl_device *device,u8 *buf,size_t length); -ssize_t mei_cl_recv (struct mei_cl_device *device,u8 *buf,size_t length); +ssize_t mei_cl_send (struct mei_cl_device *cldev,u8 *buf,size_t length); +ssize_t mei_cl_recv (struct mei_cl_device *cldev,u8 *buf,size_t length); -int mei_cl_register_event_cb (struct mei_cl_device *device, +int mei_cl_register_event_cb (struct mei_cl_device *cldev,unsigned long event_mask,mei_cl_event_cb_t read_cb,void *context);
@@ -88,11 +87,11 @@ int mei_cl_register_event_cb(struct mei_cl_device *device,const uuid_le *mei_cldev_uuid (const struct mei_cl_device *cldev);u8 mei_cldev_ver (const struct mei_cl_device *cldev); -void *mei_cl_get_drvdata (const struct mei_cl_device *device); -void mei_cl_set_drvdata (struct mei_cl_device *device,void *data); +void *mei_cl_get_drvdata (const struct mei_cl_device *cldev); +void mei_cl_set_drvdata (struct mei_cl_device *cldev,void *data); -int mei_cl_enable_device (struct mei_cl_device *device); -int mei_cl_disable_device (struct mei_cl_device *device); +int mei_cl_enable_device (struct mei_cl_device *cldev); +int mei_cl_disable_device (struct mei_cl_device *cldev);bool mei_cldev_enabled (struct mei_cl_device *cldev);#endif /* _LINUX_MEI_CL_BUS_H */
Signature · 1 line
2.4.3
PATCH 7/8 mei: bus: use mei_cldev_ prefix for the API functions
In reply to Tomas WinklerUse mei_cldev_ prefix for all mei client bus api functions in order to resolve prefix conflict with functions that handle client function and are defined in client.c
--- drivers/misc/mei/bus.c | 67 +++++++++++++++++++++++---------------------- drivers/nfc/mei_phy.c | 25 +++++++++-------- drivers/nfc/microread/mei.c | 6 ++-- drivers/nfc/pn544/mei.c | 6 ++-- include/linux/mei_cl_bus.h | 33 +++++++++++----------- 5 files changed, 70 insertions(+), 67 deletions(-)
drivers/misc/mei/bus.c +34 -33
@@ -165,7 +165,7 @@ out: }/** -* mei_cl_send - me device send (write) +* mei_cldev_send - me device send (write) * * @cldev: me client device * @buf: buffer to send
@@ -173,7 +173,7 @@ out:* * Return: written size in bytes or < 0 on error */ -ssize_t mei_cl_send (struct mei_cl_device *cldev,u8 *buf,size_t length) +ssize_t mei_cldev_send (struct mei_cl_device *cldev,u8 *buf,size_t length) {struct mei_cl *cl = cldev->cl;
@@ -182,10 +182,10 @@ ssize_t mei_cl_send(struct mei_cl_device *cldev, u8 *buf, size_t length)return __mei_cl_send (cl, buf, length,1 ); } -EXPORT_SYMBOL_GPL (mei_cl_send); +EXPORT_SYMBOL_GPL (mei_cldev_send);/** -* mei_cl_recv - client receive (read) +* mei_cldev_recv - client receive (read) * * @cldev: me client device * @buf: buffer to send
@@ -193,7 +193,7 @@ EXPORT_SYMBOL_GPL(mei_cl_send);* * Return: read size in bytes of < 0 on error */ -ssize_t mei_cl_recv (struct mei_cl_device *cldev,u8 *buf,size_t length) +ssize_t mei_cldev_recv (struct mei_cl_device *cldev,u8 *buf,size_t length) {struct mei_cl *cl = cldev->cl;
@@ -202,15 +202,15 @@ ssize_t mei_cl_recv(struct mei_cl_device *cldev, u8 *buf, size_t length)return __mei_cl_recv (cl, buf, length); } -EXPORT_SYMBOL_GPL (mei_cl_recv); +EXPORT_SYMBOL_GPL (mei_cldev_recv);/** -* mei_bus_event_work - dispatch rx event for a bus device +* mei_cl_bus_event_work - dispatch rx event for a bus device * and schedule new work * * @work: work */ -static void mei_bus_event_work (struct work_struct *work) +static void mei_cl_bus_event_work (struct work_struct *work) {struct mei_cl_device *cldev;
@@ -272,7 +272,7 @@ void mei_cl_bus_rx_event(struct mei_cl *cl) }/** -* mei_cl_register_event_cb - register event callback +* mei_cldev_register_event_cb - register event callback * * @cldev: me client devices * @event_cb: callback function
@@ -283,9 +283,9 @@ void mei_cl_bus_rx_event(struct mei_cl *cl)* -EALREADY if an callback is already registered * <0 on other errors */ -int mei_cl_register_event_cb (struct mei_cl_device *cldev, -unsigned long events_mask, -mei_cl_event_cb_t event_cb,void *context) +int mei_cldev_register_event_cb (struct mei_cl_device *cldev, +unsigned long events_mask, +mei_cldev_event_cb_t event_cb,void *context) {int ret;
@@ -296,7 +296,7 @@ int mei_cl_register_event_cb(struct mei_cl_device *cldev, cldev->events_mask = events_mask; cldev->event_cb = event_cb; cldev->event_context = context; -INIT_WORK (&cldev->event_work, mei_bus_event_work); +INIT_WORK (&cldev->event_work, mei_cl_bus_event_work);if (cldev->events_mask &BIT (MEI_CL_EVENT_RX )) { ret =mei_cl_read_start (cldev->cl,0 ,NULL );
@@ -314,32 +314,32 @@ int mei_cl_register_event_cb(struct mei_cl_device *cldev,return 0 ; } -EXPORT_SYMBOL_GPL (mei_cl_register_event_cb); +EXPORT_SYMBOL_GPL (mei_cldev_register_event_cb);/** -* mei_cl_get_drvdata - driver data getter +* mei_cldev_get_drvdata - driver data getter * * @cldev: mei client device * * Return: driver private data */ -void *mei_cl_get_drvdata (const struct mei_cl_device *cldev) +void *mei_cldev_get_drvdata (const struct mei_cl_device *cldev) {return dev_get_drvdata (&cldev->dev); } -EXPORT_SYMBOL_GPL (mei_cl_get_drvdata); +EXPORT_SYMBOL_GPL (mei_cldev_get_drvdata);/** -* mei_cl_set_drvdata - driver data setter +* mei_cldev_set_drvdata - driver data setter * * @cldev: mei client device * @data: data to store */ -void mei_cl_set_drvdata (struct mei_cl_device *cldev,void *data) +void mei_cldev_set_drvdata (struct mei_cl_device *cldev,void *data) {dev_set_drvdata (&cldev->dev, data); } -EXPORT_SYMBOL_GPL (mei_cl_set_drvdata); +EXPORT_SYMBOL_GPL (mei_cldev_set_drvdata);/** * mei_cldev_uuid - return uuid of the underlying me client
@@ -381,14 +381,14 @@ bool mei_cldev_enabled(struct mei_cl_device *cldev)EXPORT_SYMBOL_GPL (mei_cldev_enabled);/** -* mei_cl_enable_device - enable me client device +* mei_cldev_enable_device - enable me client device * create connection with me client * * @cldev: me client device * * Return: 0 on success and < 0 on error */ -int mei_cl_enable_device (struct mei_cl_device *cldev) +int mei_cldev_enable (struct mei_cl_device *cldev) {struct mei_device *bus = cldev->bus;struct mei_cl *cl;
@@ -428,17 +428,17 @@ out:return ret; } -EXPORT_SYMBOL_GPL (mei_cl_enable_device); +EXPORT_SYMBOL_GPL (mei_cldev_enable);/** -* mei_cl_disable_device - disable me client device +* mei_cldev_disable - disable me client device * disconnect form the me client * * @cldev: me client device * * Return: 0 on success and < 0 on error */ -int mei_cl_disable_device (struct mei_cl_device *cldev) +int mei_cldev_disable (struct mei_cl_device *cldev) {struct mei_device *bus;struct mei_cl *cl;
@@ -476,7 +476,7 @@ out:mutex_unlock (&bus->device_lock);return err; } -EXPORT_SYMBOL_GPL (mei_cl_disable_device); +EXPORT_SYMBOL_GPL (mei_cldev_disable);/** * mei_cl_device_find - find matching entry in the driver id table
@@ -663,14 +663,14 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a, }static DEVICE_ATTR_RO (modalias); -static struct attribute *mei_cl_dev_attrs[] = { +static struct attribute *mei_cldev_attrs[] = { &dev_attr_name.attr, &dev_attr_uuid.attr, &dev_attr_version.attr, &dev_attr_modalias.attr,NULL , }; -ATTRIBUTE_GROUPS (mei_cl_dev); +ATTRIBUTE_GROUPS (mei_cldev);/** * mei_cl_device_uevent - me client bus uevent handler
@@ -704,7 +704,7 @@ static int mei_cl_device_uevent(struct device *dev, struct kobj_uevent_env *env)static struct bus_type mei_cl_bus_type = { .name ="mei" , - .dev_groups = mei_cl_dev_groups, + .dev_groups = mei_cldev_groups, .match = mei_cl_device_match, .probe = mei_cl_device_probe, .remove = mei_cl_device_remove,
@@ -937,7 +937,8 @@ void mei_cl_bus_rescan(struct mei_device *bus)dev_dbg (bus->dev,"rescan end" ); } -int __mei_cl_driver_register (struct mei_cl_driver *cldrv,struct module *owner) +int __mei_cldev_driver_register (struct mei_cl_driver *cldrv, +struct module *owner) {int err;
@@ -953,15 +954,15 @@ int __mei_cl_driver_register(struct mei_cl_driver *cldrv, struct module *owner)return 0 ; } -EXPORT_SYMBOL_GPL (__mei_cl_driver_register); +EXPORT_SYMBOL_GPL (__mei_cldev_driver_register); -void mei_cl_driver_unregister (struct mei_cl_driver *cldrv) +void mei_cldev_driver_unregister (struct mei_cl_driver *cldrv) {driver_unregister (&cldrv->driver);pr_debug ("mei: driver [%s] unregistered\n" , cldrv->driver.name); } -EXPORT_SYMBOL_GPL (mei_cl_driver_unregister); +EXPORT_SYMBOL_GPL (mei_cldev_driver_unregister);int __init mei_cl_bus_init (void )
drivers/nfc/mei_phy.c +13 -12
@@ -118,7 +118,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy) cmd.sub_command =MEI_NFC_SUBCMD_IF_VERSION ;MEI_DUMP_NFC_HDR ("version" , &cmd.hdr); - r =mei_cl_send (phy->cldev, (u8 *)&cmd,sizeof (struct mei_nfc_cmd )); + r =mei_cldev_send (phy->cldev, (u8 *)&cmd,sizeof (struct mei_nfc_cmd ));if (r <0 ) {pr_err ("Could not send IF version cmd\n" );return r;
@@ -132,7 +132,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy)if (!reply)return -ENOMEM ; - bytes_recv =mei_cl_recv (phy->cldev, (u8 *)reply, if_version_length); + bytes_recv =mei_cldev_recv (phy->cldev, (u8 *)reply, if_version_length);if (bytes_recv <0 || bytes_recv <sizeof (struct mei_nfc_reply )) {pr_err ("Could not read IF version\n" ); r = -EIO ;
@@ -186,13 +186,14 @@ static int mei_nfc_connect(struct nfc_mei_phy *phy) connect->vendor_id = phy->vendor_id;MEI_DUMP_NFC_HDR ("connect request" , &cmd->hdr); - r =mei_cl_send (phy->cldev, (u8 *)cmd, connect_length); + r =mei_cldev_send (phy->cldev, (u8 *)cmd, connect_length);if (r <0 ) {pr_err ("Could not send connect cmd %d\n" , r); goto err; } - bytes_recv =mei_cl_recv (phy->cldev, (u8 *)reply, connect_resp_length); + bytes_recv =mei_cldev_recv (phy->cldev, (u8 *)reply, + connect_resp_length);if (bytes_recv <0 ) { r = bytes_recv;pr_err ("Could not read connect response %d\n" , r);
@@ -238,7 +239,7 @@ static int mei_nfc_send(struct nfc_mei_phy *phy, u8 *buf, size_t length)MEI_DUMP_NFC_HDR ("send" , hdr);memcpy (mei_buf +MEI_NFC_HEADER_SIZE , buf, length); - err =mei_cl_send (phy->cldev, mei_buf, length +MEI_NFC_HEADER_SIZE ); + err =mei_cldev_send (phy->cldev, mei_buf, length +MEI_NFC_HEADER_SIZE );if (err <0 ) goto out;
@@ -278,7 +279,7 @@ static int mei_nfc_recv(struct nfc_mei_phy *phy, u8 *buf, size_t length)struct mei_nfc_hdr *hdr;int received_length; - received_length =mei_cl_recv (phy->cldev, buf, length); + received_length =mei_cldev_recv (phy->cldev, buf, length);if (received_length <0 )return received_length;
@@ -337,7 +338,7 @@ static int nfc_mei_phy_enable(void *phy_id)if (phy->powered ==1 )return 0 ; - r =mei_cl_enable_device (phy->cldev); + r =mei_cldev_enable (phy->cldev);if (r <0 ) {pr_err ("Could not enable device %d\n" , r);return r;
@@ -355,7 +356,7 @@ static int nfc_mei_phy_enable(void *phy_id) goto err; } - r =mei_cl_register_event_cb (phy->cldev,BIT (MEI_CL_EVENT_RX ), + r =mei_cldev_register_event_cb (phy->cldev,BIT (MEI_CL_EVENT_RX ), nfc_mei_event_cb, phy);if (r) {pr_err ("Event cb registration failed %d\n" , r);
@@ -368,7 +369,7 @@ static int nfc_mei_phy_enable(void *phy_id) err: phy->powered =0 ; -mei_cl_disable_device (phy->cldev); +mei_cldev_disable (phy->cldev);return r; }
@@ -378,7 +379,7 @@ static void nfc_mei_phy_disable(void *phy_id)pr_info ("%s\n" , __func__); -mei_cl_disable_device (phy->cldev); +mei_cldev_disable (phy->cldev); phy->powered =0 ; }
@@ -400,7 +401,7 @@ struct nfc_mei_phy *nfc_mei_phy_alloc(struct mei_cl_device *cldev) phy->cldev = cldev;init_waitqueue_head (&phy->send_wq); -mei_cl_set_drvdata (cldev, phy); +mei_cldev_set_drvdata (cldev, phy);return phy; }
@@ -408,7 +409,7 @@ EXPORT_SYMBOL_GPL(nfc_mei_phy_alloc);void nfc_mei_phy_free (struct nfc_mei_phy *phy) { -mei_cl_disable_device (phy->cldev); +mei_cldev_disable (phy->cldev);kfree (phy); }EXPORT_SYMBOL_GPL (nfc_mei_phy_free);
drivers/nfc/microread/mei.c +3 -3
@@ -57,7 +57,7 @@ static int microread_mei_probe(struct mei_cl_device *cldev,static int microread_mei_remove (struct mei_cl_device *cldev) { -struct nfc_mei_phy *phy =mei_cl_get_drvdata (cldev); +struct nfc_mei_phy *phy =mei_cldev_get_drvdata (cldev);microread_remove (phy->hdev);
@@ -88,7 +88,7 @@ static int microread_mei_init(void)pr_debug (DRIVER_DESC ": %s\n" , __func__); - r =mei_cl_driver_register (µread_driver); + r =mei_cldev_driver_register (µread_driver);if (r) {pr_err (MICROREAD_DRIVER_NAME ": driver registration failed\n" );return r;
@@ -99,7 +99,7 @@ static int microread_mei_init(void)static void microread_mei_exit (void ) { -mei_cl_driver_unregister (µread_driver); +mei_cldev_driver_unregister (µread_driver); }module_init (microread_mei_init);
drivers/nfc/pn544/mei.c +3 -3
@@ -55,7 +55,7 @@ static int pn544_mei_probe(struct mei_cl_device *cldev,static int pn544_mei_remove (struct mei_cl_device *cldev) { -struct nfc_mei_phy *phy =mei_cl_get_drvdata (cldev); +struct nfc_mei_phy *phy =mei_cldev_get_drvdata (cldev);pr_info ("Removing pn544\n" );
@@ -88,7 +88,7 @@ static int pn544_mei_init(void)pr_debug (DRIVER_DESC ": %s\n" , __func__); - r =mei_cl_driver_register (&pn544_driver); + r =mei_cldev_driver_register (&pn544_driver);if (r) {pr_err (PN544_DRIVER_NAME ": driver registration failed\n" );return r;
@@ -99,7 +99,7 @@ static int pn544_mei_init(void)static void pn544_mei_exit (void ) { -mei_cl_driver_unregister (&pn544_driver); +mei_cldev_driver_unregister (&pn544_driver); }module_init (pn544_mei_init);
include/linux/mei_cl_bus.h +17 -16
@@ -8,8 +8,8 @@struct mei_cl_device ;struct mei_device ; -typedef void (*mei_cl_event_cb_t )(struct mei_cl_device *cldev, -u32 events,void *context); +typedef void (*mei_cldev_event_cb_t )(struct mei_cl_device *cldev, +u32 events,void *context);/** * struct mei_cl_device - MEI device handle
@@ -45,7 +45,7 @@ struct mei_cl_device {char name[MEI_CL_NAME_SIZE ];struct work_struct event_work; -mei_cl_event_cb_t event_cb; +mei_cldev_event_cb_t event_cb;void *event_context;unsigned long events_mask;unsigned long events;
@@ -67,18 +67,19 @@ struct mei_cl_driver {int (*remove)(struct mei_cl_device *cldev); }; -int __mei_cl_driver_register (struct mei_cl_driver *cldrv,struct module *owner); -#define mei_cl_driver_register (cldrv) \ - __mei_cl_driver_register(cldrv, THIS_MODULE) +int __mei_cldev_driver_register (struct mei_cl_driver *cldrv, +struct module *owner); +#define mei_cldev_driver_register (cldrv) \ + __mei_cldev_driver_register(cldrv, THIS_MODULE) -void mei_cl_driver_unregister (struct mei_cl_driver *cldrv); +void mei_cldev_driver_unregister (struct mei_cl_driver *cldrv); -ssize_t mei_cl_send (struct mei_cl_device *cldev,u8 *buf,size_t length); -ssize_t mei_cl_recv (struct mei_cl_device *cldev,u8 *buf,size_t length); +ssize_t mei_cldev_send (struct mei_cl_device *cldev,u8 *buf,size_t length); +ssize_t mei_cldev_recv (struct mei_cl_device *cldev,u8 *buf,size_t length); -int mei_cl_register_event_cb (struct mei_cl_device *cldev, -unsigned long event_mask, -mei_cl_event_cb_t read_cb,void *context); +int mei_cldev_register_event_cb (struct mei_cl_device *cldev, +unsigned long event_mask, +mei_cldev_event_cb_t read_cb,void *context);#define MEI_CL_EVENT_RX 0#define MEI_CL_EVENT_TX 1
@@ -87,11 +88,11 @@ int mei_cl_register_event_cb(struct mei_cl_device *cldev,const uuid_le *mei_cldev_uuid (const struct mei_cl_device *cldev);u8 mei_cldev_ver (const struct mei_cl_device *cldev); -void *mei_cl_get_drvdata (const struct mei_cl_device *cldev); -void mei_cl_set_drvdata (struct mei_cl_device *cldev,void *data); +void *mei_cldev_get_drvdata (const struct mei_cl_device *cldev); +void mei_cldev_set_drvdata (struct mei_cl_device *cldev,void *data); -int mei_cl_enable_device (struct mei_cl_device *cldev); -int mei_cl_disable_device (struct mei_cl_device *cldev); +int mei_cldev_enable (struct mei_cl_device *cldev); +int mei_cldev_disable (struct mei_cl_device *cldev);bool mei_cldev_enabled (struct mei_cl_device *cldev);#endif /* _LINUX_MEI_CL_BUS_H */
Signature · 1 line
2.4.3
PATCH 8/8 mei: bus: use mei_cl_bus_ prefix consistently
In reply to Tomas WinklerUse mei_cl_bus_ for internal bus function consistently.
--- drivers/misc/mei/bus-fixup.c | 4 ++-- drivers/misc/mei/bus.c | 27 ++++++++++++++------------- drivers/misc/mei/mei_dev.h | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-)
drivers/misc/mei/bus-fixup.c +2 -2
@@ -285,11 +285,11 @@ static struct mei_fixup { };/** -* mei_cl_dev_fixup - run fixup handlers +* mei_cldev_fixup - run fixup handlers * * @cldev: me client device */ -void mei_cl_dev_fixup (struct mei_cl_device *cldev) +void mei_cl_bus_dev_fixup (struct mei_cl_device *cldev) {struct mei_fixup *f;const uuid_le *uuid =mei_me_cl_uuid (cldev->me_cl);
drivers/misc/mei/bus.c +14 -13
@@ -725,7 +725,7 @@ static void mei_dev_bus_put(struct mei_device *bus)put_device (bus->dev); } -static void mei_cl_dev_release (struct device *dev) +static void mei_cl_bus_dev_release (struct device *dev) {struct mei_cl_device *cldev =to_mei_cl_device (dev);
@@ -738,19 +738,19 @@ static void mei_cl_dev_release(struct device *dev) }static struct device_type mei_cl_device_type = { - .release = mei_cl_dev_release, + .release = mei_cl_bus_dev_release, };/** -* mei_cl_dev_alloc - initialize and allocate mei client device +* mei_cl_bus_dev_alloc - initialize and allocate mei client device * * @bus: mei device * @me_cl: me client * * Return: allocated device structur or NULL on allocation failure */ -static struct mei_cl_device *mei_cl_dev_alloc (struct mei_device *bus, -struct mei_me_client *me_cl) +static struct mei_cl_device *mei_cl_bus_dev_alloc (struct mei_device *bus, +struct mei_me_client *me_cl) {struct mei_cl_device *cldev;
@@ -779,11 +779,11 @@ static struct mei_cl_device *mei_cl_dev_alloc(struct mei_device *bus,* * Return: true if the device is eligible for enumeration */ -static bool mei_cl_dev_setup (struct mei_device *bus, -struct mei_cl_device *cldev) +static bool mei_cl_bus_dev_setup (struct mei_device *bus, +struct mei_cl_device *cldev) { cldev->do_match =1 ; -mei_cl_dev_fixup (cldev); +mei_cl_bus_dev_fixup (cldev);if (cldev->do_match) dev_set_name(&cldev->dev, "mei:%s:%pUl:%02X",
@@ -872,13 +872,14 @@ void mei_cl_bus_remove_devices(struct mei_device *bus)/** -* mei_cl_dev_init - allocate and initializes an mei client devices +* mei_cl_bus_dev_init - allocate and initializes an mei client devices * based on me client * * @bus: mei device * @me_cl: me client */ -static void mei_cl_dev_init (struct mei_device *bus,struct mei_me_client *me_cl) +static void mei_cl_bus_dev_init (struct mei_device *bus, +struct mei_me_client *me_cl) {struct mei_cl_device *cldev;
@@ -887,7 +888,7 @@ static void mei_cl_dev_init(struct mei_device *bus, struct mei_me_client *me_cl)if (me_cl->bus_added)return ; - cldev =mei_cl_dev_alloc (bus, me_cl); + cldev =mei_cl_bus_dev_alloc (bus, me_cl);if (!cldev)return ;
@@ -911,7 +912,7 @@ void mei_cl_bus_rescan(struct mei_device *bus)down_read (&bus->me_clients_rwsem);list_for_each_entry (me_cl, &bus->me_clients, list) -mei_cl_dev_init (bus, me_cl); +mei_cl_bus_dev_init (bus, me_cl);up_read (&bus->me_clients_rwsem);mutex_lock (&bus->cl_bus_lock);
@@ -925,7 +926,7 @@ void mei_cl_bus_rescan(struct mei_device *bus)if (cldev->is_added)continue ; -if (mei_cl_dev_setup (bus, cldev)) +if (mei_cl_bus_dev_setup (bus, cldev))mei_cl_bus_dev_add (cldev);else {list_del_init (&cldev->bus_list);
drivers/misc/mei/mei_dev.h +1 -1
@@ -340,7 +340,7 @@ struct mei_hw_ops {/* MEI bus API*/ void mei_cl_bus_rescan (struct mei_device *bus); -void mei_cl_dev_fixup (struct mei_cl_device *dev); +void mei_cl_bus_dev_fixup (struct mei_cl_device *dev);ssize_t __mei_cl_send (struct mei_cl *cl,u8 *buf,size_t length,bool blocking);ssize_t __mei_cl_recv (struct mei_cl *cl,u8 *buf,size_t length);
Signature · 1 line
2.4.3
PATCH v2 1/8 mei: make modules.alias UUID information easier to read
In reply to Tomas WinklerFrom: Prarit Bhargava <[email protected]>
scripts/mod/file2alias.c:add_uuid() convert UUID into a single string which does not conform to the standard little endian UUID formatting. This patch changes add_uuid() to output same format as %pUL and modifies the mei driver to match the change.
---
V2: rebase over the latest code
drivers/misc/mei/bus.c | 7 ++----- include/linux/mod_devicetable.h | 4 ---- scripts/mod/file2alias.c | 8 +++++--- 3 files changed, 7 insertions(+), 12 deletions(-)
drivers/misc/mei/bus.c +2 -5
@@ -597,9 +597,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,const uuid_le *uuid =mei_me_cl_uuid (cldev->me_cl);size_t len; - len =snprintf (buf,PAGE_SIZE ,"mei:%s:" MEI_CL_UUID_FMT ":" , - cldev->name,MEI_CL_UUID_ARGS (uuid->b)); - + len =snprintf (buf,PAGE_SIZE ,"mei:%s:%pUl:" , cldev->name, uuid);return (len >=PAGE_SIZE ) ? (PAGE_SIZE -1 ) : len; }static DEVICE_ATTR_RO (modalias);
@@ -631,8 +629,7 @@ static int mei_cl_device_uevent(struct device *dev, struct kobj_uevent_env *env)if (add_uevent_var (env,"MEI_CL_NAME=%s" , cldev->name))return -ENOMEM ; -if (add_uevent_var (env,"MODALIAS=mei:%s:" MEI_CL_UUID_FMT ":" , - cldev->name,MEI_CL_UUID_ARGS (uuid->b))) +if (add_uevent_var (env,"MODALIAS=mei:%s:%pUl:" , cldev->name, uuid))return -ENOMEM ;return 0 ;
include/linux/mod_devicetable.h +0 -4
@@ -601,10 +601,6 @@ struct ipack_device_id {#define MEI_CL_MODULE_PREFIX "mei:"#define MEI_CL_NAME_SIZE 32 -#define MEI_CL_UUID_FMT "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" -#define MEI_CL_UUID_ARGS (_u) \ - _u[0], _u[1], _u[2], _u[3], _u[4], _u[5], _u[6], _u[7], \ - _u[8], _u[9], _u[10], _u[11], _u[12], _u[13], _u[14], _u[15]/** * struct mei_cl_device_id - MEI client device identifier
scripts/mod/file2alias.c +5 -3
@@ -137,10 +137,12 @@ static inline void add_wildcard(char *str)static inline void add_uuid (char *str,uuid_le uuid) {int len =strlen (str); -int i; -for (i =0 ; i <16 ; i++) -sprintf (str + len + (i <<1 ),"%02x" , uuid.b[i]); +sprintf (str + len,"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" , + uuid.b[3 ], uuid.b[2 ], uuid.b[1 ], uuid.b[0 ], + uuid.b[5 ], uuid.b[4 ], uuid.b[7 ], uuid.b[6 ], + uuid.b[8 ], uuid.b[9 ], uuid.b[10 ], uuid.b[11 ], + uuid.b[12 ], uuid.b[13 ], uuid.b[14 ], uuid.b[15 ]); }/**
Signature · 1 line
2.4.3