From patchwork Tue Apr 11 12:30:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9675161 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 79C5560234 for ; Tue, 11 Apr 2017 12:33:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A9752852B for ; Tue, 11 Apr 2017 12:33:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BF972852E; Tue, 11 Apr 2017 12:33:37 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C180F2852B for ; Tue, 11 Apr 2017 12:33:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxuwV-0000oH-Lw; Tue, 11 Apr 2017 12:30:43 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxuwU-0000o6-QV for xen-devel@lists.xenproject.org; Tue, 11 Apr 2017 12:30:42 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id 76/5F-03430-27CCCE85; Tue, 11 Apr 2017 12:30:42 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBLMWRWlGSWpSXmKPExsVyuP0Ov27hmTc RBh+aNS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozDDx+wFnyRrbg037qBcZlkFyMnh4SAkcTb if+Yuhi5OIQEFjJKXH2+nBkkwSagKrHh+ilWEFtEIF5iZu9RJhCbWaBQ4vGiVWBxYYFwiQWbm llAbBag+rnNCxhBbF4BE4m5DWuZIRbISyzaNINlAiPnAkaGVYzqxalFZalFuhZ6SUWZ6RkluY mZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiBvmIAgh2Msy/7H2KU5GBSEuUNmPk6QogvKT+lMiO xOCO+qDQntfgQowwHh5IEr/TpNxFCgkWp6akVaZk5wKCBSUtw8CiJ8OqeAkrzFhck5hZnpkOk TjHqcrxb+uE9kxBLXn5eqpQ4rzvIDAGQoozSPLgRsAC+xCgrJczLCHSUEE9BalFuZgmq/CtGc Q5GJWFeHpApPJl5JXCbXgEdwQR0xJldL0GOKElESEk1MLa2mj4xe/d1l2zt51sP/RNeBx6T69 mnu+5jnTjbg1TGRX9/tN/9sa31itdxw4wpfyv/zumw+i5unahYWp753uyOoKfE5YNVgoFPmhc 4tdfut1suG6qwNmptTuG9ZOEtZmdjTn+9VZko9uSn/5e0CNOQBo2zp11/xvqpHvLdXpy/6zrf /eSELiWW4oxEQy3mouJEABfpGqFbAgAA X-Env-Sender: jgross@suse.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1491913841!44308331!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2773 invoked from network); 11 Apr 2017 12:30:41 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-2.tower-27.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 11 Apr 2017 12:30:41 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A2BD6AC04; Tue, 11 Apr 2017 12:30:40 +0000 (UTC) From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, linux-input@vger.kernel.org Date: Tue, 11 Apr 2017 14:30:37 +0200 Message-Id: <20170411123037.31733-1-jgross@suse.com> X-Mailer: git-send-email 2.12.0 Cc: andr2000@gmail.com, Juergen Gross , boris.ostrovsky@oracle.com, dmitry.torokhov@gmail.com Subject: [Xen-devel] [PATCH v3] xen, input: add xen-kbdfront module parameter for setting resolution X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add a parameter for setting the resolution of xen-kbdfront in order to be able to cope with a (virtual) frame buffer of arbitrary resolution. While at it remove the pointless second reading of parameters from Xenstore in the device connection phase: all parameters are available during device probing already and that is where they should be read. Signed-off-by: Juergen Gross Reviewed-by: Oleksandr Andrushchenko --- V3: - merged the two patches - read Xenstore parameters during probing of the device only --- drivers/input/misc/xen-kbdfront.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c index 3900875dec10..2fc7895373ab 100644 --- a/drivers/input/misc/xen-kbdfront.c +++ b/drivers/input/misc/xen-kbdfront.c @@ -41,6 +41,12 @@ struct xenkbd_info { char phys[32]; }; +enum { KPARAM_X, KPARAM_Y, KPARAM_CNT }; +static int ptr_size[KPARAM_CNT] = { XENFB_WIDTH, XENFB_HEIGHT }; +module_param_array(ptr_size, int, NULL, 0444); +MODULE_PARM_DESC(ptr_size, + "Pointing device width, height in pixels (default 800,600)"); + static int xenkbd_remove(struct xenbus_device *); static int xenkbd_connect_backend(struct xenbus_device *, struct xenkbd_info *); static void xenkbd_disconnect_backend(struct xenkbd_info *); @@ -128,7 +134,12 @@ static int xenkbd_probe(struct xenbus_device *dev, if (!info->page) goto error_nomem; + /* Set input abs params to match backend screen res */ abs = xenbus_read_unsigned(dev->otherend, "feature-abs-pointer", 0); + ptr_size[KPARAM_X] = xenbus_read_unsigned(dev->otherend, "width", + ptr_size[KPARAM_X]); + ptr_size[KPARAM_Y] = xenbus_read_unsigned(dev->otherend, "height", + ptr_size[KPARAM_Y]); if (abs) { ret = xenbus_write(XBT_NIL, dev->nodename, "request-abs-pointer", "1"); @@ -174,8 +185,8 @@ static int xenkbd_probe(struct xenbus_device *dev, if (abs) { __set_bit(EV_ABS, ptr->evbit); - input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0); - input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0); + input_set_abs_params(ptr, ABS_X, 0, ptr_size[KPARAM_X], 0, 0); + input_set_abs_params(ptr, ABS_Y, 0, ptr_size[KPARAM_Y], 0, 0); } else { input_set_capability(ptr, EV_REL, REL_X); input_set_capability(ptr, EV_REL, REL_Y); @@ -309,9 +320,6 @@ static void xenkbd_disconnect_backend(struct xenkbd_info *info) static void xenkbd_backend_changed(struct xenbus_device *dev, enum xenbus_state backend_state) { - struct xenkbd_info *info = dev_get_drvdata(&dev->dev); - int ret, val; - switch (backend_state) { case XenbusStateInitialising: case XenbusStateInitialised: @@ -321,15 +329,6 @@ static void xenkbd_backend_changed(struct xenbus_device *dev, break; case XenbusStateInitWait: -InitWait: - if (xenbus_read_unsigned(info->xbdev->otherend, - "feature-abs-pointer", 0)) { - ret = xenbus_write(XBT_NIL, info->xbdev->nodename, - "request-abs-pointer", "1"); - if (ret) - pr_warning("xenkbd: can't request abs-pointer"); - } - xenbus_switch_state(dev, XenbusStateConnected); break; @@ -340,17 +339,7 @@ static void xenkbd_backend_changed(struct xenbus_device *dev, * get Connected twice here. */ if (dev->state != XenbusStateConnected) - goto InitWait; /* no InitWait seen yet, fudge it */ - - /* Set input abs params to match backend screen res */ - if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, - "width", "%d", &val) > 0) - input_set_abs_params(info->ptr, ABS_X, 0, val, 0, 0); - - if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, - "height", "%d", &val) > 0) - input_set_abs_params(info->ptr, ABS_Y, 0, val, 0, 0); - + xenbus_switch_state(dev, XenbusStateConnected); break; case XenbusStateClosed: