Revert "Input: trackpoint - add new trackpoint firmware ID"
Subsystems (2)
PATCH 1/1 Revert "Input: trackpoint - add new trackpoint firmware ID"
This reverts commit ec667683c532c93fb41e100e5d61a518971060e2, which breaks the Trackpoint on ThinkPad X1 Carbon Gen5 (Model 20HR). That commit intended to add support for later firmware versions to the trackpoint driver, however, the version is reported in the second byte whereas the change was made to the magic byte preceding that version. The update package linked by Lenovo suggests that 20HR models use an ALPS Touchpad instead.
--- drivers/input/mouse/trackpoint.c | 3 +-- drivers/input/mouse/trackpoint.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/input/mouse/trackpoint.c +1 -2
@@ -265,8 +265,7 @@ static int trackpoint_start_protocol(struct psmouse *psmouse, unsigned char *firif (ps2_command (&psmouse->ps2dev, param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID )))return -1 ; -/* add new TP ID. */ -if (!(param[0 ] &TP_MAGIC_IDENT )) +if (param[0 ] !=TP_MAGIC_IDENT )return -1 ;if (firmware_id)
drivers/input/mouse/trackpoint.h +1 -2
@@ -21,9 +21,8 @@#define TP_COMMAND 0xE2/* Commands start with this */ #define TP_READ_ID 0xE1/* Sent for device identification */ -#define TP_MAGIC_IDENT 0x03/* Sent after a TP_READ_ID followed */ +#define TP_MAGIC_IDENT 0x01/* Sent after a TP_READ_ID followed */ /* by the firmware ID */ -/* Firmware ID includes 0x1, 0x2, 0x3 */ /*
Signature · 1 line
2.15.1
Quoted 10 lines · Sebastian Schmidt
This reverts commit
ec667683c532c93fb41e100e5d61a518971060e2, which breaks the Trackpoint on ThinkPad X1 Carbon Gen5 (Model 20HR). That commit intended to add support for later firmware versions to the trackpoint driver, however, the version is reported in the second byte whereas the change was made to the magic byte preceding that version. The update package linked by Lenovo suggests that 20HR models use an ALPS Touchpad instead.Signed-off-by Sebastian Schmidt <[email protected]>Acked-by Greg KH <[email protected]>
Um, I didn't ack this patch, don't ever put something like that on a patch unless it is offered by the person.
thanks,
greg k-h
Quoted 9 lines · Greg KH
Quoted 8 lines · Sebastian Schmidt
This reverts commit
ec667683c532c93fb41e100e5d61a518971060e2, which breaks the Trackpoint on ThinkPad X1 Carbon Gen5 (Model 20HR). That commit intended to add support for later firmware versions to the trackpoint driver, however, the version is reported in the second byte whereas the change was made to the magic byte preceding that version. The update package linked by Lenovo suggests that 20HR models use an ALPS Touchpad instead.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Sebastian Schmidt <[email protected]>Acked-by Greg KH <[email protected]>Um, I didn't ack this patch, don't ever put something like that on a patch unless it is offered by the person.
Sorry. :( Should I re-send the amended patch?
Sebastian
Please refer to the Lenovo forum:
The patch you tried to revert solved many people's issue. Also the people who used the trackpointdetect.exe to identify their ID as (Elan (ID:03).
The elan driver can *not* work on their trackpoint, neither does ALPS. They didn't match the ID tables, commands on ALPS or Elan driver.
The error log of Windows firmware update tools maybe wrong, so do NOT based on it to guess what device it is.
Quoted 1 line · Aaron Ma
Please refer to the Lenovo forum:
Please always include the proper email context, I have no idea what you are talking about here. Remember, some people get hundreds, if not thousands, of emails a day...
thnaks,
greg k-h
1, Commit ec667683c53 addes support of the new trackpoint. The trackpoint can be identified as "TPPS/2 IBM TrackPoint" and set properties OK. Trackpoint enabled some enhanced features. Without this commit there will be no scroll mode when xf86-input-evdev is used.
2, trackpoint.c export a speed of sysfs,
the speed sys file can't be set right value on X1 Carbon 5th. This issue is caused by trackpoint firmware.
Workaround is to use xinput/xorg/udev/GUI to set trackpoint speed.
3, Windowds tool Trackpointdetect.exe shows it is ELAN (ID:03) in error log. After debugging psmouse driver on it, the IDs and FW/hardware version is not ELAN. Forcing to load ELAN driver will not make it work.
Dmitry Torokhov
maintainerHi Aaron,
Quoted 9 lines · Aaron Ma
1, Commit
ec667683c53addes support of the new trackpoint. The trackpoint can be identified as "TPPS/2 IBM TrackPoint" and set properties OK. Trackpoint enabled some enhanced features. Without this commit there will be no scroll mode when xf86-input-evdev is used.2,
trackpoint.cexport a speed of sysfs,
the speed sys file can't be set right value on X1 Carbon 5th. This issue is caused by trackpoint firmware.
No, I do not believe that this is an issue with the firmware. Rather, it seems that Lenovo is multi-sourcing trackpoint for their devices, and not all of them implement the IBM trackpoint protocol. We will need to contact Elan to figure out what capabilities their trackpoints have.
Quoted 1 line
Workaround is to use xinput/xorg/udev/GUI to set trackpoint speed.
I'd rather we did not force users to do that.
Quoted 4 lines
3, Windowds tool Trackpointdetect.exe shows it is ELAN (ID:03) in error log. After debugging psmouse driver on it, the IDs and FW/hardware version is not ELAN. Forcing to load ELAN driver will not make it work.
We do not have a special driver for Elan trackpoints and if they do not fully implement IBM trackpoint protocol, then standard PS/2 mode should be used, at least until someone creates a proper Elan trackpoint driver.
The original "magic ID" for the IBM trcakpoints was 0x1. This value was described in the original trackpoint spec and has not changed since late 90th. Now we have 0x2 and 0x3. Could they indicate ALPS and Elan trackpoints respectively? What ID does your Yoga report? Does it support all features exported by the trackpoint driver (speed, sensitivity, inertia, etc)?
Thanks.
Signature · 1 line
Dmitry
No, it is not a regression of this commit.
ThinkPad X1 Yoga 2nd:
trackpoint (ID: 01)
ThinkPad X1 Yoga 3rd:
trackpoint (ID: 03)
Both laptop's trackpoints have the same behavior.
Writing "speed" of sysfs is failed.
Override the ID and force loading drivers/input/mouse/elantech.c, it causes too many failure and trackpoint stops work.
The ID of "2.4.18 READ SECONDARY ID (x"E1")" in TrackPoint specification does not indicate any other vendors but only trackpoint. Elantech uses 0x03e9.
ALPS uses 0x00e6/0x00e7/0x00ec.
Maybe the windows tool's is wrong like Linux driver before.
Dmitry Torokhov
maintainerHi Aaron,
Quoted 5 lines · Aaron Ma
No, it is not a regression of this commit.
ThinkPad X1 Yoga 2nd:
trackpoint (ID: 01)
Quoted 8 lines
ThinkPad X1 Yoga 3rd:
trackpoint (ID: 03)Both laptop's trackpoints have the same behavior.
Writing "speed" of sysfs is failed.Override the ID and force loading
drivers/input/mouse/elantech.c, it causes too many failure and trackpoint stops work.
Right, because it does not support Elantech *touchpad* protocol, that is not a surprise.
Quoted 3 lines
The ID of "2.4.18 READ SECONDARY ID (x"E1")" in TrackPoint specification does not indicate any other vendors but only trackpoint.
Exactly. If ID does not match, it is not an IBM trackpoint device.
Quoted 4 lines
Elantech uses
0x03e9.
ALPS uses 0x00e6/0x00e7/0x00ec.Maybe the windows tool's is wrong like Linux driver before.
I am not sure what you mean by that.
Anyway, I played with my Carbons a bit, and it seems that the patch should indeed be reverted. I believe that neither the Elantech nor ALPS trackpoints support the IBM trackpoint protocol; none of the extended features (sensitivity, inertia, etc) work when we register them as TTPS/2 devices. They should continue to be registered as "Generic PS/2" as that's that they support.
I understand that you want scroll mode working with trackpoints, but forcing them to pretend that they are TTPS/2 devices is not the proper way of doing that. Write udev rules that would set ID_INPUT_POINTINGSTICK property on all input devices connected to a pass-through serio ports on LENOVO devices, and you should be set (just make sure you cover both PS/2 pass-through and RMI pass-through options).
Thanks.
Signature · 1 line
Dmitry
Hi Dmitry:
Got the official info from Lenovo:
Lenovo introduced new TrackPoint compatible sticks ( ELAN/Alps/NXP sticks) from 2016.
These new devices only support the minimum commands described in the spec, which has been used in the current Windows driver.
Legacy TrackPoint: 0101 – 0E01
ALPS: 0102 – FF02
ELAN:0103 – FF03
NXP: 0104 – FF04
2.4.18 READ SECONDARY ID (x"E1")
This command will read the secondary device ID of the pointing device (2 bytes). The least significant byte is sent first. For the first byte, the legacy TrackPoint controller from IBM will always return x"01", the pointing stick from ALPS will always return x"02", the pointing stick from Elan will always return x"03”, and the pointing stick from NXP will always return 0x”04". And a second byte which denotes a specific set of functional specifications. Differing ROM versions are used to denote changes within a given functional set.
The new devices (include Legacy ID:01) will not support the sysfs like speed.
So it is not right to revert the commit, it is about to add another 0x04 ID in it.
Old sysfs could be stayed for old legacy device ID:01 or removed.
Aaron
Dmitry Torokhov
maintainerHi Aaron,
Quoted 7 lines · Aaron Ma
Hi Dmitry:
Got the official info from Lenovo:
Lenovo introduced new TrackPoint compatible sticks ( ELAN/Alps/NXP sticks) from 2016.
These new devices only support the minimum commands described in the spec, which has been used in the current Windows driver.
What is the exact list of the commands supported by each variant?
Quoted 6 lines
Legacy TrackPoint: 0101 – 0E01
ALPS: 0102 – FF02
ELAN:0103 – FF03
NXP: 0104 – FF04
Quoted 9 lines
2.4.18 READ SECONDARY ID (x"E1")
This command will read the secondary device ID of the pointing device (2 bytes). The least significant byte is sent first. For the first byte, the legacy TrackPoint controller from IBM will always return x"01", the pointing stick from ALPS will always return x"02", the pointing stick from Elan will always return x"03”, and the pointing stick from NXP will always return 0x”04". And a second byte which denotes a specific set of functional specifications. Differing ROM versions are used to denote changes within a given functional set.
Can you/Lenovo share the updated spec?
Quoted 8 lines
The new devices (include Legacy ID:01) will not support the sysfs like speed.
So it is not right to revert the commit, it is about to add another
0x04ID in it.Old sysfs could be stayed for old legacy device ID:01 or removed.
No, because there are devices that have trackpoints properly implementing the protocol, before Lenovo started their "innovation".
Do we have any way to distinguish between properly implemented trackpoints and Lenovo "improved" ones? I played with gen3 Carbon, and while it does not error out on "speed" attribute, unlike gen5, it still has no visible effects. Additionally, the "press to select" functionality seems to be disabled, and trying to enable it via sysfs results in register content being reverted to the original "disabled" setting in a second or two. Setting to swap X and Y axes does not work either, not sure about other bits of that control register. "sensitivity" does work though, again unlike my gen5.
Thanks.
Signature · 1 line
Dmitry
Dmitry Torokhov
maintainerQuoted 53 lines · Dmitry Torokhov
Hi Aaron,
Quoted 7 lines · Aaron Ma
Hi Dmitry:
Got the official info from Lenovo:
Lenovo introduced new TrackPoint compatible sticks ( ELAN/Alps/NXP sticks) from 2016.
These new devices only support the minimum commands described in the spec, which has been used in the current Windows driver.What is the exact list of the commands supported by each variant?
Quoted 6 lines
Legacy TrackPoint: 0101 – 0E01
ALPS: 0102 – FF02
ELAN:0103 – FF03
NXP: 0104 – FF04Quoted 9 lines
2.4.18 READ SECONDARY ID (x"E1")
This command will read the secondary device ID of the pointing device (2 bytes). The least significant byte is sent first. For the first byte, the legacy TrackPoint controller from IBM will always return x"01", the pointing stick from ALPS will always return x"02", the pointing stick from Elan will always return x"03”, and the pointing stick from NXP will always return 0x”04". And a second byte which denotes a specific set of functional specifications. Differing ROM versions are used to denote changes within a given functional set.Can you/Lenovo share the updated spec?
Quoted 8 lines
The new devices (include Legacy ID:01) will not support the sysfs like speed.
So it is not right to revert the commit, it is about to add another
0x04ID in it.Old sysfs could be stayed for old legacy device ID:01 or removed.
No, because there are devices that have trackpoints properly implementing the protocol, before Lenovo started their "innovation".
Do we have any way to distinguish between properly implemented trackpoints and Lenovo "improved" ones? I played with gen3 Carbon, and while it does not error out on "speed" attribute, unlike gen5, it still has no visible effects. Additionally, the "press to select" functionality seems to be disabled, and trying to enable it via sysfs results in register content being reverted to the original "disabled" setting in a second or two. Setting to swap X and Y axes does not work either, not sure about other bits of that control register. "sensitivity" does work though, again unlike my gen5.
Quoted 4 lines
Thanks.
Signature · 1 line
Dmitry
Guys, could you please try the patch below? It will not solve the "speed" issue on 0x01 devices, but hopefully we won't be exposing non-existing controls on others.
Thanks!
Signature · 22 lines
Dmitry Input: trackpoint - only expose supported controls for Elan, ALPS and NXP From: Dmitry Torokhov <[email protected]> The newer trackpoints from ALPS, Elan and NXP implement a very limited subset of extended commands and controls that the original trackpoints implemented, so we should not be exposing not working controls in sysfs. The newer trackpoints also do not implement "Power On Reset" or "Read Extended Button Status", so we should not be using these commands during initialization. While we are at it, let's change "unsigned char" to u8 for byte data or bool for booleans and use better suited error codes instead of -1. Signed-off-by: Dmitry Torokhov <[email protected]> --- drivers/input/mouse/trackpoint.c | 241 +++++++++++++++++++++++--------------- drivers/input/mouse/trackpoint.h | 34 +++-- 2 files changed, 168 insertions(+), 107 deletions(-)
drivers/input/mouse/trackpoint.c +147 -94
@@ -19,6 +19,13 @@#include "psmouse.h" #include "trackpoint.h" +static const char *const trackpoint_variants[] = { + [TP_VARIANT_IBM ] ="IBM" , + [TP_VARIANT_ALPS ] ="ALPS" , + [TP_VARIANT_ELAN ] ="Elan" , + [TP_VARIANT_NXP ] ="NXP" , +}; +/* * Power-on Reset: Resets all trackpoint parameters, including RAM values, * to defaults.
@@ -26,7 +33,7 @@*/ static int trackpoint_power_on_reset (struct ps2dev *ps2dev) { -unsigned char results[2 ]; +u8 results[2 ];int tries =0 ;/* Issue POR command, and repeat up to once if 0xFC00 received */
@@ -38,7 +45,7 @@ static int trackpoint_power_on_reset(struct ps2dev *ps2dev)/* Check for success response -- 0xAA00 */ if (results[0 ] !=0xAA || results[1 ] !=0x00 ) -return -1 ; +return -ENODEV ;return 0 ; }
@@ -46,8 +53,7 @@ static int trackpoint_power_on_reset(struct ps2dev *ps2dev)/* * Device IO: read, write and toggle bit */ -static int trackpoint_read (struct ps2dev *ps2dev, -unsigned char loc,unsigned char *results) +static int trackpoint_read (struct ps2dev *ps2dev,u8 loc,u8 *results) {if (ps2_command (ps2dev,NULL ,MAKE_PS2_CMD (0 ,0 ,TP_COMMAND )) ||ps2_command (ps2dev, results,MAKE_PS2_CMD (0 ,1 , loc))) {
@@ -57,8 +63,7 @@ static int trackpoint_read(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_write (struct ps2dev *ps2dev, -unsigned char loc,unsigned char val) +static int trackpoint_write (struct ps2dev *ps2dev,u8 loc,u8 val) { if (ps2_command(ps2dev, NULL, MAKE_PS2_CMD(0, 0, TP_COMMAND)) || ps2_command(ps2dev, NULL, MAKE_PS2_CMD(0, 0, TP_WRITE_MEM)) ||
@@ -70,8 +75,7 @@ static int trackpoint_write(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_toggle_bit (struct ps2dev *ps2dev, -unsigned char loc,unsigned char mask) +static int trackpoint_toggle_bit (struct ps2dev *ps2dev,u8 loc,u8 mask) {/* Bad things will happen if the loc param isn't in this range */ if (loc <0x20 || loc >=0x2F )
@@ -87,11 +91,11 @@ static int trackpoint_toggle_bit(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_update_bit (struct ps2dev *ps2dev,unsigned char loc, -unsigned char mask,unsigned char value) +static int trackpoint_update_bit (struct ps2dev *ps2dev, +u8 loc,u8 mask,u8 value) {int retval =0 ; -unsigned char data; +u8 data;trackpoint_read (ps2dev, loc, &data);if (((data & mask) == mask) != !!value)
@@ -105,17 +109,18 @@ static int trackpoint_update_bit(struct ps2dev *ps2dev, unsigned char loc,*/ struct trackpoint_attr_data {size_t field_offset; -unsigned char command; -unsigned char mask; -unsigned char inverted; -unsigned char power_on_default; +u8 command; +u8 mask; +bool inverted; +u8 power_on_default; }; -static ssize_t trackpoint_show_int_attr (struct psmouse *psmouse,void *data,char *buf) +static ssize_t trackpoint_show_int_attr (struct psmouse *psmouse, +void *data,char *buf) {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char value = *(unsigned char *)((char *)tp + attr->field_offset); +u8 value = *(u8 *)((void *)tp + attr->field_offset);if (attr->inverted) value = !value;
@@ -128,8 +133,8 @@ static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data, {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); -unsigned char value; +u8 *field = (void *)tp + attr->field_offset; +u8 value;int err; err =kstrtou8 (buf,10 , &value);
@@ -157,17 +162,14 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data, {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); -unsigned int value; +bool *field = (void *)tp + attr->field_offset; +bool value;int err; - err =kstrtouint (buf,10 , &value); + err =kstrtobool (buf, &value);if (err)return err; -if (value >1 ) -return -EINVAL ; -if (attr->inverted) value = !value;
@@ -193,30 +195,6 @@ PSMOUSE_DEFINE_ATTR(_name, S_IWUSR | S_IRUGO, \ &trackpoint_attr_##_name, \ trackpoint_show_int_attr, trackpoint_set_bit_attr) -#define TRACKPOINT_UPDATE_BIT (_psmouse, _tp, _name) \ -do { \ - struct trackpoint_attr_data *_attr = &trackpoint_attr_##_name; \ - \ - trackpoint_update_bit(&_psmouse->ps2dev, \ - _attr->command, _attr->mask, _tp->_name); \ -} while (0) - -#define TRACKPOINT_UPDATE (_power_on, _psmouse, _tp, _name) \ -do { \ - if (!_power_on || \ - _tp->_name != trackpoint_attr_##_name.power_on_default) { \ - if (!trackpoint_attr_##_name.mask) \ - trackpoint_write(&_psmouse->ps2dev, \ - trackpoint_attr_##_name.command, \ - _tp->_name); \ - else \ - TRACKPOINT_UPDATE_BIT(_psmouse, _tp, _name); \ - } \ -} while (0) - -#define TRACKPOINT_SET_POWER_ON_DEFAULT (_tp, _name) \ - (_tp->_name = trackpoint_attr_##_name.power_on_default) -TRACKPOINT_INT_ATTR (sensitivity,TP_SENS ,TP_DEF_SENS );TRACKPOINT_INT_ATTR (speed,TP_SPEED ,TP_DEF_SPEED );TRACKPOINT_INT_ATTR (inertia,TP_INERTIA ,TP_DEF_INERTIA );
@@ -229,13 +207,33 @@ TRACKPOINT_INT_ATTR(ztime, TP_Z_TIME, TP_DEF_Z_TIME);TRACKPOINT_INT_ATTR (jenks,TP_JENKS_CURV ,TP_DEF_JENKS_CURV );TRACKPOINT_INT_ATTR (drift_time,TP_DRIFT_TIME ,TP_DEF_DRIFT_TIME ); -TRACKPOINT_BIT_ATTR (press_to_select,TP_TOGGLE_PTSON ,TP_MASK_PTSON ,0 , +TRACKPOINT_BIT_ATTR (press_to_select,TP_TOGGLE_PTSON ,TP_MASK_PTSON , false,TP_DEF_PTSON ); -TRACKPOINT_BIT_ATTR (skipback,TP_TOGGLE_SKIPBACK ,TP_MASK_SKIPBACK ,0 , +TRACKPOINT_BIT_ATTR (skipback,TP_TOGGLE_SKIPBACK ,TP_MASK_SKIPBACK , false,TP_DEF_SKIPBACK ); -TRACKPOINT_BIT_ATTR (ext_dev,TP_TOGGLE_EXT_DEV ,TP_MASK_EXT_DEV ,1 , +TRACKPOINT_BIT_ATTR (ext_dev,TP_TOGGLE_EXT_DEV ,TP_MASK_EXT_DEV , true,TP_DEF_EXT_DEV ); +static bool trackpoint_is_attr_available (struct psmouse *psmouse, +struct attribute *attr) +{ +struct trackpoint_data *tp = psmouse->private; + +return tp->variant_id ==TP_VARIANT_IBM || + attr == &psmouse_attr_sensitivity.dattr.attr || + attr == &psmouse_attr_press_to_select.dattr.attr; +} + +static umode_t trackpoint_is_attr_visible (struct kobject *kobj, +struct attribute *attr,int n) +{ + struct device *dev = container_of(kobj, struct device, kobj); +struct serio *serio =to_serio_port (dev); +struct psmouse *psmouse =serio_get_drvdata (serio); + +return trackpoint_is_attr_available (psmouse, attr) ? attr->mode :0 ; +} +static struct attribute *trackpoint_attrs[] = { &psmouse_attr_sensitivity.dattr.attr, &psmouse_attr_speed.dattr.attr,
@@ -255,24 +253,56 @@ static struct attribute *trackpoint_attrs[] = { };static struct attribute_group trackpoint_attr_group = { - .attrs = trackpoint_attrs, + .is_visible = trackpoint_is_attr_visible, + .attrs = trackpoint_attrs, }; -static int trackpoint_start_protocol (struct psmouse *psmouse,unsigned char *firmware_id) -{ -unsigned char param[2 ] = {0 }; +#define TRACKPOINT_UPDATE (_power_on, _psmouse, _tp, _name) \ +do { \ + struct trackpoint_attr_data *_attr = &trackpoint_attr_##_name; \ + \ + if ((!_power_on || _tp->_name != _attr->power_on_default) && \ + trackpoint_is_attr_available(_psmouse, \ + &psmouse_attr_##_name.dattr.attr)) { \ + if (!_attr->mask) \ + trackpoint_write(&_psmouse->ps2dev, \ + _attr->command, _tp->_name); \ + else \ + trackpoint_update_bit(&_psmouse->ps2dev, \ + _attr->command, _attr->mask, \ + _tp->_name); \ + } \ +} while (0) -if (ps2_command (&psmouse->ps2dev, param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID ))) -return -1 ; +#define TRACKPOINT_SET_POWER_ON_DEFAULT (_tp, _name) \ +do { \ + _tp->_name = trackpoint_attr_##_name.power_on_default; \ +} while (0) -/* add new TP ID. */ -if (!(param[0 ] &TP_MAGIC_IDENT )) -return -1 ; +static int trackpoint_start_protocol (struct psmouse *psmouse, +u8 *variant_id,u8 *firmware_id) +{ +u8 param[2 ] = {0 }; +int error; -if (firmware_id) - *firmware_id = param[1 ]; + error =ps2_command (&psmouse->ps2dev, + param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID )); +if (error) +return error; + +switch (param[0 ]) { +case TP_VARIANT_IBM : +case TP_VARIANT_ALPS : +case TP_VARIANT_ELAN : +case TP_VARIANT_NXP : +if (variant_id) + *variant_id = param[0 ]; +if (firmware_id) + *firmware_id = param[1 ]; +break ; + } -return 0 ; +return -ENODEV ; }/*
@@ -285,7 +315,7 @@ static int trackpoint_sync(struct psmouse *psmouse, bool in_power_on_state) {struct trackpoint_data *tp = psmouse->private; -if (!in_power_on_state) { +if (!in_power_on_state && tp->variant_id ==TP_VARIANT_IBM ) {/* * Disable features that may make device unusable * with this driver.
@@ -347,7 +377,8 @@ static void trackpoint_defaults(struct trackpoint_data *tp)static void trackpoint_disconnect (struct psmouse *psmouse) { -sysfs_remove_group (&psmouse->ps2dev.serio->dev.kobj, &trackpoint_attr_group); +device_remove_group (&psmouse->ps2dev.serio->dev, + &trackpoint_attr_group);kfree (psmouse->private); psmouse->private =NULL ;
@@ -355,14 +386,20 @@ static void trackpoint_disconnect(struct psmouse *psmouse)static int trackpoint_reconnect (struct psmouse *psmouse) { -int reset_fail; +struct trackpoint_data *tp = psmouse->private; +int error; +bool was_reset; -if (trackpoint_start_protocol (psmouse,NULL )) -return -1 ; + error =trackpoint_start_protocol (psmouse,NULL ,NULL ); +if (error) +return error; - reset_fail =trackpoint_power_on_reset (&psmouse->ps2dev); -if (trackpoint_sync (psmouse, !reset_fail)) -return -1 ; + was_reset = tp->variant_id ==TP_VARIANT_IBM && +trackpoint_power_on_reset (&psmouse->ps2dev) ==0 ; + + error =trackpoint_sync (psmouse, was_reset); +if (error) +return error;return 0 ; }
@@ -370,46 +407,62 @@ static int trackpoint_reconnect(struct psmouse *psmouse)int trackpoint_detect (struct psmouse *psmouse,bool set_properties) {struct ps2dev *ps2dev = &psmouse->ps2dev; -unsigned char firmware_id; -unsigned char button_info; +struct trackpoint_data *tp; +u8 variant_id; +u8 firmware_id; +u8 button_info;int error; -if (trackpoint_start_protocol (psmouse, &firmware_id)) -return -1 ; + error =trackpoint_start_protocol (psmouse, &variant_id, &firmware_id); +if (error) +return error;if (!set_properties)return 0 ; -if (trackpoint_read (ps2dev,TP_EXT_BTN , &button_info)) { -psmouse_warn (psmouse,"failed to get extended button data, assuming 3 buttons\n" ); - button_info =0x33 ; - } - - psmouse->private =kzalloc (sizeof (struct trackpoint_data ),GFP_KERNEL ); -if (!psmouse->private) + tp =kzalloc (sizeof (*tp),GFP_KERNEL ); +if (!tp)return -ENOMEM ; - psmouse->vendor ="IBM" ; +trackpoint_defaults (tp); + tp->variant_id = variant_id; + tp->firmware_id = firmware_id; + + psmouse->private = tp; + + psmouse->vendor = trackpoint_variants[variant_id]; psmouse->name ="TrackPoint" ; psmouse->reconnect = trackpoint_reconnect; psmouse->disconnect = trackpoint_disconnect; +if (variant_id !=TP_VARIANT_IBM ) { +/* Newer variants do not support extended button query. */ + button_info =0x33 ; + }else { + error =trackpoint_read (ps2dev,TP_EXT_BTN , &button_info); +if (error) { +psmouse_warn (psmouse, +"failed to get extended button data, assuming 3 buttons\n" ); + button_info =0x33 ; + } + } +if ((button_info &0x0f ) >=3 ) -__set_bit (BTN_MIDDLE , psmouse->dev->keybit); +input_set_capability (psmouse->dev,EV_KEY ,BTN_MIDDLE );__set_bit (INPUT_PROP_POINTER , psmouse->dev->propbit);__set_bit (INPUT_PROP_POINTING_STICK , psmouse->dev->propbit); -trackpoint_defaults (psmouse->private); - - error =trackpoint_power_on_reset (ps2dev); - -/* Write defaults to TP only if reset fails. */ -if (error) +if (variant_id !=TP_VARIANT_IBM || +trackpoint_power_on_reset (ps2dev) !=0 ) { +/* +* Write defaults to TP if we did not reset the trackpoint. +*/ trackpoint_sync (psmouse, false); + } - error =sysfs_create_group (&ps2dev->serio->dev.kobj, &trackpoint_attr_group); + error =device_add_group (&ps2dev->serio->dev, &trackpoint_attr_group);if (error) { psmouse_err(psmouse, "failed to create sysfs attributes, error: %d\n",
@@ -420,8 +473,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) }psmouse_info (psmouse, -"IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n" , - firmware_id, +"%s TrackPoint firmware: 0x%02x, buttons: %d/%d\n" , + psmouse->vendor, firmware_id, (button_info &0xf0 ) >>4 , button_info &0x0f );return 0 ;
drivers/input/mouse/trackpoint.h +21 -13
@@ -21,10 +21,16 @@#define TP_COMMAND 0xE2/* Commands start with this */ #define TP_READ_ID 0xE1/* Sent for device identification */ -#define TP_MAGIC_IDENT 0x03/* Sent after a TP_READ_ID followed */ -/* by the firmware ID */ -/* Firmware ID includes 0x1, 0x2, 0x3 */ +/* +* Valid first byte responses to the "Read Secondary ID" (0xE1) command. +* 0x01 was the original IBM trackpoint, others implement very limited +* subset of trackpoint features. +*/ +#define TP_VARIANT_IBM 0x01 +#define TP_VARIANT_ALPS 0x02 +#define TP_VARIANT_ELAN 0x03 +#define TP_VARIANT_NXP 0x04/* * Commands
@@ -136,18 +142,20 @@#define MAKE_PS2_CMD (params, results, cmd) ((params<<12) | (results<<8) | (cmd)) -struct trackpoint_data -{ -unsigned char sensitivity, speed, inertia, reach; -unsigned char draghys, mindrag; -unsigned char thresh, upthresh; -unsigned char ztime, jenks; -unsigned char drift_time; +struct trackpoint_data { +u8 variant_id; +u8 firmware_id; + +u8 sensitivity, speed, inertia, reach; +u8 draghys, mindrag; +u8 thresh, upthresh; +u8 ztime, jenks; +u8 drift_time;/* toggles */ -unsigned char press_to_select; -unsigned char skipback; -unsigned char ext_dev; +bool press_to_select; +bool skipback; +bool ext_dev; };#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
Hi Dmitry,
Quoted 3 lines · Dmitry Torokhov
Guys, could you please try the patch below? It will not solve the "speed" issue on
0x01devices, but hopefully we won't be exposing non-existing controls on others.
Thanks for looking into this. Which speed issue on 0x01 devices? I thought those were the legacy ones that used to work and still do as ever.
I've tried your (slightly modified, see below) patch and the trackpoint now gets apparently[1] correctly detected as "psmouse serio2:
trackpoint: Elan TrackPoint firmware: 0x04, buttons: 3/3". However, I still have the feeling that it's a lot more sensitive (or faster?) than with the regular PS/2 driver - even with libinput accel speed turned to -1. I don't know how I could measure this objectively, but there must be some difference between the trackpoint driver and the regular one. Is it maybe an init sequence that causes it to report more sensitively, or a different resolution, or ...? I really have no idea how mice work. :)
Also, I'm wondering, since my trackpoint works just fine as "Generic PS/2 Mouse", including the third button. The driver even says:
| /*
| * Bare PS/2 protocol "detection". Always succeeds.
| */
| static int ps2bare_detect(struct psmouse *psmouse, bool set_properties)
| {
| [...]
| /*
| * We have no way of figuring true number of buttons so let's
| * assume that the device has 3.
| */
| __set_bit(BTN_MIDDLE, psmouse->dev->keybit);
| }
|
| return 0;
| }So I wonder what driver Aaron was using that didn't report a third button. What vendor/firmwares did you (get reports of) have that middle mouse button problem on, Aaron?
Thanks,
Sebastian
1: If it's actually Elan. I've taken out my battery but could only find FRU numbers on the back of the keyboard, no signs of a vendor.
<https://photos.app.goo.gl/iafpfzvRY042dOBo2> or
<https://t.yath.de/IMG_20180108_143205.jpg>
In trackpoint_start_protocol:
drivers/input/mouse/trackpoint.c static struct attribute *trackpoint_attrs[] = { · line 302
Quoted 10 lines
drivers/input/mouse/trackpoint.c +10
-0+switch (param[0 ]) { +case TP_VARIANT_IBM : +case TP_VARIANT_ALPS : +case TP_VARIANT_ELAN : +case TP_VARIANT_NXP : +if (variant_id) + *variant_id = param[0 ]; +if (firmware_id) + *firmware_id = param[1 ]; +break ;
^^^^^
That should be a return 0.
Quoted 5 lines
drivers/input/mouse/trackpoint.c +2
-1+ } -return 0 ; +return -ENODEV ; }
Dmitry Torokhov
maintainerHi Sebastian,
Quoted 11 lines · Sebastian Schmidt
Hi Dmitry,
Quoted 3 lines · Dmitry Torokhov
Guys, could you please try the patch below? It will not solve the "speed" issue on
0x01devices, but hopefully we won't be exposing non-existing controls on others.Thanks for looking into this. Which speed issue on
0x01devices? I thought those were the legacy ones that used to work and still do as ever.
Quoted 9 lines
I've tried your (slightly modified, see below) patch and the trackpoint now gets apparently[1] correctly detected as "psmouse serio2:
trackpoint: Elan TrackPoint firmware:0x04, buttons: 3/3". However, I still have the feeling that it's a lot more sensitive (or faster?) than with the regular PS/2 driver - even with libinput accel speed turned to -1. I don't know how I could measure this objectively, but there must be some difference between the trackpoint driver and the regular one. Is it maybe an init sequence that causes it to report more sensitively, or a different resolution, or ...? I really have no idea how mice work. :)
Hmm.. Can you try writing different values to "sensitivity" attribute and let me know if this changes behavior. Try 0x66, 0x73, 0x80, 0x8F, 0xA0, 0xB3, 0xC9, 0xE1, 0xFC values (smaller should be less sensitive). I believe we try to program it to 0x80 by default.
Also, I think libinput/udev is trying to "normalize" trackstick feel, see /lib/udev/hwdb.d/70-pointingstick.hwdb I am adding Peter Hutterer to see if he has any more info.
Quoted 19 lines
Also, I'm wondering, since my trackpoint works just fine as "Generic PS/2 Mouse", including the third button. The driver even says:
| /* | * Bare PS/2 protocol "detection". Always succeeds. | */ | static int ps2bare_detect(struct psmouse *psmouse, bool set_properties) | { | [...] | /* | * We have no way of figuring true number of buttons so let's | * assume that the device has 3. | */ | __set_bit(BTN_MIDDLE, psmouse->dev->keybit); | } | | return 0; | }
Quoted 3 lines
So I wonder what driver Aaron was using that didn't report a third button. What vendor/firmwares did you (get reports of) have that middle mouse button problem on, Aaron?
No, the functionality Aaron is after is scrolling with the trackpoint - if you hold middle button and press onto the trackpoint upwards or downwards it should scroll window content.
Quoted 22 lines
Thanks,
Sebastian
1: If it's actually Elan. I've taken out my battery but could only find FRU numbers on the back of the keyboard, no signs of a vendor.
<https://photos.app.goo.gl/iafpfzvRY042dOBo2> or
<https://t.yath.de/IMG_20180108_143205.jpg>In
trackpoint_start_protocol:drivers/input/mouse/trackpoint.c static struct attribute *trackpoint_attrs[] = { · line 302
Quoted 10 lines
drivers/input/mouse/trackpoint.c +10
-0+switch (param[0 ]) { +case TP_VARIANT_IBM : +case TP_VARIANT_ALPS : +case TP_VARIANT_ELAN : +case TP_VARIANT_NXP : +if (variant_id) + *variant_id = param[0 ]; +if (firmware_id) + *firmware_id = param[1 ]; +break ;
Quoted 2 lines
^^^^^
That should be a return 0.
Yes, indeed.
Quoted 5 lines
Quoted 5 lines
drivers/input/mouse/trackpoint.c +2
-1+ } -return 0 ; +return -ENODEV ; }
Signature · 1 line
Dmitry
Quoted 24 lines · Dmitry Torokhov
Hi Sebastian,
Quoted 11 lines · Sebastian Schmidt
Hi Dmitry,
Quoted 3 lines · Dmitry Torokhov
Guys, could you please try the patch below? It will not solve the "speed" issue on
0x01devices, but hopefully we won't be exposing non-existing controls on others.Thanks for looking into this. Which speed issue on
0x01devices? I thought those were the legacy ones that used to work and still do as ever.Quoted 9 lines
I've tried your (slightly modified, see below) patch and the trackpoint now gets apparently[1] correctly detected as "psmouse serio2:
trackpoint: Elan TrackPoint firmware:0x04, buttons: 3/3". However, I still have the feeling that it's a lot more sensitive (or faster?) than with the regular PS/2 driver - even with libinput accel speed turned to -1. I don't know how I could measure this objectively, but there must be some difference between the trackpoint driver and the regular one. Is it maybe an init sequence that causes it to report more sensitively, or a different resolution, or ...? I really have no idea how mice work. :)
Quoted 8 lines
Hmm.. Can you try writing different values to "sensitivity" attribute and let me know if this changes behavior. Try
0x66,0x73,0x80,0x8F,0xA0,0xB3,0xC9,0xE1,0xFCvalues (smaller should be less sensitive). I believe we try to program it to0x80by default.Also, I think libinput/udev is trying to "normalize" trackstick feel, see
/lib/udev/hwdb.d/70-pointingstick.hwdbI am adding Peter Hutterer to see if he has any more info.
yeah, it is, and it also undoes the effect of the POINTINGSTICK_SENSITIVITY udev property (for backwards compatibility we assume this always matches the sysfs entry, we don't look at the sysfs entry directly). Having said that, we only check that property on device plug, so if you keep messing with the sysfs files you'll still see the various changes to the pointer speed.
in other words: messing around with the sensitivity attribute will still see changes in pointer motion and is good enough for testing.
Cheers,
Peter
Quoted 66 lines
Quoted 18 lines
Also, I'm wondering, since my trackpoint works just fine as "Generic PS/2 Mouse", including the third button. The driver even says:
| /* | * Bare PS/2 protocol "detection". Always succeeds. | */ | static int ps2bare_detect(struct psmouse *psmouse, bool set_properties) | { | [...] | /* | * We have no way of figuring true number of buttons so let's | * assume that the device has 3. | */ | __set_bit(BTN_MIDDLE, psmouse->dev->keybit); | } | | return 0; | }Quoted 3 lines
So I wonder what driver Aaron was using that didn't report a third button. What vendor/firmwares did you (get reports of) have that middle mouse button problem on, Aaron?
No, the functionality Aaron is after is scrolling with the trackpoint - if you hold middle button and press onto the trackpoint upwards or downwards it should scroll window content.
Quoted 22 lines
Thanks,
Sebastian
1: If it's actually Elan. I've taken out my battery but could only find FRU numbers on the back of the keyboard, no signs of a vendor.
<https://photos.app.goo.gl/iafpfzvRY042dOBo2> or
<https://t.yath.de/IMG_20180108_143205.jpg>In
trackpoint_start_protocol:drivers/input/mouse/trackpoint.c static struct attribute *trackpoint_attrs[] = { · line 302
Quoted 10 lines
drivers/input/mouse/trackpoint.c +10
-0+switch (param[0 ]) { +case TP_VARIANT_IBM : +case TP_VARIANT_ALPS : +case TP_VARIANT_ELAN : +case TP_VARIANT_NXP : +if (variant_id) + *variant_id = param[0 ]; +if (firmware_id) + *firmware_id = param[1 ]; +break ;Quoted 2 lines
^^^^^
That should be a return 0.Yes, indeed.
Quoted 5 lines
Quoted 5 lines
drivers/input/mouse/trackpoint.c +2
-1+ } -return 0 ; +return -ENODEV ; }Signature · 5 lines
Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Dmitry, Sebastian,
Nack for the patch..
As Sebastian pointed out, the trackpoint detection will always report an error. (see below)
I builded your original patch and it resulted in detection as generic mouse for the trackpoint:
[ 0.838143] serio: i8042 KBD port at 0x60,0x64 irq 1 [ 0.838146] serio: i8042 AUX port at 0x60,0x64 irq 12 [ 0.838267] mousedev: PS/2 mouse device common for all mice [ 9.321140] psmouse serio1: synaptics: queried max coordinates: x [..5676], y [..4758] [ 9.367095] psmouse serio1: synaptics: queried min coordinates: x [1266..], y [1096..] [ 9.367103] psmouse serio1: synaptics: The touchpad can support a better bus than the too old PS/2 protocol. Make sure MOUSE_PS2_SYNAPTICS_SMBUS and RMI4_SMB are enabled to get a better touchpad experience. [ 9.455953] psmouse serio1: synaptics: Touchpad model: 1, fw: 8.2, id: 0x1e2b1, caps: 0xf007a3/0x943300/0x12e800/0x410000, board id: 3157, fw id: 2405942 [ 9.455970] psmouse serio1: synaptics: serio: Synaptics pass-through port at isa0060/serio1/input0 [ 9.514117] input: SynPS/2 Synaptics TouchPad as /devices/platform/i8042/serio1/input/input7 [ 11.458443] input: PS/2 Generic Mouse as /devices/platform/i8042/serio1/serio2/input/input18
When I fixed your patch, it resulted in: (timing difference is because a dvd was inserted before)
[ 0.843661] serio: i8042 KBD port at 0x60,0x64 irq 1 [ 0.843664] serio: i8042 AUX port at 0x60,0x64 irq 12 [ 0.843793] mousedev: PS/2 mouse device common for all mice [ 3.822411] psmouse serio1: synaptics: queried max coordinates: x [..5676], y [..4758] [ 3.868196] psmouse serio1: synaptics: queried min coordinates: x [1266..], y [1096..] [ 3.868203] psmouse serio1: synaptics: The touchpad can support a better bus than the too old PS/2 protocol. Make sure MOUSE_PS2_SYNAPTICS_SMBUS and RMI4_SMB are enabled to get a better touchpad experience. [ 3.961024] psmouse serio1: synaptics: Touchpad model: 1, fw: 8.2, id: 0x1e2b1, caps: 0xf007a3/0x943300/0x12e800/0x410000, board id: 3157, fw id: 2405942 [ 3.961038] psmouse serio1: synaptics: serio: Synaptics pass-through port at isa0060/serio1/input0 [ 4.017290] input: SynPS/2 Synaptics TouchPad as /devices/platform/i8042/serio1/input/input7 [ 4.407930] psmouse serio2: trackpoint: failed to get extended button data, assuming 3 buttons [ 8.460022] psmouse serio2: trackpoint: IBM TrackPoint firmware: 0x0e, buttons: 3/3 [ 8.740439] input: TPPS/2 IBM TrackPoint as /devices/platform/i8042/serio1/serio2/input/input18
functionally both versions (with/without bug) resulted in a functional trackpoint with 3 buttons.
Sebastian, with regards to your middle button question, as you can see in the output I've such hardware. (lenovo e570).
Dimitrios, wasn't it your intention that this hardware would be detected as NON IBM ? Apparently it is IBM and still fails "Read Extended Button Status".
Kind regards,
Ulrik
Quoted 360 lines · Dmitry Torokhov
Date: Sat, 6 Jan 2018 22:52:01 -0800
From: Dmitry Torokhov <[email protected]>
To: Aaron Ma <[email protected]>
Cc: Greg KH <[email protected]>, Sebastian Schmidt <[email protected]>,
[email protected]
Subject: Re: [PATCH] Revert "Input: trackpoint - add new trackpoint
firmware ID"
X-Mailing-List: [email protected]Quoted 53 lines · Dmitry Torokhov
Hi Aaron,
Quoted 7 lines · Aaron Ma
Hi Dmitry:
Got the official info from Lenovo:
Lenovo introduced new TrackPoint compatible sticks ( ELAN/Alps/NXP sticks) from 2016.
These new devices only support the minimum commands described in the spec, which has been used in the current Windows driver.What is the exact list of the commands supported by each variant?
Quoted 6 lines
Legacy TrackPoint: 0101 – 0E01
ALPS: 0102 – FF02
ELAN:0103 – FF03
NXP: 0104 – FF04Quoted 9 lines
2.4.18 READ SECONDARY ID (x"E1")
This command will read the secondary device ID of the pointing device (2 bytes). The least significant byte is sent first. For the first byte, the legacy TrackPoint controller from IBM will always return x"01", the pointing stick from ALPS will always return x"02", the pointing stick from Elan will always return x"03”, and the pointing stick from NXP will always return 0x”04". And a second byte which denotes a specific set of functional specifications. Differing ROM versions are used to denote changes within a given functional set.Can you/Lenovo share the updated spec?
Quoted 8 lines
The new devices (include Legacy ID:01) will not support the sysfs like speed.
So it is not right to revert the commit, it is about to add another
0x04ID in it.Old sysfs could be stayed for old legacy device ID:01 or removed.
No, because there are devices that have trackpoints properly implementing the protocol, before Lenovo started their "innovation".
Do we have any way to distinguish between properly implemented trackpoints and Lenovo "improved" ones? I played with gen3 Carbon, and while it does not error out on "speed" attribute, unlike gen5, it still has no visible effects. Additionally, the "press to select" functionality seems to be disabled, and trying to enable it via sysfs results in register content being reverted to the original "disabled" setting in a second or two. Setting to swap X and Y axes does not work either, not sure about other bits of that control register. "sensitivity" does work though, again unlike my gen5.
Quoted 4 lines
Thanks.
Signature · 1 line
DmitryGuys, could you please try the patch below? It will not solve the "speed" issue on
0x01devices, but hopefully we won't be exposing non-existing controls on others.Thanks!
Signature · 22 lines
Dmitry Input: trackpoint - only expose supported controls for Elan, ALPS and NXP From: Dmitry Torokhov <[email protected]> The newer trackpoints from ALPS, Elan and NXP implement a very limited subset of extended commands and controls that the original trackpoints implemented, so we should not be exposing not working controls in sysfs. The newer trackpoints also do not implement "Power On Reset" or "Read Extended Button Status", so we should not be using these commands during initialization. While we are at it, let's change "unsigned char" to u8 for byte data or bool for booleans and use better suited error codes instead of -1. Signed-off-by: Dmitry Torokhov <[email protected]> --- drivers/input/mouse/trackpoint.c | 241 +++++++++++++++++++++++--------------- drivers/input/mouse/trackpoint.h | 34 +++-- 2 files changed, 168 insertions(+), 107 deletions(-)drivers/input/mouse/trackpoint.c +86
-63@@ -19,6 +19,13 @@#include "psmouse.h" #include "trackpoint.h" +static const char *const trackpoint_variants[] = { + [TP_VARIANT_IBM ] ="IBM" , + [TP_VARIANT_ALPS ] ="ALPS" , + [TP_VARIANT_ELAN ] ="Elan" , + [TP_VARIANT_NXP ] ="NXP" , +}; +/* * Power-on Reset: Resets all trackpoint parameters, including RAM values, * to defaults. @@ -26,7 +33,7 @@*/ static int trackpoint_power_on_reset (struct ps2dev *ps2dev) { -unsigned char results[2 ]; +u8 results[2 ];int tries =0 ;/* Issue POR command, and repeat up to once if 0xFC00 received */ @@ -38,7 +45,7 @@ static int trackpoint_power_on_reset(struct ps2dev *ps2dev)/* Check for success response -- 0xAA00 */ if (results[0 ] !=0xAA || results[1 ] !=0x00 ) -return -1 ; +return -ENODEV ;return 0 ; }@@ -46,8 +53,7 @@ static int trackpoint_power_on_reset(struct ps2dev *ps2dev)/* * Device IO: read, write and toggle bit */ -static int trackpoint_read (struct ps2dev *ps2dev, -unsigned char loc,unsigned char *results) +static int trackpoint_read (struct ps2dev *ps2dev,u8 loc,u8 *results) {if (ps2_command (ps2dev,NULL ,MAKE_PS2_CMD (0 ,0 ,TP_COMMAND )) ||ps2_command (ps2dev, results,MAKE_PS2_CMD (0 ,1 , loc))) {@@ -57,8 +63,7 @@ static int trackpoint_read(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_write (struct ps2dev *ps2dev, -unsigned char loc,unsigned char val) +static int trackpoint_write (struct ps2dev *ps2dev,u8 loc,u8 val) { if (ps2_command(ps2dev, NULL, MAKE_PS2_CMD(0, 0, TP_COMMAND)) || ps2_command(ps2dev, NULL, MAKE_PS2_CMD(0, 0, TP_WRITE_MEM)) ||@@ -70,8 +75,7 @@ static int trackpoint_write(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_toggle_bit (struct ps2dev *ps2dev, -unsigned char loc,unsigned char mask) +static int trackpoint_toggle_bit (struct ps2dev *ps2dev,u8 loc,u8 mask) {/* Bad things will happen if the loc param isn't in this range */ if (loc <0x20 || loc >=0x2F )@@ -87,11 +91,11 @@ static int trackpoint_toggle_bit(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_update_bit (struct ps2dev *ps2dev,unsigned char loc, -unsigned char mask,unsigned char value) +static int trackpoint_update_bit (struct ps2dev *ps2dev, +u8 loc,u8 mask,u8 value) {int retval =0 ; -unsigned char data; +u8 data;trackpoint_read (ps2dev, loc, &data);if (((data & mask) == mask) != !!value)@@ -105,17 +109,18 @@ static int trackpoint_update_bit(struct ps2dev *ps2dev, unsigned char loc,*/ struct trackpoint_attr_data {size_t field_offset; -unsigned char command; -unsigned char mask; -unsigned char inverted; -unsigned char power_on_default; +u8 command; +u8 mask; +bool inverted; +u8 power_on_default; }; -static ssize_t trackpoint_show_int_attr (struct psmouse *psmouse,void *data,char *buf) +static ssize_t trackpoint_show_int_attr (struct psmouse *psmouse, +void *data,char *buf) {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char value = *(unsigned char *)((char *)tp + attr->field_offset); +u8 value = *(u8 *)((void *)tp + attr->field_offset);if (attr->inverted) value = !value;@@ -128,8 +133,8 @@ static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data, {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); -unsigned char value; +u8 *field = (void *)tp + attr->field_offset; +u8 value;int err; err =kstrtou8 (buf,10 , &value);@@ -157,17 +162,14 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data, {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); -unsigned int value; +bool *field = (void *)tp + attr->field_offset; +bool value;int err; - err =kstrtouint (buf,10 , &value); + err =kstrtobool (buf, &value);if (err)return err; -if (value >1 ) -return -EINVAL ; -if (attr->inverted) value = !value;@@ -193,30 +195,6 @@ PSMOUSE_DEFINE_ATTR(_name, S_IWUSR | S_IRUGO, \ &trackpoint_attr_##_name, \ trackpoint_show_int_attr, trackpoint_set_bit_attr) -#define TRACKPOINT_UPDATE_BIT (_psmouse, _tp, _name) \ -do { \ - struct trackpoint_attr_data *_attr = &trackpoint_attr_##_name; \ - \ - trackpoint_update_bit(&_psmouse->ps2dev, \ - _attr->command, _attr->mask, _tp->_name); \ -} while (0) - -#define TRACKPOINT_UPDATE (_power_on, _psmouse, _tp, _name) \ -do { \ - if (!_power_on || \ - _tp->_name != trackpoint_attr_##_name.power_on_default) { \ - if (!trackpoint_attr_##_name.mask) \ - trackpoint_write(&_psmouse->ps2dev, \ - trackpoint_attr_##_name.command, \ - _tp->_name); \ - else \ - TRACKPOINT_UPDATE_BIT(_psmouse, _tp, _name); \ - } \ -} while (0) - -#define TRACKPOINT_SET_POWER_ON_DEFAULT (_tp, _name) \ - (_tp->_name = trackpoint_attr_##_name.power_on_default) -TRACKPOINT_INT_ATTR (sensitivity,TP_SENS ,TP_DEF_SENS );TRACKPOINT_INT_ATTR (speed,TP_SPEED ,TP_DEF_SPEED );TRACKPOINT_INT_ATTR (inertia,TP_INERTIA ,TP_DEF_INERTIA );@@ -229,13 +207,33 @@ TRACKPOINT_INT_ATTR(ztime, TP_Z_TIME, TP_DEF_Z_TIME);TRACKPOINT_INT_ATTR (jenks,TP_JENKS_CURV ,TP_DEF_JENKS_CURV );TRACKPOINT_INT_ATTR (drift_time,TP_DRIFT_TIME ,TP_DEF_DRIFT_TIME ); -TRACKPOINT_BIT_ATTR (press_to_select,TP_TOGGLE_PTSON ,TP_MASK_PTSON ,0 , +TRACKPOINT_BIT_ATTR (press_to_select,TP_TOGGLE_PTSON ,TP_MASK_PTSON , false,TP_DEF_PTSON ); -TRACKPOINT_BIT_ATTR (skipback,TP_TOGGLE_SKIPBACK ,TP_MASK_SKIPBACK ,0 , +TRACKPOINT_BIT_ATTR (skipback,TP_TOGGLE_SKIPBACK ,TP_MASK_SKIPBACK , false,TP_DEF_SKIPBACK ); -TRACKPOINT_BIT_ATTR (ext_dev,TP_TOGGLE_EXT_DEV ,TP_MASK_EXT_DEV ,1 , +TRACKPOINT_BIT_ATTR (ext_dev,TP_TOGGLE_EXT_DEV ,TP_MASK_EXT_DEV , true,TP_DEF_EXT_DEV ); +static bool trackpoint_is_attr_available (struct psmouse *psmouse, +struct attribute *attr) +{ +struct trackpoint_data *tp = psmouse->private; + +return tp->variant_id ==TP_VARIANT_IBM || + attr == &psmouse_attr_sensitivity.dattr.attr || + attr == &psmouse_attr_press_to_select.dattr.attr; +} + +static umode_t trackpoint_is_attr_visible (struct kobject *kobj, +struct attribute *attr,int n) +{ + struct device *dev = container_of(kobj, struct device, kobj); +struct serio *serio =to_serio_port (dev); +struct psmouse *psmouse =serio_get_drvdata (serio); + +return trackpoint_is_attr_available (psmouse, attr) ? attr->mode :0 ; +} +static struct attribute *trackpoint_attrs[] = { &psmouse_attr_sensitivity.dattr.attr, &psmouse_attr_speed.dattr.attr,@@ -255,24 +253,56 @@ static struct attribute *trackpoint_attrs[] = { };static struct attribute_group trackpoint_attr_group = { - .attrs = trackpoint_attrs, + .is_visible = trackpoint_is_attr_visible, + .attrs = trackpoint_attrs, }; -static int trackpoint_start_protocol (struct psmouse *psmouse,unsigned char *firmware_id) -{ -unsigned char param[2 ] = {0 }; +#define TRACKPOINT_UPDATE (_power_on, _psmouse, _tp, _name) \ +do { \ + struct trackpoint_attr_data *_attr = &trackpoint_attr_##_name; \ + \ + if ((!_power_on || _tp->_name != _attr->power_on_default) && \ + trackpoint_is_attr_available(_psmouse, \ + &psmouse_attr_##_name.dattr.attr)) { \ + if (!_attr->mask) \ + trackpoint_write(&_psmouse->ps2dev, \ + _attr->command, _tp->_name); \ + else \ + trackpoint_update_bit(&_psmouse->ps2dev, \ + _attr->command, _attr->mask, \ + _tp->_name); \ + } \ +} while (0) -if (ps2_command (&psmouse->ps2dev, param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID ))) -return -1 ; +#define TRACKPOINT_SET_POWER_ON_DEFAULT (_tp, _name) \ +do { \ + _tp->_name = trackpoint_attr_##_name.power_on_default; \ +} while (0) -/* add new TP ID. */ -if (!(param[0 ] &TP_MAGIC_IDENT )) -return -1 ; +static int trackpoint_start_protocol (struct psmouse *psmouse, +u8 *variant_id,u8 *firmware_id) +{ +u8 param[2 ] = {0 }; +int error; -if (firmware_id) - *firmware_id = param[1 ]; + error =ps2_command (&psmouse->ps2dev, + param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID )); +if (error) +return error; + +switch (param[0 ]) { +case TP_VARIANT_IBM : +case TP_VARIANT_ALPS : +case TP_VARIANT_ELAN :
drivers/input/mouse/trackpoint.c static struct attribute *trackpoint_attrs[] = { · line 305
Quoted 10 lines
drivers/input/mouse/trackpoint.c +8
-1+case TP_VARIANT_NXP : +if (variant_id) + *variant_id = param[0 ]; +if (firmware_id) + *firmware_id = param[1 ]; +break ; + } -return 0 ; +return -ENODEV ;
always report error .. not good.
Quoted 202 lines
drivers/input/mouse/trackpoint.c +53
-30}/* @@ -285,7 +315,7 @@ static int trackpoint_sync(struct psmouse *psmouse, bool in_power_on_state) {struct trackpoint_data *tp = psmouse->private; -if (!in_power_on_state) { +if (!in_power_on_state && tp->variant_id ==TP_VARIANT_IBM ) {/* * Disable features that may make device unusable * with this driver. @@ -347,7 +377,8 @@ static void trackpoint_defaults(struct trackpoint_data *tp)static void trackpoint_disconnect (struct psmouse *psmouse) { -sysfs_remove_group (&psmouse->ps2dev.serio->dev.kobj, &trackpoint_attr_group); +device_remove_group (&psmouse->ps2dev.serio->dev, + &trackpoint_attr_group);kfree (psmouse->private); psmouse->private =NULL ;@@ -355,14 +386,20 @@ static void trackpoint_disconnect(struct psmouse *psmouse)static int trackpoint_reconnect (struct psmouse *psmouse) { -int reset_fail; +struct trackpoint_data *tp = psmouse->private; +int error; +bool was_reset; -if (trackpoint_start_protocol (psmouse,NULL )) -return -1 ; + error =trackpoint_start_protocol (psmouse,NULL ,NULL ); +if (error) +return error; - reset_fail =trackpoint_power_on_reset (&psmouse->ps2dev); -if (trackpoint_sync (psmouse, !reset_fail)) -return -1 ; + was_reset = tp->variant_id ==TP_VARIANT_IBM && +trackpoint_power_on_reset (&psmouse->ps2dev) ==0 ; + + error =trackpoint_sync (psmouse, was_reset); +if (error) +return error;return 0 ; }@@ -370,46 +407,62 @@ static int trackpoint_reconnect(struct psmouse *psmouse)int trackpoint_detect (struct psmouse *psmouse,bool set_properties) {struct ps2dev *ps2dev = &psmouse->ps2dev; -unsigned char firmware_id; -unsigned char button_info; +struct trackpoint_data *tp; +u8 variant_id; +u8 firmware_id; +u8 button_info;int error; -if (trackpoint_start_protocol (psmouse, &firmware_id)) -return -1 ; + error =trackpoint_start_protocol (psmouse, &variant_id, &firmware_id); +if (error) +return error;if (!set_properties)return 0 ; -if (trackpoint_read (ps2dev,TP_EXT_BTN , &button_info)) { -psmouse_warn (psmouse,"failed to get extended button data, assuming 3 buttons\n" ); - button_info =0x33 ; - } - - psmouse->private =kzalloc (sizeof (struct trackpoint_data ),GFP_KERNEL ); -if (!psmouse->private) + tp =kzalloc (sizeof (*tp),GFP_KERNEL ); +if (!tp)return -ENOMEM ; - psmouse->vendor ="IBM" ; +trackpoint_defaults (tp); + tp->variant_id = variant_id; + tp->firmware_id = firmware_id; + + psmouse->private = tp; + + psmouse->vendor = trackpoint_variants[variant_id]; psmouse->name ="TrackPoint" ; psmouse->reconnect = trackpoint_reconnect; psmouse->disconnect = trackpoint_disconnect; +if (variant_id !=TP_VARIANT_IBM ) { +/* Newer variants do not support extended button query. */ + button_info =0x33 ; + }else { + error =trackpoint_read (ps2dev,TP_EXT_BTN , &button_info); +if (error) { +psmouse_warn (psmouse, +"failed to get extended button data, assuming 3 buttons\n" ); + button_info =0x33 ; + } + } +if ((button_info &0x0f ) >=3 ) -__set_bit (BTN_MIDDLE , psmouse->dev->keybit); +input_set_capability (psmouse->dev,EV_KEY ,BTN_MIDDLE );__set_bit (INPUT_PROP_POINTER , psmouse->dev->propbit);__set_bit (INPUT_PROP_POINTING_STICK , psmouse->dev->propbit); -trackpoint_defaults (psmouse->private); - - error =trackpoint_power_on_reset (ps2dev); - -/* Write defaults to TP only if reset fails. */ -if (error) +if (variant_id !=TP_VARIANT_IBM || +trackpoint_power_on_reset (ps2dev) !=0 ) { +/* +* Write defaults to TP if we did not reset the trackpoint. +*/ trackpoint_sync (psmouse, false); + } - error =sysfs_create_group (&ps2dev->serio->dev.kobj, &trackpoint_attr_group); + error =device_add_group (&ps2dev->serio->dev, &trackpoint_attr_group);if (error) { psmouse_err(psmouse, "failed to create sysfs attributes, error: %d\n",@@ -420,8 +473,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) }psmouse_info (psmouse, -"IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n" , - firmware_id, +"%s TrackPoint firmware: 0x%02x, buttons: %d/%d\n" , + psmouse->vendor, firmware_id, (button_info &0xf0 ) >>4 , button_info &0x0f );return 0 ;drivers/input/mouse/trackpoint.h +21
-14@@ -21,10 +21,16 @@#define TP_COMMAND 0xE2/* Commands start with this */ #define TP_READ_ID 0xE1/* Sent for device identification */ -#define TP_MAGIC_IDENT 0x03/* Sent after a TP_READ_ID followed */ -/* by the firmware ID */ -/* Firmware ID includes 0x1, 0x2, 0x3 */ +/* +* Valid first byte responses to the "Read Secondary ID" (0xE1) command. +* 0x01 was the original IBM trackpoint, others implement very limited +* subset of trackpoint features. +*/ +#define TP_VARIANT_IBM 0x01 +#define TP_VARIANT_ALPS 0x02 +#define TP_VARIANT_ELAN 0x03 +#define TP_VARIANT_NXP 0x04/* * Commands @@ -136,18 +142,20 @@#define MAKE_PS2_CMD (params, results, cmd) ((params<<12) | (results<<8) | (cmd)) -struct trackpoint_data -{ -unsigned char sensitivity, speed, inertia, reach; -unsigned char draghys, mindrag; -unsigned char thresh, upthresh; -unsigned char ztime, jenks; -unsigned char drift_time; +struct trackpoint_data { +u8 variant_id; +u8 firmware_id; + +u8 sensitivity, speed, inertia, reach; +u8 draghys, mindrag; +u8 thresh, upthresh; +u8 ztime, jenks; +u8 drift_time;/* toggles */ -unsigned char press_to_select; -unsigned char skipback; -unsigned char ext_dev; +bool press_to_select; +bool skipback; +bool ext_dev; };#ifdef CONFIG_MOUSE_PS2_TRACKPOINT --To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
Quoted 32 lines · On Sun, Jan 14, 2018 at 09:39:58PM +0100, [email protected] wrote:
Hi Dmitry, Sebastian,
Nack for the patch..
As Sebastian pointed out, the trackpoint detection will always report an error. (see below)I builded your original patch and it resulted in detection as generic mouse for the trackpoint:
[ 0.838143] serio: i8042 KBD port at 0x60,0x64 irq 1 [ 0.838146] serio: i8042 AUX port at 0x60,0x64 irq 12 [ 0.838267] mousedev: PS/2 mouse device common for all mice [ 9.321140] psmouse serio1: synaptics: queried max coordinates: x [..5676], y [..4758] [ 9.367095] psmouse serio1: synaptics: queried min coordinates: x [1266..], y [1096..] [ 9.367103] psmouse serio1: synaptics: The touchpad can support a better bus than the too old PS/2 protocol. Make sure MOUSE_PS2_SYNAPTICS_SMBUS and RMI4_SMB are enabled to get a better touchpad experience. [ 9.455953] psmouse serio1: synaptics: Touchpad model: 1, fw: 8.2, id: 0x1e2b1, caps: 0xf007a3/0x943300/0x12e800/0x410000, board id: 3157, fw id: 2405942 [ 9.455970] psmouse serio1: synaptics: serio: Synaptics pass-through port at isa0060/serio1/input0 [ 9.514117] input: SynPS/2 Synaptics TouchPad as /devices/platform/i8042/serio1/input/input7 [ 11.458443] input: PS/2 Generic Mouse as /devices/platform/i8042/serio1/serio2/input/input18When I fixed your patch, it resulted in: (timing difference is because a dvd was inserted before)
[ 0.843661] serio: i8042 KBD port at 0x60,0x64 irq 1 [ 0.843664] serio: i8042 AUX port at 0x60,0x64 irq 12 [ 0.843793] mousedev: PS/2 mouse device common for all mice [ 3.822411] psmouse serio1: synaptics: queried max coordinates: x [..5676], y [..4758] [ 3.868196] psmouse serio1: synaptics: queried min coordinates: x [1266..], y [1096..] [ 3.868203] psmouse serio1: synaptics: The touchpad can support a better bus than the too old PS/2 protocol. Make sure MOUSE_PS2_SYNAPTICS_SMBUS and RMI4_SMB are enabled to get a better touchpad experience. [ 3.961024] psmouse serio1: synaptics: Touchpad model: 1, fw: 8.2, id: 0x1e2b1, caps: 0xf007a3/0x943300/0x12e800/0x410000, board id: 3157, fw id: 2405942 [ 3.961038] psmouse serio1: synaptics: serio: Synaptics pass-through port at isa0060/serio1/input0 [ 4.017290] input: SynPS/2 Synaptics TouchPad as /devices/platform/i8042/serio1/input/input7 [ 4.407930] psmouse serio2: trackpoint: failed to get extended button data, assuming 3 buttons [ 8.460022] psmouse serio2: trackpoint: IBM TrackPoint firmware: 0x0e, buttons: 3/3 [ 8.740439] input: TPPS/2 IBM TrackPoint as /devices/platform/i8042/serio1/serio2/input/input18
Quoted 3 lines
functionally both versions (with/without bug) resulted in a functional trackpoint with 3 buttons.
Sebastian, with regards to your middle button question, as you can see in the output I've such hardware. (lenovo e570).
Sorry Sebastian, I was thinking Aaron had commited "Input: trackpoint - assume 3 buttons when buttons detection fails" commit 293b915fd9bebf33cdc906516fb28d54649a25ac but actually Oscar Campos did. I just realised when I reread his mails that you were actually not pointing to the patch where Aaron suggested an amendment to this 3 button commit but actually to his commit that resulted in regression for you.
Quoted 6 lines
Dimitrios, wasn't it your intention that this hardware would be detected as NON IBM ? Apparently it is IBM and still fails "Read Extended Button Status".
Kind regards,
Ulrik
Kind regards,
Ulrik
Quoted 577 lines · Dmitry Torokhov
Quoted 360 lines
Date: Sat, 6 Jan 2018 22:52:01 -0800
From: Dmitry Torokhov <[email protected]>
To: Aaron Ma <[email protected]>
Cc: Greg KH <[email protected]>, Sebastian Schmidt <[email protected]>,
[email protected]
Subject: Re: [PATCH] Revert "Input: trackpoint - add new trackpoint
firmware ID"
X-Mailing-List: [email protected]Quoted 53 lines · Dmitry Torokhov
Hi Aaron,
Quoted 7 lines · Aaron Ma
Hi Dmitry:
Got the official info from Lenovo:
Lenovo introduced new TrackPoint compatible sticks ( ELAN/Alps/NXP sticks) from 2016.
These new devices only support the minimum commands described in the spec, which has been used in the current Windows driver.What is the exact list of the commands supported by each variant?
Quoted 6 lines
Legacy TrackPoint: 0101 – 0E01
ALPS: 0102 – FF02
ELAN:0103 – FF03
NXP: 0104 – FF04Quoted 9 lines
2.4.18 READ SECONDARY ID (x"E1")
This command will read the secondary device ID of the pointing device (2 bytes). The least significant byte is sent first. For the first byte, the legacy TrackPoint controller from IBM will always return x"01", the pointing stick from ALPS will always return x"02", the pointing stick from Elan will always return x"03”, and the pointing stick from NXP will always return 0x”04". And a second byte which denotes a specific set of functional specifications. Differing ROM versions are used to denote changes within a given functional set.Can you/Lenovo share the updated spec?
Quoted 8 lines
The new devices (include Legacy ID:01) will not support the sysfs like speed.
So it is not right to revert the commit, it is about to add another
0x04ID in it.Old sysfs could be stayed for old legacy device ID:01 or removed.
No, because there are devices that have trackpoints properly implementing the protocol, before Lenovo started their "innovation".
Do we have any way to distinguish between properly implemented trackpoints and Lenovo "improved" ones? I played with gen3 Carbon, and while it does not error out on "speed" attribute, unlike gen5, it still has no visible effects. Additionally, the "press to select" functionality seems to be disabled, and trying to enable it via sysfs results in register content being reverted to the original "disabled" setting in a second or two. Setting to swap X and Y axes does not work either, not sure about other bits of that control register. "sensitivity" does work though, again unlike my gen5.
Quoted 4 lines
Thanks.
Signature · 1 line
DmitryGuys, could you please try the patch below? It will not solve the "speed" issue on
0x01devices, but hopefully we won't be exposing non-existing controls on others.Thanks!
Signature · 22 lines
Dmitry Input: trackpoint - only expose supported controls for Elan, ALPS and NXP From: Dmitry Torokhov <[email protected]> The newer trackpoints from ALPS, Elan and NXP implement a very limited subset of extended commands and controls that the original trackpoints implemented, so we should not be exposing not working controls in sysfs. The newer trackpoints also do not implement "Power On Reset" or "Read Extended Button Status", so we should not be using these commands during initialization. While we are at it, let's change "unsigned char" to u8 for byte data or bool for booleans and use better suited error codes instead of -1. Signed-off-by: Dmitry Torokhov <[email protected]> --- drivers/input/mouse/trackpoint.c | 241 +++++++++++++++++++++++--------------- drivers/input/mouse/trackpoint.h | 34 +++-- 2 files changed, 168 insertions(+), 107 deletions(-)drivers/input/mouse/trackpoint.c +86
-63@@ -19,6 +19,13 @@#include "psmouse.h" #include "trackpoint.h" +static const char *const trackpoint_variants[] = { + [TP_VARIANT_IBM ] ="IBM" , + [TP_VARIANT_ALPS ] ="ALPS" , + [TP_VARIANT_ELAN ] ="Elan" , + [TP_VARIANT_NXP ] ="NXP" , +}; +/* * Power-on Reset: Resets all trackpoint parameters, including RAM values, * to defaults. @@ -26,7 +33,7 @@*/ static int trackpoint_power_on_reset (struct ps2dev *ps2dev) { -unsigned char results[2 ]; +u8 results[2 ];int tries =0 ;/* Issue POR command, and repeat up to once if 0xFC00 received */ @@ -38,7 +45,7 @@ static int trackpoint_power_on_reset(struct ps2dev *ps2dev)/* Check for success response -- 0xAA00 */ if (results[0 ] !=0xAA || results[1 ] !=0x00 ) -return -1 ; +return -ENODEV ;return 0 ; }@@ -46,8 +53,7 @@ static int trackpoint_power_on_reset(struct ps2dev *ps2dev)/* * Device IO: read, write and toggle bit */ -static int trackpoint_read (struct ps2dev *ps2dev, -unsigned char loc,unsigned char *results) +static int trackpoint_read (struct ps2dev *ps2dev,u8 loc,u8 *results) {if (ps2_command (ps2dev,NULL ,MAKE_PS2_CMD (0 ,0 ,TP_COMMAND )) ||ps2_command (ps2dev, results,MAKE_PS2_CMD (0 ,1 , loc))) {@@ -57,8 +63,7 @@ static int trackpoint_read(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_write (struct ps2dev *ps2dev, -unsigned char loc,unsigned char val) +static int trackpoint_write (struct ps2dev *ps2dev,u8 loc,u8 val) { if (ps2_command(ps2dev, NULL, MAKE_PS2_CMD(0, 0, TP_COMMAND)) || ps2_command(ps2dev, NULL, MAKE_PS2_CMD(0, 0, TP_WRITE_MEM)) ||@@ -70,8 +75,7 @@ static int trackpoint_write(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_toggle_bit (struct ps2dev *ps2dev, -unsigned char loc,unsigned char mask) +static int trackpoint_toggle_bit (struct ps2dev *ps2dev,u8 loc,u8 mask) {/* Bad things will happen if the loc param isn't in this range */ if (loc <0x20 || loc >=0x2F )@@ -87,11 +91,11 @@ static int trackpoint_toggle_bit(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_update_bit (struct ps2dev *ps2dev,unsigned char loc, -unsigned char mask,unsigned char value) +static int trackpoint_update_bit (struct ps2dev *ps2dev, +u8 loc,u8 mask,u8 value) {int retval =0 ; -unsigned char data; +u8 data;trackpoint_read (ps2dev, loc, &data);if (((data & mask) == mask) != !!value)@@ -105,17 +109,18 @@ static int trackpoint_update_bit(struct ps2dev *ps2dev, unsigned char loc,*/ struct trackpoint_attr_data {size_t field_offset; -unsigned char command; -unsigned char mask; -unsigned char inverted; -unsigned char power_on_default; +u8 command; +u8 mask; +bool inverted; +u8 power_on_default; }; -static ssize_t trackpoint_show_int_attr (struct psmouse *psmouse,void *data,char *buf) +static ssize_t trackpoint_show_int_attr (struct psmouse *psmouse, +void *data,char *buf) {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char value = *(unsigned char *)((char *)tp + attr->field_offset); +u8 value = *(u8 *)((void *)tp + attr->field_offset);if (attr->inverted) value = !value;@@ -128,8 +133,8 @@ static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data, {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); -unsigned char value; +u8 *field = (void *)tp + attr->field_offset; +u8 value;int err; err =kstrtou8 (buf,10 , &value);@@ -157,17 +162,14 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data, {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); -unsigned int value; +bool *field = (void *)tp + attr->field_offset; +bool value;int err; - err =kstrtouint (buf,10 , &value); + err =kstrtobool (buf, &value);if (err)return err; -if (value >1 ) -return -EINVAL ; -if (attr->inverted) value = !value;@@ -193,30 +195,6 @@ PSMOUSE_DEFINE_ATTR(_name, S_IWUSR | S_IRUGO, \ &trackpoint_attr_##_name, \ trackpoint_show_int_attr, trackpoint_set_bit_attr) -#define TRACKPOINT_UPDATE_BIT (_psmouse, _tp, _name) \ -do { \ - struct trackpoint_attr_data *_attr = &trackpoint_attr_##_name; \ - \ - trackpoint_update_bit(&_psmouse->ps2dev, \ - _attr->command, _attr->mask, _tp->_name); \ -} while (0) - -#define TRACKPOINT_UPDATE (_power_on, _psmouse, _tp, _name) \ -do { \ - if (!_power_on || \ - _tp->_name != trackpoint_attr_##_name.power_on_default) { \ - if (!trackpoint_attr_##_name.mask) \ - trackpoint_write(&_psmouse->ps2dev, \ - trackpoint_attr_##_name.command, \ - _tp->_name); \ - else \ - TRACKPOINT_UPDATE_BIT(_psmouse, _tp, _name); \ - } \ -} while (0) - -#define TRACKPOINT_SET_POWER_ON_DEFAULT (_tp, _name) \ - (_tp->_name = trackpoint_attr_##_name.power_on_default) -TRACKPOINT_INT_ATTR (sensitivity,TP_SENS ,TP_DEF_SENS );TRACKPOINT_INT_ATTR (speed,TP_SPEED ,TP_DEF_SPEED );TRACKPOINT_INT_ATTR (inertia,TP_INERTIA ,TP_DEF_INERTIA );@@ -229,13 +207,33 @@ TRACKPOINT_INT_ATTR(ztime, TP_Z_TIME, TP_DEF_Z_TIME);TRACKPOINT_INT_ATTR (jenks,TP_JENKS_CURV ,TP_DEF_JENKS_CURV );TRACKPOINT_INT_ATTR (drift_time,TP_DRIFT_TIME ,TP_DEF_DRIFT_TIME ); -TRACKPOINT_BIT_ATTR (press_to_select,TP_TOGGLE_PTSON ,TP_MASK_PTSON ,0 , +TRACKPOINT_BIT_ATTR (press_to_select,TP_TOGGLE_PTSON ,TP_MASK_PTSON , false,TP_DEF_PTSON ); -TRACKPOINT_BIT_ATTR (skipback,TP_TOGGLE_SKIPBACK ,TP_MASK_SKIPBACK ,0 , +TRACKPOINT_BIT_ATTR (skipback,TP_TOGGLE_SKIPBACK ,TP_MASK_SKIPBACK , false,TP_DEF_SKIPBACK ); -TRACKPOINT_BIT_ATTR (ext_dev,TP_TOGGLE_EXT_DEV ,TP_MASK_EXT_DEV ,1 , +TRACKPOINT_BIT_ATTR (ext_dev,TP_TOGGLE_EXT_DEV ,TP_MASK_EXT_DEV , true,TP_DEF_EXT_DEV ); +static bool trackpoint_is_attr_available (struct psmouse *psmouse, +struct attribute *attr) +{ +struct trackpoint_data *tp = psmouse->private; + +return tp->variant_id ==TP_VARIANT_IBM || + attr == &psmouse_attr_sensitivity.dattr.attr || + attr == &psmouse_attr_press_to_select.dattr.attr; +} + +static umode_t trackpoint_is_attr_visible (struct kobject *kobj, +struct attribute *attr,int n) +{ + struct device *dev = container_of(kobj, struct device, kobj); +struct serio *serio =to_serio_port (dev); +struct psmouse *psmouse =serio_get_drvdata (serio); + +return trackpoint_is_attr_available (psmouse, attr) ? attr->mode :0 ; +} +static struct attribute *trackpoint_attrs[] = { &psmouse_attr_sensitivity.dattr.attr, &psmouse_attr_speed.dattr.attr,@@ -255,24 +253,56 @@ static struct attribute *trackpoint_attrs[] = { };static struct attribute_group trackpoint_attr_group = { - .attrs = trackpoint_attrs, + .is_visible = trackpoint_is_attr_visible, + .attrs = trackpoint_attrs, }; -static int trackpoint_start_protocol (struct psmouse *psmouse,unsigned char *firmware_id) -{ -unsigned char param[2 ] = {0 }; +#define TRACKPOINT_UPDATE (_power_on, _psmouse, _tp, _name) \ +do { \ + struct trackpoint_attr_data *_attr = &trackpoint_attr_##_name; \ + \ + if ((!_power_on || _tp->_name != _attr->power_on_default) && \ + trackpoint_is_attr_available(_psmouse, \ + &psmouse_attr_##_name.dattr.attr)) { \ + if (!_attr->mask) \ + trackpoint_write(&_psmouse->ps2dev, \ + _attr->command, _tp->_name); \ + else \ + trackpoint_update_bit(&_psmouse->ps2dev, \ + _attr->command, _attr->mask, \ + _tp->_name); \ + } \ +} while (0) -if (ps2_command (&psmouse->ps2dev, param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID ))) -return -1 ; +#define TRACKPOINT_SET_POWER_ON_DEFAULT (_tp, _name) \ +do { \ + _tp->_name = trackpoint_attr_##_name.power_on_default; \ +} while (0) -/* add new TP ID. */ -if (!(param[0 ] &TP_MAGIC_IDENT )) -return -1 ; +static int trackpoint_start_protocol (struct psmouse *psmouse, +u8 *variant_id,u8 *firmware_id) +{ +u8 param[2 ] = {0 }; +int error; -if (firmware_id) - *firmware_id = param[1 ]; + error =ps2_command (&psmouse->ps2dev, + param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID )); +if (error) +return error; + +switch (param[0 ]) { +case TP_VARIANT_IBM : +case TP_VARIANT_ALPS : +case TP_VARIANT_ELAN :drivers/input/mouse/trackpoint.c static struct attribute *trackpoint_attrs[] = { · line 305
Quoted 10 lines
drivers/input/mouse/trackpoint.c +8
-1+case TP_VARIANT_NXP : +if (variant_id) + *variant_id = param[0 ]; +if (firmware_id) + *firmware_id = param[1 ]; +break ; + } -return 0 ; +return -ENODEV ;always report error .. not good.
Quoted 202 lines
drivers/input/mouse/trackpoint.c +53
-30}/* @@ -285,7 +315,7 @@ static int trackpoint_sync(struct psmouse *psmouse, bool in_power_on_state) {struct trackpoint_data *tp = psmouse->private; -if (!in_power_on_state) { +if (!in_power_on_state && tp->variant_id ==TP_VARIANT_IBM ) {/* * Disable features that may make device unusable * with this driver. @@ -347,7 +377,8 @@ static void trackpoint_defaults(struct trackpoint_data *tp)static void trackpoint_disconnect (struct psmouse *psmouse) { -sysfs_remove_group (&psmouse->ps2dev.serio->dev.kobj, &trackpoint_attr_group); +device_remove_group (&psmouse->ps2dev.serio->dev, + &trackpoint_attr_group);kfree (psmouse->private); psmouse->private =NULL ;@@ -355,14 +386,20 @@ static void trackpoint_disconnect(struct psmouse *psmouse)static int trackpoint_reconnect (struct psmouse *psmouse) { -int reset_fail; +struct trackpoint_data *tp = psmouse->private; +int error; +bool was_reset; -if (trackpoint_start_protocol (psmouse,NULL )) -return -1 ; + error =trackpoint_start_protocol (psmouse,NULL ,NULL ); +if (error) +return error; - reset_fail =trackpoint_power_on_reset (&psmouse->ps2dev); -if (trackpoint_sync (psmouse, !reset_fail)) -return -1 ; + was_reset = tp->variant_id ==TP_VARIANT_IBM && +trackpoint_power_on_reset (&psmouse->ps2dev) ==0 ; + + error =trackpoint_sync (psmouse, was_reset); +if (error) +return error;return 0 ; }@@ -370,46 +407,62 @@ static int trackpoint_reconnect(struct psmouse *psmouse)int trackpoint_detect (struct psmouse *psmouse,bool set_properties) {struct ps2dev *ps2dev = &psmouse->ps2dev; -unsigned char firmware_id; -unsigned char button_info; +struct trackpoint_data *tp; +u8 variant_id; +u8 firmware_id; +u8 button_info;int error; -if (trackpoint_start_protocol (psmouse, &firmware_id)) -return -1 ; + error =trackpoint_start_protocol (psmouse, &variant_id, &firmware_id); +if (error) +return error;if (!set_properties)return 0 ; -if (trackpoint_read (ps2dev,TP_EXT_BTN , &button_info)) { -psmouse_warn (psmouse,"failed to get extended button data, assuming 3 buttons\n" ); - button_info =0x33 ; - } - - psmouse->private =kzalloc (sizeof (struct trackpoint_data ),GFP_KERNEL ); -if (!psmouse->private) + tp =kzalloc (sizeof (*tp),GFP_KERNEL ); +if (!tp)return -ENOMEM ; - psmouse->vendor ="IBM" ; +trackpoint_defaults (tp); + tp->variant_id = variant_id; + tp->firmware_id = firmware_id; + + psmouse->private = tp; + + psmouse->vendor = trackpoint_variants[variant_id]; psmouse->name ="TrackPoint" ; psmouse->reconnect = trackpoint_reconnect; psmouse->disconnect = trackpoint_disconnect; +if (variant_id !=TP_VARIANT_IBM ) { +/* Newer variants do not support extended button query. */ + button_info =0x33 ; + }else { + error =trackpoint_read (ps2dev,TP_EXT_BTN , &button_info); +if (error) { +psmouse_warn (psmouse, +"failed to get extended button data, assuming 3 buttons\n" ); + button_info =0x33 ; + } + } +if ((button_info &0x0f ) >=3 ) -__set_bit (BTN_MIDDLE , psmouse->dev->keybit); +input_set_capability (psmouse->dev,EV_KEY ,BTN_MIDDLE );__set_bit (INPUT_PROP_POINTER , psmouse->dev->propbit);__set_bit (INPUT_PROP_POINTING_STICK , psmouse->dev->propbit); -trackpoint_defaults (psmouse->private); - - error =trackpoint_power_on_reset (ps2dev); - -/* Write defaults to TP only if reset fails. */ -if (error) +if (variant_id !=TP_VARIANT_IBM || +trackpoint_power_on_reset (ps2dev) !=0 ) { +/* +* Write defaults to TP if we did not reset the trackpoint. +*/ trackpoint_sync (psmouse, false); + } - error =sysfs_create_group (&ps2dev->serio->dev.kobj, &trackpoint_attr_group); + error =device_add_group (&ps2dev->serio->dev, &trackpoint_attr_group);if (error) { psmouse_err(psmouse, "failed to create sysfs attributes, error: %d\n",@@ -420,8 +473,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) }psmouse_info (psmouse, -"IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n" , - firmware_id, +"%s TrackPoint firmware: 0x%02x, buttons: %d/%d\n" , + psmouse->vendor, firmware_id, (button_info &0xf0 ) >>4 , button_info &0x0f );return 0 ;drivers/input/mouse/trackpoint.h +21
-14@@ -21,10 +21,16 @@#define TP_COMMAND 0xE2/* Commands start with this */ #define TP_READ_ID 0xE1/* Sent for device identification */ -#define TP_MAGIC_IDENT 0x03/* Sent after a TP_READ_ID followed */ -/* by the firmware ID */ -/* Firmware ID includes 0x1, 0x2, 0x3 */ +/* +* Valid first byte responses to the "Read Secondary ID" (0xE1) command. +* 0x01 was the original IBM trackpoint, others implement very limited +* subset of trackpoint features. +*/ +#define TP_VARIANT_IBM 0x01 +#define TP_VARIANT_ALPS 0x02 +#define TP_VARIANT_ELAN 0x03 +#define TP_VARIANT_NXP 0x04/* * Commands @@ -136,18 +142,20 @@#define MAKE_PS2_CMD (params, results, cmd) ((params<<12) | (results<<8) | (cmd)) -struct trackpoint_data -{ -unsigned char sensitivity, speed, inertia, reach; -unsigned char draghys, mindrag; -unsigned char thresh, upthresh; -unsigned char ztime, jenks; -unsigned char drift_time; +struct trackpoint_data { +u8 variant_id; +u8 firmware_id; + +u8 sensitivity, speed, inertia, reach; +u8 draghys, mindrag; +u8 thresh, upthresh; +u8 ztime, jenks; +u8 drift_time;/* toggles */ -unsigned char press_to_select; -unsigned char skipback; -unsigned char ext_dev; +bool press_to_select; +bool skipback; +bool ext_dev; };#ifdef CONFIG_MOUSE_PS2_TRACKPOINT --To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov
maintainerHi Ulrik,
Quoted 2 lines · On Sun, Jan 14, 2018 at 09:39:59PM +0100, [email protected] wrote:
Hi Dmitry, Sebastian,
Nack for the patch..
NAK because of the issue pointed by Sebastian, or bigger disagreement?
Quoted 29 lines
As Sebastian pointed out, the trackpoint detection will always report an error. (see below)
I builded your original patch and it resulted in detection as generic mouse for the trackpoint:
[ 0.838143] serio: i8042 KBD port at 0x60,0x64 irq 1 [ 0.838146] serio: i8042 AUX port at 0x60,0x64 irq 12 [ 0.838267] mousedev: PS/2 mouse device common for all mice [ 9.321140] psmouse serio1: synaptics: queried max coordinates: x [..5676], y [..4758] [ 9.367095] psmouse serio1: synaptics: queried min coordinates: x [1266..], y [1096..] [ 9.367103] psmouse serio1: synaptics: The touchpad can support a better bus than the too old PS/2 protocol. Make sure MOUSE_PS2_SYNAPTICS_SMBUS and RMI4_SMB are enabled to get a better touchpad experience. [ 9.455953] psmouse serio1: synaptics: Touchpad model: 1, fw: 8.2, id: 0x1e2b1, caps: 0xf007a3/0x943300/0x12e800/0x410000, board id: 3157, fw id: 2405942 [ 9.455970] psmouse serio1: synaptics: serio: Synaptics pass-through port at isa0060/serio1/input0 [ 9.514117] input: SynPS/2 Synaptics TouchPad as /devices/platform/i8042/serio1/input/input7 [ 11.458443] input: PS/2 Generic Mouse as /devices/platform/i8042/serio1/serio2/input/input18When I fixed your patch, it resulted in: (timing difference is because a dvd was inserted before)
[ 0.843661] serio: i8042 KBD port at 0x60,0x64 irq 1 [ 0.843664] serio: i8042 AUX port at 0x60,0x64 irq 12 [ 0.843793] mousedev: PS/2 mouse device common for all mice [ 3.822411] psmouse serio1: synaptics: queried max coordinates: x [..5676], y [..4758] [ 3.868196] psmouse serio1: synaptics: queried min coordinates: x [1266..], y [1096..] [ 3.868203] psmouse serio1: synaptics: The touchpad can support a better bus than the too old PS/2 protocol. Make sure MOUSE_PS2_SYNAPTICS_SMBUS and RMI4_SMB are enabled to get a better touchpad experience. [ 3.961024] psmouse serio1: synaptics: Touchpad model: 1, fw: 8.2, id: 0x1e2b1, caps: 0xf007a3/0x943300/0x12e800/0x410000, board id: 3157, fw id: 2405942 [ 3.961038] psmouse serio1: synaptics: serio: Synaptics pass-through port at isa0060/serio1/input0 [ 4.017290] input: SynPS/2 Synaptics TouchPad as /devices/platform/i8042/serio1/input/input7 [ 4.407930] psmouse serio2: trackpoint: failed to get extended button data, assuming 3 buttons [ 8.460022] psmouse serio2: trackpoint: IBM TrackPoint firmware: 0x0e, buttons: 3/3 [ 8.740439] input: TPPS/2 IBM TrackPoint as /devices/platform/i8042/serio1/serio2/input/input18
Quoted 6 lines
functionally both versions (with/without bug) resulted in a functional trackpoint with 3 buttons.
Sebastian, with regards to your middle button question, as you can see in the output I've such hardware. (lenovo e570).
Dimitrios, wasn't it your intention that this hardware would be detected as NON IBM ? Apparently it is IBM and still fails "Read Extended Button Status".
Only devices reporting 0x02, 0x03 or 0x04 as the first byte of the xetended ID command should be identified as non-IBM. If device responds with 0x01 then we have to assume it is proper IBM. Your appears to be reporting 0x01 0x0e, like the real trackpoint would. Unfortunately it seems Lenovo managed to mess up the firmware in those.
Thanks.
Quoted 580 lines
Kind regards,
UlrikQuoted 360 lines · Dmitry Torokhov
Date: Sat, 6 Jan 2018 22:52:01 -0800
From: Dmitry Torokhov <[email protected]>
To: Aaron Ma <[email protected]>
Cc: Greg KH <[email protected]>, Sebastian Schmidt <[email protected]>,
[email protected]
Subject: Re: [PATCH] Revert "Input: trackpoint - add new trackpoint
firmware ID"
X-Mailing-List: [email protected]Quoted 53 lines · Dmitry Torokhov
Hi Aaron,
Quoted 7 lines · Aaron Ma
Hi Dmitry:
Got the official info from Lenovo:
Lenovo introduced new TrackPoint compatible sticks ( ELAN/Alps/NXP sticks) from 2016.
These new devices only support the minimum commands described in the spec, which has been used in the current Windows driver.What is the exact list of the commands supported by each variant?
Quoted 6 lines
Legacy TrackPoint: 0101 – 0E01
ALPS: 0102 – FF02
ELAN:0103 – FF03
NXP: 0104 – FF04Quoted 9 lines
2.4.18 READ SECONDARY ID (x"E1")
This command will read the secondary device ID of the pointing device (2 bytes). The least significant byte is sent first. For the first byte, the legacy TrackPoint controller from IBM will always return x"01", the pointing stick from ALPS will always return x"02", the pointing stick from Elan will always return x"03”, and the pointing stick from NXP will always return 0x”04". And a second byte which denotes a specific set of functional specifications. Differing ROM versions are used to denote changes within a given functional set.Can you/Lenovo share the updated spec?
Quoted 8 lines
The new devices (include Legacy ID:01) will not support the sysfs like speed.
So it is not right to revert the commit, it is about to add another
0x04ID in it.Old sysfs could be stayed for old legacy device ID:01 or removed.
No, because there are devices that have trackpoints properly implementing the protocol, before Lenovo started their "innovation".
Do we have any way to distinguish between properly implemented trackpoints and Lenovo "improved" ones? I played with gen3 Carbon, and while it does not error out on "speed" attribute, unlike gen5, it still has no visible effects. Additionally, the "press to select" functionality seems to be disabled, and trying to enable it via sysfs results in register content being reverted to the original "disabled" setting in a second or two. Setting to swap X and Y axes does not work either, not sure about other bits of that control register. "sensitivity" does work though, again unlike my gen5.
Quoted 4 lines
Thanks.
Signature · 1 line
DmitryGuys, could you please try the patch below? It will not solve the "speed" issue on
0x01devices, but hopefully we won't be exposing non-existing controls on others.Thanks!
Signature · 22 lines
Dmitry Input: trackpoint - only expose supported controls for Elan, ALPS and NXP From: Dmitry Torokhov <[email protected]> The newer trackpoints from ALPS, Elan and NXP implement a very limited subset of extended commands and controls that the original trackpoints implemented, so we should not be exposing not working controls in sysfs. The newer trackpoints also do not implement "Power On Reset" or "Read Extended Button Status", so we should not be using these commands during initialization. While we are at it, let's change "unsigned char" to u8 for byte data or bool for booleans and use better suited error codes instead of -1. Signed-off-by: Dmitry Torokhov <[email protected]> --- drivers/input/mouse/trackpoint.c | 241 +++++++++++++++++++++++--------------- drivers/input/mouse/trackpoint.h | 34 +++-- 2 files changed, 168 insertions(+), 107 deletions(-)drivers/input/mouse/trackpoint.c +86
-63@@ -19,6 +19,13 @@#include "psmouse.h" #include "trackpoint.h" +static const char *const trackpoint_variants[] = { + [TP_VARIANT_IBM ] ="IBM" , + [TP_VARIANT_ALPS ] ="ALPS" , + [TP_VARIANT_ELAN ] ="Elan" , + [TP_VARIANT_NXP ] ="NXP" , +}; +/* * Power-on Reset: Resets all trackpoint parameters, including RAM values, * to defaults. @@ -26,7 +33,7 @@*/ static int trackpoint_power_on_reset (struct ps2dev *ps2dev) { -unsigned char results[2 ]; +u8 results[2 ];int tries =0 ;/* Issue POR command, and repeat up to once if 0xFC00 received */ @@ -38,7 +45,7 @@ static int trackpoint_power_on_reset(struct ps2dev *ps2dev)/* Check for success response -- 0xAA00 */ if (results[0 ] !=0xAA || results[1 ] !=0x00 ) -return -1 ; +return -ENODEV ;return 0 ; }@@ -46,8 +53,7 @@ static int trackpoint_power_on_reset(struct ps2dev *ps2dev)/* * Device IO: read, write and toggle bit */ -static int trackpoint_read (struct ps2dev *ps2dev, -unsigned char loc,unsigned char *results) +static int trackpoint_read (struct ps2dev *ps2dev,u8 loc,u8 *results) {if (ps2_command (ps2dev,NULL ,MAKE_PS2_CMD (0 ,0 ,TP_COMMAND )) ||ps2_command (ps2dev, results,MAKE_PS2_CMD (0 ,1 , loc))) {@@ -57,8 +63,7 @@ static int trackpoint_read(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_write (struct ps2dev *ps2dev, -unsigned char loc,unsigned char val) +static int trackpoint_write (struct ps2dev *ps2dev,u8 loc,u8 val) { if (ps2_command(ps2dev, NULL, MAKE_PS2_CMD(0, 0, TP_COMMAND)) || ps2_command(ps2dev, NULL, MAKE_PS2_CMD(0, 0, TP_WRITE_MEM)) ||@@ -70,8 +75,7 @@ static int trackpoint_write(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_toggle_bit (struct ps2dev *ps2dev, -unsigned char loc,unsigned char mask) +static int trackpoint_toggle_bit (struct ps2dev *ps2dev,u8 loc,u8 mask) {/* Bad things will happen if the loc param isn't in this range */ if (loc <0x20 || loc >=0x2F )@@ -87,11 +91,11 @@ static int trackpoint_toggle_bit(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_update_bit (struct ps2dev *ps2dev,unsigned char loc, -unsigned char mask,unsigned char value) +static int trackpoint_update_bit (struct ps2dev *ps2dev, +u8 loc,u8 mask,u8 value) {int retval =0 ; -unsigned char data; +u8 data;trackpoint_read (ps2dev, loc, &data);if (((data & mask) == mask) != !!value)@@ -105,17 +109,18 @@ static int trackpoint_update_bit(struct ps2dev *ps2dev, unsigned char loc,*/ struct trackpoint_attr_data {size_t field_offset; -unsigned char command; -unsigned char mask; -unsigned char inverted; -unsigned char power_on_default; +u8 command; +u8 mask; +bool inverted; +u8 power_on_default; }; -static ssize_t trackpoint_show_int_attr (struct psmouse *psmouse,void *data,char *buf) +static ssize_t trackpoint_show_int_attr (struct psmouse *psmouse, +void *data,char *buf) {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char value = *(unsigned char *)((char *)tp + attr->field_offset); +u8 value = *(u8 *)((void *)tp + attr->field_offset);if (attr->inverted) value = !value;@@ -128,8 +133,8 @@ static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data, {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); -unsigned char value; +u8 *field = (void *)tp + attr->field_offset; +u8 value;int err; err =kstrtou8 (buf,10 , &value);@@ -157,17 +162,14 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data, {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); -unsigned int value; +bool *field = (void *)tp + attr->field_offset; +bool value;int err; - err =kstrtouint (buf,10 , &value); + err =kstrtobool (buf, &value);if (err)return err; -if (value >1 ) -return -EINVAL ; -if (attr->inverted) value = !value;@@ -193,30 +195,6 @@ PSMOUSE_DEFINE_ATTR(_name, S_IWUSR | S_IRUGO, \ &trackpoint_attr_##_name, \ trackpoint_show_int_attr, trackpoint_set_bit_attr) -#define TRACKPOINT_UPDATE_BIT (_psmouse, _tp, _name) \ -do { \ - struct trackpoint_attr_data *_attr = &trackpoint_attr_##_name; \ - \ - trackpoint_update_bit(&_psmouse->ps2dev, \ - _attr->command, _attr->mask, _tp->_name); \ -} while (0) - -#define TRACKPOINT_UPDATE (_power_on, _psmouse, _tp, _name) \ -do { \ - if (!_power_on || \ - _tp->_name != trackpoint_attr_##_name.power_on_default) { \ - if (!trackpoint_attr_##_name.mask) \ - trackpoint_write(&_psmouse->ps2dev, \ - trackpoint_attr_##_name.command, \ - _tp->_name); \ - else \ - TRACKPOINT_UPDATE_BIT(_psmouse, _tp, _name); \ - } \ -} while (0) - -#define TRACKPOINT_SET_POWER_ON_DEFAULT (_tp, _name) \ - (_tp->_name = trackpoint_attr_##_name.power_on_default) -TRACKPOINT_INT_ATTR (sensitivity,TP_SENS ,TP_DEF_SENS );TRACKPOINT_INT_ATTR (speed,TP_SPEED ,TP_DEF_SPEED );TRACKPOINT_INT_ATTR (inertia,TP_INERTIA ,TP_DEF_INERTIA );@@ -229,13 +207,33 @@ TRACKPOINT_INT_ATTR(ztime, TP_Z_TIME, TP_DEF_Z_TIME);TRACKPOINT_INT_ATTR (jenks,TP_JENKS_CURV ,TP_DEF_JENKS_CURV );TRACKPOINT_INT_ATTR (drift_time,TP_DRIFT_TIME ,TP_DEF_DRIFT_TIME ); -TRACKPOINT_BIT_ATTR (press_to_select,TP_TOGGLE_PTSON ,TP_MASK_PTSON ,0 , +TRACKPOINT_BIT_ATTR (press_to_select,TP_TOGGLE_PTSON ,TP_MASK_PTSON , false,TP_DEF_PTSON ); -TRACKPOINT_BIT_ATTR (skipback,TP_TOGGLE_SKIPBACK ,TP_MASK_SKIPBACK ,0 , +TRACKPOINT_BIT_ATTR (skipback,TP_TOGGLE_SKIPBACK ,TP_MASK_SKIPBACK , false,TP_DEF_SKIPBACK ); -TRACKPOINT_BIT_ATTR (ext_dev,TP_TOGGLE_EXT_DEV ,TP_MASK_EXT_DEV ,1 , +TRACKPOINT_BIT_ATTR (ext_dev,TP_TOGGLE_EXT_DEV ,TP_MASK_EXT_DEV , true,TP_DEF_EXT_DEV ); +static bool trackpoint_is_attr_available (struct psmouse *psmouse, +struct attribute *attr) +{ +struct trackpoint_data *tp = psmouse->private; + +return tp->variant_id ==TP_VARIANT_IBM || + attr == &psmouse_attr_sensitivity.dattr.attr || + attr == &psmouse_attr_press_to_select.dattr.attr; +} + +static umode_t trackpoint_is_attr_visible (struct kobject *kobj, +struct attribute *attr,int n) +{ + struct device *dev = container_of(kobj, struct device, kobj); +struct serio *serio =to_serio_port (dev); +struct psmouse *psmouse =serio_get_drvdata (serio); + +return trackpoint_is_attr_available (psmouse, attr) ? attr->mode :0 ; +} +static struct attribute *trackpoint_attrs[] = { &psmouse_attr_sensitivity.dattr.attr, &psmouse_attr_speed.dattr.attr,@@ -255,24 +253,56 @@ static struct attribute *trackpoint_attrs[] = { };static struct attribute_group trackpoint_attr_group = { - .attrs = trackpoint_attrs, + .is_visible = trackpoint_is_attr_visible, + .attrs = trackpoint_attrs, }; -static int trackpoint_start_protocol (struct psmouse *psmouse,unsigned char *firmware_id) -{ -unsigned char param[2 ] = {0 }; +#define TRACKPOINT_UPDATE (_power_on, _psmouse, _tp, _name) \ +do { \ + struct trackpoint_attr_data *_attr = &trackpoint_attr_##_name; \ + \ + if ((!_power_on || _tp->_name != _attr->power_on_default) && \ + trackpoint_is_attr_available(_psmouse, \ + &psmouse_attr_##_name.dattr.attr)) { \ + if (!_attr->mask) \ + trackpoint_write(&_psmouse->ps2dev, \ + _attr->command, _tp->_name); \ + else \ + trackpoint_update_bit(&_psmouse->ps2dev, \ + _attr->command, _attr->mask, \ + _tp->_name); \ + } \ +} while (0) -if (ps2_command (&psmouse->ps2dev, param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID ))) -return -1 ; +#define TRACKPOINT_SET_POWER_ON_DEFAULT (_tp, _name) \ +do { \ + _tp->_name = trackpoint_attr_##_name.power_on_default; \ +} while (0) -/* add new TP ID. */ -if (!(param[0 ] &TP_MAGIC_IDENT )) -return -1 ; +static int trackpoint_start_protocol (struct psmouse *psmouse, +u8 *variant_id,u8 *firmware_id) +{ +u8 param[2 ] = {0 }; +int error; -if (firmware_id) - *firmware_id = param[1 ]; + error =ps2_command (&psmouse->ps2dev, + param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID )); +if (error) +return error; + +switch (param[0 ]) { +case TP_VARIANT_IBM : +case TP_VARIANT_ALPS : +case TP_VARIANT_ELAN :drivers/input/mouse/trackpoint.c static struct attribute *trackpoint_attrs[] = { · line 305
Quoted 10 lines
drivers/input/mouse/trackpoint.c +8
-1+case TP_VARIANT_NXP : +if (variant_id) + *variant_id = param[0 ]; +if (firmware_id) + *firmware_id = param[1 ]; +break ; + } -return 0 ; +return -ENODEV ;always report error .. not good.
Quoted 202 lines
drivers/input/mouse/trackpoint.c +53
-30}/* @@ -285,7 +315,7 @@ static int trackpoint_sync(struct psmouse *psmouse, bool in_power_on_state) {struct trackpoint_data *tp = psmouse->private; -if (!in_power_on_state) { +if (!in_power_on_state && tp->variant_id ==TP_VARIANT_IBM ) {/* * Disable features that may make device unusable * with this driver. @@ -347,7 +377,8 @@ static void trackpoint_defaults(struct trackpoint_data *tp)static void trackpoint_disconnect (struct psmouse *psmouse) { -sysfs_remove_group (&psmouse->ps2dev.serio->dev.kobj, &trackpoint_attr_group); +device_remove_group (&psmouse->ps2dev.serio->dev, + &trackpoint_attr_group);kfree (psmouse->private); psmouse->private =NULL ;@@ -355,14 +386,20 @@ static void trackpoint_disconnect(struct psmouse *psmouse)static int trackpoint_reconnect (struct psmouse *psmouse) { -int reset_fail; +struct trackpoint_data *tp = psmouse->private; +int error; +bool was_reset; -if (trackpoint_start_protocol (psmouse,NULL )) -return -1 ; + error =trackpoint_start_protocol (psmouse,NULL ,NULL ); +if (error) +return error; - reset_fail =trackpoint_power_on_reset (&psmouse->ps2dev); -if (trackpoint_sync (psmouse, !reset_fail)) -return -1 ; + was_reset = tp->variant_id ==TP_VARIANT_IBM && +trackpoint_power_on_reset (&psmouse->ps2dev) ==0 ; + + error =trackpoint_sync (psmouse, was_reset); +if (error) +return error;return 0 ; }@@ -370,46 +407,62 @@ static int trackpoint_reconnect(struct psmouse *psmouse)int trackpoint_detect (struct psmouse *psmouse,bool set_properties) {struct ps2dev *ps2dev = &psmouse->ps2dev; -unsigned char firmware_id; -unsigned char button_info; +struct trackpoint_data *tp; +u8 variant_id; +u8 firmware_id; +u8 button_info;int error; -if (trackpoint_start_protocol (psmouse, &firmware_id)) -return -1 ; + error =trackpoint_start_protocol (psmouse, &variant_id, &firmware_id); +if (error) +return error;if (!set_properties)return 0 ; -if (trackpoint_read (ps2dev,TP_EXT_BTN , &button_info)) { -psmouse_warn (psmouse,"failed to get extended button data, assuming 3 buttons\n" ); - button_info =0x33 ; - } - - psmouse->private =kzalloc (sizeof (struct trackpoint_data ),GFP_KERNEL ); -if (!psmouse->private) + tp =kzalloc (sizeof (*tp),GFP_KERNEL ); +if (!tp)return -ENOMEM ; - psmouse->vendor ="IBM" ; +trackpoint_defaults (tp); + tp->variant_id = variant_id; + tp->firmware_id = firmware_id; + + psmouse->private = tp; + + psmouse->vendor = trackpoint_variants[variant_id]; psmouse->name ="TrackPoint" ; psmouse->reconnect = trackpoint_reconnect; psmouse->disconnect = trackpoint_disconnect; +if (variant_id !=TP_VARIANT_IBM ) { +/* Newer variants do not support extended button query. */ + button_info =0x33 ; + }else { + error =trackpoint_read (ps2dev,TP_EXT_BTN , &button_info); +if (error) { +psmouse_warn (psmouse, +"failed to get extended button data, assuming 3 buttons\n" ); + button_info =0x33 ; + } + } +if ((button_info &0x0f ) >=3 ) -__set_bit (BTN_MIDDLE , psmouse->dev->keybit); +input_set_capability (psmouse->dev,EV_KEY ,BTN_MIDDLE );__set_bit (INPUT_PROP_POINTER , psmouse->dev->propbit);__set_bit (INPUT_PROP_POINTING_STICK , psmouse->dev->propbit); -trackpoint_defaults (psmouse->private); - - error =trackpoint_power_on_reset (ps2dev); - -/* Write defaults to TP only if reset fails. */ -if (error) +if (variant_id !=TP_VARIANT_IBM || +trackpoint_power_on_reset (ps2dev) !=0 ) { +/* +* Write defaults to TP if we did not reset the trackpoint. +*/ trackpoint_sync (psmouse, false); + } - error =sysfs_create_group (&ps2dev->serio->dev.kobj, &trackpoint_attr_group); + error =device_add_group (&ps2dev->serio->dev, &trackpoint_attr_group);if (error) { psmouse_err(psmouse, "failed to create sysfs attributes, error: %d\n",@@ -420,8 +473,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) }psmouse_info (psmouse, -"IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n" , - firmware_id, +"%s TrackPoint firmware: 0x%02x, buttons: %d/%d\n" , + psmouse->vendor, firmware_id, (button_info &0xf0 ) >>4 , button_info &0x0f );return 0 ;drivers/input/mouse/trackpoint.h +21
-14@@ -21,10 +21,16 @@#define TP_COMMAND 0xE2/* Commands start with this */ #define TP_READ_ID 0xE1/* Sent for device identification */ -#define TP_MAGIC_IDENT 0x03/* Sent after a TP_READ_ID followed */ -/* by the firmware ID */ -/* Firmware ID includes 0x1, 0x2, 0x3 */ +/* +* Valid first byte responses to the "Read Secondary ID" (0xE1) command. +* 0x01 was the original IBM trackpoint, others implement very limited +* subset of trackpoint features. +*/ +#define TP_VARIANT_IBM 0x01 +#define TP_VARIANT_ALPS 0x02 +#define TP_VARIANT_ELAN 0x03 +#define TP_VARIANT_NXP 0x04/* * Commands @@ -136,18 +142,20 @@#define MAKE_PS2_CMD (params, results, cmd) ((params<<12) | (results<<8) | (cmd)) -struct trackpoint_data -{ -unsigned char sensitivity, speed, inertia, reach; -unsigned char draghys, mindrag; -unsigned char thresh, upthresh; -unsigned char ztime, jenks; -unsigned char drift_time; +struct trackpoint_data { +u8 variant_id; +u8 firmware_id; + +u8 sensitivity, speed, inertia, reach; +u8 draghys, mindrag; +u8 thresh, upthresh; +u8 ztime, jenks; +u8 drift_time;/* toggles */ -unsigned char press_to_select; -unsigned char skipback; -unsigned char ext_dev; +bool press_to_select; +bool skipback; +bool ext_dev; };#ifdef CONFIG_MOUSE_PS2_TRACKPOINT --To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 1 line
Dmitry
Quoted 9 lines · Dmitry Torokhov
Hi Ulrik,
Quoted 2 lines · On Sun, Jan 14, 2018 at 09:39:59PM +0100, [email protected] wrote:
Hi Dmitry, Sebastian,
Nack for the patch..NAK because of the issue pointed by Sebastian, or bigger disagreement?
I originally had 2 reasons:
1) issue pointed out by Sebastian, of course easy to fix
2) The remark I had below which was because I did not understand yet the reason why you made this patch in the first place. I now understand it is not the purpose to change anything for the Lenovo e470/e570 and it will also not change anything for those if you at least fix nr 1)
Thanks,
best regards,
Ulrik
Quoted 632 lines
Quoted 30 lines
As Sebastian pointed out, the trackpoint detection will always report an error. (see below)
I builded your original patch and it resulted in detection as generic mouse for the trackpoint:
[ 0.838143] serio: i8042 KBD port at 0x60,0x64 irq 1 [ 0.838146] serio: i8042 AUX port at 0x60,0x64 irq 12 [ 0.838267] mousedev: PS/2 mouse device common for all mice [ 9.321140] psmouse serio1: synaptics: queried max coordinates: x [..5676], y [..4758] [ 9.367095] psmouse serio1: synaptics: queried min coordinates: x [1266..], y [1096..] [ 9.367103] psmouse serio1: synaptics: The touchpad can support a better bus than the too old PS/2 protocol. Make sure MOUSE_PS2_SYNAPTICS_SMBUS and RMI4_SMB are enabled to get a better touchpad experience. [ 9.455953] psmouse serio1: synaptics: Touchpad model: 1, fw: 8.2, id: 0x1e2b1, caps: 0xf007a3/0x943300/0x12e800/0x410000, board id: 3157, fw id: 2405942 [ 9.455970] psmouse serio1: synaptics: serio: Synaptics pass-through port at isa0060/serio1/input0 [ 9.514117] input: SynPS/2 Synaptics TouchPad as /devices/platform/i8042/serio1/input/input7 [ 11.458443] input: PS/2 Generic Mouse as /devices/platform/i8042/serio1/serio2/input/input18When I fixed your patch, it resulted in: (timing difference is because a dvd was inserted before)
[ 0.843661] serio: i8042 KBD port at 0x60,0x64 irq 1 [ 0.843664] serio: i8042 AUX port at 0x60,0x64 irq 12 [ 0.843793] mousedev: PS/2 mouse device common for all mice [ 3.822411] psmouse serio1: synaptics: queried max coordinates: x [..5676], y [..4758] [ 3.868196] psmouse serio1: synaptics: queried min coordinates: x [1266..], y [1096..] [ 3.868203] psmouse serio1: synaptics: The touchpad can support a better bus than the too old PS/2 protocol. Make sure MOUSE_PS2_SYNAPTICS_SMBUS and RMI4_SMB are enabled to get a better touchpad experience. [ 3.961024] psmouse serio1: synaptics: Touchpad model: 1, fw: 8.2, id: 0x1e2b1, caps: 0xf007a3/0x943300/0x12e800/0x410000, board id: 3157, fw id: 2405942 [ 3.961038] psmouse serio1: synaptics: serio: Synaptics pass-through port at isa0060/serio1/input0 [ 4.017290] input: SynPS/2 Synaptics TouchPad as /devices/platform/i8042/serio1/input/input7 [ 4.407930] psmouse serio2: trackpoint: failed to get extended button data, assuming 3 buttons [ 8.460022] psmouse serio2: trackpoint: IBM TrackPoint firmware: 0x0e, buttons: 3/3 [ 8.740439] input: TPPS/2 IBM TrackPoint as /devices/platform/i8042/serio1/serio2/input/input18Quoted 6 lines
functionally both versions (with/without bug) resulted in a functional trackpoint with 3 buttons.
Sebastian, with regards to your middle button question, as you can see in the output I've such hardware. (lenovo e570).
Dimitrios, wasn't it your intention that this hardware would be detected as NON IBM ? Apparently it is IBM and still fails "Read Extended Button Status".
Only devices reporting
0x02,0x03or0x04as the first byte of the xetended ID command should be identified as non-IBM. If device responds with0x01then we have to assume it is proper IBM. Your appears to be reporting0x010x0e, like the real trackpoint would. Unfortunately it seems Lenovo managed to mess up the firmware in those.Thanks.
Quoted 580 lines
Kind regards,
UlrikQuoted 360 lines · Dmitry Torokhov
Date: Sat, 6 Jan 2018 22:52:01 -0800
From: Dmitry Torokhov <[email protected]>
To: Aaron Ma <[email protected]>
Cc: Greg KH <[email protected]>, Sebastian Schmidt <[email protected]>,
[email protected]
Subject: Re: [PATCH] Revert "Input: trackpoint - add new trackpoint
firmware ID"
X-Mailing-List: [email protected]Quoted 53 lines · Dmitry Torokhov
Hi Aaron,
Quoted 7 lines · Aaron Ma
Hi Dmitry:
Got the official info from Lenovo:
Lenovo introduced new TrackPoint compatible sticks ( ELAN/Alps/NXP sticks) from 2016.
These new devices only support the minimum commands described in the spec, which has been used in the current Windows driver.What is the exact list of the commands supported by each variant?
Quoted 6 lines
Legacy TrackPoint: 0101 – 0E01
ALPS: 0102 – FF02
ELAN:0103 – FF03
NXP: 0104 – FF04Quoted 9 lines
2.4.18 READ SECONDARY ID (x"E1")
This command will read the secondary device ID of the pointing device (2 bytes). The least significant byte is sent first. For the first byte, the legacy TrackPoint controller from IBM will always return x"01", the pointing stick from ALPS will always return x"02", the pointing stick from Elan will always return x"03”, and the pointing stick from NXP will always return 0x”04". And a second byte which denotes a specific set of functional specifications. Differing ROM versions are used to denote changes within a given functional set.Can you/Lenovo share the updated spec?
Quoted 8 lines
The new devices (include Legacy ID:01) will not support the sysfs like speed.
So it is not right to revert the commit, it is about to add another
0x04ID in it.Old sysfs could be stayed for old legacy device ID:01 or removed.
No, because there are devices that have trackpoints properly implementing the protocol, before Lenovo started their "innovation".
Do we have any way to distinguish between properly implemented trackpoints and Lenovo "improved" ones? I played with gen3 Carbon, and while it does not error out on "speed" attribute, unlike gen5, it still has no visible effects. Additionally, the "press to select" functionality seems to be disabled, and trying to enable it via sysfs results in register content being reverted to the original "disabled" setting in a second or two. Setting to swap X and Y axes does not work either, not sure about other bits of that control register. "sensitivity" does work though, again unlike my gen5.
Quoted 4 lines
Thanks.
Signature · 1 line
DmitryGuys, could you please try the patch below? It will not solve the "speed" issue on
0x01devices, but hopefully we won't be exposing non-existing controls on others.Thanks!
Signature · 22 lines
Dmitry Input: trackpoint - only expose supported controls for Elan, ALPS and NXP From: Dmitry Torokhov <[email protected]> The newer trackpoints from ALPS, Elan and NXP implement a very limited subset of extended commands and controls that the original trackpoints implemented, so we should not be exposing not working controls in sysfs. The newer trackpoints also do not implement "Power On Reset" or "Read Extended Button Status", so we should not be using these commands during initialization. While we are at it, let's change "unsigned char" to u8 for byte data or bool for booleans and use better suited error codes instead of -1. Signed-off-by: Dmitry Torokhov <[email protected]> --- drivers/input/mouse/trackpoint.c | 241 +++++++++++++++++++++++--------------- drivers/input/mouse/trackpoint.h | 34 +++-- 2 files changed, 168 insertions(+), 107 deletions(-)drivers/input/mouse/trackpoint.c +86
-63@@ -19,6 +19,13 @@#include "psmouse.h" #include "trackpoint.h" +static const char *const trackpoint_variants[] = { + [TP_VARIANT_IBM ] ="IBM" , + [TP_VARIANT_ALPS ] ="ALPS" , + [TP_VARIANT_ELAN ] ="Elan" , + [TP_VARIANT_NXP ] ="NXP" , +}; +/* * Power-on Reset: Resets all trackpoint parameters, including RAM values, * to defaults. @@ -26,7 +33,7 @@*/ static int trackpoint_power_on_reset (struct ps2dev *ps2dev) { -unsigned char results[2 ]; +u8 results[2 ];int tries =0 ;/* Issue POR command, and repeat up to once if 0xFC00 received */ @@ -38,7 +45,7 @@ static int trackpoint_power_on_reset(struct ps2dev *ps2dev)/* Check for success response -- 0xAA00 */ if (results[0 ] !=0xAA || results[1 ] !=0x00 ) -return -1 ; +return -ENODEV ;return 0 ; }@@ -46,8 +53,7 @@ static int trackpoint_power_on_reset(struct ps2dev *ps2dev)/* * Device IO: read, write and toggle bit */ -static int trackpoint_read (struct ps2dev *ps2dev, -unsigned char loc,unsigned char *results) +static int trackpoint_read (struct ps2dev *ps2dev,u8 loc,u8 *results) {if (ps2_command (ps2dev,NULL ,MAKE_PS2_CMD (0 ,0 ,TP_COMMAND )) ||ps2_command (ps2dev, results,MAKE_PS2_CMD (0 ,1 , loc))) {@@ -57,8 +63,7 @@ static int trackpoint_read(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_write (struct ps2dev *ps2dev, -unsigned char loc,unsigned char val) +static int trackpoint_write (struct ps2dev *ps2dev,u8 loc,u8 val) { if (ps2_command(ps2dev, NULL, MAKE_PS2_CMD(0, 0, TP_COMMAND)) || ps2_command(ps2dev, NULL, MAKE_PS2_CMD(0, 0, TP_WRITE_MEM)) ||@@ -70,8 +75,7 @@ static int trackpoint_write(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_toggle_bit (struct ps2dev *ps2dev, -unsigned char loc,unsigned char mask) +static int trackpoint_toggle_bit (struct ps2dev *ps2dev,u8 loc,u8 mask) {/* Bad things will happen if the loc param isn't in this range */ if (loc <0x20 || loc >=0x2F )@@ -87,11 +91,11 @@ static int trackpoint_toggle_bit(struct ps2dev *ps2dev,return 0 ; } -static int trackpoint_update_bit (struct ps2dev *ps2dev,unsigned char loc, -unsigned char mask,unsigned char value) +static int trackpoint_update_bit (struct ps2dev *ps2dev, +u8 loc,u8 mask,u8 value) {int retval =0 ; -unsigned char data; +u8 data;trackpoint_read (ps2dev, loc, &data);if (((data & mask) == mask) != !!value)@@ -105,17 +109,18 @@ static int trackpoint_update_bit(struct ps2dev *ps2dev, unsigned char loc,*/ struct trackpoint_attr_data {size_t field_offset; -unsigned char command; -unsigned char mask; -unsigned char inverted; -unsigned char power_on_default; +u8 command; +u8 mask; +bool inverted; +u8 power_on_default; }; -static ssize_t trackpoint_show_int_attr (struct psmouse *psmouse,void *data,char *buf) +static ssize_t trackpoint_show_int_attr (struct psmouse *psmouse, +void *data,char *buf) {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char value = *(unsigned char *)((char *)tp + attr->field_offset); +u8 value = *(u8 *)((void *)tp + attr->field_offset);if (attr->inverted) value = !value;@@ -128,8 +133,8 @@ static ssize_t trackpoint_set_int_attr(struct psmouse *psmouse, void *data, {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); -unsigned char value; +u8 *field = (void *)tp + attr->field_offset; +u8 value;int err; err =kstrtou8 (buf,10 , &value);@@ -157,17 +162,14 @@ static ssize_t trackpoint_set_bit_attr(struct psmouse *psmouse, void *data, {struct trackpoint_data *tp = psmouse->private;struct trackpoint_attr_data *attr = data; -unsigned char *field = (unsigned char *)((char *)tp + attr->field_offset); -unsigned int value; +bool *field = (void *)tp + attr->field_offset; +bool value;int err; - err =kstrtouint (buf,10 , &value); + err =kstrtobool (buf, &value);if (err)return err; -if (value >1 ) -return -EINVAL ; -if (attr->inverted) value = !value;@@ -193,30 +195,6 @@ PSMOUSE_DEFINE_ATTR(_name, S_IWUSR | S_IRUGO, \ &trackpoint_attr_##_name, \ trackpoint_show_int_attr, trackpoint_set_bit_attr) -#define TRACKPOINT_UPDATE_BIT (_psmouse, _tp, _name) \ -do { \ - struct trackpoint_attr_data *_attr = &trackpoint_attr_##_name; \ - \ - trackpoint_update_bit(&_psmouse->ps2dev, \ - _attr->command, _attr->mask, _tp->_name); \ -} while (0) - -#define TRACKPOINT_UPDATE (_power_on, _psmouse, _tp, _name) \ -do { \ - if (!_power_on || \ - _tp->_name != trackpoint_attr_##_name.power_on_default) { \ - if (!trackpoint_attr_##_name.mask) \ - trackpoint_write(&_psmouse->ps2dev, \ - trackpoint_attr_##_name.command, \ - _tp->_name); \ - else \ - TRACKPOINT_UPDATE_BIT(_psmouse, _tp, _name); \ - } \ -} while (0) - -#define TRACKPOINT_SET_POWER_ON_DEFAULT (_tp, _name) \ - (_tp->_name = trackpoint_attr_##_name.power_on_default) -TRACKPOINT_INT_ATTR (sensitivity,TP_SENS ,TP_DEF_SENS );TRACKPOINT_INT_ATTR (speed,TP_SPEED ,TP_DEF_SPEED );TRACKPOINT_INT_ATTR (inertia,TP_INERTIA ,TP_DEF_INERTIA );@@ -229,13 +207,33 @@ TRACKPOINT_INT_ATTR(ztime, TP_Z_TIME, TP_DEF_Z_TIME);TRACKPOINT_INT_ATTR (jenks,TP_JENKS_CURV ,TP_DEF_JENKS_CURV );TRACKPOINT_INT_ATTR (drift_time,TP_DRIFT_TIME ,TP_DEF_DRIFT_TIME ); -TRACKPOINT_BIT_ATTR (press_to_select,TP_TOGGLE_PTSON ,TP_MASK_PTSON ,0 , +TRACKPOINT_BIT_ATTR (press_to_select,TP_TOGGLE_PTSON ,TP_MASK_PTSON , false,TP_DEF_PTSON ); -TRACKPOINT_BIT_ATTR (skipback,TP_TOGGLE_SKIPBACK ,TP_MASK_SKIPBACK ,0 , +TRACKPOINT_BIT_ATTR (skipback,TP_TOGGLE_SKIPBACK ,TP_MASK_SKIPBACK , false,TP_DEF_SKIPBACK ); -TRACKPOINT_BIT_ATTR (ext_dev,TP_TOGGLE_EXT_DEV ,TP_MASK_EXT_DEV ,1 , +TRACKPOINT_BIT_ATTR (ext_dev,TP_TOGGLE_EXT_DEV ,TP_MASK_EXT_DEV , true,TP_DEF_EXT_DEV ); +static bool trackpoint_is_attr_available (struct psmouse *psmouse, +struct attribute *attr) +{ +struct trackpoint_data *tp = psmouse->private; + +return tp->variant_id ==TP_VARIANT_IBM || + attr == &psmouse_attr_sensitivity.dattr.attr || + attr == &psmouse_attr_press_to_select.dattr.attr; +} + +static umode_t trackpoint_is_attr_visible (struct kobject *kobj, +struct attribute *attr,int n) +{ + struct device *dev = container_of(kobj, struct device, kobj); +struct serio *serio =to_serio_port (dev); +struct psmouse *psmouse =serio_get_drvdata (serio); + +return trackpoint_is_attr_available (psmouse, attr) ? attr->mode :0 ; +} +static struct attribute *trackpoint_attrs[] = { &psmouse_attr_sensitivity.dattr.attr, &psmouse_attr_speed.dattr.attr,@@ -255,24 +253,56 @@ static struct attribute *trackpoint_attrs[] = { };static struct attribute_group trackpoint_attr_group = { - .attrs = trackpoint_attrs, + .is_visible = trackpoint_is_attr_visible, + .attrs = trackpoint_attrs, }; -static int trackpoint_start_protocol (struct psmouse *psmouse,unsigned char *firmware_id) -{ -unsigned char param[2 ] = {0 }; +#define TRACKPOINT_UPDATE (_power_on, _psmouse, _tp, _name) \ +do { \ + struct trackpoint_attr_data *_attr = &trackpoint_attr_##_name; \ + \ + if ((!_power_on || _tp->_name != _attr->power_on_default) && \ + trackpoint_is_attr_available(_psmouse, \ + &psmouse_attr_##_name.dattr.attr)) { \ + if (!_attr->mask) \ + trackpoint_write(&_psmouse->ps2dev, \ + _attr->command, _tp->_name); \ + else \ + trackpoint_update_bit(&_psmouse->ps2dev, \ + _attr->command, _attr->mask, \ + _tp->_name); \ + } \ +} while (0) -if (ps2_command (&psmouse->ps2dev, param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID ))) -return -1 ; +#define TRACKPOINT_SET_POWER_ON_DEFAULT (_tp, _name) \ +do { \ + _tp->_name = trackpoint_attr_##_name.power_on_default; \ +} while (0) -/* add new TP ID. */ -if (!(param[0 ] &TP_MAGIC_IDENT )) -return -1 ; +static int trackpoint_start_protocol (struct psmouse *psmouse, +u8 *variant_id,u8 *firmware_id) +{ +u8 param[2 ] = {0 }; +int error; -if (firmware_id) - *firmware_id = param[1 ]; + error =ps2_command (&psmouse->ps2dev, + param,MAKE_PS2_CMD (0 ,2 ,TP_READ_ID )); +if (error) +return error; + +switch (param[0 ]) { +case TP_VARIANT_IBM : +case TP_VARIANT_ALPS : +case TP_VARIANT_ELAN :drivers/input/mouse/trackpoint.c static struct attribute *trackpoint_attrs[] = { · line 305
Quoted 10 lines
drivers/input/mouse/trackpoint.c +8
-1+case TP_VARIANT_NXP : +if (variant_id) + *variant_id = param[0 ]; +if (firmware_id) + *firmware_id = param[1 ]; +break ; + } -return 0 ; +return -ENODEV ;always report error .. not good.
Quoted 202 lines
drivers/input/mouse/trackpoint.c +53
-30}/* @@ -285,7 +315,7 @@ static int trackpoint_sync(struct psmouse *psmouse, bool in_power_on_state) {struct trackpoint_data *tp = psmouse->private; -if (!in_power_on_state) { +if (!in_power_on_state && tp->variant_id ==TP_VARIANT_IBM ) {/* * Disable features that may make device unusable * with this driver. @@ -347,7 +377,8 @@ static void trackpoint_defaults(struct trackpoint_data *tp)static void trackpoint_disconnect (struct psmouse *psmouse) { -sysfs_remove_group (&psmouse->ps2dev.serio->dev.kobj, &trackpoint_attr_group); +device_remove_group (&psmouse->ps2dev.serio->dev, + &trackpoint_attr_group);kfree (psmouse->private); psmouse->private =NULL ;@@ -355,14 +386,20 @@ static void trackpoint_disconnect(struct psmouse *psmouse)static int trackpoint_reconnect (struct psmouse *psmouse) { -int reset_fail; +struct trackpoint_data *tp = psmouse->private; +int error; +bool was_reset; -if (trackpoint_start_protocol (psmouse,NULL )) -return -1 ; + error =trackpoint_start_protocol (psmouse,NULL ,NULL ); +if (error) +return error; - reset_fail =trackpoint_power_on_reset (&psmouse->ps2dev); -if (trackpoint_sync (psmouse, !reset_fail)) -return -1 ; + was_reset = tp->variant_id ==TP_VARIANT_IBM && +trackpoint_power_on_reset (&psmouse->ps2dev) ==0 ; + + error =trackpoint_sync (psmouse, was_reset); +if (error) +return error;return 0 ; }@@ -370,46 +407,62 @@ static int trackpoint_reconnect(struct psmouse *psmouse)int trackpoint_detect (struct psmouse *psmouse,bool set_properties) {struct ps2dev *ps2dev = &psmouse->ps2dev; -unsigned char firmware_id; -unsigned char button_info; +struct trackpoint_data *tp; +u8 variant_id; +u8 firmware_id; +u8 button_info;int error; -if (trackpoint_start_protocol (psmouse, &firmware_id)) -return -1 ; + error =trackpoint_start_protocol (psmouse, &variant_id, &firmware_id); +if (error) +return error;if (!set_properties)return 0 ; -if (trackpoint_read (ps2dev,TP_EXT_BTN , &button_info)) { -psmouse_warn (psmouse,"failed to get extended button data, assuming 3 buttons\n" ); - button_info =0x33 ; - } - - psmouse->private =kzalloc (sizeof (struct trackpoint_data ),GFP_KERNEL ); -if (!psmouse->private) + tp =kzalloc (sizeof (*tp),GFP_KERNEL ); +if (!tp)return -ENOMEM ; - psmouse->vendor ="IBM" ; +trackpoint_defaults (tp); + tp->variant_id = variant_id; + tp->firmware_id = firmware_id; + + psmouse->private = tp; + + psmouse->vendor = trackpoint_variants[variant_id]; psmouse->name ="TrackPoint" ; psmouse->reconnect = trackpoint_reconnect; psmouse->disconnect = trackpoint_disconnect; +if (variant_id !=TP_VARIANT_IBM ) { +/* Newer variants do not support extended button query. */ + button_info =0x33 ; + }else { + error =trackpoint_read (ps2dev,TP_EXT_BTN , &button_info); +if (error) { +psmouse_warn (psmouse, +"failed to get extended button data, assuming 3 buttons\n" ); + button_info =0x33 ; + } + } +if ((button_info &0x0f ) >=3 ) -__set_bit (BTN_MIDDLE , psmouse->dev->keybit); +input_set_capability (psmouse->dev,EV_KEY ,BTN_MIDDLE );__set_bit (INPUT_PROP_POINTER , psmouse->dev->propbit);__set_bit (INPUT_PROP_POINTING_STICK , psmouse->dev->propbit); -trackpoint_defaults (psmouse->private); - - error =trackpoint_power_on_reset (ps2dev); - -/* Write defaults to TP only if reset fails. */ -if (error) +if (variant_id !=TP_VARIANT_IBM || +trackpoint_power_on_reset (ps2dev) !=0 ) { +/* +* Write defaults to TP if we did not reset the trackpoint. +*/ trackpoint_sync (psmouse, false); + } - error =sysfs_create_group (&ps2dev->serio->dev.kobj, &trackpoint_attr_group); + error =device_add_group (&ps2dev->serio->dev, &trackpoint_attr_group);if (error) { psmouse_err(psmouse, "failed to create sysfs attributes, error: %d\n",@@ -420,8 +473,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) }psmouse_info (psmouse, -"IBM TrackPoint firmware: 0x%02x, buttons: %d/%d\n" , - firmware_id, +"%s TrackPoint firmware: 0x%02x, buttons: %d/%d\n" , + psmouse->vendor, firmware_id, (button_info &0xf0 ) >>4 , button_info &0x0f );return 0 ;drivers/input/mouse/trackpoint.h +21
-14@@ -21,10 +21,16 @@#define TP_COMMAND 0xE2/* Commands start with this */ #define TP_READ_ID 0xE1/* Sent for device identification */ -#define TP_MAGIC_IDENT 0x03/* Sent after a TP_READ_ID followed */ -/* by the firmware ID */ -/* Firmware ID includes 0x1, 0x2, 0x3 */ +/* +* Valid first byte responses to the "Read Secondary ID" (0xE1) command. +* 0x01 was the original IBM trackpoint, others implement very limited +* subset of trackpoint features. +*/ +#define TP_VARIANT_IBM 0x01 +#define TP_VARIANT_ALPS 0x02 +#define TP_VARIANT_ELAN 0x03 +#define TP_VARIANT_NXP 0x04/* * Commands @@ -136,18 +142,20 @@#define MAKE_PS2_CMD (params, results, cmd) ((params<<12) | (results<<8) | (cmd)) -struct trackpoint_data -{ -unsigned char sensitivity, speed, inertia, reach; -unsigned char draghys, mindrag; -unsigned char thresh, upthresh; -unsigned char ztime, jenks; -unsigned char drift_time; +struct trackpoint_data { +u8 variant_id; +u8 firmware_id; + +u8 sensitivity, speed, inertia, reach; +u8 draghys, mindrag; +u8 thresh, upthresh; +u8 ztime, jenks; +u8 drift_time;/* toggles */ -unsigned char press_to_select; -unsigned char skipback; -unsigned char ext_dev; +bool press_to_select; +bool skipback; +bool ext_dev; };#ifdef CONFIG_MOUSE_PS2_TRACKPOINT --To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.htmlSignature · 5 lines
Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov
maintainerQuoted 11 lines · On January 21, 2018 12:37:01 PM PST, [email protected] wrote:
Quoted 5 lines · Dmitry Torokhov
Hi Ulrik,
On Sun, Jan 14, 2018 at 09:39:59PM +0100, [email protected]
Quoted 4 lines · wrote:
Quoted 2 lines
Hi Dmitry, Sebastian,
Nack for the patch..NAK because of the issue pointed by Sebastian, or bigger
Quoted 10 lines
disagreement?
I originally had 2 reasons:
1) issue pointed out by Sebastian, of course easy to fix
2) The remark I had below which was because I did not understand yet the reason
why you made this patch in the first place. I now understand it is not the
purpose to change anything for the Lenovo e470/e570 and it will also not change
anything for those if you at least fix nr 1)
I see. Yes, I did fix the problem mentioned by sensation of course, I did not bother posting updated patch because the change is trivial.
Thanks.
Signature · 1 line
Dmitry
Dmitry Torokhov
maintainerQuoted 23 lines · Dmitry Torokhov
Quoted 11 lines · On January 21, 2018 12:37:01 PM PST, [email protected] wrote:
Quoted 5 lines · Dmitry Torokhov
Hi Ulrik,
On Sun, Jan 14, 2018 at 09:39:59PM +0100, [email protected]
Quoted 4 lines · wrote:
Quoted 2 lines
Hi Dmitry, Sebastian,
Nack for the patch..NAK because of the issue pointed by Sebastian, or bigger
Quoted 10 lines
disagreement?
I originally had 2 reasons:
1) issue pointed out by Sebastian, of course easy to fix
2) The remark I had below which was because I did not understand yet the reason
why you made this patch in the first place. I now understand it is not the
purpose to change anything for the Lenovo e470/e570 and it will also not change
anything for those if you at least fix nr 1)
Quoted 1 line
I see. Yes, I did fix the problem mentioned by sensation of course, I did not bother posting updated patch because the change is trivial.
Gah, that should have read "Sebastian", not "sensation". Damn phones and their swipe/autocorrect keyboards.
Signature · 1 line
Dmitry