Support TrackStick of Thinkpad L570

Commit Message

Masaki Ota Nov. 29, 2017, 8:33 a.m. UTC

From: Masaki Ota <[e-mail]>
- The issue is that Thinkpad L570 TrackStick does not work. Because the main interface of Thinkpad L570 device is SMBus, so ALPS overlooked PS2 interface Firmware setting of TrackStick. The detail is that TrackStick otp bit is disabled.
- Add the code that checks 0xD7 address value. This value is device number information, so we can identify the device by checking this value.
- If we check 0xD7 value, we need to enable Command mode and after check the value we need to disable Command mode, then we have to enable the device(0xF4 command).
- Thinkpad L570 device number is 0x0C or 0x1D. If it is TRUE, enable ALPS_DUALPOINT flag.

Signed-off-by: Masaki Ota <[e-mail]>
---
 drivers/input/mouse/alps.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

Comments

Aaron Ma Nov. 30, 2017, 7:55 a.m. UTC | #1

Please add the patch version next time.

The patch make trackstick work on L570.

Tested-by: Aaron Ma <[e-mail]>

On 11/29/2017 04:33 PM, Masaki Ota wrote:
> From: Masaki Ota <[e-mail]>
> - The issue is that Thinkpad L570 TrackStick does not work. Because the main interface of Thinkpad L570 device is SMBus, so ALPS overlooked PS2 interface Firmware setting of TrackStick. The detail is that TrackStick otp bit is disabled.
> - Add the code that checks 0xD7 address value. This value is device number information, so we can identify the device by checking this value.
> - If we check 0xD7 value, we need to enable Command mode and after check the value we need to disable Command mode, then we have to enable the device(0xF4 command).
> - Thinkpad L570 device number is 0x0C or 0x1D. If it is TRUE, enable ALPS_DUALPOINT flag.
> 
> Signed-off-by: Masaki Ota <[e-mail]>
> ---
>  drivers/input/mouse/alps.c | 24 +++++++++++++++++++++---
>  1 file changed, 21 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> index 850b00e3ad8e..6f092bdd9fc5 100644
> --- a/drivers/input/mouse/alps.c
> +++ b/drivers/input/mouse/alps.c
> @@ -2541,13 +2541,31 @@ static int alps_update_btn_info_ss4_v2(unsigned char otp[][4],
>  }
>  
>  static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],
> -				       struct alps_data *priv)
> +				       struct alps_data *priv,
> +					struct psmouse *psmouse)
>  {
>  	bool is_dual = false;
> +	int reg_val = 0;
> +	struct ps2dev *ps2dev = &psmouse->ps2dev;
>  
> -	if (IS_SS4PLUS_DEV(priv->dev_id))
> +	if (IS_SS4PLUS_DEV(priv->dev_id)) {
>  		is_dual = (otp[0][0] >> 4) & 0x01;
>  
> +		if (!is_dual) {
> +			/* For support TrackStick of Thinkpad L/E series */
> +			if (alps_exit_command_mode(psmouse) == 0 &&
> +				alps_enter_command_mode(psmouse) == 0) {
> +				reg_val = alps_command_mode_read_reg(psmouse,
> +									0xD7);
> +			}
> +			alps_exit_command_mode(psmouse);
> +			ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);
> +
> +			if (reg_val == 0x0C || reg_val == 0x1D)
> +				is_dual = true;
> +		}
> +	}
> +
>  	if (is_dual)
>  		priv->flags |= ALPS_DUALPOINT |
>  					ALPS_DUALPOINT_WITH_PRESSURE;
> @@ -2570,7 +2588,7 @@ static int alps_set_defaults_ss4_v2(struct psmouse *psmouse,
>  
>  	alps_update_btn_info_ss4_v2(otp, priv);
>  
> -	alps_update_dual_info_ss4_v2(otp, priv);
> +	alps_update_dual_info_ss4_v2(otp, priv, psmouse);
>  
>  	return 0;
>  }
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Jonathan Liu Dec. 1, 2017, 1:26 p.m. UTC | #2

Hi Masaki,

On 29 November 2017 at 19:33, Masaki Ota <[e-mail]> wrote:
> From: Masaki Ota <[e-mail]>
> - The issue is that Thinkpad L570 TrackStick does not work. Because the main interface of Thinkpad L570 device is SMBus, so ALPS overlooked PS2 interface Firmware setting of TrackStick. The detail is that TrackStick otp bit is disabled.
> - Add the code that checks 0xD7 address value. This value is device number information, so we can identify the device by checking this value.
> - If we check 0xD7 value, we need to enable Command mode and after check the value we need to disable Command mode, then we have to enable the device(0xF4 command).
> - Thinkpad L570 device number is 0x0C or 0x1D. If it is TRUE, enable ALPS_DUALPOINT flag.
>
> Signed-off-by: Masaki Ota <[e-mail]>
> ---
>  drivers/input/mouse/alps.c | 24 +++++++++++++++++++++---
>  1 file changed, 21 insertions(+), 3 deletions(-)

Tested-by: Jonathan Liu <[e-mail]>

This fixes trackstick and physical left/middle/right mouse buttons
above touchpad on Lenovo ThinkPad E570p laptop for me.

Regards,
Jonathan
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Pali Rohár Dec. 1, 2017, 9:07 p.m. UTC | #3

On Wednesday 29 November 2017 17:33:58 Masaki Ota wrote:
> From: Masaki Ota <[e-mail]>
> - The issue is that Thinkpad L570 TrackStick does not work. Because the main interface of Thinkpad L570 device is SMBus, so ALPS overlooked PS2 interface Firmware setting of TrackStick. The detail is that TrackStick otp bit is disabled.
> - Add the code that checks 0xD7 address value. This value is device number information, so we can identify the device by checking this value.
> - If we check 0xD7 value, we need to enable Command mode and after check the value we need to disable Command mode, then we have to enable the device(0xF4 command).
> - Thinkpad L570 device number is 0x0C or 0x1D. If it is TRUE, enable ALPS_DUALPOINT flag.
> 
> Signed-off-by: Masaki Ota <[e-mail]>
> ---
>  drivers/input/mouse/alps.c | 24 +++++++++++++++++++++---
>  1 file changed, 21 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> index 850b00e3ad8e..6f092bdd9fc5 100644
> --- a/drivers/input/mouse/alps.c
> +++ b/drivers/input/mouse/alps.c
> @@ -2541,13 +2541,31 @@ static int alps_update_btn_info_ss4_v2(unsigned char otp[][4],
>  }
>  
>  static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],
> -				       struct alps_data *priv)
> +				       struct alps_data *priv,
> +					struct psmouse *psmouse)
>  {
>  	bool is_dual = false;
> +	int reg_val = 0;
> +	struct ps2dev *ps2dev = &psmouse->ps2dev;
>  
> -	if (IS_SS4PLUS_DEV(priv->dev_id))
> +	if (IS_SS4PLUS_DEV(priv->dev_id)) {
>  		is_dual = (otp[0][0] >> 4) & 0x01;
>  
> +		if (!is_dual) {
> +			/* For support TrackStick of Thinkpad L/E series */
> +			if (alps_exit_command_mode(psmouse) == 0 &&
> +				alps_enter_command_mode(psmouse) == 0) {
> +				reg_val = alps_command_mode_read_reg(psmouse,
> +									0xD7);
> +			}
> +			alps_exit_command_mode(psmouse);
> +			ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);
> +
> +			if (reg_val == 0x0C || reg_val == 0x1D)
> +				is_dual = true;
> +		}
> +	}
> +
>  	if (is_dual)
>  		priv->flags |= ALPS_DUALPOINT |
>  					ALPS_DUALPOINT_WITH_PRESSURE;
> @@ -2570,7 +2588,7 @@ static int alps_set_defaults_ss4_v2(struct psmouse *psmouse,
>  
>  	alps_update_btn_info_ss4_v2(otp, priv);
>  
> -	alps_update_dual_info_ss4_v2(otp, priv);
> +	alps_update_dual_info_ss4_v2(otp, priv, psmouse);

Now looking at this change... Is there reason why you are passing
psmouse parameter there? Because struct alps_data contains psmouse
member.

>  
>  	return 0;
>  }

Masaki Ota Dec. 4, 2017, 4:48 a.m. UTC | #4

Hi, Pali,

I don't get your point.
Please modify the code if you have an idea.

Best Regards,
Masaki Ota
-----Original Message-----
From: Pali Rohár [mailto:[e-mail]] 

Sent: Saturday, December 02, 2017 6:08 AM
To: Masaki Ota <[e-mail]>
Cc: [e-mail]; [e-mail]; [e-mail]; [e-mail]; 太田 真喜 Masaki Ota <[e-mail]>; [e-mail]; [e-mail]
Subject: Re: [PATCH] Support TrackStick of Thinkpad L570

On Wednesday 29 November 2017 17:33:58 Masaki Ota wrote:
> From: Masaki Ota <[e-mail]>

> - The issue is that Thinkpad L570 TrackStick does not work. Because the main interface of Thinkpad L570 device is SMBus, so ALPS overlooked PS2 interface Firmware setting of TrackStick. The detail is that TrackStick otp bit is disabled.

> - Add the code that checks 0xD7 address value. This value is device number information, so we can identify the device by checking this value.

> - If we check 0xD7 value, we need to enable Command mode and after check the value we need to disable Command mode, then we have to enable the device(0xF4 command).

> - Thinkpad L570 device number is 0x0C or 0x1D. If it is TRUE, enable ALPS_DUALPOINT flag.

> 

> Signed-off-by: Masaki Ota <[e-mail]>

> ---

>  drivers/input/mouse/alps.c | 24 +++++++++++++++++++++---

>  1 file changed, 21 insertions(+), 3 deletions(-)

> 

> diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c 

> index 850b00e3ad8e..6f092bdd9fc5 100644

> --- a/drivers/input/mouse/alps.c

> +++ b/drivers/input/mouse/alps.c

> @@ -2541,13 +2541,31 @@ static int 

> alps_update_btn_info_ss4_v2(unsigned char otp[][4],  }

>  

>  static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],

> -				       struct alps_data *priv)

> +				       struct alps_data *priv,

> +					struct psmouse *psmouse)

>  {

>  	bool is_dual = false;

> +	int reg_val = 0;

> +	struct ps2dev *ps2dev = &psmouse->ps2dev;

>  

> -	if (IS_SS4PLUS_DEV(priv->dev_id))

> +	if (IS_SS4PLUS_DEV(priv->dev_id)) {

>  		is_dual = (otp[0][0] >> 4) & 0x01;

>  

> +		if (!is_dual) {

> +			/* For support TrackStick of Thinkpad L/E series */

> +			if (alps_exit_command_mode(psmouse) == 0 &&

> +				alps_enter_command_mode(psmouse) == 0) {

> +				reg_val = alps_command_mode_read_reg(psmouse,

> +									0xD7);

> +			}

> +			alps_exit_command_mode(psmouse);

> +			ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);

> +

> +			if (reg_val == 0x0C || reg_val == 0x1D)

> +				is_dual = true;

> +		}

> +	}

> +

>  	if (is_dual)

>  		priv->flags |= ALPS_DUALPOINT |

>  					ALPS_DUALPOINT_WITH_PRESSURE;

> @@ -2570,7 +2588,7 @@ static int alps_set_defaults_ss4_v2(struct 

> psmouse *psmouse,

>  

>  	alps_update_btn_info_ss4_v2(otp, priv);

>  

> -	alps_update_dual_info_ss4_v2(otp, priv);

> +	alps_update_dual_info_ss4_v2(otp, priv, psmouse);


Now looking at this change... Is there reason why you are passing psmouse parameter there? Because struct alps_data contains psmouse member.

>  

>  	return 0;

>  }


--
Pali Rohár
[e-mail]

Pali Rohár Dec. 4, 2017, 9:11 a.m. UTC | #5

On Monday 04 December 2017 04:48:43 Masaki Ota wrote:
> Hi, Pali,
> 
> I don't get your point.
> Please modify the code if you have an idea.

See below

> Best Regards,
> Masaki Ota
> -----Original Message-----
> From: Pali Rohár [mailto:[e-mail]] 
> Sent: Saturday, December 02, 2017 6:08 AM
> To: Masaki Ota <[e-mail]>
> Cc: [e-mail]; [e-mail]; [e-mail]; [e-mail]; 太田 真喜 Masaki Ota <[e-mail]>; [e-mail]; [e-mail]
> Subject: Re: [PATCH] Support TrackStick of Thinkpad L570
> 
> On Wednesday 29 November 2017 17:33:58 Masaki Ota wrote:
> > From: Masaki Ota <[e-mail]>
> > - The issue is that Thinkpad L570 TrackStick does not work. Because the main interface of Thinkpad L570 device is SMBus, so ALPS overlooked PS2 interface Firmware setting of TrackStick. The detail is that TrackStick otp bit is disabled.
> > - Add the code that checks 0xD7 address value. This value is device number information, so we can identify the device by checking this value.
> > - If we check 0xD7 value, we need to enable Command mode and after check the value we need to disable Command mode, then we have to enable the device(0xF4 command).
> > - Thinkpad L570 device number is 0x0C or 0x1D. If it is TRUE, enable ALPS_DUALPOINT flag.
> > 
> > Signed-off-by: Masaki Ota <[e-mail]>
> > ---
> >  drivers/input/mouse/alps.c | 24 +++++++++++++++++++++---
> >  1 file changed, 21 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c 
> > index 850b00e3ad8e..6f092bdd9fc5 100644
> > --- a/drivers/input/mouse/alps.c
> > +++ b/drivers/input/mouse/alps.c
> > @@ -2541,13 +2541,31 @@ static int 
> > alps_update_btn_info_ss4_v2(unsigned char otp[][4],  }
> >  
> >  static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],
> > -				       struct alps_data *priv)
> > +				       struct alps_data *priv,
> > +					struct psmouse *psmouse)
> >  {

You can access psmouse from the priv structure as:

  struct psmouse *psmouse = priv->psmouse;

Therefore you do not have to extend function parameters with psmouse
pointer as that is already present int alps_data.

struct alps_data is defined as:

struct alps_data {
	struct psmouse *psmouse;
	...
}

> >  	bool is_dual = false;
> > +	int reg_val = 0;
> > +	struct ps2dev *ps2dev = &psmouse->ps2dev;
> >  
> > -	if (IS_SS4PLUS_DEV(priv->dev_id))
> > +	if (IS_SS4PLUS_DEV(priv->dev_id)) {
> >  		is_dual = (otp[0][0] >> 4) & 0x01;
> >  
> > +		if (!is_dual) {
> > +			/* For support TrackStick of Thinkpad L/E series */
> > +			if (alps_exit_command_mode(psmouse) == 0 &&
> > +				alps_enter_command_mode(psmouse) == 0) {
> > +				reg_val = alps_command_mode_read_reg(psmouse,
> > +									0xD7);
> > +			}
> > +			alps_exit_command_mode(psmouse);
> > +			ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);
> > +
> > +			if (reg_val == 0x0C || reg_val == 0x1D)
> > +				is_dual = true;
> > +		}
> > +	}
> > +
> >  	if (is_dual)
> >  		priv->flags |= ALPS_DUALPOINT |
> >  					ALPS_DUALPOINT_WITH_PRESSURE;
> > @@ -2570,7 +2588,7 @@ static int alps_set_defaults_ss4_v2(struct 
> > psmouse *psmouse,
> >  
> >  	alps_update_btn_info_ss4_v2(otp, priv);
> >  
> > -	alps_update_dual_info_ss4_v2(otp, priv);
> > +	alps_update_dual_info_ss4_v2(otp, priv, psmouse);
> 
> Now looking at this change... Is there reason why you are passing psmouse parameter there? Because struct alps_data contains psmouse member.
> 
> >  
> >  	return 0;
> >  }
> 
> --
> Pali Rohár
> [e-mail]

Masaki Ota Dec. 4, 2017, 9:40 a.m. UTC | #6

Hi, Pali,

It does not work in my test result.

BTW, other some functions also use both of "struct psmouse" and "struct alps_data" argument.
I just followed it.

Best Regards,
Masaki Ota
-----Original Message-----
From: Pali Rohár [mailto:[e-mail]] 

Sent: Monday, December 04, 2017 6:12 PM
To: 太田 真喜 Masaki Ota <[e-mail]>
Cc: Masaki Ota <[e-mail]>; [e-mail]; [e-mail]; [e-mail]; [e-mail]; [e-mail]; [e-mail]
Subject: Re: [PATCH] Support TrackStick of Thinkpad L570

On Monday 04 December 2017 04:48:43 Masaki Ota wrote:
> Hi, Pali,

> 

> I don't get your point.

> Please modify the code if you have an idea.


See below

> Best Regards,

> Masaki Ota

> -----Original Message-----

> From: Pali Rohár [mailto:[e-mail]]

> Sent: Saturday, December 02, 2017 6:08 AM

> To: Masaki Ota <[e-mail]>

> Cc: [e-mail]; [e-mail]; 

> [e-mail]; [e-mail]; 太田 真喜 Masaki Ota 

> <[e-mail]>; [e-mail]; 

> [e-mail]

> Subject: Re: [PATCH] Support TrackStick of Thinkpad L570

> 

> On Wednesday 29 November 2017 17:33:58 Masaki Ota wrote:

> > From: Masaki Ota <[e-mail]>

> > - The issue is that Thinkpad L570 TrackStick does not work. Because the main interface of Thinkpad L570 device is SMBus, so ALPS overlooked PS2 interface Firmware setting of TrackStick. The detail is that TrackStick otp bit is disabled.

> > - Add the code that checks 0xD7 address value. This value is device number information, so we can identify the device by checking this value.

> > - If we check 0xD7 value, we need to enable Command mode and after check the value we need to disable Command mode, then we have to enable the device(0xF4 command).

> > - Thinkpad L570 device number is 0x0C or 0x1D. If it is TRUE, enable ALPS_DUALPOINT flag.

> > 

> > Signed-off-by: Masaki Ota <[e-mail]>

> > ---

> >  drivers/input/mouse/alps.c | 24 +++++++++++++++++++++---

> >  1 file changed, 21 insertions(+), 3 deletions(-)

> > 

> > diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c 

> > index 850b00e3ad8e..6f092bdd9fc5 100644

> > --- a/drivers/input/mouse/alps.c

> > +++ b/drivers/input/mouse/alps.c

> > @@ -2541,13 +2541,31 @@ static int

> > alps_update_btn_info_ss4_v2(unsigned char otp[][4],  }

> >  

> >  static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],

> > -				       struct alps_data *priv)

> > +				       struct alps_data *priv,

> > +					struct psmouse *psmouse)

> >  {


You can access psmouse from the priv structure as:

  struct psmouse *psmouse = priv->psmouse;

Therefore you do not have to extend function parameters with psmouse pointer as that is already present int alps_data.

struct alps_data is defined as:

struct alps_data {
	struct psmouse *psmouse;
	...
}

> >  	bool is_dual = false;

> > +	int reg_val = 0;

> > +	struct ps2dev *ps2dev = &psmouse->ps2dev;

> >  

> > -	if (IS_SS4PLUS_DEV(priv->dev_id))

> > +	if (IS_SS4PLUS_DEV(priv->dev_id)) {

> >  		is_dual = (otp[0][0] >> 4) & 0x01;

> >  

> > +		if (!is_dual) {

> > +			/* For support TrackStick of Thinkpad L/E series */

> > +			if (alps_exit_command_mode(psmouse) == 0 &&

> > +				alps_enter_command_mode(psmouse) == 0) {

> > +				reg_val = alps_command_mode_read_reg(psmouse,

> > +									0xD7);

> > +			}

> > +			alps_exit_command_mode(psmouse);

> > +			ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);

> > +

> > +			if (reg_val == 0x0C || reg_val == 0x1D)

> > +				is_dual = true;

> > +		}

> > +	}

> > +

> >  	if (is_dual)

> >  		priv->flags |= ALPS_DUALPOINT |

> >  					ALPS_DUALPOINT_WITH_PRESSURE;

> > @@ -2570,7 +2588,7 @@ static int alps_set_defaults_ss4_v2(struct 

> > psmouse *psmouse,

> >  

> >  	alps_update_btn_info_ss4_v2(otp, priv);

> >  

> > -	alps_update_dual_info_ss4_v2(otp, priv);

> > +	alps_update_dual_info_ss4_v2(otp, priv, psmouse);

> 

> Now looking at this change... Is there reason why you are passing psmouse parameter there? Because struct alps_data contains psmouse member.

> 

> >  

> >  	return 0;

> >  }

> 

> --

> Pali Rohár

> [e-mail]


--
Pali Rohár
[e-mail]

Pali Rohár Dec. 4, 2017, 9:50 a.m. UTC | #7

On Monday 04 December 2017 09:40:04 Masaki Ota wrote:
> Hi, Pali,
> 
> It does not work in my test result.

Hm.. that is strange, we have dangling pointers in struct alps_data?
Otherwise I have no idea why does not work.

> BTW, other some functions also use both of "struct psmouse" and "struct alps_data" argument.

It does not make sense to pass one structure (via pointers) two times.
And if this "pattern" is already used in code and reason is that one
pointer "does not work" because it is dangling, then it is really wrong.

I know it is irrelevant to your patch, but this problem with dangling
pointer should be fixed, e.g. in next patches (not in this one).

Problems (with memory allocation/pointers) should not be camouflaged.
Memory corruption in kernel can lead to fatal problems.

> I just followed it.

Blindly following bad code is a bad idea. When we see something like
this, we should at least stop and ask question "why is this code pattern
used?".

> Best Regards,
> Masaki Ota
> -----Original Message-----
> From: Pali Rohár [mailto:[e-mail]] 
> Sent: Monday, December 04, 2017 6:12 PM
> To: 太田 真喜 Masaki Ota <[e-mail]>
> Cc: Masaki Ota <[e-mail]>; [e-mail]; [e-mail]; [e-mail]; [e-mail]; [e-mail]; [e-mail]
> Subject: Re: [PATCH] Support TrackStick of Thinkpad L570
> 
> On Monday 04 December 2017 04:48:43 Masaki Ota wrote:
> > Hi, Pali,
> > 
> > I don't get your point.
> > Please modify the code if you have an idea.
> 
> See below
> 
> > Best Regards,
> > Masaki Ota
> > -----Original Message-----
> > From: Pali Rohár [mailto:[e-mail]]
> > Sent: Saturday, December 02, 2017 6:08 AM
> > To: Masaki Ota <[e-mail]>
> > Cc: [e-mail]; [e-mail]; 
> > [e-mail]; [e-mail]; 太田 真喜 Masaki Ota 
> > <[e-mail]>; [e-mail]; 
> > [e-mail]
> > Subject: Re: [PATCH] Support TrackStick of Thinkpad L570
> > 
> > On Wednesday 29 November 2017 17:33:58 Masaki Ota wrote:
> > > From: Masaki Ota <[e-mail]>
> > > - The issue is that Thinkpad L570 TrackStick does not work. Because the main interface of Thinkpad L570 device is SMBus, so ALPS overlooked PS2 interface Firmware setting of TrackStick. The detail is that TrackStick otp bit is disabled.
> > > - Add the code that checks 0xD7 address value. This value is device number information, so we can identify the device by checking this value.
> > > - If we check 0xD7 value, we need to enable Command mode and after check the value we need to disable Command mode, then we have to enable the device(0xF4 command).
> > > - Thinkpad L570 device number is 0x0C or 0x1D. If it is TRUE, enable ALPS_DUALPOINT flag.
> > > 
> > > Signed-off-by: Masaki Ota <[e-mail]>
> > > ---
> > >  drivers/input/mouse/alps.c | 24 +++++++++++++++++++++---
> > >  1 file changed, 21 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c 
> > > index 850b00e3ad8e..6f092bdd9fc5 100644
> > > --- a/drivers/input/mouse/alps.c
> > > +++ b/drivers/input/mouse/alps.c
> > > @@ -2541,13 +2541,31 @@ static int
> > > alps_update_btn_info_ss4_v2(unsigned char otp[][4],  }
> > >  
> > >  static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],
> > > -				       struct alps_data *priv)
> > > +				       struct alps_data *priv,
> > > +					struct psmouse *psmouse)
> > >  {
> 
> You can access psmouse from the priv structure as:
> 
>   struct psmouse *psmouse = priv->psmouse;
> 
> Therefore you do not have to extend function parameters with psmouse pointer as that is already present int alps_data.
> 
> struct alps_data is defined as:
> 
> struct alps_data {
> 	struct psmouse *psmouse;
> 	...
> }
> 
> > >  	bool is_dual = false;
> > > +	int reg_val = 0;
> > > +	struct ps2dev *ps2dev = &psmouse->ps2dev;
> > >  
> > > -	if (IS_SS4PLUS_DEV(priv->dev_id))
> > > +	if (IS_SS4PLUS_DEV(priv->dev_id)) {
> > >  		is_dual = (otp[0][0] >> 4) & 0x01;
> > >  
> > > +		if (!is_dual) {
> > > +			/* For support TrackStick of Thinkpad L/E series */
> > > +			if (alps_exit_command_mode(psmouse) == 0 &&
> > > +				alps_enter_command_mode(psmouse) == 0) {
> > > +				reg_val = alps_command_mode_read_reg(psmouse,
> > > +									0xD7);
> > > +			}
> > > +			alps_exit_command_mode(psmouse);
> > > +			ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);
> > > +
> > > +			if (reg_val == 0x0C || reg_val == 0x1D)
> > > +				is_dual = true;
> > > +		}
> > > +	}
> > > +
> > >  	if (is_dual)
> > >  		priv->flags |= ALPS_DUALPOINT |
> > >  					ALPS_DUALPOINT_WITH_PRESSURE;
> > > @@ -2570,7 +2588,7 @@ static int alps_set_defaults_ss4_v2(struct 
> > > psmouse *psmouse,
> > >  
> > >  	alps_update_btn_info_ss4_v2(otp, priv);
> > >  
> > > -	alps_update_dual_info_ss4_v2(otp, priv);
> > > +	alps_update_dual_info_ss4_v2(otp, priv, psmouse);
> > 
> > Now looking at this change... Is there reason why you are passing psmouse parameter there? Because struct alps_data contains psmouse member.
> > 
> > >  
> > >  	return 0;
> > >  }
> > 
> > --
> > Pali Rohár
> > [e-mail]
> 
> --
> Pali Rohár
> [e-mail]

Masaki Ota Dec. 5, 2017, 8:29 a.m. UTC | #8

Hi, Pali,

OK, I got it.
So, the problem of structure will be solved next chance.

Best Regards,
Masaki Ota
-----Original Message-----
From: Pali Rohár [mailto:[e-mail]] 

Sent: Monday, December 04, 2017 6:51 PM
To: 太田 真喜 Masaki Ota <[e-mail]>
Cc: Masaki Ota <[e-mail]>; [e-mail]; [e-mail]; [e-mail]; [e-mail]; [e-mail]; [e-mail]
Subject: Re: [PATCH] Support TrackStick of Thinkpad L570

On Monday 04 December 2017 09:40:04 Masaki Ota wrote:
> Hi, Pali,

> 

> It does not work in my test result.


Hm.. that is strange, we have dangling pointers in struct alps_data?
Otherwise I have no idea why does not work.

> BTW, other some functions also use both of "struct psmouse" and "struct alps_data" argument.


It does not make sense to pass one structure (via pointers) two times.
And if this "pattern" is already used in code and reason is that one pointer "does not work" because it is dangling, then it is really wrong.

I know it is irrelevant to your patch, but this problem with dangling pointer should be fixed, e.g. in next patches (not in this one).

Problems (with memory allocation/pointers) should not be camouflaged.
Memory corruption in kernel can lead to fatal problems.

> I just followed it.


Blindly following bad code is a bad idea. When we see something like this, we should at least stop and ask question "why is this code pattern used?".

> Best Regards,

> Masaki Ota

> -----Original Message-----

> From: Pali Rohár [mailto:[e-mail]]

> Sent: Monday, December 04, 2017 6:12 PM

> To: 太田 真喜 Masaki Ota <[e-mail]>

> Cc: Masaki Ota <[e-mail]>; [e-mail]; 

> [e-mail]; [e-mail]; 

> [e-mail]; [e-mail]; 

> [e-mail]

> Subject: Re: [PATCH] Support TrackStick of Thinkpad L570

> 

> On Monday 04 December 2017 04:48:43 Masaki Ota wrote:

> > Hi, Pali,

> > 

> > I don't get your point.

> > Please modify the code if you have an idea.

> 

> See below

> 

> > Best Regards,

> > Masaki Ota

> > -----Original Message-----

> > From: Pali Rohár [mailto:[e-mail]]

> > Sent: Saturday, December 02, 2017 6:08 AM

> > To: Masaki Ota <[e-mail]>

> > Cc: [e-mail]; [e-mail]; 

> > [e-mail]; [e-mail]; 太田 真喜 Masaki Ota 

> > <[e-mail]>; [e-mail]; 

> > [e-mail]

> > Subject: Re: [PATCH] Support TrackStick of Thinkpad L570

> > 

> > On Wednesday 29 November 2017 17:33:58 Masaki Ota wrote:

> > > From: Masaki Ota <[e-mail]>

> > > - The issue is that Thinkpad L570 TrackStick does not work. Because the main interface of Thinkpad L570 device is SMBus, so ALPS overlooked PS2 interface Firmware setting of TrackStick. The detail is that TrackStick otp bit is disabled.

> > > - Add the code that checks 0xD7 address value. This value is device number information, so we can identify the device by checking this value.

> > > - If we check 0xD7 value, we need to enable Command mode and after check the value we need to disable Command mode, then we have to enable the device(0xF4 command).

> > > - Thinkpad L570 device number is 0x0C or 0x1D. If it is TRUE, enable ALPS_DUALPOINT flag.

> > > 

> > > Signed-off-by: Masaki Ota <[e-mail]>

> > > ---

> > >  drivers/input/mouse/alps.c | 24 +++++++++++++++++++++---

> > >  1 file changed, 21 insertions(+), 3 deletions(-)

> > > 

> > > diff --git a/drivers/input/mouse/alps.c 

> > > b/drivers/input/mouse/alps.c index 850b00e3ad8e..6f092bdd9fc5 

> > > 100644

> > > --- a/drivers/input/mouse/alps.c

> > > +++ b/drivers/input/mouse/alps.c

> > > @@ -2541,13 +2541,31 @@ static int 

> > > alps_update_btn_info_ss4_v2(unsigned char otp[][4],  }

> > >  

> > >  static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],

> > > -				       struct alps_data *priv)

> > > +				       struct alps_data *priv,

> > > +					struct psmouse *psmouse)

> > >  {

> 

> You can access psmouse from the priv structure as:

> 

>   struct psmouse *psmouse = priv->psmouse;

> 

> Therefore you do not have to extend function parameters with psmouse pointer as that is already present int alps_data.

> 

> struct alps_data is defined as:

> 

> struct alps_data {

> 	struct psmouse *psmouse;

> 	...

> }

> 

> > >  	bool is_dual = false;

> > > +	int reg_val = 0;

> > > +	struct ps2dev *ps2dev = &psmouse->ps2dev;

> > >  

> > > -	if (IS_SS4PLUS_DEV(priv->dev_id))

> > > +	if (IS_SS4PLUS_DEV(priv->dev_id)) {

> > >  		is_dual = (otp[0][0] >> 4) & 0x01;

> > >  

> > > +		if (!is_dual) {

> > > +			/* For support TrackStick of Thinkpad L/E series */

> > > +			if (alps_exit_command_mode(psmouse) == 0 &&

> > > +				alps_enter_command_mode(psmouse) == 0) {

> > > +				reg_val = alps_command_mode_read_reg(psmouse,

> > > +									0xD7);

> > > +			}

> > > +			alps_exit_command_mode(psmouse);

> > > +			ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);

> > > +

> > > +			if (reg_val == 0x0C || reg_val == 0x1D)

> > > +				is_dual = true;

> > > +		}

> > > +	}

> > > +

> > >  	if (is_dual)

> > >  		priv->flags |= ALPS_DUALPOINT |

> > >  					ALPS_DUALPOINT_WITH_PRESSURE; @@ -2570,7 +2588,7 @@ static 

> > > int alps_set_defaults_ss4_v2(struct psmouse *psmouse,

> > >  

> > >  	alps_update_btn_info_ss4_v2(otp, priv);

> > >  

> > > -	alps_update_dual_info_ss4_v2(otp, priv);

> > > +	alps_update_dual_info_ss4_v2(otp, priv, psmouse);

> > 

> > Now looking at this change... Is there reason why you are passing psmouse parameter there? Because struct alps_data contains psmouse member.

> > 

> > >  

> > >  	return 0;

> > >  }

> > 

> > --

> > Pali Rohár

> > [e-mail]

> 

> --

> Pali Rohár

> [e-mail]


--
Pali Rohár
[e-mail]

Patch

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 850b00e3ad8e..6f092bdd9fc5 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -2541,13 +2541,31 @@  static int alps_update_btn_info_ss4_v2(unsigned char otp[][4],
 }
 
 static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],
-				       struct alps_data *priv)
+				       struct alps_data *priv,
+					struct psmouse *psmouse)
 {
 	bool is_dual = false;
+	int reg_val = 0;
+	struct ps2dev *ps2dev = &psmouse->ps2dev;
 
-	if (IS_SS4PLUS_DEV(priv->dev_id))
+	if (IS_SS4PLUS_DEV(priv->dev_id)) {
 		is_dual = (otp[0][0] >> 4) & 0x01;
 
+		if (!is_dual) {
+			/* For support TrackStick of Thinkpad L/E series */
+			if (alps_exit_command_mode(psmouse) == 0 &&
+				alps_enter_command_mode(psmouse) == 0) {
+				reg_val = alps_command_mode_read_reg(psmouse,
+									0xD7);
+			}
+			alps_exit_command_mode(psmouse);
+			ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE);
+
+			if (reg_val == 0x0C || reg_val == 0x1D)
+				is_dual = true;
+		}
+	}
+
 	if (is_dual)
 		priv->flags |= ALPS_DUALPOINT |
 					ALPS_DUALPOINT_WITH_PRESSURE;
@@ -2570,7 +2588,7 @@  static int alps_set_defaults_ss4_v2(struct psmouse *psmouse,
 
 	alps_update_btn_info_ss4_v2(otp, priv);
 
-	alps_update_dual_info_ss4_v2(otp, priv);
+	alps_update_dual_info_ss4_v2(otp, priv, psmouse);
 
 	return 0;
 }