From patchwork Mon Apr 18 15:23:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Laws X-Patchwork-Id: 8873151 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B46CD9F1C1 for ; Mon, 18 Apr 2016 15:24:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7760F20115 for ; Mon, 18 Apr 2016 15:24:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DD56200F0 for ; Mon, 18 Apr 2016 15:24:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751899AbcDRPYO (ORCPT ); Mon, 18 Apr 2016 11:24:14 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:34990 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751552AbcDRPYO (ORCPT ); Mon, 18 Apr 2016 11:24:14 -0400 Received: by mail-pa0-f66.google.com with SMTP id zy2so16781719pac.2 for ; Mon, 18 Apr 2016 08:24:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=60hz-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=5t+G6qEEJH85VkI80o23/l9RGHXsQ2xzriYYTsZXwig=; b=Brtisj6iYsfyCYx9nSCmf67ZFHL5PHSVGURL++wd9T/sIFzXHYh5xzEyIb3mlCJjTo F2TpjLMwF4RlYcvHXzgENo0q/L3DODa5jUYMjXiv4hJOTu5Oqo3y+VLMPaPEDgA7yDVs h+yOcNX/sS3BfXAVmVa1rKeahtmOFJpo5V/eMp9+hYCcBifxavs9s1FhO/Fy/vhhHvaE YgPLn4+cznp1cTsIECoY4f/bbIITOZa3ZociR4pD3iz6hwvZQhBjcpYzEd4kU3+rHYc6 4liUx4CHlD82J99wUVTnHFja+uR9PRQqEFmmXHej804WbtwdkgxyECPZ+0FaDp+9511U f6Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=5t+G6qEEJH85VkI80o23/l9RGHXsQ2xzriYYTsZXwig=; b=eAIaMpYs17KXJVfQ9dTK4zZ75TCZVU5lR9NeeifDi0SXusNyFP05+9ARBJ19lWQXIu 8KHrmh+mmb1qNcn7Avyz/rPqiCMejZ1vrCnCUcPCtm5P8z5vRxKrE3+alMXcY9QHwWPU fZTemwtFfPtK4hq/J8uImbkWY39+aMK6iJm5NkLSsxNhoPOoK79ZqiSu5JSxKSgs8BZC JwxHG6dWWKKeJGtxnZOhdNO98eKSyaA+ET0UYto0EeDt/Em51D0GJrLHWkOxAgVRP3PZ jFZHzVtRUscnutnxQwVwoWbj9kAD5EiMR/Pk0MRicaVlMKzyXy+crYzqYACif/7ikkin PNxQ== X-Gm-Message-State: AOPr4FUo3BB7hwnEl8qNNJbVaMVI6BIkQH4KAKucg8zKmE5RCHHMQKCdz0i9zfTKC9UWBg== X-Received: by 10.66.62.232 with SMTP id b8mr50107876pas.104.1460993053122; Mon, 18 Apr 2016 08:24:13 -0700 (PDT) Received: from arch-vm.localdomain (pl2290.nas82c.p-tokyo.nttpc.ne.jp. [219.102.86.242]) by smtp.gmail.com with ESMTPSA id t126sm12196405pfb.73.2016.04.18.08.24.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Apr 2016 08:24:12 -0700 (PDT) From: Mark Laws To: kys@microsoft.com, haiyangz@microsoft.com Cc: Mark Laws , devel@linuxdriverproject.org, linux-input@vger.kernel.org Subject: [PATCH] Input: i8042 - Fix console keyboard support on Gen2 Hyper-V VMs Date: Tue, 19 Apr 2016 00:23:36 +0900 Message-Id: <341e0bb72d58c1c7d72ad5352f4bb364d939c0a8.1460985538.git.mdl@60hz.org> X-Mailer: git-send-email 2.8.0 In-Reply-To: References: In-Reply-To: References: <1407814240-4275-1-git-send-email-decui@microsoft.com> 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 As explained in 1407814240-4275-1-git-send-email-decui@microsoft.com: > hyperv_keyboard invokes serio_interrupt(), which needs a valid serio > driver like atkbd.c. atkbd.c depends on libps2.c because it invokes > ps2_command(). libps2.c depends on i8042.c because it invokes > i8042_check_port_owner(). As a result, hyperv_keyboard actually > depends on i8042.c. > > For a Generation 2 Hyper-V VM (meaning no i8042 device emulated), if a > Linux VM (like Arch Linux) happens to configure CONFIG_SERIO_I8042=m > rather than =y, atkbd.ko can't load because i8042.ko can't load(due to > no i8042 device emulated) and finally hyperv_keyboard can't work and > the user can't input: https://bugs.archlinux.org/task/39820 > (Ubuntu/RHEL/SUSE aren't affected since they use CONFIG_SERIO_I8042=y) The transitive dependency on i8042.c is non-trivial--there appears to be no obvious way to untangle it other than by duplicating much of atkbd.c within hyperv-keyboard--so we employ a simple workaround: keep i8042.ko loaded even if no i8042 device is detected, but set a flag so that any calls into the module simply return (since we don't want to try to interact with the non-existent i8042). This allows atkbd.c and libps2.c to load, solving the problem. Signed-off-by: Mark Laws --- drivers/input/serio/i8042.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 4541957..4d49496 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -132,6 +132,7 @@ struct i8042_port { static struct i8042_port i8042_ports[I8042_NUM_PORTS]; +static bool i8042_present; static unsigned char i8042_initial_ctr; static unsigned char i8042_ctr; static bool i8042_mux_present; @@ -163,6 +164,9 @@ int i8042_install_filter(bool (*filter)(unsigned char data, unsigned char str, unsigned long flags; int ret = 0; + if (!i8042_present) + return ret; + spin_lock_irqsave(&i8042_lock, flags); if (i8042_platform_filter) { @@ -184,6 +188,9 @@ int i8042_remove_filter(bool (*filter)(unsigned char data, unsigned char str, unsigned long flags; int ret = 0; + if (!i8042_present) + return ret; + spin_lock_irqsave(&i8042_lock, flags); if (i8042_platform_filter != filter) { @@ -311,7 +318,10 @@ static int __i8042_command(unsigned char *param, int command) int i8042_command(unsigned char *param, int command) { unsigned long flags; - int retval; + int retval = 0; + + if (!i8042_present) + return retval; spin_lock_irqsave(&i8042_lock, flags); retval = __i8042_command(param, command); @@ -1380,6 +1390,9 @@ bool i8042_check_port_owner(const struct serio *port) { int i; + if (!i8042_present) + return false; + for (i = 0; i < I8042_NUM_PORTS; i++) if (i8042_ports[i].serio == port) return true; @@ -1569,13 +1582,17 @@ static int __init i8042_init(void) dbg_init(); + i8042_present = false; + err = i8042_platform_init(); if (err) return err; err = i8042_controller_check(); - if (err) - goto err_platform_exit; + if (err) { + pr_info("Staying resident in case of module dependencies\n"); + goto out; + } pdev = platform_create_bundle(&i8042_driver, i8042_probe, NULL, 0, NULL, 0); if (IS_ERR(pdev)) { @@ -1585,7 +1602,9 @@ static int __init i8042_init(void) bus_register_notifier(&serio_bus, &i8042_kbd_bind_notifier_block); panic_blink = i8042_panic_blink; + i8042_present = true; +out: return 0; err_platform_exit: @@ -1595,12 +1614,20 @@ static int __init i8042_init(void) static void __exit i8042_exit(void) { - platform_device_unregister(i8042_platform_device); - platform_driver_unregister(&i8042_driver); + if (i8042_present) { + platform_device_unregister(i8042_platform_device); + platform_driver_unregister(&i8042_driver); + } + i8042_platform_exit(); - bus_unregister_notifier(&serio_bus, &i8042_kbd_bind_notifier_block); - panic_blink = NULL; + if (i8042_present) { + bus_unregister_notifier(&serio_bus, + &i8042_kbd_bind_notifier_block); + panic_blink = NULL; + } + + i8042_present = false; } module_init(i8042_init);