[PATCH 3.12 01/66] Input: serio - add firmware_id sysfs attribute

From: Jiri Slaby
Date: Sat Dec 06 2014 - 10:13:29 EST

From: Hans de Goede <hdegoede@xxxxxxxxxx>

3.12-stable review patch. If anyone has any objections, please let me know.


commit 0456c66f4e905e1ca839318219c770988b47975c upstream.

serio devices exposed via platform firmware interfaces such as ACPI may
provide additional identifying information of use to userspace.

We don't associate the serio devices with the firmware device (we don't
set it as parent), so there's no way for userspace to make use of this

We cannot change the parent for serio devices instantiated though a
firmware interface as that would break suspend / resume ordering.

Therefore this patch adds a new firmware_id sysfs attribute so that
userspace can get a string from there with any additional identifying
information the firmware interface may provide.

Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Acked-by: Peter Hutterer <peter.hutterer@xxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
drivers/input/serio/serio.c | 13 +++++++++++++
include/linux/serio.h | 1 +
2 files changed, 14 insertions(+)

diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index de019ebb7e29..fffc0a69c6ff 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -474,11 +474,19 @@ static ssize_t serio_set_bind_mode(struct device *dev, struct device_attribute *
return retval;

+static ssize_t firmware_id_show(struct device *dev, struct device_attribute *attr, char *buf)
+ struct serio *serio = to_serio_port(dev);
+ return sprintf(buf, "%s\n", serio->firmware_id);
static struct device_attribute serio_device_attrs[] = {
__ATTR(description, S_IRUGO, serio_show_description, NULL),
__ATTR(modalias, S_IRUGO, serio_show_modalias, NULL),
__ATTR(drvctl, S_IWUSR, NULL, serio_rebind_driver),
__ATTR(bind_mode, S_IWUSR | S_IRUGO, serio_show_bind_mode, serio_set_bind_mode),
+ __ATTR(firmware_id, S_IRUGO, firmware_id_show, NULL),

@@ -912,9 +920,14 @@ static int serio_uevent(struct device *dev, struct kobj_uevent_env *env)
SERIO_ADD_UEVENT_VAR("SERIO_PROTO=%02x", serio->id.proto);
SERIO_ADD_UEVENT_VAR("SERIO_ID=%02x", serio->id.id);
SERIO_ADD_UEVENT_VAR("SERIO_EXTRA=%02x", serio->id.extra);
serio->id.type, serio->id.proto, serio->id.id, serio->id.extra);

+ if (serio->firmware_id[0])
+ serio->firmware_id);
return 0;
diff --git a/include/linux/serio.h b/include/linux/serio.h
index 36aac733840a..9f779c7a2da4 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -23,6 +23,7 @@ struct serio {

char name[32];
char phys[32];
+ char firmware_id[128];

bool manual_bind;


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/