From patchwork Mon Mar 20 09:32:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 9634025 X-Patchwork-Delegate: dvhart@infradead.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 71A8960327 for ; Mon, 20 Mar 2017 12:46:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6669623B23 for ; Mon, 20 Mar 2017 12:46:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B30B2808F; Mon, 20 Mar 2017 12:46:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65EEC23B23 for ; Mon, 20 Mar 2017 12:46:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753358AbdCTMqC (ORCPT ); Mon, 20 Mar 2017 08:46:02 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34878 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753368AbdCTJce (ORCPT ); Mon, 20 Mar 2017 05:32:34 -0400 Received: by mail-lf0-f65.google.com with SMTP id v2so9608747lfi.2 for ; Mon, 20 Mar 2017 02:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UsO5im3MqTlVTA9L6mdyzyTE65xQtJJ1i+FcfH/MYNM=; b=UryWJeLqxA8PisEYVH/lw/UtworfI/j/K7/whY9eq8ltp+JEjxkZjLkRTt8JUkpe5a 1nHweWVq4+VQHAnFl9pWfUruF5ZTuPBYDmWkcNYeQBwmYyFWyylU3urBKAm0Nl2c5Ut9 Oge2ZyMlW5CdpC9jUXFMIYEUcJXV1rORoqnjo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UsO5im3MqTlVTA9L6mdyzyTE65xQtJJ1i+FcfH/MYNM=; b=oCt85FoWsucsUK8WxKBKFCwUpJKXVK11qQhfaKx51HmmwnDH2xIqiEc9F85SHZYCfI zSSK8nvlyftJq8AMsHFn62a039Na9I26V4qcQc1+ZweXa+q71JWGwX5M1w/x/tBul234 ncrji82ZOoiZ41LzSr7FTUN9ahubZ9b1s/7ZcNcTAoRyJ1+Kr7bfpxdgscKh8dQ6Qmgx vrjCCWsHI25uw4dTIt0o4b22eM1aVetcS/Tf2M+X12XZS26R1rZiw80EY95h9iEP9YHn M49SMDkXQzFqsD77BN30ckWpyyyhbd/90W2WjtPLxSIiwFmxIud5Omjx7ukqg0bDdNFt 9i+g== X-Gm-Message-State: AFeK/H3qOJ2CsevcmPXNJpvrgVHACno2nDlX+7GULND94Sxkqle3PCD5r/BxRMEG0bbj8Q== X-Received: by 10.25.167.203 with SMTP id q194mr7428633lfe.138.1490002351686; Mon, 20 Mar 2017 02:32:31 -0700 (PDT) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id 4sm2918755ljf.33.2017.03.20.02.32.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 02:32:31 -0700 (PDT) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/8] platform/x86: fujitsu-laptop: use a sparse keymap for hotkey event generation Date: Mon, 20 Mar 2017 10:32:22 +0100 Message-Id: <20170320093224.18541-7-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170320093224.18541-1-kernel@kempniu.pl> References: <20170320093224.18541-1-kernel@kempniu.pl> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Simplify hotkey event generation by using a sparse keymap. As sparse keymap operates on scancodes instead of keycodes, adjust variable names and debug messages accordingly. This patch only handles the default keymap for clarity. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 111 +++++++++++++--------------------- 1 file changed, 41 insertions(+), 70 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 74da588ed871..8f1c9c204110 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -756,9 +756,22 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event) /* ACPI device for hotkey handling */ +static const struct key_entry keymap_default[] = { + { KE_KEY, KEY1_CODE, { KEY_PROG1 } }, + { KE_KEY, KEY2_CODE, { KEY_PROG2 } }, + { KE_KEY, KEY3_CODE, { KEY_PROG3 } }, + { KE_KEY, KEY4_CODE, { KEY_PROG4 } }, + { KE_KEY, KEY5_CODE, { KEY_RFKILL } }, + { KE_KEY, BIT(26), { KEY_TOUCHPAD_TOGGLE } }, + { KE_END, 0 } +}; + +static const struct key_entry *keymap = keymap_default; + static int acpi_fujitsu_laptop_input_setup(struct acpi_device *device) { struct fujitsu_laptop *fujitsu_laptop = acpi_driver_data(device); + int ret; fujitsu_laptop->input = devm_input_allocate_device(&device->dev); if (!fujitsu_laptop->input) @@ -772,14 +785,9 @@ static int acpi_fujitsu_laptop_input_setup(struct acpi_device *device) fujitsu_laptop->input->id.bustype = BUS_HOST; fujitsu_laptop->input->id.product = 0x06; - set_bit(EV_KEY, fujitsu_laptop->input->evbit); - set_bit(fujitsu_bl->keycode1, fujitsu_laptop->input->keybit); - set_bit(fujitsu_bl->keycode2, fujitsu_laptop->input->keybit); - set_bit(fujitsu_bl->keycode3, fujitsu_laptop->input->keybit); - set_bit(fujitsu_bl->keycode4, fujitsu_laptop->input->keybit); - set_bit(fujitsu_bl->keycode5, fujitsu_laptop->input->keybit); - set_bit(KEY_TOUCHPAD_TOGGLE, fujitsu_laptop->input->keybit); - set_bit(KEY_UNKNOWN, fujitsu_laptop->input->keybit); + ret = sparse_keymap_setup(fujitsu_laptop->input, keymap, NULL); + if (ret) + return ret; return input_register_device(fujitsu_laptop->input); } @@ -995,61 +1003,54 @@ static int acpi_fujitsu_laptop_remove(struct acpi_device *device) return 0; } -static void acpi_fujitsu_laptop_press(int keycode) +static void acpi_fujitsu_laptop_press(int scancode) { struct input_dev *input = fujitsu_laptop->input; int status; status = kfifo_in_locked(&fujitsu_laptop->fifo, - (unsigned char *)&keycode, sizeof(keycode), + (unsigned char *)&scancode, sizeof(scancode), &fujitsu_laptop->fifo_lock); - if (status != sizeof(keycode)) { + if (status != sizeof(scancode)) { vdbg_printk(FUJLAPTOP_DBG_WARN, - "Could not push keycode [0x%x]\n", keycode); + "Could not push scancode [0x%x]\n", scancode); return; } - input_report_key(input, keycode, 1); - input_sync(input); + sparse_keymap_report_event(input, scancode, 1, false); vdbg_printk(FUJLAPTOP_DBG_TRACE, - "Push keycode into ringbuffer [%d]\n", keycode); + "Push scancode into ringbuffer [0x%x]\n", scancode); } static void acpi_fujitsu_laptop_release(void) { struct input_dev *input = fujitsu_laptop->input; - int keycode, status; + int scancode, status; while (true) { status = kfifo_out_locked(&fujitsu_laptop->fifo, - (unsigned char *)&keycode, - sizeof(keycode), + (unsigned char *)&scancode, + sizeof(scancode), &fujitsu_laptop->fifo_lock); - if (status != sizeof(keycode)) + if (status != sizeof(scancode)) return; - input_report_key(input, keycode, 0); - input_sync(input); + sparse_keymap_report_event(input, scancode, 0, false); vdbg_printk(FUJLAPTOP_DBG_TRACE, - "Pop keycode from ringbuffer [%d]\n", keycode); + "Pop scancode from ringbuffer [0x%x]\n", scancode); } } static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event) { struct input_dev *input; - int keycode; - unsigned int irb = 1; - int i; + int scancode, i = 0; + unsigned int irb; input = fujitsu_laptop->input; if (event != ACPI_FUJITSU_NOTIFY_CODE1) { - keycode = KEY_UNKNOWN; vdbg_printk(FUJLAPTOP_DBG_WARN, "Unsupported event [0x%x]\n", event); - input_report_key(input, keycode, 1); - input_sync(input); - input_report_key(input, keycode, 0); - input_sync(input); + sparse_keymap_report_event(input, -1, 1, true); return; } @@ -1057,40 +1058,16 @@ static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event) fujitsu_laptop->flags_state = call_fext_func(FUNC_FLAGS, 0x4, 0x0, 0x0); - i = 0; - while ((irb = - call_fext_func(FUNC_BUTTONS, 0x1, 0x0, 0x0)) != 0 - && (i++) < MAX_HOTKEY_RINGBUFFER_SIZE) { - switch (irb & 0x4ff) { - case KEY1_CODE: - keycode = fujitsu_bl->keycode1; - break; - case KEY2_CODE: - keycode = fujitsu_bl->keycode2; - break; - case KEY3_CODE: - keycode = fujitsu_bl->keycode3; - break; - case KEY4_CODE: - keycode = fujitsu_bl->keycode4; - break; - case KEY5_CODE: - keycode = fujitsu_bl->keycode5; - break; - case 0: - keycode = 0; - break; - default: + while ((irb = call_fext_func(FUNC_BUTTONS, 0x1, 0x0, 0x0)) != 0 && + i++ < MAX_HOTKEY_RINGBUFFER_SIZE) { + scancode = irb & 0x4ff; + if (sparse_keymap_entry_from_scancode(input, scancode)) + acpi_fujitsu_laptop_press(scancode); + else if (scancode == 0) + acpi_fujitsu_laptop_release(); + else vdbg_printk(FUJLAPTOP_DBG_WARN, "Unknown GIRB result [%x]\n", irb); - keycode = -1; - break; - } - - if (keycode > 0) - acpi_fujitsu_laptop_press(keycode); - else if (keycode == 0) - acpi_fujitsu_laptop_release(); } /* On some models (first seen on the Skylake-based Lifebook @@ -1098,14 +1075,8 @@ static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event) * handled in software; its state is queried using FUNC_FLAGS */ if ((fujitsu_laptop->flags_supported & BIT(26)) && - (call_fext_func(FUNC_FLAGS, 0x1, 0x0, 0x0) & BIT(26))) { - keycode = KEY_TOUCHPAD_TOGGLE; - input_report_key(input, keycode, 1); - input_sync(input); - input_report_key(input, keycode, 0); - input_sync(input); - } - + (call_fext_func(FLAG_RFKILL, 0x1, 0x0, 0x0) & BIT(26))) + sparse_keymap_report_event(input, BIT(26), 1, true); } /* Initialization */