Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c93b76b3 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: bus: report also uuid in module alias 



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: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 41c95b04

Documentation/ABI/testing/sysfs-bus-mei

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ KernelVersion: 3.10 
Contact:	Samuel Ortiz <sameo@linux.intel.com>

		linux-mei@linux.intel.com

Description:	Stores the same MODALIAS value emitted by uevent

		Format: mei:<mei device name>
 
		Format: mei:<mei device name>:<device uuid>:

drivers/misc/mei/bus.c

+34 −8
Original line number Diff line number Diff line
@@ -30,23 +30,40 @@ 
#define to_mei_cl_driver(d) container_of(d, struct mei_cl_driver, driver)

#define to_mei_cl_device(d) container_of(d, struct mei_cl_device, dev)



static inline uuid_le uuid_le_cast(const __u8 uuid[16])

{

	return *(uuid_le *)uuid;

}



static int mei_cl_device_match(struct device *dev, struct device_driver *drv)

{

	struct mei_cl_device *device = to_mei_cl_device(dev);

	struct mei_cl_driver *driver = to_mei_cl_driver(drv);

	const struct mei_cl_device_id *id;

	const uuid_le *uuid;

	const char *name;



	if (!device)

		return 0;



	uuid = mei_me_cl_uuid(device->me_cl);

	name = device->name;



	if (!driver || !driver->id_table)

		return 0;



	id = driver->id_table;



	while (id->name[0]) {

		if (!strncmp(dev_name(dev), id->name, sizeof(id->name)))

	while (uuid_le_cmp(NULL_UUID_LE, uuid_le_cast(id->uuid))) {



		if (!uuid_le_cmp(*uuid, uuid_le_cast(id->uuid))) {

			if (id->name[0]) {

				if (!strncmp(name, id->name, sizeof(id->name)))

					return 1;

			} else {

				return 1;

			}

		}



		id++;

	}
@@ -69,7 +86,7 @@ static int mei_cl_device_probe(struct device *dev) 


	dev_dbg(dev, "Device probe\n");



	strlcpy(id.name, dev_name(dev), sizeof(id.name));

	strlcpy(id.name, device->name, sizeof(id.name));



	return driver->probe(device, &id);

}
@@ -100,9 +117,12 @@ static int mei_cl_device_remove(struct device *dev) 
static ssize_t modalias_show(struct device *dev, struct device_attribute *a,

			     char *buf)

{

	int len;

	struct mei_cl_device *device = to_mei_cl_device(dev);

	const uuid_le *uuid = mei_me_cl_uuid(device->me_cl);

	size_t len;



	len = snprintf(buf, PAGE_SIZE, "mei:%s\n", dev_name(dev));

	len = snprintf(buf, PAGE_SIZE, "mei:%s:" MEI_CL_UUID_FMT ":",

		device->name, MEI_CL_UUID_ARGS(uuid->b));



	return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;

}
@@ -116,7 +136,11 @@ ATTRIBUTE_GROUPS(mei_cl_dev); 


static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	if (add_uevent_var(env, "MODALIAS=mei:%s", dev_name(dev)))

	struct mei_cl_device *device = to_mei_cl_device(dev);

	const uuid_le *uuid = mei_me_cl_uuid(device->me_cl);



	if (add_uevent_var(env, "MODALIAS=mei:%s:" MEI_CL_UUID_FMT ":",

		device->name, MEI_CL_UUID_ARGS(uuid->b)))

		return -ENOMEM;



	return 0;
@@ -185,7 +209,9 @@ struct mei_cl_device *mei_cl_add_device(struct mei_device *dev, 
	device->dev.bus = &mei_cl_bus_type;

	device->dev.type = &mei_cl_device_type;



	dev_set_name(&device->dev, "%s", name);

	strlcpy(device->name, name, sizeof(device->name));



	dev_set_name(&device->dev, "mei:%s:%pUl", name, mei_me_cl_uuid(me_cl));



	status = device_register(&device->dev);

	if (status) {

drivers/misc/mei/mei_dev.h

+2 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ struct mei_cl *mei_cl_bus_find_cl_by_uuid(struct mei_device *dev, uuid_le uuid); 
 * @dev: linux driver model device pointer

 * @me_cl: me client

 * @cl: mei client

 * @name: device name

 * @ops: ME transport ops

 * @event_work: async work to execute event callback

 * @event_cb: Drivers register this callback to get asynchronous ME
@@ -389,6 +390,7 @@ struct mei_cl_device { 


	struct mei_me_client *me_cl;

	struct mei_cl *cl;

	char name[MEI_CL_NAME_SIZE];



	const struct mei_cl_ops *ops;

drivers/nfc/mei_phy.h

+3 −0
Original line number Diff line number Diff line
@@ -3,7 +3,10 @@ 


#include <linux/mei_cl_bus.h>

#include <net/nfc/hci.h>

#include <linux/uuid.h>



#define MEI_NFC_UUID __UUID_LE(0x0bb17a78, 0x2a8e, 0x4c50, \

		0x94, 0xd4, 0x50, 0x26, 0x67, 0x23, 0x77, 0x5c)

#define MEI_NFC_HEADER_SIZE 10

#define MEI_NFC_MAX_HCI_PAYLOAD 300

drivers/nfc/microread/mei.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },

	{ MICROREAD_DRIVER_NAME, MEI_NFC_UUID},



	/* required last entry */

	{ }