Input: cypress_ps2 - clean up setting reporting rate
Subsystems (2)
Dmitry Torokhov
maintainerPATCH 1/5 Input: cypress_ps2 - clean up setting reporting rate
Casting an integer field containing desired rate to a pointer to bytes works on little endian architectures where the driver is used, but not a good practice. Use a temporary of proper type instead.
--- drivers/input/mouse/cypress_ps2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/input/mouse/cypress_ps2.c +3 -2
@@ -612,6 +612,7 @@ static psmouse_ret_t cypress_protocol_handler(struct psmouse *psmouse)static void cypress_set_rate (struct psmouse *psmouse,unsigned int rate) {struct cytp_data *cytp = psmouse->private; +u8 rate_param;if (rate >=80 ) { psmouse->rate =80 ;
@@ -621,8 +622,8 @@ static void cypress_set_rate(struct psmouse *psmouse, unsigned int rate) cytp->mode &= ~CYTP_BIT_HIGH_RATE ; } -ps2_command (&psmouse->ps2dev, (unsigned char *)&psmouse->rate, -PSMOUSE_CMD_SETRATE ); + rate_param = (u8 )rate; +ps2_command (&psmouse->ps2dev, &rate_param,PSMOUSE_CMD_SETRATE ); }static void cypress_disconnect (struct psmouse *psmouse)
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Dmitry Torokhov
maintainerPATCH 2/5 Input: cypress_ps2 - fix error handling when sending command fails
Stop layering error handling in cypress_ps2_sendbyte() and simply pass on error code from ps2_sendbyte() and use it in the callers.
This fixes mishandling of error condition in cypress_ps2_read_cmd_status() which expects errors to be negative.
--- drivers/input/mouse/cypress_ps2.c | 32 +++++++++++++++---------------- drivers/input/mouse/cypress_ps2.h | 6 ------ 2 files changed, 15 insertions(+), 23 deletions(-)
drivers/input/mouse/cypress_ps2.c +15 -17
@@ -38,15 +38,14 @@ static const unsigned char cytp_resolution[] = {0x00, 0x01, 0x02, 0x03};static int cypress_ps2_sendbyte (struct psmouse *psmouse,int value) {struct ps2dev *ps2dev = &psmouse->ps2dev; +int error; -if (ps2_sendbyte (ps2dev, value &0xff ,CYTP_CMD_TIMEOUT ) <0 ) { + error =ps2_sendbyte (ps2dev, value &0xff ,CYTP_CMD_TIMEOUT ); +if (error) {psmouse_dbg (psmouse, -"sending command 0x%02x failed, resp 0x%02x\n" , - value &0xff , ps2dev->nak); -if (ps2dev->nak ==CYTP_PS2_RETRY ) -return CYTP_PS2_RETRY ; -else -return CYTP_PS2_ERROR ; +"sending command 0x%02x failed, resp 0x%02x, error %d\n" , + value &0xff , ps2dev->nak, error); +return error; }#ifdef CYTP_DEBUG_VERBOSE
@@ -73,21 +72,20 @@ static int cypress_ps2_ext_cmd(struct psmouse *psmouse, unsigned short cmd,* to make the device return to the ready state. */ rc =cypress_ps2_sendbyte (psmouse, cmd &0xff ); -if (rc ==CYTP_PS2_RETRY ) { +if (rc == -EAGAIN ) { rc =cypress_ps2_sendbyte (psmouse,0x00 ); -if (rc ==CYTP_PS2_RETRY ) +if (rc == -EAGAIN ) rc =cypress_ps2_sendbyte (psmouse,0x0a ); } -if (rc ==CYTP_PS2_ERROR ) -continue ; - rc =cypress_ps2_sendbyte (psmouse, data); -if (rc ==CYTP_PS2_RETRY ) +if (!rc) { rc =cypress_ps2_sendbyte (psmouse, data); -if (rc ==CYTP_PS2_ERROR ) -continue ; -else -break ; +if (rc == -EAGAIN ) + rc =cypress_ps2_sendbyte (psmouse, data); + +if (!rc) +break ; + } }while (--tries >0 );ps2_end_command (ps2dev);
drivers/input/mouse/cypress_ps2.h +0 -6
@@ -72,12 +72,6 @@#define CYTP_DATA_TIMEOUT 30#define CYTP_EXT_CMD 0xe8 -#define CYTP_PS2_RETRY 0xfe -#define CYTP_PS2_ERROR 0xfc - -#define CYTP_RESP_RETRY 0x01 -#define CYTP_RESP_ERROR 0xfe -#define CYTP_105001_WIDTH 97/* Dell XPS 13 */ #define CYTP_105001_HIGH 59
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Dmitry Torokhov
maintainerPATCH 3/5 Input: cypress_ps2 - report timeouts when reading command status
In reply to Dmitry TorokhovReport -ETIMEDOUT error code from cypress_ps2_read_cmd_status() when device does not send enough data within the allotted time in response to a command.
--- drivers/input/mouse/cypress_ps2.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/input/mouse/cypress_ps2.c +6 -3
@@ -115,9 +115,12 @@ static int cypress_ps2_read_cmd_status(struct psmouse *psmouse,if (rc <0 ) goto out; -wait_event_timeout (ps2dev->wait, - (psmouse->pktcnt >= pktsize), -msecs_to_jiffies (CYTP_CMD_TIMEOUT )); +if (!wait_event_timeout (ps2dev->wait, + psmouse->pktcnt >= pktsize, +msecs_to_jiffies (CYTP_CMD_TIMEOUT ))) { + rc = -ETIMEDOUT ; + goto out; + }memcpy (param, psmouse->packet, pktsize);
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Dmitry Torokhov
maintainerPATCH 4/5 Input: cypress_ps2 - propagate errors from lower layers
In reply to Dmitry TorokhovDo not override errors reported by lower layers with generic "-1", but propagate them to the callers. Change the checks for errors to be in the form of "if (error)" to maintain consistency.
--- drivers/input/mouse/cypress_ps2.c | 62 +++++++++++++++++-------------- 1 file changed, 35 insertions(+), 27 deletions(-)
drivers/input/mouse/cypress_ps2.c +35 -27
@@ -97,10 +97,10 @@ static int cypress_ps2_read_cmd_status(struct psmouse *psmouse,unsigned char cmd, unsigned char *param) { - int rc; struct ps2dev *ps2dev = &psmouse->ps2dev;enum psmouse_state old_state;int pktsize; +int rc;ps2_begin_command (ps2dev);
@@ -112,7 +112,7 @@ static int cypress_ps2_read_cmd_status(struct psmouse *psmouse,memset (param,0 , pktsize); rc =cypress_ps2_sendbyte (psmouse,0xe9 ); -if (rc <0 ) +if (rc) goto out; if (!wait_event_timeout(ps2dev->wait,
@@ -322,15 +322,15 @@ static int cypress_read_tp_metrics(struct psmouse *psmouse)static int cypress_query_hardware (struct psmouse *psmouse) { -int ret; +int error; - ret =cypress_read_fw_version (psmouse); -if (ret) -return ret; + error =cypress_read_fw_version (psmouse); +if (error) +return error; - ret =cypress_read_tp_metrics (psmouse); -if (ret) -return ret; + error =cypress_read_tp_metrics (psmouse); +if (error) +return error;return 0 ; }
@@ -339,9 +339,12 @@ static int cypress_set_absolute_mode(struct psmouse *psmouse) {struct cytp_data *cytp = psmouse->private;unsigned char param[3 ]; +int error; -if (cypress_send_ext_cmd (psmouse,CYTP_CMD_ABS_WITH_PRESSURE_MODE , param) <0 ) -return -1 ; + error =cypress_send_ext_cmd (psmouse,CYTP_CMD_ABS_WITH_PRESSURE_MODE , + param); +if (error) +return error; cytp->mode = (cytp->mode & ~CYTP_BIT_ABS_REL_MASK ) |CYTP_BIT_ABS_PRESSURE ;
@@ -366,7 +369,7 @@ static void cypress_reset(struct psmouse *psmouse)static int cypress_set_input_params (struct input_dev *input,struct cytp_data *cytp) { -int ret; +int error;if (!cytp->tp_res_x || !cytp->tp_res_y)return -EINVAL ;
@@ -383,10 +386,10 @@ static int cypress_set_input_params(struct input_dev *input,input_set_abs_params (input,ABS_MT_POSITION_Y ,0 , cytp->tp_max_abs_y,0 ,0 );input_set_abs_params (input,ABS_MT_PRESSURE ,0 ,255 ,0 ,0 ); - ret =input_mt_init_slots (input,CYTP_MAX_MT_SLOTS , -INPUT_MT_DROP_UNUSED |INPUT_MT_TRACK ); -if (ret <0 ) -return ret; + error =input_mt_init_slots (input,CYTP_MAX_MT_SLOTS , +INPUT_MT_DROP_UNUSED |INPUT_MT_TRACK ); +if (error) +return error;__set_bit (INPUT_PROP_SEMI_MT , input->propbit);
@@ -637,21 +640,22 @@ static void cypress_disconnect(struct psmouse *psmouse)static int cypress_reconnect (struct psmouse *psmouse) {int tries =CYTP_PS2_CMD_TRIES ; -int rc; +int error;do {cypress_reset (psmouse); - rc =cypress_detect (psmouse, false); - }while (rc && (--tries >0 )); + error =cypress_detect (psmouse, false); + }while (error && (--tries >0 )); -if (rc) { +if (error) {psmouse_err (psmouse,"Reconnect: unable to detect trackpad.\n" ); -return -1 ; +return error; } -if (cypress_set_absolute_mode (psmouse)) { + error =cypress_set_absolute_mode (psmouse); +if (error) {psmouse_err (psmouse,"Reconnect: Unable to initialize Cypress absolute mode.\n" ); -return -1 ; +return error; }return 0 ;
@@ -660,6 +664,7 @@ static int cypress_reconnect(struct psmouse *psmouse)int cypress_init (struct psmouse *psmouse) {struct cytp_data *cytp; +int error; cytp =kzalloc (sizeof (*cytp),GFP_KERNEL );if (!cytp)
@@ -670,17 +675,20 @@ int cypress_init(struct psmouse *psmouse)cypress_reset (psmouse); -if (cypress_query_hardware (psmouse)) { + error =cypress_query_hardware (psmouse); +if (error) {psmouse_err (psmouse,"Unable to query Trackpad hardware.\n" ); goto err_exit; } -if (cypress_set_absolute_mode (psmouse)) { + error =cypress_set_absolute_mode (psmouse); +if (error) {psmouse_err (psmouse,"init: Unable to initialize Cypress absolute mode.\n" ); goto err_exit; } -if (cypress_set_input_params (psmouse->dev, cytp) <0 ) { + error =cypress_set_input_params (psmouse->dev, cytp); +if (error) {psmouse_err (psmouse,"init: Unable to set input params.\n" ); goto err_exit; }
@@ -705,5 +713,5 @@ int cypress_init(struct psmouse *psmouse) psmouse->private =NULL ;kfree (cytp); -return -1 ; +return error; }
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Dmitry Torokhov
maintainerPATCH 5/5 Input: cypress_ps2 - use u8 when dealing with byte data
In reply to Dmitry TorokhovWhen dealing with byte data use u8 instead of unsigned char or int. Stop layering error handling in cypress_ps2_sendbyte() and simply pass on error code from ps2_sendbyte().
Additionally use u8 instead of unisgned char throughout the code.
--- drivers/input/mouse/cypress_ps2.c | 78 ++++++++++++++----------------- 1 file changed, 34 insertions(+), 44 deletions(-)
drivers/input/mouse/cypress_ps2.c +34 -44
@@ -32,32 +32,30 @@ static void cypress_set_packet_size(struct psmouse *psmouse, unsigned int n) cytp->pkt_size = n; } -static const unsigned char cytp_rate[] = {10 ,20 ,40 ,60 ,100 ,200 }; -static const unsigned char cytp_resolution[] = {0x00 ,0x01 ,0x02 ,0x03 }; +static const u8 cytp_rate[] = {10 ,20 ,40 ,60 ,100 ,200 }; +static const u8 cytp_resolution[] = {0x00 ,0x01 ,0x02 ,0x03 }; -static int cypress_ps2_sendbyte (struct psmouse *psmouse,int value) +static int cypress_ps2_sendbyte (struct psmouse *psmouse,u8 cmd) {struct ps2dev *ps2dev = &psmouse->ps2dev;int error; - error =ps2_sendbyte (ps2dev, value &0xff ,CYTP_CMD_TIMEOUT ); + error =ps2_sendbyte (ps2dev, cmd,CYTP_CMD_TIMEOUT );if (error) {psmouse_dbg (psmouse,"sending command 0x%02x failed, resp 0x%02x, error %d\n" , - value &0xff , ps2dev->nak, error); + cmd, ps2dev->nak, error);return error; }#ifdef CYTP_DEBUG_VERBOSE -psmouse_dbg (psmouse,"sending command 0x%02x succeeded, resp 0xfa\n" , - value &0xff ); +psmouse_dbg (psmouse,"sending command 0x%02x succeeded\n" , cmd);#endif return 0 ; } -static int cypress_ps2_ext_cmd (struct psmouse *psmouse,unsigned short cmd, -unsigned char data) +static int cypress_ps2_ext_cmd (struct psmouse *psmouse,u8 prefix,u8 nibble) {struct ps2dev *ps2dev = &psmouse->ps2dev;int tries =CYTP_PS2_CMD_TRIES ;
@@ -71,7 +69,7 @@ static int cypress_ps2_ext_cmd(struct psmouse *psmouse, unsigned short cmd,* If sending the command fails, send recovery command * to make the device return to the ready state. */ - rc =cypress_ps2_sendbyte (psmouse, cmd &0xff ); + rc =cypress_ps2_sendbyte (psmouse, prefix);if (rc == -EAGAIN ) { rc =cypress_ps2_sendbyte (psmouse,0x00 );if (rc == -EAGAIN )
@@ -79,9 +77,9 @@ static int cypress_ps2_ext_cmd(struct psmouse *psmouse, unsigned short cmd, }if (!rc) { - rc =cypress_ps2_sendbyte (psmouse, data); + rc =cypress_ps2_sendbyte (psmouse, nibble);if (rc == -EAGAIN ) - rc =cypress_ps2_sendbyte (psmouse, data); + rc =cypress_ps2_sendbyte (psmouse, nibble);if (!rc)break ;
@@ -94,8 +92,7 @@ static int cypress_ps2_ext_cmd(struct psmouse *psmouse, unsigned short cmd, }static int cypress_ps2_read_cmd_status (struct psmouse *psmouse, -unsigned char cmd, -unsigned char *param) +u8 cmd,u8 *param) {struct ps2dev *ps2dev = &psmouse->ps2dev;enum psmouse_state old_state;
@@ -111,7 +108,7 @@ static int cypress_ps2_read_cmd_status(struct psmouse *psmouse, pktsize = (cmd ==CYTP_CMD_READ_TP_METRICS ) ?8 :3 ;memset (param,0 , pktsize); - rc =cypress_ps2_sendbyte (psmouse,0xe9 ); + rc =cypress_ps2_sendbyte (psmouse,PSMOUSE_CMD_GETINFO &0xff );if (rc) goto out;
@@ -136,8 +133,7 @@ static int cypress_ps2_read_cmd_status(struct psmouse *psmouse,return rc; } -static bool cypress_verify_cmd_state (struct psmouse *psmouse, -unsigned char cmd,unsigned char *param) +static bool cypress_verify_cmd_state (struct psmouse *psmouse,u8 cmd,u8 * param) {bool rate_match = false;bool resolution_match = false;
@@ -167,31 +163,24 @@ static bool cypress_verify_cmd_state(struct psmouse *psmouse,return false; } -static int cypress_send_ext_cmd (struct psmouse *psmouse,unsigned char cmd, -unsigned char *param) +static int cypress_send_ext_cmd (struct psmouse *psmouse,u8 cmd,u8 *param) { +u8 cmd_prefix =PSMOUSE_CMD_SETRES &0xff ;int tries =CYTP_PS2_CMD_TRIES ; -int rc; +int error;psmouse_dbg (psmouse,"send extension cmd 0x%02x, [%d %d %d %d]\n" , cmd,DECODE_CMD_AA (cmd),DECODE_CMD_BB (cmd),DECODE_CMD_CC (cmd),DECODE_CMD_DD (cmd));do { -cypress_ps2_ext_cmd (psmouse, -PSMOUSE_CMD_SETRES ,DECODE_CMD_DD (cmd)); -cypress_ps2_ext_cmd (psmouse, -PSMOUSE_CMD_SETRES ,DECODE_CMD_CC (cmd)); -cypress_ps2_ext_cmd (psmouse, -PSMOUSE_CMD_SETRES ,DECODE_CMD_BB (cmd)); -cypress_ps2_ext_cmd (psmouse, -PSMOUSE_CMD_SETRES ,DECODE_CMD_AA (cmd)); - - rc =cypress_ps2_read_cmd_status (psmouse, cmd, param); -if (rc) -continue ; - -if (cypress_verify_cmd_state (psmouse, cmd, param)) +cypress_ps2_ext_cmd (psmouse, cmd_prefix,DECODE_CMD_DD (cmd)); +cypress_ps2_ext_cmd (psmouse, cmd_prefix,DECODE_CMD_CC (cmd)); +cypress_ps2_ext_cmd (psmouse, cmd_prefix,DECODE_CMD_BB (cmd)); +cypress_ps2_ext_cmd (psmouse, cmd_prefix,DECODE_CMD_AA (cmd)); + + error =cypress_ps2_read_cmd_status (psmouse, cmd, param); +if (!error &&cypress_verify_cmd_state (psmouse, cmd, param))return 0 ; }while (--tries >0 );
@@ -201,7 +190,7 @@ static int cypress_send_ext_cmd(struct psmouse *psmouse, unsigned char cmd,int cypress_detect (struct psmouse *psmouse,bool set_properties) { -unsigned char param[3 ]; +u8 param[3 ];if (cypress_send_ext_cmd (psmouse,CYTP_CMD_READ_CYPRESS_ID , param))return -ENODEV ;
@@ -221,7 +210,7 @@ int cypress_detect(struct psmouse *psmouse, bool set_properties)static int cypress_read_fw_version (struct psmouse *psmouse) {struct cytp_data *cytp = psmouse->private; -unsigned char param[3 ]; +u8 param[3 ];if (cypress_send_ext_cmd (psmouse,CYTP_CMD_READ_CYPRESS_ID , param))return -ENODEV ;
@@ -250,7 +239,7 @@ static int cypress_read_fw_version(struct psmouse *psmouse)static int cypress_read_tp_metrics (struct psmouse *psmouse) {struct cytp_data *cytp = psmouse->private; -unsigned char param[8 ]; +u8 param[8 ];/* set default values for tp metrics. */ cytp->tp_width =CYTP_DEFAULT_WIDTH ;
@@ -338,7 +327,7 @@ static int cypress_query_hardware(struct psmouse *psmouse)static int cypress_set_absolute_mode (struct psmouse *psmouse) {struct cytp_data *cytp = psmouse->private; -unsigned char param[3 ]; +u8 param[3 ];int error; error = cypress_send_ext_cmd(psmouse, CYTP_CMD_ABS_WITH_PRESSURE_MODE,
@@ -418,9 +407,9 @@ static int cypress_set_input_params(struct input_dev *input,return 0 ; } -static int cypress_get_finger_count (unsigned char header_byte) +static int cypress_get_finger_count (u8 header_byte) { -unsigned char bits6_7; +u8 bits6_7;int finger_count; bits6_7 = header_byte >>6 ;
@@ -445,10 +434,11 @@ static int cypress_get_finger_count(unsigned char header_byte)static int cypress_parse_packet (struct psmouse *psmouse, -struct cytp_data *cytp,struct cytp_report_data *report_data) +struct cytp_data *cytp, +struct cytp_report_data *report_data) { -unsigned char *packet = psmouse->packet; -unsigned char header_byte = packet[0 ]; +u8 *packet = psmouse->packet; +u8 header_byte = packet[0 ];memset (report_data,0 ,sizeof (struct cytp_report_data ));
@@ -563,7 +553,7 @@ static psmouse_ret_t cypress_validate_byte(struct psmouse *psmouse) {int contact_cnt;int index = psmouse->pktcnt -1 ; -unsigned char *packet = psmouse->packet; +u8 *packet = psmouse->packet;struct cytp_data *cytp = psmouse->private;if (index <0 || index > cytp->pkt_size)
Signature · 1 line
2.45.2.803.g4e1b14247a-goog