From patchwork Fri Jul 12 09:56:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 2826895 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 23B2FC0AB2 for ; Fri, 12 Jul 2013 09:56:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5B2C201C0 for ; Fri, 12 Jul 2013 09:56:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 599B020154 for ; Fri, 12 Jul 2013 09:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932722Ab3GLJ4M (ORCPT ); Fri, 12 Jul 2013 05:56:12 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:37422 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932714Ab3GLJ4L (ORCPT ); Fri, 12 Jul 2013 05:56:11 -0400 Received: by mail-wi0-f170.google.com with SMTP id ey16so494899wid.5 for ; Fri, 12 Jul 2013 02:56:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=DGsyg+4nF+BD6a2A/4pefTindMryA2WS/iZLBN47vmc=; b=jl8QrsfDdOfOCxU8o4cdENOFNe0eFTkLyeDJnmhOCi99t0tuqLPI3tVN5IeTL+4wEQ DwdDZIN77tc1T+WC9TQcHibqzF1iW03URpgWwZF9eNyspu0Ohs2caLRMccijK36sYmVN icWJEQlAeVRjHzpJpgiR+BD21dR5VjtLrZhLTUAi2MJye6j13wYo8hxcJCZuu695FQ5/ 0GjBEp00I+TJsnd09HMPL0j1V9bO5Po4EAXUYQC0Ui77/Y+M45uZIuvR1JVho40boK0N Ph/NoRU7KySKjywyp64rhnP1assJOzADw49jvu6GC0KU5vcLo4FSGtXO3sTELlsOBwsw PEYA== X-Received: by 10.180.187.47 with SMTP id fp15mr1174191wic.27.1373622970379; Fri, 12 Jul 2013 02:56:10 -0700 (PDT) Received: from localhost.localdomain ([193.120.41.118]) by mx.google.com with ESMTPSA id nb12sm2250205wic.7.2013.07.12.02.56.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Jul 2013 02:56:09 -0700 (PDT) From: mathieu.poirier@linaro.org To: grant.likely@linaro.org, dmitry.torokhov@gmail.com Cc: devicetree-discuss@lists.ozlabs.org, john.stultz@linaro.org, linux-input@vger.kernel.org, kernel-team@android.com, mathieu.poirier@linaro.org Subject: [PATCH v3] Input: sysrq - DT binding for key sequences Date: Fri, 12 Jul 2013 03:56:02 -0600 Message-Id: <1373622962-16534-1-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.8.1.2 X-Gm-Message-State: ALoCoQk0/YGr2QJTn24LmMQNVrKSLHiiek5TPBQYfRFhFdE+WB1YTNLfpShIP+R0Y7JyPrfqd5mX Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Mathieu J. Poirier" Adding a simple device tree binding for the specification of key sequences. Definition of the keys found in the sequence are located in 'include/uapi/linux/input.h'. For the sysrq driver, holding the sequence of keys down for a specific amount of time will reset the system. Signed-off-by: Mathieu Poirier --- changes for v3: - Simplified binding definition. - Renamed binding and moved to chosen. --- .../devicetree/bindings/input/input-reset.txt | 34 +++++++++++++ drivers/tty/sysrq.c | 58 ++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/input-reset.txt diff --git a/Documentation/devicetree/bindings/input/input-reset.txt b/Documentation/devicetree/bindings/input/input-reset.txt new file mode 100644 index 0000000..79504af --- /dev/null +++ b/Documentation/devicetree/bindings/input/input-reset.txt @@ -0,0 +1,34 @@ +Input: sysrq reset sequence + +A simple binding to represent a set of keys as described in +include/uapi/linux/input.h. This is to communicate a +sequence of keys to the sysrq driver. Upon holding the keys +for a specified amount of time (if specified) the system is +sync'ed and reset. + +Key sequences are global to the system but all the keys in a +set must be coming from the same input device. + +The /chosen node should contain a 'linux,sysrq-reset-seq' child +node to define a set of keys. + +Required property: +sysrq-reset-seq: array of keycodes + +Optional property: +timeout-ms: duration keys must be pressed together in microseconds +before generating a sysrq + +Example: + + chosen { + linux,sysrq-reset-seq { + keyset = <0x03 + 0x04 + 0x0a>; + timeout-ms = <3000>; + }; + }; + +Would represent KEY_2, KEY_3 and KEY_9. + diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index b51c154..4b77adf 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -671,6 +672,54 @@ static void sysrq_detect_reset_sequence(struct sysrq_state *state, } } +static void sysrq_of_get_keyreset_config(void) +{ + unsigned short key; + struct device_node *np; + const struct property *prop; + const __be32 *val; + int count, i; + + np = of_find_node_by_path("/chosen"); + if (!np) + goto out; + + np = of_find_node_by_name(np, "linux,sysrq-reset-seq"); + if (!np) { + pr_debug("No sysrq node found"); + goto out; + } + + prop = of_find_property(np, "keyset", NULL); + if (!prop || !prop->value) { + pr_err("Invalid input keyset"); + goto out; + } + + count = prop->length / sizeof(u32); + val = prop->value; + + if (count > SYSRQ_KEY_RESET_MAX) + count = SYSRQ_KEY_RESET_MAX; + + /* reset in case a __weak definition was present */ + sysrq_reset_seq_len = 0; + + for (i = 0; i < count; i++) { + key = (unsigned short)be32_to_cpup(val++); + if (key == KEY_RESERVED || key > KEY_MAX) + break; + + sysrq_reset_seq[sysrq_reset_seq_len++] = key; + } + + /* get reset timeout if any */ + of_property_read_u32(np, "timeout-ms", &sysrq_reset_downtime_ms); + + out: + ; +} + static void sysrq_reinject_alt_sysrq(struct work_struct *work) { struct sysrq_state *sysrq = @@ -688,6 +737,7 @@ static void sysrq_reinject_alt_sysrq(struct work_struct *work) input_inject_event(handle, EV_KEY, KEY_SYSRQ, 1); input_inject_event(handle, EV_SYN, SYN_REPORT, 1); + input_inject_event(handle, EV_KEY, KEY_SYSRQ, 0); input_inject_event(handle, EV_KEY, alt_code, 0); input_inject_event(handle, EV_SYN, SYN_REPORT, 1); @@ -903,6 +953,7 @@ static inline void sysrq_register_handler(void) int error; int i; + /* first check if a __weak interface was instantiated */ for (i = 0; i < ARRAY_SIZE(sysrq_reset_seq); i++) { key = platform_sysrq_reset_seq[i]; if (key == KEY_RESERVED || key > KEY_MAX) @@ -911,6 +962,13 @@ static inline void sysrq_register_handler(void) sysrq_reset_seq[sysrq_reset_seq_len++] = key; } + /* + * DT configuration takes precedence over anything + * that would have been defined via the __weak + * interface + */ + sysrq_of_get_keyreset_config(); + error = input_register_handler(&sysrq_handler); if (error) pr_err("Failed to register input handler, error %d", error);