* [PATCH v2] Input: synaptics-rmi4 - stop scanning PDT after two empty pages
@ 2016-10-25 20:36 Nick Dyer
2016-10-25 21:14 ` Chris Healy
2016-10-26 19:27 ` Andrew Duggan
0 siblings, 2 replies; 3+ messages in thread
From: Nick Dyer @ 2016-10-25 20:36 UTC (permalink / raw)
To: Dmitry Torokhov, Andrew Duggan, Christopher Heiny, Guenter Roeck
Cc: Chris Healy, linux-input, linux-kernel, Nick Dyer
We have encountered some RMI4 firmwares where there are blank pages in
between PDT pages which contain functions. This change makes them
correctly enumerate all functions on the device.
Tested on S7817 (has empty page 2).
Signed-off-by: Nick Dyer <nick@shmanahar.org>
---
drivers/input/rmi4/rmi_driver.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index 4a88312..425bd19 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -422,6 +422,7 @@ static void rmi_driver_copy_pdt_to_fd(const struct pdt_entry *pdt,
static int rmi_scan_pdt_page(struct rmi_device *rmi_dev,
int page,
+ int *empty_pages,
void *ctx,
int (*callback)(struct rmi_device *rmi_dev,
void *ctx,
@@ -449,7 +450,16 @@ static int rmi_scan_pdt_page(struct rmi_device *rmi_dev,
return retval;
}
- return (data->f01_bootloader_mode || addr == pdt_start) ?
+ /*
+ * Count number of empty PDT pages. If a gap of two pages
+ * or more is found, stop scanning.
+ */
+ if (addr == pdt_start)
+ ++*empty_pages;
+ else
+ *empty_pages = 0;
+
+ return (data->f01_bootloader_mode || *empty_pages >= 2) ?
RMI_SCAN_DONE : RMI_SCAN_CONTINUE;
}
@@ -459,10 +469,12 @@ static int rmi_scan_pdt(struct rmi_device *rmi_dev, void *ctx,
const struct pdt_entry *entry))
{
int page;
+ int empty_pages = 0;
int retval = RMI_SCAN_DONE;
for (page = 0; page <= RMI4_MAX_PAGE; page++) {
- retval = rmi_scan_pdt_page(rmi_dev, page, ctx, callback);
+ retval = rmi_scan_pdt_page(rmi_dev, page, &empty_pages,
+ ctx, callback);
if (retval != RMI_SCAN_CONTINUE)
break;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] Input: synaptics-rmi4 - stop scanning PDT after two empty pages
2016-10-25 20:36 [PATCH v2] Input: synaptics-rmi4 - stop scanning PDT after two empty pages Nick Dyer
@ 2016-10-25 21:14 ` Chris Healy
2016-10-26 19:27 ` Andrew Duggan
1 sibling, 0 replies; 3+ messages in thread
From: Chris Healy @ 2016-10-25 21:14 UTC (permalink / raw)
To: Nick Dyer
Cc: Dmitry Torokhov, Andrew Duggan, Christopher Heiny, Guenter Roeck,
linux-input, linux-kernel
On Tue, Oct 25, 2016 at 1:36 PM, Nick Dyer <nick@shmanahar.org> wrote:
> We have encountered some RMI4 firmwares where there are blank pages in
> between PDT pages which contain functions. This change makes them
> correctly enumerate all functions on the device.
>
> Tested on S7817 (has empty page 2).
>
> Signed-off-by: Nick Dyer <nick@shmanahar.org>
> ---
> drivers/input/rmi4/rmi_driver.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
> index 4a88312..425bd19 100644
> --- a/drivers/input/rmi4/rmi_driver.c
> +++ b/drivers/input/rmi4/rmi_driver.c
> @@ -422,6 +422,7 @@ static void rmi_driver_copy_pdt_to_fd(const struct pdt_entry *pdt,
>
> static int rmi_scan_pdt_page(struct rmi_device *rmi_dev,
> int page,
> + int *empty_pages,
> void *ctx,
> int (*callback)(struct rmi_device *rmi_dev,
> void *ctx,
> @@ -449,7 +450,16 @@ static int rmi_scan_pdt_page(struct rmi_device *rmi_dev,
> return retval;
> }
>
> - return (data->f01_bootloader_mode || addr == pdt_start) ?
> + /*
> + * Count number of empty PDT pages. If a gap of two pages
> + * or more is found, stop scanning.
> + */
> + if (addr == pdt_start)
> + ++*empty_pages;
> + else
> + *empty_pages = 0;
> +
> + return (data->f01_bootloader_mode || *empty_pages >= 2) ?
> RMI_SCAN_DONE : RMI_SCAN_CONTINUE;
> }
>
> @@ -459,10 +469,12 @@ static int rmi_scan_pdt(struct rmi_device *rmi_dev, void *ctx,
> const struct pdt_entry *entry))
> {
> int page;
> + int empty_pages = 0;
> int retval = RMI_SCAN_DONE;
>
> for (page = 0; page <= RMI4_MAX_PAGE; page++) {
> - retval = rmi_scan_pdt_page(rmi_dev, page, ctx, callback);
> + retval = rmi_scan_pdt_page(rmi_dev, page, &empty_pages,
> + ctx, callback);
> if (retval != RMI_SCAN_CONTINUE)
> break;
> }
> --
> 2.7.4
>
Tested successfully on S7817 and S7300 Synaptics touch controllers.
The S7300 has no regressions and the S7817 now shows fn55 in the
sysfs. (It did not show fn55 before the patch.)
Tested-by: Chris Healy <cphealy@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] Input: synaptics-rmi4 - stop scanning PDT after two empty pages
2016-10-25 20:36 [PATCH v2] Input: synaptics-rmi4 - stop scanning PDT after two empty pages Nick Dyer
2016-10-25 21:14 ` Chris Healy
@ 2016-10-26 19:27 ` Andrew Duggan
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Duggan @ 2016-10-26 19:27 UTC (permalink / raw)
To: Nick Dyer, Dmitry Torokhov, Christopher Heiny, Guenter Roeck
Cc: Chris Healy, linux-input, linux-kernel
On 10/25/2016 01:36 PM, Nick Dyer wrote:
> We have encountered some RMI4 firmwares where there are blank pages in
> between PDT pages which contain functions. This change makes them
> correctly enumerate all functions on the device.
>
> Tested on S7817 (has empty page 2).
>
> Signed-off-by: Nick Dyer <nick@shmanahar.org>
Reviewed-by: Andrew Duggan <aduggan@synaptics.com>
> ---
> drivers/input/rmi4/rmi_driver.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
> index 4a88312..425bd19 100644
> --- a/drivers/input/rmi4/rmi_driver.c
> +++ b/drivers/input/rmi4/rmi_driver.c
> @@ -422,6 +422,7 @@ static void rmi_driver_copy_pdt_to_fd(const struct pdt_entry *pdt,
>
> static int rmi_scan_pdt_page(struct rmi_device *rmi_dev,
> int page,
> + int *empty_pages,
> void *ctx,
> int (*callback)(struct rmi_device *rmi_dev,
> void *ctx,
> @@ -449,7 +450,16 @@ static int rmi_scan_pdt_page(struct rmi_device *rmi_dev,
> return retval;
> }
>
> - return (data->f01_bootloader_mode || addr == pdt_start) ?
> + /*
> + * Count number of empty PDT pages. If a gap of two pages
> + * or more is found, stop scanning.
> + */
> + if (addr == pdt_start)
> + ++*empty_pages;
> + else
> + *empty_pages = 0;
> +
> + return (data->f01_bootloader_mode || *empty_pages >= 2) ?
> RMI_SCAN_DONE : RMI_SCAN_CONTINUE;
> }
>
> @@ -459,10 +469,12 @@ static int rmi_scan_pdt(struct rmi_device *rmi_dev, void *ctx,
> const struct pdt_entry *entry))
> {
> int page;
> + int empty_pages = 0;
> int retval = RMI_SCAN_DONE;
>
> for (page = 0; page <= RMI4_MAX_PAGE; page++) {
> - retval = rmi_scan_pdt_page(rmi_dev, page, ctx, callback);
> + retval = rmi_scan_pdt_page(rmi_dev, page, &empty_pages,
> + ctx, callback);
> if (retval != RMI_SCAN_CONTINUE)
> break;
> }
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-26 19:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-25 20:36 [PATCH v2] Input: synaptics-rmi4 - stop scanning PDT after two empty pages Nick Dyer
2016-10-25 21:14 ` Chris Healy
2016-10-26 19:27 ` Andrew Duggan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).