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

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

mei: bus: add name and uuid into device attributes 



Export name and uuid via sysfs and uevent

Cc: linux-api@vger.kernel.org
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c93b76b3

Documentation/ABI/testing/sysfs-bus-mei

+14 −0
Original line number Diff line number Diff line
@@ -5,3 +5,17 @@ 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>:<device uuid>:



What:		/sys/bus/mei/devices/.../name

Date:		May 2015

KernelVersion:	4.2

Contact:	Tomas Winkler <tomas.winkler@intel.com>

Description:	Stores mei client device name

		Format: string



What:		/sys/bus/mei/devices/.../uuid

Date:		May 2015

KernelVersion:	4.2

Contact:	Tomas Winkler <tomas.winkler@intel.com>

Description:	Stores mei client device uuid

		Format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx

drivers/misc/mei/bus.c

+33 −0
Original line number Diff line number Diff line
@@ -114,6 +114,31 @@ static int mei_cl_device_remove(struct device *dev) 
	return driver->remove(device);

}



static ssize_t name_show(struct device *dev, struct device_attribute *a,

			     char *buf)

{

	struct mei_cl_device *device = to_mei_cl_device(dev);

	size_t len;



	len = snprintf(buf, PAGE_SIZE, "%s", device->name);



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

}

static DEVICE_ATTR_RO(name);



static ssize_t uuid_show(struct device *dev, struct device_attribute *a,

			     char *buf)

{

	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, "%pUl", uuid);



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

}

static DEVICE_ATTR_RO(uuid);



static ssize_t modalias_show(struct device *dev, struct device_attribute *a,

			     char *buf)

{
@@ -129,6 +154,8 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a, 
static DEVICE_ATTR_RO(modalias);



static struct attribute *mei_cl_dev_attrs[] = {

	&dev_attr_name.attr,

	&dev_attr_uuid.attr,

	&dev_attr_modalias.attr,

	NULL,

};
@@ -139,6 +166,12 @@ static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env) 
	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, "MEI_CL_UUID=%pUl", uuid))

		return -ENOMEM;



	if (add_uevent_var(env, "MEI_CL_NAME=%s", device->name))

		return -ENOMEM;



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

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

		return -ENOMEM;