From: Juergen Gross <jgross@suse.com> To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Juergen Gross <jgross@suse.com>, stable@vger.kernel.org Subject: [PATCH 2/2] xen,input: repair xen-kbdfront resolution setting via xenstore Date: Tue, 21 Mar 2017 18:19:05 +0100 [thread overview] Message-ID: <20170321171905.31584-3-jgross@suse.com> (raw) In-Reply-To: <20170321171905.31584-1-jgross@suse.com> Setting the pointing device resolution via Xenstore isn't working reliably: in case XenbusStateInitWait has been missed the resolution settings won't be read. Correct this. Cc: stable@vger.kernel.org Signed-off-by: Juergen Gross <jgross@suse.com> --- drivers/input/misc/xen-kbdfront.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c index 2df5678..7585fa4 100644 --- a/drivers/input/misc/xen-kbdfront.c +++ b/drivers/input/misc/xen-kbdfront.c @@ -312,11 +312,27 @@ static void xenkbd_disconnect_backend(struct xenkbd_info *info) info->gref = -1; } +static void xenkbd_set_connected(struct xenbus_device *dev) +{ + struct xenkbd_info *info = dev_get_drvdata(&dev->dev); + int ret; + + 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_warn("xenkbd: can't request abs-pointer"); + } + + xenbus_switch_state(dev, XenbusStateConnected); +} + 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; + int val; switch (backend_state) { case XenbusStateInitialising: @@ -327,16 +343,7 @@ 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); + xenkbd_set_connected(dev); break; case XenbusStateConnected: @@ -346,7 +353,8 @@ 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 */ + /* No InitWait seen yet, fudge it. */ + xenkbd_set_connected(dev); /* Set input abs params to match backend screen res */ if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, -- 2.10.2
WARNING: multiple messages have this Message-ID (diff)
From: Juergen Gross <jgross@suse.com> To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, linux-input@vger.kernel.org Cc: Juergen Gross <jgross@suse.com>, dmitry.torokhov@gmail.com, stable@vger.kernel.org Subject: [PATCH 2/2] xen, input: repair xen-kbdfront resolution setting via xenstore Date: Tue, 21 Mar 2017 18:19:05 +0100 [thread overview] Message-ID: <20170321171905.31584-3-jgross@suse.com> (raw) In-Reply-To: <20170321171905.31584-1-jgross@suse.com> Setting the pointing device resolution via Xenstore isn't working reliably: in case XenbusStateInitWait has been missed the resolution settings won't be read. Correct this. Cc: stable@vger.kernel.org Signed-off-by: Juergen Gross <jgross@suse.com> --- drivers/input/misc/xen-kbdfront.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c index 2df5678..7585fa4 100644 --- a/drivers/input/misc/xen-kbdfront.c +++ b/drivers/input/misc/xen-kbdfront.c @@ -312,11 +312,27 @@ static void xenkbd_disconnect_backend(struct xenkbd_info *info) info->gref = -1; } +static void xenkbd_set_connected(struct xenbus_device *dev) +{ + struct xenkbd_info *info = dev_get_drvdata(&dev->dev); + int ret; + + 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_warn("xenkbd: can't request abs-pointer"); + } + + xenbus_switch_state(dev, XenbusStateConnected); +} + 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; + int val; switch (backend_state) { case XenbusStateInitialising: @@ -327,16 +343,7 @@ 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); + xenkbd_set_connected(dev); break; case XenbusStateConnected: @@ -346,7 +353,8 @@ 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 */ + /* No InitWait seen yet, fudge it. */ + xenkbd_set_connected(dev); /* Set input abs params to match backend screen res */ if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, -- 2.10.2 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-03-21 17:19 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-21 17:19 [PATCH 0/2] xen,input: xen-kbdfront pointing device resolution support Juergen Gross 2017-03-21 17:19 ` [PATCH 0/2] xen, input: " Juergen Gross 2017-03-21 17:19 ` [PATCH 1/2] xen,input: add xen-kbdfront module parameter for setting resolution Juergen Gross 2017-03-21 17:19 ` [PATCH 1/2] xen, input: " Juergen Gross 2017-04-10 13:44 ` Oleksandr Andrushchenko 2017-04-10 13:44 ` [Xen-devel] " Oleksandr Andrushchenko 2017-04-10 13:50 ` Juergen Gross 2017-04-10 13:50 ` [Xen-devel] " Juergen Gross 2017-04-10 14:00 ` Oleksandr Andrushchenko 2017-04-10 14:00 ` [Xen-devel] " Oleksandr Andrushchenko 2017-04-10 14:11 ` Juergen Gross 2017-04-10 14:18 ` Oleksandr Andrushchenko 2017-04-11 8:54 ` Juergen Gross 2017-04-11 8:54 ` [Xen-devel] " Juergen Gross 2017-04-10 14:18 ` Oleksandr Andrushchenko 2017-04-10 14:11 ` Juergen Gross 2017-03-21 17:19 ` Juergen Gross [this message] 2017-03-21 17:19 ` [PATCH 2/2] xen, input: repair xen-kbdfront resolution setting via xenstore Juergen Gross 2017-04-10 14:20 ` [Xen-devel] " Oleksandr Andrushchenko 2017-04-10 14:20 ` Oleksandr Andrushchenko 2017-04-04 11:58 ` [PATCH 0/2] xen, input: xen-kbdfront pointing device resolution support Juergen Gross 2017-04-04 11:58 ` [PATCH 0/2] xen,input: " Juergen Gross 2017-04-07 13:45 ` [Xen-devel] [PATCH 0/2] xen, input: " Oleksandr Andrushchenko 2017-04-07 13:45 ` Oleksandr Andrushchenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170321171905.31584-3-jgross@suse.com \ --to=jgross@suse.com \ --cc=dmitry.torokhov@gmail.com \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=stable@vger.kernel.org \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.