| Message ID | 20170701100311.11859-1-hdegoede@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
On Sat, 2017-07-01 at 12:03 +0200, Hans de Goede wrote: > ACPI video devices get tagged by the kernel with the custom LNXVIDEO > HID so that normal pnp-id matching can be used and are handled by the > acpi-video driver. > > Sometimes the ACPI nodes describing these contain a SERIAL_TYPE_I2C > ACPI > resource. Before this commit the presence of this resource would cause > the > i2c-core to create a /sys/bus/i2c/devices/i2c-LNXVIDEO:00 device for > this > with a modalias of: "i2c:LNXVIDEO:00". > > There is no i2c driver for this custom HID, the acpi-video driver > binds > directly to the ACPI device /sys/bus/acpi/devices/LNXVIDEO\:00 which > has > a modalias of "acpi:LNXVIDEO:" . > > Not only is the creation of an i2c-client for this undesirable, it is > actually causing problems. This weird pseudo-resource claims an i2c > speed of 100KHz and typically points to the i2c bus which is used by > the > touchscreen controller. Some touchscreen controllers only work > properly at > 400KHz, at 100KHz they cause errors like these: > > i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration > i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration > i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration > i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration > silead_ts i2c-MSSL1680:00: Registers clear error -11 > > This commit makes the i2c-core ignore LNXVIDEO compatible ACPI devices > which has 2 positive results: > > 1) The bogus i2c-client for these is no longer created. > 2) i2c_acpi_lookup_speed now ignores the 100KHz speed from the pseudo > i2c-resouce and properly returns 400KHz as speed for the touchscreen > i2c bus, fixing the touchscreen not working on various devies. Should it have Fixes tag? > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/i2c/i2c-core.c | 11 +++++++++++ Shouldn't you rebase it on top of i2c-next? The file is called i2c-core- acpi.c nowadays. > 1 file changed, 11 insertions(+) > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c > index 82576aaccc90..4334ee1116fe 100644 > --- a/drivers/i2c/i2c-core.c > +++ b/drivers/i2c/i2c-core.c > @@ -154,11 +154,22 @@ static int i2c_acpi_do_lookup(struct acpi_device > *adev, > struct i2c_board_info *info = lookup->info; > struct list_head resource_list; > int ret; > + static const struct acpi_device_id video_device_ids[] = { > + { ACPI_VIDEO_HID, 0 }, > + {} > + }; > > if (acpi_bus_get_status(adev) || !adev->status.present || > acpi_device_enumerated(adev)) > return -EINVAL; > > + /* > + * ACPI video acpi_devices, which are handled by the acpi- > video driver > + * sometimes contain a SERIAL_TYPE_I2C ACPI resource, ignore > these. > + */ > + if (acpi_match_device_ids(adev, video_device_ids) == 0) > + return -ENODEV; > + > memset(info, 0, sizeof(*info)); > lookup->device_handle = acpi_device_handle(adev); >
Hi, On 03-07-17 13:10, Andy Shevchenko wrote: > On Sat, 2017-07-01 at 12:03 +0200, Hans de Goede wrote: >> ACPI video devices get tagged by the kernel with the custom LNXVIDEO >> HID so that normal pnp-id matching can be used and are handled by the >> acpi-video driver. >> >> Sometimes the ACPI nodes describing these contain a SERIAL_TYPE_I2C >> ACPI >> resource. Before this commit the presence of this resource would cause >> the >> i2c-core to create a /sys/bus/i2c/devices/i2c-LNXVIDEO:00 device for >> this >> with a modalias of: "i2c:LNXVIDEO:00". >> >> There is no i2c driver for this custom HID, the acpi-video driver >> binds >> directly to the ACPI device /sys/bus/acpi/devices/LNXVIDEO\:00 which >> has >> a modalias of "acpi:LNXVIDEO:" . >> >> Not only is the creation of an i2c-client for this undesirable, it is >> actually causing problems. This weird pseudo-resource claims an i2c >> speed of 100KHz and typically points to the i2c bus which is used by >> the >> touchscreen controller. Some touchscreen controllers only work >> properly at >> 400KHz, at 100KHz they cause errors like these: >> >> i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration >> i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration >> i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration >> i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration >> silead_ts i2c-MSSL1680:00: Registers clear error -11 >> >> This commit makes the i2c-core ignore LNXVIDEO compatible ACPI devices >> which has 2 positive results: >> >> 1) The bogus i2c-client for these is no longer created. >> 2) i2c_acpi_lookup_speed now ignores the 100KHz speed from the pseudo >> i2c-resouce and properly returns 400KHz as speed for the touchscreen >> i2c bus, fixing the touchscreen not working on various devies. > > Should it have Fixes tag? Well it is a fix, but it does not fix one specific commit, so no I don't think it should. > >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> drivers/i2c/i2c-core.c | 11 +++++++++++ > > Shouldn't you rebase it on top of i2c-next? The file is called i2c-core- > acpi.c nowadays. Ah, ok, I will rebase and send a new version. Regards, Hans > >> 1 file changed, 11 insertions(+) >> >> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c >> index 82576aaccc90..4334ee1116fe 100644 >> --- a/drivers/i2c/i2c-core.c >> +++ b/drivers/i2c/i2c-core.c >> @@ -154,11 +154,22 @@ static int i2c_acpi_do_lookup(struct acpi_device >> *adev, >> struct i2c_board_info *info = lookup->info; >> struct list_head resource_list; >> int ret; >> + static const struct acpi_device_id video_device_ids[] = { >> + { ACPI_VIDEO_HID, 0 }, >> + {} >> + }; >> >> if (acpi_bus_get_status(adev) || !adev->status.present || >> acpi_device_enumerated(adev)) >> return -EINVAL; >> >> + /* >> + * ACPI video acpi_devices, which are handled by the acpi- >> video driver >> + * sometimes contain a SERIAL_TYPE_I2C ACPI resource, ignore >> these. >> + */ >> + if (acpi_match_device_ids(adev, video_device_ids) == 0) >> + return -ENODEV; >> + >> memset(info, 0, sizeof(*info)); >> lookup->device_handle = acpi_device_handle(adev); >> >
On Mon, 2017-07-03 at 17:04 +0200, Hans de Goede wrote: > On 03-07-17 13:10, Andy Shevchenko wrote: > > On Sat, 2017-07-01 at 12:03 +0200, Hans de Goede wrote: > > > This commit makes the i2c-core ignore LNXVIDEO compatible ACPI > > > devices > > > which has 2 positive results: > > > > > > 1) The bogus i2c-client for these is no longer created. > > > 2) i2c_acpi_lookup_speed now ignores the 100KHz speed from the > > > pseudo > > > i2c-resouce and properly returns 400KHz as speed for the > > > touchscreen > > > i2c bus, fixing the touchscreen not working on various devies. > > > > Should it have Fixes tag? > > Well it is a fix, but it does not fix one specific commit, so no > I don't think it should. One may put several Fixes tags to make it clear that it applies on top of the tree that has all of them (in the given sequence AFAIR).
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 82576aaccc90..4334ee1116fe 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -154,11 +154,22 @@ static int i2c_acpi_do_lookup(struct acpi_device *adev, struct i2c_board_info *info = lookup->info; struct list_head resource_list; int ret; + static const struct acpi_device_id video_device_ids[] = { + { ACPI_VIDEO_HID, 0 }, + {} + }; if (acpi_bus_get_status(adev) || !adev->status.present || acpi_device_enumerated(adev)) return -EINVAL; + /* + * ACPI video acpi_devices, which are handled by the acpi-video driver + * sometimes contain a SERIAL_TYPE_I2C ACPI resource, ignore these. + */ + if (acpi_match_device_ids(adev, video_device_ids) == 0) + return -ENODEV; + memset(info, 0, sizeof(*info)); lookup->device_handle = acpi_device_handle(adev);
ACPI video devices get tagged by the kernel with the custom LNXVIDEO HID so that normal pnp-id matching can be used and are handled by the acpi-video driver. Sometimes the ACPI nodes describing these contain a SERIAL_TYPE_I2C ACPI resource. Before this commit the presence of this resource would cause the i2c-core to create a /sys/bus/i2c/devices/i2c-LNXVIDEO:00 device for this with a modalias of: "i2c:LNXVIDEO:00". There is no i2c driver for this custom HID, the acpi-video driver binds directly to the ACPI device /sys/bus/acpi/devices/LNXVIDEO\:00 which has a modalias of "acpi:LNXVIDEO:" . Not only is the creation of an i2c-client for this undesirable, it is actually causing problems. This weird pseudo-resource claims an i2c speed of 100KHz and typically points to the i2c bus which is used by the touchscreen controller. Some touchscreen controllers only work properly at 400KHz, at 100KHz they cause errors like these: i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration i2c_designware 80860F41:03: i2c_dw_handle_tx_abort: lost arbitration silead_ts i2c-MSSL1680:00: Registers clear error -11 This commit makes the i2c-core ignore LNXVIDEO compatible ACPI devices which has 2 positive results: 1) The bogus i2c-client for these is no longer created. 2) i2c_acpi_lookup_speed now ignores the 100KHz speed from the pseudo i2c-resouce and properly returns 400KHz as speed for the touchscreen i2c bus, fixing the touchscreen not working on various devies. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/i2c/i2c-core.c | 11 +++++++++++ 1 file changed, 11 insertions(+)