Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1973705ybb; Thu, 26 Mar 2020 18:33:30 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt7djsOLfhmrBjzAOi4TBmP+2/xDg5IDQ7Y+ZeGxaWs873bvVNkd8TKu4XtyQWSwn4m4NUZ X-Received: by 2002:aca:a94a:: with SMTP id s71mr2291658oie.152.1585272809924; Thu, 26 Mar 2020 18:33:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585272809; cv=none; d=google.com; s=arc-20160816; b=mxD+zQ6EGDcjz3S3bVUqihye+dqb4/yC1mQzc9Z+ddHGiKTss66f31S7ADgmeUBJc3 Fo5N4Z4xMbQ2vV2WxelJ4A51jGupwi1x4QAMFK8wf+tXQLhr8BiSgdgmJ84lEUmjLLeU Pxit0vI9OnHx70B64hlK2AjcisFnNnegxZi/399b4gnf/sd/LpHTNtkmmIkFl8DX9UtK z9qxmQ0zRhiU6+j1oAqhNKy1tvbve9QBdsj3II9Lhrv4AllrDC4Mqbd+g+idz0JjtnCP bE66O6raCyrIRJE32tsasukruH31Q8JOQayJ40dY07JmaUvil+7PVaAV1fZm+h5rmDp0 guTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=m+LBqNPjIzI/i9s16PMcLCo7oQ00z3NG9NsKpsashP4=; b=obY1VxVunNqb0VAL6ghFO0QkREUMjU0yfav0rc/cdKI0BwR8exnM2qA+QxBk7bWW5p 939oMgJZ/n5LkfrWeDGcJSImDOc/hMIRD3RXGGVSCkDXm7nfxdVbYoTE2vUP4gk7jCY5 IFF/cZuzZSRox7Me9MoJCJlsWuiJQLJXitD2yoR7Ge1wGVwKww8VhMZKC3kJT8jC3ADG L2rS+qCH5+NPOwQCGxfcdlw2R6CF7P4BC9aROWhJJdV7rfW+88mLPcJWffmqBQhcATug pDwajaez+zwsxYCVjBI7UBrsD3cLXIBE2qv1YTItuVQ0OJ7b7lWlnOiQn+2pXOKYlRp2 UO6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=IniSd5FS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e5si1830515otp.317.2020.03.26.18.33.17; Thu, 26 Mar 2020 18:33:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=IniSd5FS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727820AbgC0Bcx (ORCPT + 99 others); Thu, 26 Mar 2020 21:32:53 -0400 Received: from mail-pj1-f74.google.com ([209.85.216.74]:35575 "EHLO mail-pj1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727122AbgC0Bcw (ORCPT ); Thu, 26 Mar 2020 21:32:52 -0400 Received: by mail-pj1-f74.google.com with SMTP id nk12so5841006pjb.0 for ; Thu, 26 Mar 2020 18:32:51 -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=m+LBqNPjIzI/i9s16PMcLCo7oQ00z3NG9NsKpsashP4=; b=IniSd5FS/y8perrcfoLk0jYuwuXa9iiB7J6jReuu7Drq4aE2/mX2ZLrg+PF7EfI7Ef IOxyACbnWFgAg2bxNIqHCTatF8ZMi7A6axNsKDsvZsYXVIU/Omw/HGlcxztyvOzbFLUO Wd1OVOZBLhY6HdtSlhIalBcn1PLJVVGEm993t/nHozzxGk9zQnv02VcBHCp4j2Ds/nYO GYq7IBe3GUcxmGQbGgCWsLwSy9mfW3cheiajnPpylz51hEAlIPtP7zM4nAaipZRdJHjL It73mvnfAcAJiVsW9ttG3lv8f8pncVOYOdRk1qYFMoq3EQprr/CFW3mDmxjTVkZ8fqX/ /v+w== 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=m+LBqNPjIzI/i9s16PMcLCo7oQ00z3NG9NsKpsashP4=; b=i4/t3VXLoJpcotzsPifuKDOuwQO7uKFoOgYo/ZhHGqClYSMezIifvOzuwDJLFlCH2d MNdyg4Be9RDMCDCIpI20+/T/LZs/938W63U83CRw0yz5xnVSJL78fsQYraG+tgOlbCuR qL7s4GmfDT8LhqcEzYebrmLBzKwCWeL9UZc8+3RmwmvXZMR68/Qh6QwkhnYbcotglgjU K9W5d5vng450I3dyjD7dNuhrh+GpM1RKK87Zka9FH+KbJv4TWgh8Yn7/Y6784+Zw3w19 Xfo1xl5BTDk83T+5PRBseQP41vtSpK2LyfZ/qW4YtRI3NYu0d6oCuldWz5xo2ocj/Rdt vikw== X-Gm-Message-State: ANhLgQ3o60uTXbUzwm9LGDgsSzQxgkcNk8+bYagTpBR+9tgNdJTbzm5X bZKWt/oitYbtUaoUQFtY6XLyyzaWWefx X-Received: by 2002:a17:90a:d349:: with SMTP id i9mr2965528pjx.180.1585272770919; Thu, 26 Mar 2020 18:32:50 -0700 (PDT) Date: Thu, 26 Mar 2020 18:32:36 -0700 In-Reply-To: <20200327013239.238182-1-rajatja@google.com> Message-Id: <20200327013239.238182-2-rajatja@google.com> Mime-Version: 1.0 References: <20200327013239.238182-1-rajatja@google.com> X-Mailer: git-send-email 2.25.1.696.g5e7596f4ac-goog Subject: [PATCH v3 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 --- v3: Change to dev_dbg and remove unecessary error check v2: Remove the Change-Id from the commit log drivers/input/keyboard/atkbd.c | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 7e3eae54c1926..3b20aba1861cd 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,22 @@ 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; + + /* 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_dbg(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 +1238,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