Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp578621pxb; Wed, 3 Nov 2021 08:56:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlHCJnHXVsnvPpJoOHZd+tN349djEs5aCrOimUnP/r7IQsQSMqvn93tTj167/0XYOOm6Xh X-Received: by 2002:a92:d78a:: with SMTP id d10mr30872371iln.108.1635954986606; Wed, 03 Nov 2021 08:56:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635954986; cv=none; d=google.com; s=arc-20160816; b=gkZppOiyhfHOMYwBHvBfU20PPHkqMJMTP154WXvKThnGN4uWPcwjTgvUIGIlKwuzg8 S71PXn3udU4+FpqzUy7m7bbvDPQFNapgxGauci3JHgictcn37+riWWrKFbTldA7d2i7D 1fEb1rJjsRP5whmQ1cmMjKk2+vAQMaFQ9rmtKD3d4iyO2tbbl8s49YoIy6VJyjp/vvMV tvpOCEK7Ho5S0lHqQmBNqxUqbjXUWQFQJXdBYlVkOo9SimtcDEBi8SeqJSFoIn16Db+x 6JZVzwSwkOHfSIpRwv39HmqUU5ctao6gkQH3QW4nczy0QPPxEBRw2gxJELeQV7x/M9u4 ma4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=dYFcOK0td6J3aWBhAxDG5ToaiGq3Ib7pijMhP/ZVLy4=; b=m94mCKSxsc4nJNIP4I18/8ZqiqhWUlymEqfyV7YXlxnDECPKqk25DIyrvCCD6kIc5R 95ftt7WpnCPtqyt1Fo/waB8AevEJoPZMGI39Z2+Tp3i2vTGux9mVjRm2jizTK62b+oRx QcTCRdDgjWHJxAvq1GgRLIlIk8JIL1eoWl8lGzEiXYhMYQPTRr1VWFLxtiF531c031s2 3DXNFfbC+AvXF/4NlAYCIPc5OKyYXqSvmLNWupKv7wEUdGQQ65bFv63YvNVpqMdahbgM QXIWD8unRY1A1fZWqPm8VbmLkriyFw1VJJobUkcXO4I/T8GTqFQONEGmPSUp6CnkmjuP hnww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i11si3891033ilv.33.2021.11.03.08.56.13; Wed, 03 Nov 2021 08:56:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231876AbhKCP5X (ORCPT + 99 others); Wed, 3 Nov 2021 11:57:23 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:46742 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231804AbhKCP5V (ORCPT ); Wed, 3 Nov 2021 11:57:21 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id AC7971F459B4 From: Andrzej Pietrasiewicz To: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Cc: Greg Kroah-Hartman , Dmitry Torokhov , Jiri Slaby , Andrzej Pietrasiewicz , kernel@collabora.com Subject: [RFC] tty/sysrq: Add alternative SysRq key Date: Wed, 3 Nov 2021 16:54:38 +0100 Message-Id: <20211103155438.11167-1-andrzej.p@collabora.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There exist machines which don't have SysRq key at all, e.g. chromebooks. This patch allows configuring an alternative key to act as SysRq. Devices which declare KEY_SYSRQ in their 'keybit' bitmap continue using KEY_SYSRQ, but other devices use the alternative SysRq key instead, by default F10. Which key is actually used can be modified with sysrq's module parameter. Signed-off-by: Andrzej Pietrasiewicz --- I'd like to resurrect an old thread regarding supporting alternative SysRq key for machines which don't have a physical SysRq key at all. The old thread: https://www.spinics.net/lists/linux-input/msg67982.html I'm resending this patch, rebased onto v5.15. Any (new) thoughts about it? drivers/tty/sysrq.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index c911196ac893..6dd288e53ce9 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -634,6 +634,7 @@ EXPORT_SYMBOL(handle_sysrq); #ifdef CONFIG_INPUT static int sysrq_reset_downtime_ms; +static unsigned short alternative_sysrq_key = KEY_F10; /* Simple translation table for the SysRq keys */ static const unsigned char sysrq_xlate[KEY_CNT] = @@ -653,6 +654,7 @@ struct sysrq_state { unsigned int alt_use; unsigned int shift; unsigned int shift_use; + unsigned short sys bool active; bool need_reinject; bool reinjecting; @@ -802,10 +804,10 @@ static void sysrq_reinject_alt_sysrq(struct work_struct *work) /* Simulate press and release of Alt + SysRq */ input_inject_event(handle, EV_KEY, alt_code, 1); - input_inject_event(handle, EV_KEY, KEY_SYSRQ, 1); + input_inject_event(handle, EV_KEY, sysrq->sysrq_key, 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, sysrq->sysrq_key, 0); input_inject_event(handle, EV_KEY, alt_code, 0); input_inject_event(handle, EV_SYN, SYN_REPORT, 1); @@ -845,6 +847,7 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq, sysrq->shift = code; break; +key_sysrq: case KEY_SYSRQ: if (value == 1 && sysrq->alt != KEY_RESERVED) { sysrq->active = true; @@ -867,11 +870,15 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq, * triggering print screen function. */ if (sysrq->active) - clear_bit(KEY_SYSRQ, sysrq->handle.dev->key); + clear_bit(sysrq->sysrq_key, sysrq->handle.dev->key); break; default: + /* handle non-default sysrq key */ + if (code == sysrq->sysrq_key) + goto key_sysrq; + if (sysrq->active && value && value != 2) { unsigned char c = sysrq_xlate[code]; @@ -970,6 +977,14 @@ static int sysrq_connect(struct input_handler *handler, sysrq->handle.private = sysrq; timer_setup(&sysrq->keyreset_timer, sysrq_do_reset, 0); + if (test_bit(KEY_SYSRQ, dev->keybit)) { + sysrq->sysrq_key = KEY_SYSRQ; + pr_info("%s: using default sysrq key [%x]\n", dev->name, KEY_SYSRQ); + } else { + sysrq->sysrq_key = alternative_sysrq_key; + pr_info("%s: Using alternative sysrq key: [%x]\n", dev->name, sysrq->sysrq_key); + } + error = input_register_handle(&sysrq->handle); if (error) { pr_err("Failed to register input sysrq handler, error %d\n", @@ -1078,6 +1093,13 @@ module_param_array_named(reset_seq, sysrq_reset_seq, sysrq_reset_seq, module_param_named(sysrq_downtime_ms, sysrq_reset_downtime_ms, int, 0644); +module_param(alternative_sysrq_key, ushort, 0644); +MODULE_PARM_DESC(alternative_sysrq_key, + "Alternative SysRq key for input devices that don't have SysRq key. F10 by default.\n" + "Example\n" + "Using F9 as SysRq:\n" + "sysrq.alternative_sysrq_key=0x43\n"); + #else static inline void sysrq_register_handler(void) -- 2.17.1