From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29281C41621 for ; Tue, 24 Mar 2020 12:35:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE1792070A for ; Tue, 24 Mar 2020 12:35:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ryqLlcu+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727592AbgCXMfh (ORCPT ); Tue, 24 Mar 2020 08:35:37 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:53375 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727523AbgCXMfg (ORCPT ); Tue, 24 Mar 2020 08:35:36 -0400 Received: by mail-pf1-f202.google.com with SMTP id i26so13831503pfk.20 for ; Tue, 24 Mar 2020 05:35:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=/YRnD9CiSnz4bNQqQAQi7E7yBYNFZlFMr5qPYuWGXYo=; b=ryqLlcu+ZImrQtE0BsB+04n0p17Xu8OO8g6/NMipyvx7mN1TP5o2wYo9LSE59VqqBT 0o6PO7hfCON/n8dn8H3mvcF1f9+AoqrWyL69CvPdWRZgLgSynS3bBrOy2IilJEoxXkts Bg6rbIXllNhd8gs0lsXhE29c8JyYQsjgmdZ7+PYH9PTngwzux0uBr+fJQzsbGLM2mLuN +tHUpDGjXkPY6z+ZKrEH6JS15AeXCBx5krWG05AuGTaGf/9pht0lOicLCO/+igClk0LQ Mup0jURDYD5urOw3IV0ggPpgNy24b9JpuisS5RD45n5fHT/upFI4aCSqr0DDD7/3I376 lgIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=/YRnD9CiSnz4bNQqQAQi7E7yBYNFZlFMr5qPYuWGXYo=; b=kz+OHngidrAADHx60a7Rck8p7iAhlZlPcbzC3UnIdxgsOkiCE6TqbIgNnNFhI/y6KR p5veyXfSpGVM12k+O00wDXY/fXUuAvqi8q7ufFJkiOxyOHibdZTBVG+FieuUMUz8LFSW UXUwFb7Urwm37W4fd1F7DI42MbVkTbH6Lo19UlASk2Zh+n+gbgQdduHhY1OPUglMHTyi jYyVMfyzKCscyZVz1wT39INfi98ViDc2TLT4hsldxtqJ/2ocwNhGsd0y8V8XSZcWxjp/ pGwLjTval7tPZ+bDwzj6uNkJcbCzzvfq8gd8Gwt04rA0zLqI5OXwO3DVPwri9keWYcCT Uo+w== X-Gm-Message-State: ANhLgQ1h1HshcT9KoGsOaxq+AUokZaxW//ERa7dTZ4gLe93Bk5r5P4s+ gq6sHBKJT1d1DNWVCKXpw8zIBGxD42oF X-Google-Smtp-Source: ADFU+vupwZn7p/lnTjgKdRh3aONKbqdisHUy4MWZsIMqWdWh7L09grvSsyKzfmnrOynojDBh9qWzXaKqagJj X-Received: by 2002:a17:90b:14cb:: with SMTP id jz11mr5289443pjb.142.1585053333868; Tue, 24 Mar 2020 05:35:33 -0700 (PDT) Date: Tue, 24 Mar 2020 05:35:15 -0700 In-Reply-To: <20200324123518.239768-1-rajatja@google.com> Message-Id: <20200324123518.239768-2-rajatja@google.com> Mime-Version: 1.0 References: <20200324123518.239768-1-rajatja@google.com> X-Mailer: git-send-email 2.25.1.696.g5e7596f4ac-goog Subject: [PATCH v2 2/5] Input: atkbd: Expose function row physical map to userspace From: Rajat Jain To: Dmitry Torokhov , dtor@google.com, Rob Herring , Mark Rutland , Rajat Jain , Kate Stewart , Enrico Weigelt , Greg Kroah-Hartman , Thomas Gleixner , Allison Randal , "Rafael J. Wysocki" , Stephen Boyd , linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, furquan@google.com, dlaurie@google.com, bleung@google.com, zentaro@google.com, dbehr@google.com Cc: rajatxjain@gmail.com Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Certain keyboards have their top-row keys intended for actions such as "Browser back", "Browser Refresh", "Fullscreen" etc as their primary mode, thus they will send physical codes for those actions. Further, they don't have a dedicated "Fn" key so don't have the capability to generate function key codes (e.g. F1, F2 etc..). However in this case, if userspace still wants to "synthesize" those function keys using the top row action keys, it needs to know the physical position of the top row keys. (Essentially a mapping between usage codes and a physical location in the top row). This patch enhances the atkbd driver to receive such a mapping from the firmware / device tree, and expose it to userspace in the form of a function-row-physmap attribute. The attribute would be a space separated ordered list of physical codes, for the keys in the function row, in left-to-right order. The attribute will only be present if the kernel knows about such mapping, otherwise the attribute shall not be visible. Signed-off-by: Rajat Jain --- v2: Remove the Change-Id from the commit log drivers/input/keyboard/atkbd.c | 59 ++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 7e3eae54c1926..7623eebef2593 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c @@ -24,6 +24,7 @@ #include #include #include +#include #define DRIVER_DESC "AT and PS/2 keyboard driver" @@ -63,6 +64,8 @@ static bool atkbd_terminal; module_param_named(terminal, atkbd_terminal, bool, 0); MODULE_PARM_DESC(terminal, "Enable break codes on an IBM Terminal keyboard connected via AT/PS2"); +#define MAX_FUNCTION_ROW_KEYS 24 + /* * Scancode to keycode tables. These are just the default setting, and * are loadable via a userland utility. @@ -230,6 +233,9 @@ struct atkbd { /* Serializes reconnect(), attr->set() and event work */ struct mutex mutex; + + u16 function_row_physmap[MAX_FUNCTION_ROW_KEYS]; + int num_function_row_keys; }; /* @@ -283,6 +289,7 @@ static struct device_attribute atkbd_attr_##_name = \ __ATTR(_name, S_IRUGO, atkbd_do_show_##_name, NULL); ATKBD_DEFINE_RO_ATTR(err_count); +ATKBD_DEFINE_RO_ATTR(function_row_physmap); static struct attribute *atkbd_attributes[] = { &atkbd_attr_extra.attr, @@ -292,11 +299,42 @@ static struct attribute *atkbd_attributes[] = { &atkbd_attr_softrepeat.attr, &atkbd_attr_softraw.attr, &atkbd_attr_err_count.attr, + &atkbd_attr_function_row_physmap.attr, NULL }; +static ssize_t atkbd_show_function_row_physmap(struct atkbd *atkbd, char *buf) +{ + ssize_t size = 0; + int i; + + if (!atkbd->num_function_row_keys) + return 0; + + for (i = 0; i < atkbd->num_function_row_keys; i++) + size += sprintf(buf + size, "%02X ", + atkbd->function_row_physmap[i]); + size += sprintf(buf + size, "\n"); + return size; +} + +static umode_t atkbd_attr_is_visible(struct kobject *kobj, + struct attribute *attr, int i) +{ + struct device *dev = container_of(kobj, struct device, kobj); + struct serio *serio = to_serio_port(dev); + struct atkbd *atkbd = serio_get_drvdata(serio); + + if (attr == &atkbd_attr_function_row_physmap.attr && + !atkbd->num_function_row_keys) + return 0; + + return attr->mode; +} + static struct attribute_group atkbd_attribute_group = { .attrs = atkbd_attributes, + .is_visible = atkbd_attr_is_visible, }; static const unsigned int xl_table[] = { @@ -1121,6 +1159,25 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd) } } +static void atkbd_parse_fwnode_data(struct serio *serio) +{ + struct atkbd *atkbd = serio_get_drvdata(serio); + struct device *dev = &serio->dev; + int n; + + if (!dev_fwnode(dev)) + return; + + /* Parse "function-row-physmap" property */ + n = device_property_count_u16(dev, "function-row-physmap"); + if (n > 0 && n <= MAX_FUNCTION_ROW_KEYS && + !device_property_read_u16_array(dev, "function-row-physmap", + atkbd->function_row_physmap, n)) { + atkbd->num_function_row_keys = n; + dev_info(dev, "FW reported %d function-row key locations\n", n); + } +} + /* * atkbd_connect() is called when the serio module finds an interface * that isn't handled yet by an appropriate device driver. We check if @@ -1184,6 +1241,8 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv) atkbd->id = 0xab00; } + atkbd_parse_fwnode_data(serio); + atkbd_set_keycode_table(atkbd); atkbd_set_device_attrs(atkbd); -- 2.25.1.696.g5e7596f4ac-goog