Hi Javier, On Fri, Jun 16, 2023 at 09:28:51AM +0200, Javier Carrasco wrote: > Some touchscreens provide mechanical overlays with different objects > like buttons or clipped touchscreen surfaces. > > In order to support these objects, add a series of helper functions > to the input subsystem to transform them into overlay objects via > device tree nodes. > > These overlay objects consume the raw touch events and report the > expected input events depending on the object properties. > > Signed-off-by: Javier Carrasco <javier.carrasco@xxxxxxxxxxxxxx> > --- Excellent work; it's great to see this series move along. > MAINTAINERS | 7 + > drivers/input/touchscreen/Kconfig | 9 + > drivers/input/touchscreen/Makefile | 1 + > drivers/input/touchscreen/ts-overlay.c | 356 +++++++++++++++++++++++++++++++++ > include/linux/input/ts-overlay.h | 43 ++++ > 5 files changed, 416 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 7e0b87d5aa2e..db9427926a4c 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -21434,6 +21434,13 @@ W: https://github.com/srcres258/linux-doc > T: git git://github.com/srcres258/linux-doc.git doc-zh-tw > F: Documentation/translations/zh_TW/ > > +TOUCHSCREEN OVERLAY OBJECTS > +M: Javier Carrasco <javier.carrasco@xxxxxxxxxxxxxx> > +L: linux-input@xxxxxxxxxxxxxxx > +S: Maintained > +F: drivers/input/touchscreen/ts-overlay.c > +F: include/linux/input/ts-overlay.h > + > TTY LAYER > M: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > M: Jiri Slaby <jirislaby@xxxxxxxxxx> > diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig > index 143ff43c67ae..8382a4d68326 100644 > --- a/drivers/input/touchscreen/Kconfig > +++ b/drivers/input/touchscreen/Kconfig > @@ -1388,4 +1388,13 @@ config TOUCHSCREEN_HIMAX_HX83112B > To compile this driver as a module, choose M here: the > module will be called himax_hx83112b. > > +config TOUCHSCREEN_TS_OVERLAY > + bool "Touchscreen Overlay Objects" > + help > + Say Y here if you are using a touchscreen driver that supports > + printed overlays with keys or a clipped touchscreen area. > + > + Should be selected by the touchscren drivers that support > + this feature. > + > endif > diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile > index 159cd5136fdb..f554826706ff 100644 > --- a/drivers/input/touchscreen/Makefile > +++ b/drivers/input/touchscreen/Makefile > @@ -117,3 +117,4 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o > obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o > obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o > obj-$(CONFIG_TOUCHSCREEN_HIMAX_HX83112B) += himax_hx83112b.o > +obj-$(CONFIG_TOUCHSCREEN_TS_OVERLAY) += ts-overlay.o It seems like this feature is useful for any two-dimensional touch surface (e.g. trackpads) and not just touchscreens. For that reason, the touchscreen helpers in touchscreen.c were moved out of input/touchscreen and into input/ such that they are not guarded by CONFIG_INPUT_TOUCHSCREEN. A growing number of devices in input/misc are taking advantage of these. Therefore, I think this feature should follow suit and be available to any input device as is the case for touchscreen.c. As written, the newly updated binding is misleading because one may believe that any device that includes touchscreen.yaml can define an overlay child, but the code does not currently support this. To that end, it seems like touch-overlay would be a more descriptive name as well. I understand that the name has changed once already, so hopefully this feedback is not too annoying :) > diff --git a/drivers/input/touchscreen/ts-overlay.c b/drivers/input/touchscreen/ts-overlay.c > new file mode 100644 > index 000000000000..7afa77d86c1f > --- /dev/null > +++ b/drivers/input/touchscreen/ts-overlay.c > @@ -0,0 +1,356 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Helper functions for overlay objects on touchscreens > + * > + * Copyright (c) 2023 Javier Carrasco <javier.carrasco@xxxxxxxxxxxxxx> > + */ > + > +#include <linux/property.h> > +#include <linux/input.h> > +#include <linux/input/mt.h> > +#include <linux/module.h> > +#include <linux/input/ts-overlay.h> > + > +enum ts_overlay_valid_objects { > + TOUCHSCREEN, > + BUTTON, Please namespace these, i.e. TOUCH_OVERLAY_*. > +}; > + > +static const char *const ts_overlay_names[] = { > + [TOUCHSCREEN] = "overlay-touchscreen", I'm a little confused why we need new code for this particular function; it's what touchscreen-min-x/y and touchscreen-size-x/y were meant to define. Why can't we keep using those? > + [BUTTON] = "overlay-buttons", > +}; > + > +struct ts_overlay_shape { > + u32 x_origin; > + u32 y_origin; > + u32 x_size; > + u32 y_size; > +}; > + > +struct ts_overlay_button { > + struct ts_overlay_shape shape; > + u32 key; > + bool pressed; > + int slot; > +}; > + > +static int ts_overlay_get_shape_properties(struct fwnode_handle *child_node, > + struct ts_overlay_shape *shape) > +{ > + int rc; In input, the common practice is to use 'error' for return values that are either zero or negative. The reasoning is because the variable quite literally represents an error, or lack thereof. And then: error = ... if (error) return error; > + > + rc = fwnode_property_read_u32(child_node, "x-origin", &shape->x_origin); > + if (rc < 0) > + return rc; It seems like all of these properties are required; if so, please update the binding to make this clear. If the binding is correct and these properties are in fact optional, then you must evaluate fwnode_property_read_u32() against -EINVAL. > + > + rc = fwnode_property_read_u32(child_node, "y-origin", &shape->y_origin); > + if (rc < 0) > + return rc; > + > + rc = fwnode_property_read_u32(child_node, "x-size", &shape->x_size); > + if (rc < 0) > + return rc; > + > + rc = fwnode_property_read_u32(child_node, "y-size", &shape->y_size); > + if (rc < 0) > + return rc; > + > + return 0; > +} > + > +static int ts_overlay_get_button_properties(struct device *dev, > + struct fwnode_handle *child_node, > + struct ts_overlay_button *btn) > +{ > + struct fwnode_handle *child_btn; > + int rc; > + int j = 0; > + > + fwnode_for_each_child_node(child_node, child_btn) { > + rc = ts_overlay_get_shape_properties(child_btn, &btn[j].shape); > + if (rc < 0) > + goto button_prop_cleanup; > + > + rc = fwnode_property_read_u32(child_btn, "linux,code", > + &btn[j].key); > + if (rc < 0) > + goto button_prop_cleanup; The binding needs to list this property as required, too. > + > + dev_info(dev, "Added button at (%u, %u), size %ux%u, code=%u\n", > + btn[j].shape.x_origin, btn[j].shape.y_origin, > + btn[j].shape.x_size, btn[j].shape.y_size, btn[j].key); This seems like a dev_dbg() to me. > + j++; > + } > + > + return 0; > + > +button_prop_cleanup: > + fwnode_handle_put(child_btn); > + return rc; > +} > + > +void ts_overlay_set_button_caps(struct ts_overlay_map *map, > + struct input_dev *dev) > +{ > + int i; > + > + for (i = 0; i < map->button_count; i++) > + input_set_capability(dev, EV_KEY, map->buttons[i].key); > +} > +EXPORT_SYMBOL(ts_overlay_set_button_caps); I don't see a need to expose this function and require participating drivers to call it; we should just have one over-arching function for processing the overlay(s), akin to touchscreen_parse_properties but for the button input device in case the driver separates the button and touchscreen input devices. That one function would then be responsible for parsing the overlay(s) and calling input_set_capability() on each button. > + > +static int ts_overlay_count_buttons(struct device *dev) > +{ > + struct fwnode_handle *child_node; > + struct fwnode_handle *child_button; These names confused me; they're both children, but only the second is aptly named. How about child_overlay and child_button, or perhaps overlay_node and button_node? > + int count = 0; > + > + child_node = device_get_named_child_node(dev, ts_overlay_names[BUTTON]); > + if (!child_node) > + return 0; > + > + fwnode_for_each_child_node(child_node, child_button) > + count++; > + fwnode_handle_put(child_node); > + > + return count; > +} > + > +static int ts_overlay_map_touchscreen(struct device *dev, > + struct ts_overlay_map *map) > +{ > + struct fwnode_handle *child; Same here; there are two layers of children, so please use more descriptive variable names. > + int rc = 0; > + > + child = device_get_named_child_node(dev, ts_overlay_names[TOUCHSCREEN]); > + if (!child) > + goto touchscreen_ret; I don't think we need a label here; just return 0 directly. > + > + map->touchscreen = > + devm_kzalloc(dev, sizeof(*map->touchscreen), GFP_KERNEL); > + if (!map->touchscreen) { > + rc = -ENOMEM; > + goto touchscreen_handle; > + } > + rc = ts_overlay_get_shape_properties(child, map->touchscreen); > + if (rc < 0) > + goto touchscreen_free; > + > + map->overlay_touchscreen = true; > + dev_info(dev, "Added overlay touchscreen at (%u, %u), size %u x %u\n", > + map->touchscreen->x_origin, map->touchscreen->y_origin, > + map->touchscreen->x_size, map->touchscreen->y_size); dev_dbg() > + > + rc = 0; rc (error) can only be zero if we have gotten this far; I don't see a need to assign it here. > + goto touchscreen_handle; Please think about whether this can be reorganized to prevent jumping over small bits of code; I found it hard to follow. Maybe one or more tasks can be offloaded to a helper function? > + > +touchscreen_free: > + devm_kfree(dev, map->touchscreen); This set off a red flag; it's unclear that it's necessary. Regardless of whether the participating driver is smart enough to bail during probe() if the overlay parsing fails, or it happily continues, this memory will get freed when the driver tied to 'dev' is torn down. Calling devm_kfree() is generally limited to special cases where you are dynamically reallocating memory at runtime. In case I have misunderstood the intent, please let me know. > +touchscreen_handle: > + fwnode_handle_put(child); > +touchscreen_ret: > + return rc; > +} > + > +static int ts_overlay_map_buttons(struct device *dev, > + struct ts_overlay_map *map, > + struct input_dev *input) > +{ > + struct fwnode_handle *child; > + u32 button_count; > + int rc = 0; > + > + button_count = ts_overlay_count_buttons(dev); > + if (button_count) { > + map->buttons = devm_kcalloc(dev, button_count, > + sizeof(*map->buttons), GFP_KERNEL); > + if (!map->buttons) { > + rc = -ENOMEM; > + goto map_buttons_ret; > + } > + child = device_get_named_child_node(dev, > + ts_overlay_names[BUTTON]); > + if (unlikely(!child)) > + goto map_buttons_free; > + > + rc = ts_overlay_get_button_properties(dev, child, map->buttons); > + if (rc < 0) > + goto map_buttons_free; > + > + map->button_count = button_count; > + } > + > + return 0; > + > +map_buttons_free: > + devm_kfree(dev, map->buttons); > +map_buttons_ret: > + return rc; > +} > + > +static bool ts_overlay_defined_objects(struct device *dev) > +{ > + struct fwnode_handle *child; > + int i; > + > + for (i = 0; i < ARRAY_SIZE(ts_overlay_names); i++) { > + child = device_get_named_child_node(dev, ts_overlay_names[i]); > + if (child) { > + fwnode_handle_put(child); > + return true; > + } > + fwnode_handle_put(child); > + } > + > + return false; > +} > + > +struct ts_overlay_map *ts_overlay_map_objects(struct device *dev, > + struct input_dev *input) > +{ > + struct ts_overlay_map *map = NULL; > + int rc; > + > + if (!ts_overlay_defined_objects(dev)) > + return NULL; > + > + map = devm_kzalloc(dev, sizeof(*map), GFP_KERNEL); > + if (!map) { > + rc = -ENOMEM; > + goto objects_err; > + } > + rc = ts_overlay_map_touchscreen(dev, map); > + if (rc < 0) > + goto objects_free; > + > + rc = ts_overlay_map_buttons(dev, map, input); > + if (rc < 0) > + goto objects_free; > + > + return map; > + > +objects_free: > + devm_kfree(dev, map); > +objects_err: > + return ERR_PTR(rc); > +} > +EXPORT_SYMBOL(ts_overlay_map_objects); > + > +void ts_overlay_get_touchscreen_abs(struct ts_overlay_map *map, u16 *x, u16 *y) > +{ > + *x = map->touchscreen->x_size - 1; > + *y = map->touchscreen->y_size - 1; > +} > +EXPORT_SYMBOL(ts_overlay_get_touchscreen_abs); > + > +static bool ts_overlay_shape_event(struct ts_overlay_shape *shape, u32 x, u32 y) > +{ > + if (!shape) > + return false; > + > + if (x >= shape->x_origin && x < (shape->x_origin + shape->x_size) && > + y >= shape->y_origin && y < (shape->y_origin + shape->y_size)) > + return true; > + > + return false; > +} > + > +static bool ts_overlay_touchscreen_event(struct ts_overlay_shape *touchscreen, > + u32 *x, u32 *y) > +{ > + if (ts_overlay_shape_event(touchscreen, *x, *y)) { > + *x -= touchscreen->x_origin; > + *y -= touchscreen->y_origin; > + return true; > + } > + > + return false; > +} > + > +bool ts_overlay_mapped_touchscreen(struct ts_overlay_map *map) > +{ > + if (!map || !map->overlay_touchscreen) > + return false; > + > + return true; > +} > +EXPORT_SYMBOL(ts_overlay_mapped_touchscreen); > + > +bool ts_overlay_mapped_buttons(struct ts_overlay_map *map) > +{ > + if (!map || !map->button_count) > + return false; > + > + return true; > +} > +EXPORT_SYMBOL(ts_overlay_mapped_buttons); > + > +bool ts_overlay_mt_on_touchscreen(struct ts_overlay_map *map, u32 *x, u32 *y) > +{ > + if (!ts_overlay_mapped_touchscreen(map)) > + return true; > + > + if (!ts_overlay_touchscreen_event(map->touchscreen, x, y)) > + return false; > + > + return true; > +} > +EXPORT_SYMBOL(ts_overlay_mt_on_touchscreen); > + > +bool ts_overlay_button_press(struct ts_overlay_map *map, > + struct input_dev *input, u32 x, u32 y, u32 slot) > +{ > + int i; > + > + if (!ts_overlay_mapped_buttons(map)) > + return false; > + > + for (i = 0; i < map->button_count; i++) { > + if (ts_overlay_shape_event(&map->buttons[i].shape, x, y)) { > + input_report_key(input, map->buttons[i].key, 1); > + map->buttons[i].pressed = true; > + map->buttons[i].slot = slot; > + return true; > + } > + } > + > + return false; > +} > +EXPORT_SYMBOL(ts_overlay_button_press); The level of abstraction here does not seem quite right. Rather than force each participating driver to call a press and release function, I think it is better to expose something like touch_overlay_process_buttons() which then handles the press and release events internally. You're also relying on each individual driver to decide whether a touch coordinate is inside or outside the overlay, and selectively call the press and release functions OR report coordinates which is non-optimal. To me, this says we actually need one wrapper function that accepts handles to both the touchscreen and button input devices (which may be the same at the driver's discretion) as well as the coordinates. If the coordinate is within an overlay area, handle press/release; if not, call touchscreen_report_pos(). > + > +bool ts_overlay_is_button_slot(struct ts_overlay_map *map, int slot) > +{ > + int i; > + > + if (!map || !map->button_count) > + return false; > + > + for (i = 0; i < map->button_count; i++) { > + if (map->buttons[i].pressed && map->buttons[i].slot == slot) > + return true; > + } > + > + return false; > +} > +EXPORT_SYMBOL(ts_overlay_is_button_slot); > + > +void ts_overlay_button_release(struct ts_overlay_map *map, > + struct input_dev *input, u32 slot) > +{ > + int i; > + > + if (!map || !map->button_count) > + return; > + > + for (i = 0; i < map->button_count; i++) { > + if (map->buttons[i].pressed && map->buttons[i].slot == slot) { > + input_report_key(input, map->buttons[i].key, 0); > + map->buttons[i].pressed = false; > + } > + } > +} > +EXPORT_SYMBOL(ts_overlay_button_release); > + > +MODULE_LICENSE("GPL"); > +MODULE_DESCRIPTION("Helper functions for overlay objects on touchscreens"); > diff --git a/include/linux/input/ts-overlay.h b/include/linux/input/ts-overlay.h > new file mode 100644 > index 000000000000..b75df0dec3ab > --- /dev/null > +++ b/include/linux/input/ts-overlay.h > @@ -0,0 +1,43 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright (c) 2023 Javier Carrasco <javier.carrasco@xxxxxxxxxxxxxx> > + */ > + > +#ifndef _TS_OVERLAY > +#define _TS_OVERLAY > + > +#include <linux/types.h> > + > +struct input_dev; > +struct device; > + > +struct ts_overlay_map { > + struct ts_overlay_shape *touchscreen; > + bool overlay_touchscreen; > + struct ts_overlay_button *buttons; > + u32 button_count; > +}; > + > +struct ts_overlay_map *ts_overlay_map_objects(struct device *dev, > + struct input_dev *input); > + > +void ts_overlay_get_touchscreen_abs(struct ts_overlay_map *map, u16 *x, u16 *y); > + > +bool ts_overlay_mapped_touchscreen(struct ts_overlay_map *map); > + > +bool ts_overlay_mapped_buttons(struct ts_overlay_map *map); > + > +bool ts_overlay_mt_on_touchscreen(struct ts_overlay_map *map, u32 *x, u32 *y); > + > +bool ts_overlay_button_press(struct ts_overlay_map *map, > + struct input_dev *input, u32 x, u32 y, u32 slot); > + > +bool ts_overlay_is_button_slot(struct ts_overlay_map *map, int slot); > + > +void ts_overlay_button_release(struct ts_overlay_map *map, > + struct input_dev *input, u32 slot); > + > +void ts_overlay_set_button_caps(struct ts_overlay_map *map, > + struct input_dev *dev); > + > +#endif > > -- > 2.39.2 > Kind regards, Jeff LaBundy
