* [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p
@ 2020-12-11 22:24 Douglas Anderson
2020-12-11 22:24 ` [PATCH v8 1/4] HID: i2c-hid: Reorganize so ACPI and OF are separate modules Douglas Anderson
` (4 more replies)
0 siblings, 5 replies; 13+ messages in thread
From: Douglas Anderson @ 2020-12-11 22:24 UTC (permalink / raw)
To: jkosina, benjamin.tissoires, gregkh, Dmitry Torokhov
Cc: hdegoede, linux-input, kai.heng.feng, robh+dt, swboyd, andrea,
Douglas Anderson, Anson Huang, Bjorn Andersson, Catalin Marinas,
Daniel Playfair Cal, Geert Uytterhoeven, Guido Günther,
Jiri Kosina, Li Yang, Masahiro Yamada, Max Krummenacher,
Michael Walle, Pavel Balan, Shawn Guo, Vinod Koul, Will Deacon,
Xiaofei Tan, devicetree, linux-arm-kernel, linux-kernel
The goal of this series is to support the Goodix GT7375P touchscreen.
This touchscreen is special because it has power sequencing
requirements that necessitate driving a reset GPIO.
To do this, we totally rejigger the way i2c-hid is organized so that
it's easier to jam the Goodix support in there.
This series was:
- Tested on a device that uses normal i2c-hid.
- Tested on a device that has a Goodix i2c-hid device.
- Tested on an ACPI device, but an earlier version of the series.
I believe the plan is for Benjamin to land the whole series. Will
said this about the arm64 defconfig change (and provided his Ack):
> ...there are a few things I really care about
> in defconfig (e.g. things like page size!), generally speaking we don't
> need to Ack everything that changes in there.
>
> That said, might be worth checking whether arm-soc have any defconfig
> changes queued in -next so you don't end up with conflicts.
Changes in v8:
- Mark suspend/resume as static as per patches robot.
Changes in v7:
- Rebase atop commit afdd34c5fa40 ("HID: i2c-hid: show the error ...")
Changes in v6:
- ACPI probe function should have been "static"
- Don't export suspend/resume, just export dev_pm_ops from core.
- Fixed crash in ACPI module (missing init of "client")
- No need for regulator include in the core.
- Removed i2c_device_id table from ACPI module.
- Suspend/resume are no longer exported from the core.
Changes in v5:
- Add shutdown_tail op and use it in ACPI.
- Added mention of i2c-hid in the yaml itself as per Rob.
- Adjusted subject as per Rob.
- i2chid_subclass_data => i2chid_ops.
- power_up_device => power_up (same with power_down).
- subclass => ops.
Changes in v4:
- ("arm64: defconfig: Update config names for i2c-hid rejigger") new for v4.
- Fully rejigger so ACPI and OF are full subclasses.
- Totally redid based on the new subclass system.
Changes in v3:
- Fixed compatible in example.
- Removed Benjamin as a maintainer.
- Rework to use subclassing.
- Updated description.
Changes in v2:
- ("dt-bindings: HID: i2c-hid: Introduce bindings for the Goodix GT7375P") new in v2.
- Get timings based on the compatible string.
- Use a separate compatible string for this new touchscreen.
Douglas Anderson (4):
HID: i2c-hid: Reorganize so ACPI and OF are separate modules
arm64: defconfig: Update config names for i2c-hid rejigger
dt-bindings: input: HID: i2c-hid: Introduce bindings for the Goodix
GT7375P
HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core
.../bindings/input/goodix,gt7375p.yaml | 65 +++++
arch/arm64/configs/defconfig | 3 +-
drivers/hid/Makefile | 2 +-
drivers/hid/i2c-hid/Kconfig | 47 +++-
drivers/hid/i2c-hid/Makefile | 6 +-
drivers/hid/i2c-hid/i2c-hid-acpi.c | 159 +++++++++++
drivers/hid/i2c-hid/i2c-hid-core.c | 252 +++---------------
drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 116 ++++++++
drivers/hid/i2c-hid/i2c-hid-of.c | 143 ++++++++++
drivers/hid/i2c-hid/i2c-hid.h | 22 ++
include/linux/platform_data/i2c-hid.h | 41 ---
11 files changed, 594 insertions(+), 262 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/goodix,gt7375p.yaml
create mode 100644 drivers/hid/i2c-hid/i2c-hid-acpi.c
create mode 100644 drivers/hid/i2c-hid/i2c-hid-of-goodix.c
create mode 100644 drivers/hid/i2c-hid/i2c-hid-of.c
delete mode 100644 include/linux/platform_data/i2c-hid.h
--
2.29.2.576.ga3fc446d84-goog
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH v8 1/4] HID: i2c-hid: Reorganize so ACPI and OF are separate modules 2020-12-11 22:24 [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p Douglas Anderson @ 2020-12-11 22:24 ` Douglas Anderson 2020-12-11 22:24 ` [PATCH v8 2/4] arm64: defconfig: Update config names for i2c-hid rejigger Douglas Anderson ` (3 subsequent siblings) 4 siblings, 0 replies; 13+ messages in thread From: Douglas Anderson @ 2020-12-11 22:24 UTC (permalink / raw) To: jkosina, benjamin.tissoires, gregkh, Dmitry Torokhov Cc: hdegoede, linux-input, kai.heng.feng, robh+dt, swboyd, andrea, Douglas Anderson, Daniel Playfair Cal, Jiri Kosina, Masahiro Yamada, Pavel Balan, Xiaofei Tan, linux-kernel This patch rejiggers the i2c-hid code so that the OF (Open Firmware aka Device Tree) and ACPI support is separated out a bit. The OF and ACPI drivers are now separate modules that wrap the core module. Essentially, what we're doing here: * Make "power up" and "power down" a function that can be (optionally) implemented by a given user of the i2c-hid core. * The OF and ACPI modules are drivers on their own, so they implement probe / remove / suspend / resume / shutdown. The core code provides implementations that OF and ACPI can call into. We'll organize this so that we now have 3 modules: the old i2c-hid module becomes the "core" module and two new modules will depend on it, handling probing the specific device. As part of this work, we'll remove the i2c-hid "platform data" concept since it's not needed. Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v8: - Mark suspend/resume as static as per patches robot. Changes in v7: - Rebase atop commit afdd34c5fa40 ("HID: i2c-hid: show the error ...") Changes in v6: - ACPI probe function should have been "static" - Don't export suspend/resume, just export dev_pm_ops from core. - Fixed crash in ACPI module (missing init of "client") - No need for regulator include in the core. - Removed i2c_device_id table from ACPI module. Changes in v5: - Add shutdown_tail op and use it in ACPI. - i2chid_subclass_data => i2chid_ops. - power_up_device => power_up (same with power_down). - subclass => ops. Changes in v4: - Fully rejigger so ACPI and OF are full subclasses. Changes in v3: - Rework to use subclassing. Changes in v2: - Get timings based on the compatible string. - Use a separate compatible string for this new touchscreen. drivers/hid/Makefile | 2 +- drivers/hid/i2c-hid/Kconfig | 32 +++- drivers/hid/i2c-hid/Makefile | 5 +- drivers/hid/i2c-hid/i2c-hid-acpi.c | 159 ++++++++++++++++ drivers/hid/i2c-hid/i2c-hid-core.c | 252 ++++---------------------- drivers/hid/i2c-hid/i2c-hid-of.c | 143 +++++++++++++++ drivers/hid/i2c-hid/i2c-hid.h | 22 +++ include/linux/platform_data/i2c-hid.h | 41 ----- 8 files changed, 395 insertions(+), 261 deletions(-) create mode 100644 drivers/hid/i2c-hid/i2c-hid-acpi.c create mode 100644 drivers/hid/i2c-hid/i2c-hid-of.c delete mode 100644 include/linux/platform_data/i2c-hid.h diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 014d21fe7dac..a0621a4a65cd 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -138,7 +138,7 @@ obj-$(CONFIG_USB_HID) += usbhid/ obj-$(CONFIG_USB_MOUSE) += usbhid/ obj-$(CONFIG_USB_KBD) += usbhid/ -obj-$(CONFIG_I2C_HID) += i2c-hid/ +obj-$(CONFIG_I2C_HID_CORE) += i2c-hid/ obj-$(CONFIG_INTEL_ISH_HID) += intel-ish-hid/ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ish-hid/ diff --git a/drivers/hid/i2c-hid/Kconfig b/drivers/hid/i2c-hid/Kconfig index c4e5dfeab2bd..819b7521c182 100644 --- a/drivers/hid/i2c-hid/Kconfig +++ b/drivers/hid/i2c-hid/Kconfig @@ -2,18 +2,40 @@ menu "I2C HID support" depends on I2C -config I2C_HID - tristate "HID over I2C transport layer" +config I2C_HID_ACPI + tristate "HID over I2C transport layer ACPI driver" default n - depends on I2C && INPUT - select HID + depends on I2C && INPUT && ACPI + help + Say Y here if you use a keyboard, a touchpad, a touchscreen, or any + other HID based devices which is connected to your computer via I2C. + This driver supports ACPI-based systems. + + If unsure, say N. + + This support is also available as a module. If so, the module + will be called i2c-hid-acpi. It will also build/depend on the + module i2c-hid. + +config I2C_HID_OF + tristate "HID over I2C transport layer Open Firmware driver" + default n + depends on I2C && INPUT && OF help Say Y here if you use a keyboard, a touchpad, a touchscreen, or any other HID based devices which is connected to your computer via I2C. + This driver supports Open Firmware (Device Tree)-based systems. If unsure, say N. This support is also available as a module. If so, the module - will be called i2c-hid. + will be called i2c-hid-of. It will also build/depend on the + module i2c-hid. endmenu + +config I2C_HID_CORE + tristate + default y if I2C_HID_ACPI=y || I2C_HID_OF=y + default m if I2C_HID_ACPI=m || I2C_HID_OF=m + select HID diff --git a/drivers/hid/i2c-hid/Makefile b/drivers/hid/i2c-hid/Makefile index 681b3896898e..9b4a73446841 100644 --- a/drivers/hid/i2c-hid/Makefile +++ b/drivers/hid/i2c-hid/Makefile @@ -3,7 +3,10 @@ # Makefile for the I2C input drivers # -obj-$(CONFIG_I2C_HID) += i2c-hid.o +obj-$(CONFIG_I2C_HID_CORE) += i2c-hid.o i2c-hid-objs = i2c-hid-core.o i2c-hid-$(CONFIG_DMI) += i2c-hid-dmi-quirks.o + +obj-$(CONFIG_I2C_HID_ACPI) += i2c-hid-acpi.o +obj-$(CONFIG_I2C_HID_OF) += i2c-hid-of.o diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c new file mode 100644 index 000000000000..0f86060f01b4 --- /dev/null +++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c @@ -0,0 +1,159 @@ +/* + * HID over I2C ACPI Subclass + * + * Copyright (c) 2012 Benjamin Tissoires <benjamin.tissoires@gmail.com> + * Copyright (c) 2012 Ecole Nationale de l'Aviation Civile, France + * Copyright (c) 2012 Red Hat, Inc + * + * This code was forked out of the core code, which was partly based on + * "USB HID support for Linux": + * + * Copyright (c) 1999 Andreas Gal + * Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz> + * Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc + * Copyright (c) 2007-2008 Oliver Neukum + * Copyright (c) 2006-2010 Jiri Kosina + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +#include <linux/acpi.h> +#include <linux/device.h> +#include <linux/i2c.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/pm.h> + +#include "i2c-hid.h" + +struct i2c_hid_acpi { + struct i2chid_ops ops; + struct i2c_client *client; + bool power_fixed; +}; + +static const struct acpi_device_id i2c_hid_acpi_blacklist[] = { + /* + * The CHPN0001 ACPI device, which is used to describe the Chipone + * ICN8505 controller, has a _CID of PNP0C50 but is not HID compatible. + */ + {"CHPN0001", 0 }, + { }, +}; + +static int i2c_hid_acpi_get_descriptor(struct i2c_client *client) +{ + static guid_t i2c_hid_guid = + GUID_INIT(0x3CDFF6F7, 0x4267, 0x4555, + 0xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x38, 0xDE); + union acpi_object *obj; + struct acpi_device *adev; + acpi_handle handle; + u16 hid_descriptor_address; + + handle = ACPI_HANDLE(&client->dev); + if (!handle || acpi_bus_get_device(handle, &adev)) { + dev_err(&client->dev, "Error could not get ACPI device\n"); + return -ENODEV; + } + + if (acpi_match_device_ids(adev, i2c_hid_acpi_blacklist) == 0) + return -ENODEV; + + obj = acpi_evaluate_dsm_typed(handle, &i2c_hid_guid, 1, 1, NULL, + ACPI_TYPE_INTEGER); + if (!obj) { + dev_err(&client->dev, "Error _DSM call to get HID descriptor address failed\n"); + return -ENODEV; + } + + hid_descriptor_address = obj->integer.value; + ACPI_FREE(obj); + + return hid_descriptor_address; +} + +static int i2c_hid_acpi_power_up(struct i2chid_ops *ops) +{ + struct i2c_hid_acpi *ihid_of = + container_of(ops, struct i2c_hid_acpi, ops); + struct device *dev = &ihid_of->client->dev; + struct acpi_device *adev; + + /* Only need to call acpi_device_fix_up_power() the first time */ + if (ihid_of->power_fixed) + return 0; + ihid_of->power_fixed = true; + + adev = ACPI_COMPANION(dev); + if (adev) + acpi_device_fix_up_power(adev); + + return 0; +} + +static void i2c_hid_acpi_shutdown_tail(struct i2chid_ops *ops) +{ + struct i2c_hid_acpi *ihid_of = + container_of(ops, struct i2c_hid_acpi, ops); + struct device *dev = &ihid_of->client->dev; + acpi_device_set_power(ACPI_COMPANION(dev), ACPI_STATE_D3_COLD); +} + +static int i2c_hid_acpi_probe(struct i2c_client *client, + const struct i2c_device_id *dev_id) +{ + struct device *dev = &client->dev; + struct i2c_hid_acpi *ihid_acpi; + u16 hid_descriptor_address; + int ret; + + ihid_acpi = devm_kzalloc(&client->dev, sizeof(*ihid_acpi), GFP_KERNEL); + if (!ihid_acpi) + return -ENOMEM; + + ihid_acpi->client = client; + ihid_acpi->ops.power_up = i2c_hid_acpi_power_up; + ihid_acpi->ops.shutdown_tail = i2c_hid_acpi_shutdown_tail; + + ret = i2c_hid_acpi_get_descriptor(client); + if (ret < 0) + return ret; + hid_descriptor_address = ret; + + if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) { + device_set_wakeup_capable(dev, true); + device_set_wakeup_enable(dev, false); + } + + return i2c_hid_core_probe(client, &ihid_acpi->ops, + hid_descriptor_address); +} + +static const struct acpi_device_id i2c_hid_acpi_match[] = { + {"ACPI0C50", 0 }, + {"PNP0C50", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(acpi, i2c_hid_acpi_match); + +static struct i2c_driver i2c_hid_acpi_driver = { + .driver = { + .name = "i2c_hid_acpi", + .pm = &i2c_hid_core_pm, + .probe_type = PROBE_PREFER_ASYNCHRONOUS, + .acpi_match_table = ACPI_PTR(i2c_hid_acpi_match), + }, + + .probe = i2c_hid_acpi_probe, + .remove = i2c_hid_core_remove, + .shutdown = i2c_hid_core_shutdown, +}; + +module_i2c_driver(i2c_hid_acpi_driver); + +MODULE_DESCRIPTION("HID over I2C ACPI driver"); +MODULE_AUTHOR("Benjamin Tissoires <benjamin.tissoires@gmail.com>"); +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index bfe716d7ea44..b64441db29a8 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -35,11 +35,6 @@ #include <linux/kernel.h> #include <linux/hid.h> #include <linux/mutex.h> -#include <linux/acpi.h> -#include <linux/of.h> -#include <linux/regulator/consumer.h> - -#include <linux/platform_data/i2c-hid.h> #include "../hid-ids.h" #include "i2c-hid.h" @@ -156,10 +151,10 @@ struct i2c_hid { wait_queue_head_t wait; /* For waiting the interrupt */ - struct i2c_hid_platform_data pdata; - bool irq_wake_enabled; struct mutex reset_lock; + + struct i2chid_ops *ops; }; static const struct i2c_hid_quirks { @@ -884,144 +879,36 @@ static int i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid) return 0; } -#ifdef CONFIG_ACPI -static const struct acpi_device_id i2c_hid_acpi_blacklist[] = { - /* - * The CHPN0001 ACPI device, which is used to describe the Chipone - * ICN8505 controller, has a _CID of PNP0C50 but is not HID compatible. - */ - {"CHPN0001", 0 }, - { }, -}; - -static int i2c_hid_acpi_pdata(struct i2c_client *client, - struct i2c_hid_platform_data *pdata) -{ - static guid_t i2c_hid_guid = - GUID_INIT(0x3CDFF6F7, 0x4267, 0x4555, - 0xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x38, 0xDE); - union acpi_object *obj; - struct acpi_device *adev; - acpi_handle handle; - - handle = ACPI_HANDLE(&client->dev); - if (!handle || acpi_bus_get_device(handle, &adev)) { - dev_err(&client->dev, "Error could not get ACPI device\n"); - return -ENODEV; - } - - if (acpi_match_device_ids(adev, i2c_hid_acpi_blacklist) == 0) - return -ENODEV; - - obj = acpi_evaluate_dsm_typed(handle, &i2c_hid_guid, 1, 1, NULL, - ACPI_TYPE_INTEGER); - if (!obj) { - dev_err(&client->dev, "Error _DSM call to get HID descriptor address failed\n"); - return -ENODEV; - } - - pdata->hid_descriptor_address = obj->integer.value; - ACPI_FREE(obj); - - return 0; -} - -static void i2c_hid_acpi_fix_up_power(struct device *dev) -{ - struct acpi_device *adev; - - adev = ACPI_COMPANION(dev); - if (adev) - acpi_device_fix_up_power(adev); -} - -static void i2c_hid_acpi_enable_wakeup(struct device *dev) -{ - if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) { - device_set_wakeup_capable(dev, true); - device_set_wakeup_enable(dev, false); - } -} - -static void i2c_hid_acpi_shutdown(struct device *dev) +static int i2c_hid_core_power_up(struct i2c_hid *ihid) { - acpi_device_set_power(ACPI_COMPANION(dev), ACPI_STATE_D3_COLD); -} + if (!ihid->ops->power_up) + return 0; -static const struct acpi_device_id i2c_hid_acpi_match[] = { - {"ACPI0C50", 0 }, - {"PNP0C50", 0 }, - { }, -}; -MODULE_DEVICE_TABLE(acpi, i2c_hid_acpi_match); -#else -static inline int i2c_hid_acpi_pdata(struct i2c_client *client, - struct i2c_hid_platform_data *pdata) -{ - return -ENODEV; + return ihid->ops->power_up(ihid->ops); } -static inline void i2c_hid_acpi_fix_up_power(struct device *dev) {} - -static inline void i2c_hid_acpi_enable_wakeup(struct device *dev) {} - -static inline void i2c_hid_acpi_shutdown(struct device *dev) {} -#endif - -#ifdef CONFIG_OF -static int i2c_hid_of_probe(struct i2c_client *client, - struct i2c_hid_platform_data *pdata) +static void i2c_hid_core_power_down(struct i2c_hid *ihid) { - struct device *dev = &client->dev; - u32 val; - int ret; - - ret = of_property_read_u32(dev->of_node, "hid-descr-addr", &val); - if (ret) { - dev_err(&client->dev, "HID register address not provided\n"); - return -ENODEV; - } - if (val >> 16) { - dev_err(&client->dev, "Bad HID register address: 0x%08x\n", - val); - return -EINVAL; - } - pdata->hid_descriptor_address = val; - - return 0; -} + if (!ihid->ops->power_down) + return; -static const struct of_device_id i2c_hid_of_match[] = { - { .compatible = "hid-over-i2c" }, - {}, -}; -MODULE_DEVICE_TABLE(of, i2c_hid_of_match); -#else -static inline int i2c_hid_of_probe(struct i2c_client *client, - struct i2c_hid_platform_data *pdata) -{ - return -ENODEV; + ihid->ops->power_down(ihid->ops); } -#endif -static void i2c_hid_fwnode_probe(struct i2c_client *client, - struct i2c_hid_platform_data *pdata) +static void i2c_hid_core_shutdown_tail(struct i2c_hid *ihid) { - u32 val; + if (!ihid->ops->shutdown_tail) + return; - if (!device_property_read_u32(&client->dev, "post-power-on-delay-ms", - &val)) - pdata->post_power_delay_ms = val; + ihid->ops->shutdown_tail(ihid->ops); } -static int i2c_hid_probe(struct i2c_client *client, - const struct i2c_device_id *dev_id) +int i2c_hid_core_probe(struct i2c_client *client, struct i2chid_ops *ops, + u16 hid_descriptor_address) { int ret; struct i2c_hid *ihid; struct hid_device *hid; - __u16 hidRegister; - struct i2c_hid_platform_data *platform_data = client->dev.platform_data; dbg_hid("HID probe called for i2c 0x%02x\n", client->addr); @@ -1042,44 +929,17 @@ static int i2c_hid_probe(struct i2c_client *client, if (!ihid) return -ENOMEM; - if (client->dev.of_node) { - ret = i2c_hid_of_probe(client, &ihid->pdata); - if (ret) - return ret; - } else if (!platform_data) { - ret = i2c_hid_acpi_pdata(client, &ihid->pdata); - if (ret) - return ret; - } else { - ihid->pdata = *platform_data; - } - - /* Parse platform agnostic common properties from ACPI / device tree */ - i2c_hid_fwnode_probe(client, &ihid->pdata); - - ihid->pdata.supplies[0].supply = "vdd"; - ihid->pdata.supplies[1].supply = "vddl"; + ihid->ops = ops; - ret = devm_regulator_bulk_get(&client->dev, - ARRAY_SIZE(ihid->pdata.supplies), - ihid->pdata.supplies); + ret = i2c_hid_core_power_up(ihid); if (ret) return ret; - ret = regulator_bulk_enable(ARRAY_SIZE(ihid->pdata.supplies), - ihid->pdata.supplies); - if (ret < 0) - return ret; - - if (ihid->pdata.post_power_delay_ms) - msleep(ihid->pdata.post_power_delay_ms); - i2c_set_clientdata(client, ihid); ihid->client = client; - hidRegister = ihid->pdata.hid_descriptor_address; - ihid->wHIDDescRegister = cpu_to_le16(hidRegister); + ihid->wHIDDescRegister = cpu_to_le16(hid_descriptor_address); init_waitqueue_head(&ihid->wait); mutex_init(&ihid->reset_lock); @@ -1089,11 +949,7 @@ static int i2c_hid_probe(struct i2c_client *client, * real computation later. */ ret = i2c_hid_alloc_buffers(ihid, HID_MIN_BUFFER_SIZE); if (ret < 0) - goto err_regulator; - - i2c_hid_acpi_fix_up_power(&client->dev); - - i2c_hid_acpi_enable_wakeup(&client->dev); + goto err_powered; device_enable_async_suspend(&client->dev); @@ -1102,19 +958,19 @@ static int i2c_hid_probe(struct i2c_client *client, if (ret < 0) { dev_dbg(&client->dev, "nothing at this address: %d\n", ret); ret = -ENXIO; - goto err_regulator; + goto err_powered; } ret = i2c_hid_fetch_hid_descriptor(ihid); if (ret < 0) { dev_err(&client->dev, "Failed to fetch the HID Descriptor\n"); - goto err_regulator; + goto err_powered; } ret = i2c_hid_init_irq(client); if (ret < 0) - goto err_regulator; + goto err_powered; hid = hid_allocate_device(); if (IS_ERR(hid)) { @@ -1153,14 +1009,14 @@ static int i2c_hid_probe(struct i2c_client *client, err_irq: free_irq(client->irq, ihid); -err_regulator: - regulator_bulk_disable(ARRAY_SIZE(ihid->pdata.supplies), - ihid->pdata.supplies); +err_powered: + i2c_hid_core_power_down(ihid); i2c_hid_free_buffers(ihid); return ret; } +EXPORT_SYMBOL_GPL(i2c_hid_core_probe); -static int i2c_hid_remove(struct i2c_client *client) +int i2c_hid_core_remove(struct i2c_client *client) { struct i2c_hid *ihid = i2c_get_clientdata(client); struct hid_device *hid; @@ -1173,24 +1029,25 @@ static int i2c_hid_remove(struct i2c_client *client) if (ihid->bufsize) i2c_hid_free_buffers(ihid); - regulator_bulk_disable(ARRAY_SIZE(ihid->pdata.supplies), - ihid->pdata.supplies); + i2c_hid_core_power_down(ihid); return 0; } +EXPORT_SYMBOL_GPL(i2c_hid_core_remove); -static void i2c_hid_shutdown(struct i2c_client *client) +void i2c_hid_core_shutdown(struct i2c_client *client) { struct i2c_hid *ihid = i2c_get_clientdata(client); i2c_hid_set_power(client, I2C_HID_PWR_SLEEP); free_irq(client->irq, ihid); - i2c_hid_acpi_shutdown(&client->dev); + i2c_hid_core_shutdown_tail(ihid); } +EXPORT_SYMBOL_GPL(i2c_hid_core_shutdown); #ifdef CONFIG_PM_SLEEP -static int i2c_hid_suspend(struct device *dev) +static int i2c_hid_core_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); struct i2c_hid *ihid = i2c_get_clientdata(client); @@ -1217,14 +1074,13 @@ static int i2c_hid_suspend(struct device *dev) hid_warn(hid, "Failed to enable irq wake: %d\n", wake_status); } else { - regulator_bulk_disable(ARRAY_SIZE(ihid->pdata.supplies), - ihid->pdata.supplies); + i2c_hid_core_power_down(ihid); } return 0; } -static int i2c_hid_resume(struct device *dev) +static int i2c_hid_core_resume(struct device *dev) { int ret; struct i2c_client *client = to_i2c_client(dev); @@ -1233,13 +1089,7 @@ static int i2c_hid_resume(struct device *dev) int wake_status; if (!device_may_wakeup(&client->dev)) { - ret = regulator_bulk_enable(ARRAY_SIZE(ihid->pdata.supplies), - ihid->pdata.supplies); - if (ret) - hid_warn(hid, "Failed to enable supplies: %d\n", ret); - - if (ihid->pdata.post_power_delay_ms) - msleep(ihid->pdata.post_power_delay_ms); + i2c_hid_core_power_up(ihid); } else if (ihid->irq_wake_enabled) { wake_status = disable_irq_wake(client->irq); if (!wake_status) @@ -1276,34 +1126,10 @@ static int i2c_hid_resume(struct device *dev) } #endif -static const struct dev_pm_ops i2c_hid_pm = { - SET_SYSTEM_SLEEP_PM_OPS(i2c_hid_suspend, i2c_hid_resume) +const struct dev_pm_ops i2c_hid_core_pm = { + SET_SYSTEM_SLEEP_PM_OPS(i2c_hid_core_suspend, i2c_hid_core_resume) }; - -static const struct i2c_device_id i2c_hid_id_table[] = { - { "hid", 0 }, - { "hid-over-i2c", 0 }, - { }, -}; -MODULE_DEVICE_TABLE(i2c, i2c_hid_id_table); - - -static struct i2c_driver i2c_hid_driver = { - .driver = { - .name = "i2c_hid", - .pm = &i2c_hid_pm, - .probe_type = PROBE_PREFER_ASYNCHRONOUS, - .acpi_match_table = ACPI_PTR(i2c_hid_acpi_match), - .of_match_table = of_match_ptr(i2c_hid_of_match), - }, - - .probe = i2c_hid_probe, - .remove = i2c_hid_remove, - .shutdown = i2c_hid_shutdown, - .id_table = i2c_hid_id_table, -}; - -module_i2c_driver(i2c_hid_driver); +EXPORT_SYMBOL_GPL(i2c_hid_core_pm); MODULE_DESCRIPTION("HID over I2C core driver"); MODULE_AUTHOR("Benjamin Tissoires <benjamin.tissoires@gmail.com>"); diff --git a/drivers/hid/i2c-hid/i2c-hid-of.c b/drivers/hid/i2c-hid/i2c-hid-of.c new file mode 100644 index 000000000000..4bf7cea92637 --- /dev/null +++ b/drivers/hid/i2c-hid/i2c-hid-of.c @@ -0,0 +1,143 @@ +/* + * HID over I2C Open Firmware Subclass + * + * Copyright (c) 2012 Benjamin Tissoires <benjamin.tissoires@gmail.com> + * Copyright (c) 2012 Ecole Nationale de l'Aviation Civile, France + * Copyright (c) 2012 Red Hat, Inc + * + * This code was forked out of the core code, which was partly based on + * "USB HID support for Linux": + * + * Copyright (c) 1999 Andreas Gal + * Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz> + * Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc + * Copyright (c) 2007-2008 Oliver Neukum + * Copyright (c) 2006-2010 Jiri Kosina + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/i2c.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/pm.h> +#include <linux/regulator/consumer.h> + +#include "i2c-hid.h" + +struct i2c_hid_of { + struct i2chid_ops ops; + + struct i2c_client *client; + struct regulator_bulk_data supplies[2]; + int post_power_delay_ms; +}; + +static int i2c_hid_of_power_up(struct i2chid_ops *ops) +{ + struct i2c_hid_of *ihid_of = container_of(ops, struct i2c_hid_of, ops); + struct device *dev = &ihid_of->client->dev; + int ret; + + ret = regulator_bulk_enable(ARRAY_SIZE(ihid_of->supplies), + ihid_of->supplies); + if (ret) { + dev_warn(dev, "Failed to enable supplies: %d\n", ret); + return ret; + } + + if (ihid_of->post_power_delay_ms) + msleep(ihid_of->post_power_delay_ms); + + return 0; +} + +static void i2c_hid_of_power_down(struct i2chid_ops *ops) +{ + struct i2c_hid_of *ihid_of = container_of(ops, struct i2c_hid_of, ops); + + regulator_bulk_disable(ARRAY_SIZE(ihid_of->supplies), + ihid_of->supplies); +} + +static int i2c_hid_of_probe(struct i2c_client *client, + const struct i2c_device_id *dev_id) +{ + struct device *dev = &client->dev; + struct i2c_hid_of *ihid_of; + u16 hid_descriptor_address; + int ret; + u32 val; + + ihid_of = devm_kzalloc(&client->dev, sizeof(*ihid_of), GFP_KERNEL); + if (!ihid_of) + return -ENOMEM; + + ihid_of->ops.power_up = i2c_hid_of_power_up; + ihid_of->ops.power_down = i2c_hid_of_power_down; + + ret = of_property_read_u32(dev->of_node, "hid-descr-addr", &val); + if (ret) { + dev_err(&client->dev, "HID register address not provided\n"); + return -ENODEV; + } + if (val >> 16) { + dev_err(&client->dev, "Bad HID register address: 0x%08x\n", + val); + return -EINVAL; + } + hid_descriptor_address = val; + + if (!device_property_read_u32(&client->dev, "post-power-on-delay-ms", + &val)) + ihid_of->post_power_delay_ms = val; + + ihid_of->supplies[0].supply = "vdd"; + ihid_of->supplies[1].supply = "vddl"; + ret = devm_regulator_bulk_get(&client->dev, + ARRAY_SIZE(ihid_of->supplies), + ihid_of->supplies); + if (ret) + return ret; + + return i2c_hid_core_probe(client, &ihid_of->ops, + hid_descriptor_address); +} + +static const struct of_device_id i2c_hid_of_match[] = { + { .compatible = "hid-over-i2c" }, + {}, +}; +MODULE_DEVICE_TABLE(of, i2c_hid_of_match); + +static const struct i2c_device_id i2c_hid_of_id_table[] = { + { "hid", 0 }, + { "hid-over-i2c", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(i2c, i2c_hid_of_id_table); + +static struct i2c_driver i2c_hid_of_driver = { + .driver = { + .name = "i2c_hid_of", + .pm = &i2c_hid_core_pm, + .probe_type = PROBE_PREFER_ASYNCHRONOUS, + .of_match_table = of_match_ptr(i2c_hid_of_match), + }, + + .probe = i2c_hid_of_probe, + .remove = i2c_hid_core_remove, + .shutdown = i2c_hid_core_shutdown, + .id_table = i2c_hid_of_id_table, +}; + +module_i2c_driver(i2c_hid_of_driver); + +MODULE_DESCRIPTION("HID over I2C OF driver"); +MODULE_AUTHOR("Benjamin Tissoires <benjamin.tissoires@gmail.com>"); +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/i2c-hid/i2c-hid.h b/drivers/hid/i2c-hid/i2c-hid.h index a8c19aef5824..05a7827d211a 100644 --- a/drivers/hid/i2c-hid/i2c-hid.h +++ b/drivers/hid/i2c-hid/i2c-hid.h @@ -3,6 +3,7 @@ #ifndef I2C_HID_H #define I2C_HID_H +#include <linux/i2c.h> #ifdef CONFIG_DMI struct i2c_hid_desc *i2c_hid_get_dmi_i2c_hid_desc_override(uint8_t *i2c_name); @@ -17,4 +18,25 @@ static inline char *i2c_hid_get_dmi_hid_report_desc_override(uint8_t *i2c_name, { return NULL; } #endif +/** + * struct i2chid_ops - Ops provided to the core. + * + * @power_up: do sequencing to power up the device. + * @power_down: do sequencing to power down the device. + * @shutdown_tail: called at the end of shutdown. + */ +struct i2chid_ops { + int (*power_up)(struct i2chid_ops *ops); + void (*power_down)(struct i2chid_ops *ops); + void (*shutdown_tail)(struct i2chid_ops *ops); +}; + +int i2c_hid_core_probe(struct i2c_client *client, struct i2chid_ops *ops, + u16 hid_descriptor_address); +int i2c_hid_core_remove(struct i2c_client *client); + +void i2c_hid_core_shutdown(struct i2c_client *client); + +extern const struct dev_pm_ops i2c_hid_core_pm; + #endif diff --git a/include/linux/platform_data/i2c-hid.h b/include/linux/platform_data/i2c-hid.h deleted file mode 100644 index c628bb5e1061..000000000000 --- a/include/linux/platform_data/i2c-hid.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * HID over I2C protocol implementation - * - * Copyright (c) 2012 Benjamin Tissoires <benjamin.tissoires@gmail.com> - * Copyright (c) 2012 Ecole Nationale de l'Aviation Civile, France - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive for - * more details. - */ - -#ifndef __LINUX_I2C_HID_H -#define __LINUX_I2C_HID_H - -#include <linux/regulator/consumer.h> -#include <linux/types.h> - -/** - * struct i2chid_platform_data - used by hid over i2c implementation. - * @hid_descriptor_address: i2c register where the HID descriptor is stored. - * @supplies: regulators for powering on the device. - * @post_power_delay_ms: delay after powering on before device is usable. - * - * Note that it is the responsibility of the platform driver (or the acpi 5.0 - * driver, or the flattened device tree) to setup the irq related to the gpio in - * the struct i2c_board_info. - * The platform driver should also setup the gpio according to the device: - * - * A typical example is the following: - * irq = gpio_to_irq(intr_gpio); - * hkdk4412_i2c_devs5[0].irq = irq; // store the irq in i2c_board_info - * gpio_request(intr_gpio, "elan-irq"); - * s3c_gpio_setpull(intr_gpio, S3C_GPIO_PULL_UP); - */ -struct i2c_hid_platform_data { - u16 hid_descriptor_address; - struct regulator_bulk_data supplies[2]; - int post_power_delay_ms; -}; - -#endif /* __LINUX_I2C_HID_H */ -- 2.29.2.576.ga3fc446d84-goog ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v8 2/4] arm64: defconfig: Update config names for i2c-hid rejigger 2020-12-11 22:24 [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p Douglas Anderson 2020-12-11 22:24 ` [PATCH v8 1/4] HID: i2c-hid: Reorganize so ACPI and OF are separate modules Douglas Anderson @ 2020-12-11 22:24 ` Douglas Anderson 2020-12-11 22:24 ` [PATCH v8 3/4] dt-bindings: input: HID: i2c-hid: Introduce bindings for the Goodix GT7375P Douglas Anderson ` (2 subsequent siblings) 4 siblings, 0 replies; 13+ messages in thread From: Douglas Anderson @ 2020-12-11 22:24 UTC (permalink / raw) To: jkosina, benjamin.tissoires, gregkh, Dmitry Torokhov Cc: hdegoede, linux-input, kai.heng.feng, robh+dt, swboyd, andrea, Douglas Anderson, Will Deacon, Anson Huang, Bjorn Andersson, Catalin Marinas, Geert Uytterhoeven, Guido Günther, Li Yang, Max Krummenacher, Michael Walle, Shawn Guo, Vinod Koul, linux-arm-kernel, linux-kernel The i2c-hid driver has been split in two. Let's enable both halves. Signed-off-by: Douglas Anderson <dianders@chromium.org> Acked-by: Will Deacon <will@kernel.org> --- (no changes since v4) Changes in v4: - ("arm64: defconfig: Update config names for i2c-hid rejigger") new for v4. arch/arm64/configs/defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 838301650a79..326198305beb 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -749,7 +749,8 @@ CONFIG_SND_SOC_WM8904=m CONFIG_SND_SOC_WSA881X=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_AUDIO_GRAPH_CARD=m -CONFIG_I2C_HID=m +CONFIG_I2C_HID_ACPI=m +CONFIG_I2C_HID_OF=m CONFIG_USB_CONN_GPIO=m CONFIG_USB=y CONFIG_USB_OTG=y -- 2.29.2.576.ga3fc446d84-goog ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v8 3/4] dt-bindings: input: HID: i2c-hid: Introduce bindings for the Goodix GT7375P 2020-12-11 22:24 [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p Douglas Anderson 2020-12-11 22:24 ` [PATCH v8 1/4] HID: i2c-hid: Reorganize so ACPI and OF are separate modules Douglas Anderson 2020-12-11 22:24 ` [PATCH v8 2/4] arm64: defconfig: Update config names for i2c-hid rejigger Douglas Anderson @ 2020-12-11 22:24 ` Douglas Anderson 2020-12-11 22:24 ` [PATCH v8 4/4] HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core Douglas Anderson 2021-01-06 1:35 ` [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p Doug Anderson 4 siblings, 0 replies; 13+ messages in thread From: Douglas Anderson @ 2020-12-11 22:24 UTC (permalink / raw) To: jkosina, benjamin.tissoires, gregkh, Dmitry Torokhov Cc: hdegoede, linux-input, kai.heng.feng, robh+dt, swboyd, andrea, Douglas Anderson, Rob Herring, devicetree, linux-kernel This adds new bindings for the Goodix GT7375P touchscreen. While this touchscreen's communications are based on the generic "i2c-over-hid" protocol, it needs special power sequencing and thus gets its own compatible and bindings. Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Rob Herring <robh@kernel.org> --- (no changes since v5) Changes in v5: - Added mention of i2c-hid in the yaml itself as per Rob. - Adjusted subject as per Rob. Changes in v3: - Fixed compatible in example. - Removed Benjamin as a maintainer. - Updated description. Changes in v2: - ("dt-bindings: HID: i2c-hid: Introduce bindings for the Goodix GT7375P") new in v2. .../bindings/input/goodix,gt7375p.yaml | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/goodix,gt7375p.yaml diff --git a/Documentation/devicetree/bindings/input/goodix,gt7375p.yaml b/Documentation/devicetree/bindings/input/goodix,gt7375p.yaml new file mode 100644 index 000000000000..fe1c5016f7f3 --- /dev/null +++ b/Documentation/devicetree/bindings/input/goodix,gt7375p.yaml @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/goodix,gt7375p.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Goodix GT7375P touchscreen + +maintainers: + - Douglas Anderson <dianders@chromium.org> + +description: + Supports the Goodix GT7375P touchscreen. + This touchscreen uses the i2c-hid protocol but has some non-standard + power sequencing required. + +properties: + compatible: + items: + - const: goodix,gt7375p + + reg: + enum: + - 0x5d + - 0x14 + + interrupts: + maxItems: 1 + + reset-gpios: + true + + vdd-supply: + description: The 3.3V supply to the touchscreen. + +required: + - compatible + - reg + - interrupts + - reset-gpios + - vdd-supply + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/qcom,rpmh.h> + #include <dt-bindings/gpio/gpio.h> + #include <dt-bindings/interrupt-controller/irq.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + ap_ts: touchscreen@5d { + compatible = "goodix,gt7375p"; + reg = <0x5d>; + + interrupt-parent = <&tlmm>; + interrupts = <9 IRQ_TYPE_LEVEL_LOW>; + + reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>; + vdd-supply = <&pp3300_ts>; + }; + }; -- 2.29.2.576.ga3fc446d84-goog ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v8 4/4] HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core 2020-12-11 22:24 [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p Douglas Anderson ` (2 preceding siblings ...) 2020-12-11 22:24 ` [PATCH v8 3/4] dt-bindings: input: HID: i2c-hid: Introduce bindings for the Goodix GT7375P Douglas Anderson @ 2020-12-11 22:24 ` Douglas Anderson 2021-01-06 16:44 ` Doug Anderson 2021-01-06 1:35 ` [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p Doug Anderson 4 siblings, 1 reply; 13+ messages in thread From: Douglas Anderson @ 2020-12-11 22:24 UTC (permalink / raw) To: jkosina, benjamin.tissoires, gregkh, Dmitry Torokhov Cc: hdegoede, linux-input, kai.heng.feng, robh+dt, swboyd, andrea, Douglas Anderson, Jiri Kosina, Masahiro Yamada, linux-kernel Goodix i2c-hid touchscreens are mostly i2c-hid compliant but have some special power sequencing requirements, including the need to drive a reset line during the sequencing. Let's use the new rejiggering of i2c-hid to support this with a thin wrapper driver to support the first Goodix i2c-hid touchscreen: GT7375P Signed-off-by: Douglas Anderson <dianders@chromium.org> --- (no changes since v6) Changes in v6: - Suspend/resume are no longer exported from the core. Changes in v5: - i2chid_subclass_data => i2chid_ops. - power_up_device => power_up (same with power_down). - subclass => ops. Changes in v4: - Totally redid based on the new subclass system. Changes in v3: - Rework to use subclassing. drivers/hid/i2c-hid/Kconfig | 19 +++- drivers/hid/i2c-hid/Makefile | 1 + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 116 ++++++++++++++++++++++++ 3 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 drivers/hid/i2c-hid/i2c-hid-of-goodix.c diff --git a/drivers/hid/i2c-hid/Kconfig b/drivers/hid/i2c-hid/Kconfig index 819b7521c182..a16c6a69680b 100644 --- a/drivers/hid/i2c-hid/Kconfig +++ b/drivers/hid/i2c-hid/Kconfig @@ -32,10 +32,25 @@ config I2C_HID_OF will be called i2c-hid-of. It will also build/depend on the module i2c-hid. +config I2C_HID_OF_GOODIX + tristate "Driver for Goodix hid-i2c based devices on OF systems" + default n + depends on I2C && INPUT && OF + help + Say Y here if you want support for Goodix i2c devices that use + the i2c-hid protocol on Open Firmware (Device Tree)-based + systems. + + If unsure, say N. + + This support is also available as a module. If so, the module + will be called i2c-hid-of-goodix. It will also build/depend on + the module i2c-hid. + endmenu config I2C_HID_CORE tristate - default y if I2C_HID_ACPI=y || I2C_HID_OF=y - default m if I2C_HID_ACPI=m || I2C_HID_OF=m + default y if I2C_HID_ACPI=y || I2C_HID_OF=y || I2C_HID_OF_GOODIX=y + default m if I2C_HID_ACPI=m || I2C_HID_OF=m || I2C_HID_OF_GOODIX=m select HID diff --git a/drivers/hid/i2c-hid/Makefile b/drivers/hid/i2c-hid/Makefile index 9b4a73446841..302545a771f3 100644 --- a/drivers/hid/i2c-hid/Makefile +++ b/drivers/hid/i2c-hid/Makefile @@ -10,3 +10,4 @@ i2c-hid-$(CONFIG_DMI) += i2c-hid-dmi-quirks.o obj-$(CONFIG_I2C_HID_ACPI) += i2c-hid-acpi.o obj-$(CONFIG_I2C_HID_OF) += i2c-hid-of.o +obj-$(CONFIG_I2C_HID_OF_GOODIX) += i2c-hid-of-goodix.o diff --git a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c new file mode 100644 index 000000000000..7cc51c25c609 --- /dev/null +++ b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c @@ -0,0 +1,116 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Driver for Goodix touchscreens that use the i2c-hid protocol. + * + * Copyright 2020 Google LLC + */ + +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/gpio/consumer.h> +#include <linux/i2c.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/pm.h> +#include <linux/regulator/consumer.h> + +#include "i2c-hid.h" + +struct goodix_i2c_hid_timing_data { + unsigned int post_gpio_reset_delay_ms; + unsigned int post_power_delay_ms; +}; + +struct i2c_hid_of_goodix { + struct i2chid_ops ops; + + struct regulator *vdd; + struct gpio_desc *reset_gpio; + const struct goodix_i2c_hid_timing_data *timings; +}; + +static int goodix_i2c_hid_power_up(struct i2chid_ops *ops) +{ + struct i2c_hid_of_goodix *ihid_goodix = + container_of(ops, struct i2c_hid_of_goodix, ops); + int ret; + + ret = regulator_enable(ihid_goodix->vdd); + if (ret) + return ret; + + if (ihid_goodix->timings->post_power_delay_ms) + msleep(ihid_goodix->timings->post_power_delay_ms); + + gpiod_set_value_cansleep(ihid_goodix->reset_gpio, 0); + if (ihid_goodix->timings->post_gpio_reset_delay_ms) + msleep(ihid_goodix->timings->post_gpio_reset_delay_ms); + + return 0; +} + +static void goodix_i2c_hid_power_down(struct i2chid_ops *ops) +{ + struct i2c_hid_of_goodix *ihid_goodix = + container_of(ops, struct i2c_hid_of_goodix, ops); + + gpiod_set_value_cansleep(ihid_goodix->reset_gpio, 1); + regulator_disable(ihid_goodix->vdd); +} + +static int i2c_hid_of_goodix_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct i2c_hid_of_goodix *ihid_goodix; + + ihid_goodix = devm_kzalloc(&client->dev, sizeof(*ihid_goodix), + GFP_KERNEL); + if (!ihid_goodix) + return -ENOMEM; + + ihid_goodix->ops.power_up = goodix_i2c_hid_power_up; + ihid_goodix->ops.power_down = goodix_i2c_hid_power_down; + + /* Start out with reset asserted */ + ihid_goodix->reset_gpio = + devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(ihid_goodix->reset_gpio)) + return PTR_ERR(ihid_goodix->reset_gpio); + + ihid_goodix->vdd = devm_regulator_get(&client->dev, "vdd"); + if (IS_ERR(ihid_goodix->vdd)) + return PTR_ERR(ihid_goodix->vdd); + + ihid_goodix->timings = device_get_match_data(&client->dev); + + return i2c_hid_core_probe(client, &ihid_goodix->ops, 0x0001); +} + +static const struct goodix_i2c_hid_timing_data goodix_gt7375p_timing_data = { + .post_power_delay_ms = 10, + .post_gpio_reset_delay_ms = 120, +}; + +static const struct of_device_id goodix_i2c_hid_of_match[] = { + { .compatible = "goodix,gt7375p", .data = &goodix_gt7375p_timing_data }, + { } +}; +MODULE_DEVICE_TABLE(of, goodix_i2c_hid_of_match); + +static struct i2c_driver goodix_i2c_hid_ts_driver = { + .driver = { + .name = "i2c_hid_of_goodix", + .pm = &i2c_hid_core_pm, + .probe_type = PROBE_PREFER_ASYNCHRONOUS, + .of_match_table = of_match_ptr(goodix_i2c_hid_of_match), + }, + .probe = i2c_hid_of_goodix_probe, + .remove = i2c_hid_core_remove, + .shutdown = i2c_hid_core_shutdown, +}; +module_i2c_driver(goodix_i2c_hid_ts_driver); + +MODULE_AUTHOR("Douglas Anderson <dianders@chromium.org>"); +MODULE_DESCRIPTION("Goodix i2c-hid touchscreen driver"); +MODULE_LICENSE("GPL v2"); -- 2.29.2.576.ga3fc446d84-goog ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v8 4/4] HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core 2020-12-11 22:24 ` [PATCH v8 4/4] HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core Douglas Anderson @ 2021-01-06 16:44 ` Doug Anderson 0 siblings, 0 replies; 13+ messages in thread From: Doug Anderson @ 2021-01-06 16:44 UTC (permalink / raw) To: Jiri Kosina, Benjamin Tissoires, Greg Kroah-Hartman, Dmitry Torokhov Cc: Hans de Goede, open list:HID CORE LAYER, Kai-Heng Feng, Rob Herring, Stephen Boyd, Andrea Borgia, Jiri Kosina, Masahiro Yamada, LKML Hi, On Fri, Dec 11, 2020 at 2:25 PM Douglas Anderson <dianders@chromium.org> wrote: > > +static const struct goodix_i2c_hid_timing_data goodix_gt7375p_timing_data = { > + .post_power_delay_ms = 10, > + .post_gpio_reset_delay_ms = 120, As I've been going through my holiday email I found that Goodix has released a new datasheet (datasheet rev 0.6 from 2020-12-11) where this moves from 120 ms to 180 ms. Sigh. I'm hoping that we can just land it with the 120 though and then I'll send a follow-up patch to change to 180. This will avoid spamming everyone with a v9 of the patch series. Please yell if there are any objections to that plan. I'd also be fine if you wanted to just change it to 180 when landing it. Thanks much! -Doug ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p 2020-12-11 22:24 [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p Douglas Anderson ` (3 preceding siblings ...) 2020-12-11 22:24 ` [PATCH v8 4/4] HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core Douglas Anderson @ 2021-01-06 1:35 ` Doug Anderson 2021-01-08 17:52 ` Benjamin Tissoires 4 siblings, 1 reply; 13+ messages in thread From: Doug Anderson @ 2021-01-06 1:35 UTC (permalink / raw) To: Jiri Kosina, Benjamin Tissoires, Greg Kroah-Hartman, Dmitry Torokhov Cc: Hans de Goede, open list:HID CORE LAYER, Kai-Heng Feng, Rob Herring, Stephen Boyd, Andrea Borgia, Anson Huang, Bjorn Andersson, Catalin Marinas, Daniel Playfair Cal, Geert Uytterhoeven, Guido Günther, Jiri Kosina, Li Yang, Masahiro Yamada, Max Krummenacher, Michael Walle, Pavel Balan, Shawn Guo, Vinod Koul, Will Deacon, Xiaofei Tan, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux ARM, LKML Benjamin, On Fri, Dec 11, 2020 at 2:24 PM Douglas Anderson <dianders@chromium.org> wrote: > > The goal of this series is to support the Goodix GT7375P touchscreen. > This touchscreen is special because it has power sequencing > requirements that necessitate driving a reset GPIO. > > To do this, we totally rejigger the way i2c-hid is organized so that > it's easier to jam the Goodix support in there. > > This series was: > - Tested on a device that uses normal i2c-hid. > - Tested on a device that has a Goodix i2c-hid device. > - Tested on an ACPI device, but an earlier version of the series. > > I believe the plan is for Benjamin to land the whole series. Will > said this about the arm64 defconfig change (and provided his Ack): > > ...there are a few things I really care about > > in defconfig (e.g. things like page size!), generally speaking we don't > > need to Ack everything that changes in there. > > > > That said, might be worth checking whether arm-soc have any defconfig > > changes queued in -next so you don't end up with conflicts. > > Changes in v8: > - Mark suspend/resume as static as per patches robot. > > Changes in v7: > - Rebase atop commit afdd34c5fa40 ("HID: i2c-hid: show the error ...") > > Changes in v6: > - ACPI probe function should have been "static" > - Don't export suspend/resume, just export dev_pm_ops from core. > - Fixed crash in ACPI module (missing init of "client") > - No need for regulator include in the core. > - Removed i2c_device_id table from ACPI module. > - Suspend/resume are no longer exported from the core. > > Changes in v5: > - Add shutdown_tail op and use it in ACPI. > - Added mention of i2c-hid in the yaml itself as per Rob. > - Adjusted subject as per Rob. > - i2chid_subclass_data => i2chid_ops. > - power_up_device => power_up (same with power_down). > - subclass => ops. > > Changes in v4: > - ("arm64: defconfig: Update config names for i2c-hid rejigger") new for v4. > - Fully rejigger so ACPI and OF are full subclasses. > - Totally redid based on the new subclass system. > > Changes in v3: > - Fixed compatible in example. > - Removed Benjamin as a maintainer. > - Rework to use subclassing. > - Updated description. > > Changes in v2: > - ("dt-bindings: HID: i2c-hid: Introduce bindings for the Goodix GT7375P") new in v2. > - Get timings based on the compatible string. > - Use a separate compatible string for this new touchscreen. > > Douglas Anderson (4): > HID: i2c-hid: Reorganize so ACPI and OF are separate modules > arm64: defconfig: Update config names for i2c-hid rejigger > dt-bindings: input: HID: i2c-hid: Introduce bindings for the Goodix > GT7375P > HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core I think this series is ready to land. The "defconfig" has a trivial conflict with commit 74b87103b3d0 ("arm64: defconfig: Enable HID multitouch") against linuxnext, but it's so simple that hopefully folks will be OK with that when it lands. Please let me know if there's anything else you need me to do. :-) -Doug ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p 2021-01-06 1:35 ` [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p Doug Anderson @ 2021-01-08 17:52 ` Benjamin Tissoires 2021-01-13 15:08 ` Benjamin Tissoires 0 siblings, 1 reply; 13+ messages in thread From: Benjamin Tissoires @ 2021-01-08 17:52 UTC (permalink / raw) To: Doug Anderson Cc: Jiri Kosina, Greg Kroah-Hartman, Dmitry Torokhov, Hans de Goede, open list:HID CORE LAYER, Kai-Heng Feng, Rob Herring, Stephen Boyd, Andrea Borgia, Anson Huang, Bjorn Andersson, Catalin Marinas, Daniel Playfair Cal, Geert Uytterhoeven, Guido Günther, Jiri Kosina, Li Yang, Masahiro Yamada, Max Krummenacher, Michael Walle, Pavel Balan, Shawn Guo, Vinod Koul, Will Deacon, Xiaofei Tan, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux ARM, LKML Hi Doug, On Wed, Jan 6, 2021 at 2:35 AM Doug Anderson <dianders@chromium.org> wrote: > > Benjamin, > > On Fri, Dec 11, 2020 at 2:24 PM Douglas Anderson <dianders@chromium.org> wrote: > > > > The goal of this series is to support the Goodix GT7375P touchscreen. > > This touchscreen is special because it has power sequencing > > requirements that necessitate driving a reset GPIO. > > > > To do this, we totally rejigger the way i2c-hid is organized so that > > it's easier to jam the Goodix support in there. > > > > This series was: > > - Tested on a device that uses normal i2c-hid. > > - Tested on a device that has a Goodix i2c-hid device. > > - Tested on an ACPI device, but an earlier version of the series. > > > > I believe the plan is for Benjamin to land the whole series. Will > > said this about the arm64 defconfig change (and provided his Ack): > > > ...there are a few things I really care about > > > in defconfig (e.g. things like page size!), generally speaking we don't > > > need to Ack everything that changes in there. > > > > > > That said, might be worth checking whether arm-soc have any defconfig > > > changes queued in -next so you don't end up with conflicts. > > > > Changes in v8: > > - Mark suspend/resume as static as per patches robot. > > > > Changes in v7: > > - Rebase atop commit afdd34c5fa40 ("HID: i2c-hid: show the error ...") > > > > Changes in v6: > > - ACPI probe function should have been "static" > > - Don't export suspend/resume, just export dev_pm_ops from core. > > - Fixed crash in ACPI module (missing init of "client") > > - No need for regulator include in the core. > > - Removed i2c_device_id table from ACPI module. > > - Suspend/resume are no longer exported from the core. > > > > Changes in v5: > > - Add shutdown_tail op and use it in ACPI. > > - Added mention of i2c-hid in the yaml itself as per Rob. > > - Adjusted subject as per Rob. > > - i2chid_subclass_data => i2chid_ops. > > - power_up_device => power_up (same with power_down). > > - subclass => ops. > > > > Changes in v4: > > - ("arm64: defconfig: Update config names for i2c-hid rejigger") new for v4. > > - Fully rejigger so ACPI and OF are full subclasses. > > - Totally redid based on the new subclass system. > > > > Changes in v3: > > - Fixed compatible in example. > > - Removed Benjamin as a maintainer. > > - Rework to use subclassing. > > - Updated description. > > > > Changes in v2: > > - ("dt-bindings: HID: i2c-hid: Introduce bindings for the Goodix GT7375P") new in v2. > > - Get timings based on the compatible string. > > - Use a separate compatible string for this new touchscreen. > > > > Douglas Anderson (4): > > HID: i2c-hid: Reorganize so ACPI and OF are separate modules > > arm64: defconfig: Update config names for i2c-hid rejigger > > dt-bindings: input: HID: i2c-hid: Introduce bindings for the Goodix > > GT7375P > > HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core > > I think this series is ready to land. The "defconfig" has a trivial > conflict with commit 74b87103b3d0 ("arm64: defconfig: Enable HID > multitouch") against linuxnext, but it's so simple that hopefully > folks will be OK with that when it lands. > > Please let me know if there's anything else you need me to do. :-) > I wanted to apply the series yesterday, but for these kinds of changes I like giving it a spin on actual hardware. Turns out that my XPS-13 can not boot to v5.11-rc2, which makes testing the new branch slightly more difficult. I'll give it a spin next week, but I think I should be able to land it for 5.12. Regarding the defconfig conflict, no worries, we can handle it with Stephen and Linus. Cheers, Benjamin ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p 2021-01-08 17:52 ` Benjamin Tissoires @ 2021-01-13 15:08 ` Benjamin Tissoires 2021-01-13 15:58 ` Doug Anderson 0 siblings, 1 reply; 13+ messages in thread From: Benjamin Tissoires @ 2021-01-13 15:08 UTC (permalink / raw) To: Doug Anderson Cc: Jiri Kosina, Greg Kroah-Hartman, Dmitry Torokhov, Hans de Goede, open list:HID CORE LAYER, Kai-Heng Feng, Rob Herring, Stephen Boyd, Andrea Borgia, Anson Huang, Bjorn Andersson, Catalin Marinas, Daniel Playfair Cal, Geert Uytterhoeven, Guido Günther, Jiri Kosina, Li Yang, Masahiro Yamada, Max Krummenacher, Michael Walle, Pavel Balan, Shawn Guo, Vinod Koul, Will Deacon, Xiaofei Tan, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux ARM, LKML On Fri, Jan 8, 2021 at 6:52 PM Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > > Hi Doug, > > On Wed, Jan 6, 2021 at 2:35 AM Doug Anderson <dianders@chromium.org> wrote: > > > > Benjamin, > > > > On Fri, Dec 11, 2020 at 2:24 PM Douglas Anderson <dianders@chromium.org> wrote: > > > > > > The goal of this series is to support the Goodix GT7375P touchscreen. > > > This touchscreen is special because it has power sequencing > > > requirements that necessitate driving a reset GPIO. > > > > > > To do this, we totally rejigger the way i2c-hid is organized so that > > > it's easier to jam the Goodix support in there. > > > > > > This series was: > > > - Tested on a device that uses normal i2c-hid. > > > - Tested on a device that has a Goodix i2c-hid device. > > > - Tested on an ACPI device, but an earlier version of the series. > > > > > > I believe the plan is for Benjamin to land the whole series. Will > > > said this about the arm64 defconfig change (and provided his Ack): > > > > ...there are a few things I really care about > > > > in defconfig (e.g. things like page size!), generally speaking we don't > > > > need to Ack everything that changes in there. > > > > > > > > That said, might be worth checking whether arm-soc have any defconfig > > > > changes queued in -next so you don't end up with conflicts. > > > > > > Changes in v8: > > > - Mark suspend/resume as static as per patches robot. > > > > > > Changes in v7: > > > - Rebase atop commit afdd34c5fa40 ("HID: i2c-hid: show the error ...") > > > > > > Changes in v6: > > > - ACPI probe function should have been "static" > > > - Don't export suspend/resume, just export dev_pm_ops from core. > > > - Fixed crash in ACPI module (missing init of "client") > > > - No need for regulator include in the core. > > > - Removed i2c_device_id table from ACPI module. > > > - Suspend/resume are no longer exported from the core. > > > > > > Changes in v5: > > > - Add shutdown_tail op and use it in ACPI. > > > - Added mention of i2c-hid in the yaml itself as per Rob. > > > - Adjusted subject as per Rob. > > > - i2chid_subclass_data => i2chid_ops. > > > - power_up_device => power_up (same with power_down). > > > - subclass => ops. > > > > > > Changes in v4: > > > - ("arm64: defconfig: Update config names for i2c-hid rejigger") new for v4. > > > - Fully rejigger so ACPI and OF are full subclasses. > > > - Totally redid based on the new subclass system. > > > > > > Changes in v3: > > > - Fixed compatible in example. > > > - Removed Benjamin as a maintainer. > > > - Rework to use subclassing. > > > - Updated description. > > > > > > Changes in v2: > > > - ("dt-bindings: HID: i2c-hid: Introduce bindings for the Goodix GT7375P") new in v2. > > > - Get timings based on the compatible string. > > > - Use a separate compatible string for this new touchscreen. > > > > > > Douglas Anderson (4): > > > HID: i2c-hid: Reorganize so ACPI and OF are separate modules > > > arm64: defconfig: Update config names for i2c-hid rejigger > > > dt-bindings: input: HID: i2c-hid: Introduce bindings for the Goodix > > > GT7375P > > > HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core > > > > I think this series is ready to land. The "defconfig" has a trivial > > conflict with commit 74b87103b3d0 ("arm64: defconfig: Enable HID > > multitouch") against linuxnext, but it's so simple that hopefully > > folks will be OK with that when it lands. > > > > Please let me know if there's anything else you need me to do. :-) > > > > I wanted to apply the series yesterday, but for these kinds of changes > I like giving it a spin on actual hardware. Turns out that my XPS-13 > can not boot to v5.11-rc2, which makes testing the new branch slightly > more difficult. > > I'll give it a spin next week, but I think I should be able to land it for 5.12. > > Regarding the defconfig conflict, no worries, we can handle it with > Stephen and Linus. > After 2 full kernel bisects (I messed up the first because I am an idiot and inverted good and bad after the first reboot), I found my culprit, and I was able to test the series today. The series works fine regarding enumeration and removing of devices, but it prevents my system from being suspended. If I rmmod i2c-hid-acpi, suspend works fine, but if it is present, it immediately comes back, which makes me think that something must be wrong. I also just reverted the series and confirmed that suspend/resume now works, meaning that patch 1/4 needs to be checked. Cheers, Benjamin ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p 2021-01-13 15:08 ` Benjamin Tissoires @ 2021-01-13 15:58 ` Doug Anderson 2021-01-13 19:35 ` Benjamin Tissoires 0 siblings, 1 reply; 13+ messages in thread From: Doug Anderson @ 2021-01-13 15:58 UTC (permalink / raw) To: Benjamin Tissoires Cc: Jiri Kosina, Greg Kroah-Hartman, Dmitry Torokhov, Hans de Goede, open list:HID CORE LAYER, Kai-Heng Feng, Rob Herring, Stephen Boyd, Andrea Borgia, Anson Huang, Bjorn Andersson, Catalin Marinas, Daniel Playfair Cal, Geert Uytterhoeven, Guido Günther, Jiri Kosina, Li Yang, Masahiro Yamada, Max Krummenacher, Michael Walle, Pavel Balan, Shawn Guo, Vinod Koul, Will Deacon, Xiaofei Tan, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux ARM, LKML Hi, On Wed, Jan 13, 2021 at 7:09 AM Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > > > I wanted to apply the series yesterday, but for these kinds of changes > > I like giving it a spin on actual hardware. Turns out that my XPS-13 > > can not boot to v5.11-rc2, which makes testing the new branch slightly > > more difficult. > > > > I'll give it a spin next week, but I think I should be able to land it for 5.12. > > > > Regarding the defconfig conflict, no worries, we can handle it with > > Stephen and Linus. > > > > After 2 full kernel bisects (I messed up the first because I am an > idiot and inverted good and bad after the first reboot), I found my > culprit, and I was able to test the series today. > > The series works fine regarding enumeration and removing of devices, > but it prevents my system from being suspended. If I rmmod > i2c-hid-acpi, suspend works fine, but if it is present, it immediately > comes back, which makes me think that something must be wrong. > > I also just reverted the series and confirmed that suspend/resume now > works, meaning that patch 1/4 needs to be checked. Can you give me any hints about what type of failure you're seeing? Any logs? I don't have an ACPI system to test with... Is there any chance that some type of userspace / udev rule is getting tripped up by the driver being renamed? We ran into something like this recently on Chrome OS where we had a tool that was hardcoded to look for "i2c-hid" and needed to be adapted to account for the new driver name. Often userspace tweaks with wakeup rules based on driver name... I'll go stare at the code now and see if anything jumps out. -Doug ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p 2021-01-13 15:58 ` Doug Anderson @ 2021-01-13 19:35 ` Benjamin Tissoires 2021-01-15 14:58 ` Benjamin Tissoires 0 siblings, 1 reply; 13+ messages in thread From: Benjamin Tissoires @ 2021-01-13 19:35 UTC (permalink / raw) To: Doug Anderson Cc: Jiri Kosina, Greg Kroah-Hartman, Dmitry Torokhov, Hans de Goede, open list:HID CORE LAYER, Kai-Heng Feng, Rob Herring, Stephen Boyd, Andrea Borgia, Anson Huang, Bjorn Andersson, Catalin Marinas, Daniel Playfair Cal, Geert Uytterhoeven, Guido Günther, Jiri Kosina, Li Yang, Masahiro Yamada, Max Krummenacher, Michael Walle, Pavel Balan, Shawn Guo, Vinod Koul, Will Deacon, Xiaofei Tan, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux ARM, LKML On Wed, Jan 13, 2021 at 5:05 PM Doug Anderson <dianders@chromium.org> wrote: > > Hi, > > On Wed, Jan 13, 2021 at 7:09 AM Benjamin Tissoires > <benjamin.tissoires@redhat.com> wrote: > > > > > I wanted to apply the series yesterday, but for these kinds of changes > > > I like giving it a spin on actual hardware. Turns out that my XPS-13 > > > can not boot to v5.11-rc2, which makes testing the new branch slightly > > > more difficult. > > > > > > I'll give it a spin next week, but I think I should be able to land it for 5.12. > > > > > > Regarding the defconfig conflict, no worries, we can handle it with > > > Stephen and Linus. > > > > > > > After 2 full kernel bisects (I messed up the first because I am an > > idiot and inverted good and bad after the first reboot), I found my > > culprit, and I was able to test the series today. > > > > The series works fine regarding enumeration and removing of devices, > > but it prevents my system from being suspended. If I rmmod > > i2c-hid-acpi, suspend works fine, but if it is present, it immediately > > comes back, which makes me think that something must be wrong. > > > > I also just reverted the series and confirmed that suspend/resume now > > works, meaning that patch 1/4 needs to be checked. > > Can you give me any hints about what type of failure you're seeing? > Any logs? I don't have an ACPI system to test with... I don't have any logs, just that the system comes back up. There is a chance we are not powering the device down correctly, which triggers an IRQ and which puts the system back on. > > Is there any chance that some type of userspace / udev rule is getting > tripped up by the driver being renamed? We ran into something like > this recently on Chrome OS where we had a tool that was hardcoded to > look for "i2c-hid" and needed to be adapted to account for the new > driver name. Often userspace tweaks with wakeup rules based on driver > name... I don't think there is anything like that on a regular desktop. > > I'll go stare at the code now and see if anything jumps out. > Thanks, but don't spend too much time on it, unless something really jumps out. I'll debug that tomorrow. It's much easier with an actual device than by just looking at the code. Cheers, Benjamin > -Doug > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p 2021-01-13 19:35 ` Benjamin Tissoires @ 2021-01-15 14:58 ` Benjamin Tissoires 2021-01-15 17:11 ` Doug Anderson 0 siblings, 1 reply; 13+ messages in thread From: Benjamin Tissoires @ 2021-01-15 14:58 UTC (permalink / raw) To: Doug Anderson Cc: Jiri Kosina, Greg Kroah-Hartman, Dmitry Torokhov, Hans de Goede, open list:HID CORE LAYER, Kai-Heng Feng, Rob Herring, Stephen Boyd, Andrea Borgia, Anson Huang, Bjorn Andersson, Catalin Marinas, Daniel Playfair Cal, Geert Uytterhoeven, Guido Günther, Jiri Kosina, Li Yang, Masahiro Yamada, Max Krummenacher, Michael Walle, Pavel Balan, Shawn Guo, Vinod Koul, Will Deacon, Xiaofei Tan, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux ARM, LKML Hi, On Wed, Jan 13, 2021 at 8:35 PM Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > > On Wed, Jan 13, 2021 at 5:05 PM Doug Anderson <dianders@chromium.org> wrote: > > > > Hi, > > > > On Wed, Jan 13, 2021 at 7:09 AM Benjamin Tissoires > > <benjamin.tissoires@redhat.com> wrote: > > > > > > > I wanted to apply the series yesterday, but for these kinds of changes > > > > I like giving it a spin on actual hardware. Turns out that my XPS-13 > > > > can not boot to v5.11-rc2, which makes testing the new branch slightly > > > > more difficult. > > > > > > > > I'll give it a spin next week, but I think I should be able to land it for 5.12. > > > > > > > > Regarding the defconfig conflict, no worries, we can handle it with > > > > Stephen and Linus. > > > > > > > > > > After 2 full kernel bisects (I messed up the first because I am an > > > idiot and inverted good and bad after the first reboot), I found my > > > culprit, and I was able to test the series today. > > > > > > The series works fine regarding enumeration and removing of devices, > > > but it prevents my system from being suspended. If I rmmod > > > i2c-hid-acpi, suspend works fine, but if it is present, it immediately > > > comes back, which makes me think that something must be wrong. > > > > > > I also just reverted the series and confirmed that suspend/resume now > > > works, meaning that patch 1/4 needs to be checked. > > > > Can you give me any hints about what type of failure you're seeing? > > Any logs? I don't have an ACPI system to test with... > > I don't have any logs, just that the system comes back up. There is a > chance we are not powering the device down correctly, which triggers > an IRQ and which puts the system back on. > > > > > Is there any chance that some type of userspace / udev rule is getting > > tripped up by the driver being renamed? We ran into something like > > this recently on Chrome OS where we had a tool that was hardcoded to > > look for "i2c-hid" and needed to be adapted to account for the new > > driver name. Often userspace tweaks with wakeup rules based on driver > > name... > > I don't think there is anything like that on a regular desktop. > > > > > I'll go stare at the code now and see if anything jumps out. > > > > Thanks, but don't spend too much time on it, unless something really > jumps out. I'll debug that tomorrow. It's much easier with an actual > device than by just looking at the code. > Well, that's weird. Now suspend resume works reliably even with your series. It could just have been that the lid sensor was too close to a magnet or something like that. Though while testing the old version of i2c-hid, it was working... Such a mystery :) Anyway, while trying to dig up that now-non-issue, I got the following patch that you likely want to squash into 1/4: --- diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c index 0f86060f01b4..dd6d9f74e7e7 100644 --- a/drivers/hid/i2c-hid/i2c-hid-acpi.c +++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c @@ -31,7 +31,6 @@ struct i2c_hid_acpi { struct i2chid_ops ops; struct i2c_client *client; - bool power_fixed; }; static const struct acpi_device_id i2c_hid_acpi_blacklist[] = { @@ -75,25 +74,6 @@ static int i2c_hid_acpi_get_descriptor(struct i2c_client *client) return hid_descriptor_address; } -static int i2c_hid_acpi_power_up(struct i2chid_ops *ops) -{ - struct i2c_hid_acpi *ihid_of = - container_of(ops, struct i2c_hid_acpi, ops); - struct device *dev = &ihid_of->client->dev; - struct acpi_device *adev; - - /* Only need to call acpi_device_fix_up_power() the first time */ - if (ihid_of->power_fixed) - return 0; - ihid_of->power_fixed = true; - - adev = ACPI_COMPANION(dev); - if (adev) - acpi_device_fix_up_power(adev); - - return 0; -} - static void i2c_hid_acpi_shutdown_tail(struct i2chid_ops *ops) { struct i2c_hid_acpi *ihid_of = @@ -107,6 +87,7 @@ static int i2c_hid_acpi_probe(struct i2c_client *client, { struct device *dev = &client->dev; struct i2c_hid_acpi *ihid_acpi; + struct acpi_device *adev; u16 hid_descriptor_address; int ret; @@ -115,7 +96,6 @@ static int i2c_hid_acpi_probe(struct i2c_client *client, return -ENOMEM; ihid_acpi->client = client; - ihid_acpi->ops.power_up = i2c_hid_acpi_power_up; ihid_acpi->ops.shutdown_tail = i2c_hid_acpi_shutdown_tail; ret = i2c_hid_acpi_get_descriptor(client); @@ -123,6 +103,10 @@ static int i2c_hid_acpi_probe(struct i2c_client *client, return ret; hid_descriptor_address = ret; + adev = ACPI_COMPANION(dev); + if (adev) + acpi_device_fix_up_power(adev); + if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) { device_set_wakeup_capable(dev, true); device_set_wakeup_enable(dev, false); --- This allows to keep the powering ordering of the old i2c-hid module (power up before setting device wakeup capable), and simplify the not so obvious power_fixed field of struct i2c_hid_acpi. (I can also send it as a followup on the series if you prefer). Cheers, Benjamin ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p 2021-01-15 14:58 ` Benjamin Tissoires @ 2021-01-15 17:11 ` Doug Anderson 0 siblings, 0 replies; 13+ messages in thread From: Doug Anderson @ 2021-01-15 17:11 UTC (permalink / raw) To: Benjamin Tissoires Cc: Jiri Kosina, Greg Kroah-Hartman, Dmitry Torokhov, Hans de Goede, open list:HID CORE LAYER, Kai-Heng Feng, Rob Herring, Stephen Boyd, Andrea Borgia, Anson Huang, Bjorn Andersson, Catalin Marinas, Daniel Playfair Cal, Geert Uytterhoeven, Guido Günther, Jiri Kosina, Li Yang, Masahiro Yamada, Max Krummenacher, Michael Walle, Pavel Balan, Shawn Guo, Vinod Koul, Will Deacon, Xiaofei Tan, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux ARM, LKML Hi, On Fri, Jan 15, 2021 at 6:58 AM Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > > > Thanks, but don't spend too much time on it, unless something really > > jumps out. I'll debug that tomorrow. It's much easier with an actual > > device than by just looking at the code. > > > > Well, that's weird. Now suspend resume works reliably even with your > series. It could just have been that the lid sensor was too close to a > magnet or something like that. Though while testing the old version of > i2c-hid, it was working... Such a mystery :) Friggin magnets, how do those work? ;-) I also managed to obtain remote access to a device with an ACPI i2c-hid device and confirmed that suspend/resume was working and that I saw no errors, though obviously I couldn't physically interact with the device remotely. Hopefully that gives a tiny bit of extra confidence that the series is OK... > This allows to keep the powering ordering of the old i2c-hid module > (power up before setting device wakeup capable), and simplify the > not so obvious power_fixed field of struct i2c_hid_acpi. > > (I can also send it as a followup on the series if you prefer). Squashed it into a v9 as well as a local variable rename that I noticed while looking at the code with fresh eyes. My v9 also incorporates the new Goodix timing that I self-commented about on v8. Crossing fingers that it's all good now. :-) -Doug ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-01-15 17:12 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-12-11 22:24 [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p Douglas Anderson 2020-12-11 22:24 ` [PATCH v8 1/4] HID: i2c-hid: Reorganize so ACPI and OF are separate modules Douglas Anderson 2020-12-11 22:24 ` [PATCH v8 2/4] arm64: defconfig: Update config names for i2c-hid rejigger Douglas Anderson 2020-12-11 22:24 ` [PATCH v8 3/4] dt-bindings: input: HID: i2c-hid: Introduce bindings for the Goodix GT7375P Douglas Anderson 2020-12-11 22:24 ` [PATCH v8 4/4] HID: i2c-hid: Introduce goodix-i2c-hid using i2c-hid core Douglas Anderson 2021-01-06 16:44 ` Doug Anderson 2021-01-06 1:35 ` [PATCH v8 0/4] HID: i2c-hid: Reorganize to allow supporting goodix,gt7375p Doug Anderson 2021-01-08 17:52 ` Benjamin Tissoires 2021-01-13 15:08 ` Benjamin Tissoires 2021-01-13 15:58 ` Doug Anderson 2021-01-13 19:35 ` Benjamin Tissoires 2021-01-15 14:58 ` Benjamin Tissoires 2021-01-15 17:11 ` Doug Anderson
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).