Commit f69c1f0f authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: atkbd - harden ACK/NAK and command processing logic

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 2da8c34a
...@@ -173,8 +173,7 @@ static unsigned char atkbd_scroll_keys[5][2] = { ...@@ -173,8 +173,7 @@ static unsigned char atkbd_scroll_keys[5][2] = {
#define ATKBD_FLAG_ACK 0 /* Waiting for ACK/NAK */ #define ATKBD_FLAG_ACK 0 /* Waiting for ACK/NAK */
#define ATKBD_FLAG_CMD 1 /* Waiting for command to finish */ #define ATKBD_FLAG_CMD 1 /* Waiting for command to finish */
#define ATKBD_FLAG_CMD1 2 /* First byte of command response */ #define ATKBD_FLAG_CMD1 2 /* First byte of command response */
#define ATKBD_FLAG_ID 3 /* First byte is not keyboard ID */ #define ATKBD_FLAG_ENABLED 3 /* Waining for init to finish */
#define ATKBD_FLAG_ENABLED 4 /* Waining for init to finish */
/* /*
* The atkbd control structure * The atkbd control structure
...@@ -254,34 +253,30 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, ...@@ -254,34 +253,30 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
atkbd->resend = 0; atkbd->resend = 0;
#endif #endif
if (test_bit(ATKBD_FLAG_ACK, &atkbd->flags)) if (test_bit(ATKBD_FLAG_ACK, &atkbd->flags)) {
switch (code) { switch (code) {
case ATKBD_RET_ACK: case ATKBD_RET_ACK:
atkbd->nak = 0; atkbd->nak = 0;
if (atkbd->cmdcnt) { if (atkbd->cmdcnt) {
set_bit(ATKBD_FLAG_CMD, &atkbd->flags); set_bit(ATKBD_FLAG_CMD, &atkbd->flags);
set_bit(ATKBD_FLAG_CMD1, &atkbd->flags); set_bit(ATKBD_FLAG_CMD1, &atkbd->flags);
set_bit(ATKBD_FLAG_ID, &atkbd->flags);
} }
clear_bit(ATKBD_FLAG_ACK, &atkbd->flags); clear_bit(ATKBD_FLAG_ACK, &atkbd->flags);
goto out; break;
case ATKBD_RET_NAK: case ATKBD_RET_NAK:
atkbd->nak = 1; atkbd->nak = 1;
clear_bit(ATKBD_FLAG_ACK, &atkbd->flags); clear_bit(ATKBD_FLAG_ACK, &atkbd->flags);
break;
}
goto out; goto out;
} }
if (test_bit(ATKBD_FLAG_CMD, &atkbd->flags)) { if (test_bit(ATKBD_FLAG_CMD, &atkbd->flags)) {
atkbd->cmdcnt--; if (atkbd->cmdcnt)
atkbd->cmdbuf[atkbd->cmdcnt] = code; atkbd->cmdbuf[--atkbd->cmdcnt] = code;
if (atkbd->cmdcnt == 1) {
if (code != 0xab && code != 0xac)
clear_bit(ATKBD_FLAG_ID, &atkbd->flags);
clear_bit(ATKBD_FLAG_CMD1, &atkbd->flags); clear_bit(ATKBD_FLAG_CMD1, &atkbd->flags);
}
if (!atkbd->cmdcnt) if (!atkbd->cmdcnt)
clear_bit(ATKBD_FLAG_CMD, &atkbd->flags); clear_bit(ATKBD_FLAG_CMD, &atkbd->flags);
...@@ -426,14 +421,14 @@ static int atkbd_sendbyte(struct atkbd *atkbd, unsigned char byte) ...@@ -426,14 +421,14 @@ static int atkbd_sendbyte(struct atkbd *atkbd, unsigned char byte)
#ifdef ATKBD_DEBUG #ifdef ATKBD_DEBUG
printk(KERN_DEBUG "atkbd.c: Sent: %02x\n", byte); printk(KERN_DEBUG "atkbd.c: Sent: %02x\n", byte);
#endif #endif
atkbd->nak = 1;
set_bit(ATKBD_FLAG_ACK, &atkbd->flags); set_bit(ATKBD_FLAG_ACK, &atkbd->flags);
clear_bit(ATKBD_FLAG_CMD, &atkbd->flags);
if (serio_write(atkbd->serio, byte))
return -1;
while (test_bit(ATKBD_FLAG_ACK, &atkbd->flags) && timeout--) udelay(1);
clear_bit(ATKBD_FLAG_ACK, &atkbd->flags);
if (serio_write(atkbd->serio, byte) == 0)
while (test_bit(ATKBD_FLAG_ACK, &atkbd->flags) && timeout--)
udelay(1);
clear_bit(ATKBD_FLAG_ACK, &atkbd->flags);
return -atkbd->nak; return -atkbd->nak;
} }
...@@ -447,24 +442,27 @@ static int atkbd_command(struct atkbd *atkbd, unsigned char *param, int command) ...@@ -447,24 +442,27 @@ static int atkbd_command(struct atkbd *atkbd, unsigned char *param, int command)
int timeout = 500000; /* 500 msec */ int timeout = 500000; /* 500 msec */
int send = (command >> 12) & 0xf; int send = (command >> 12) & 0xf;
int receive = (command >> 8) & 0xf; int receive = (command >> 8) & 0xf;
int rc = -1;
int i; int i;
atkbd->cmdcnt = receive;
if (command == ATKBD_CMD_RESET_BAT) if (command == ATKBD_CMD_RESET_BAT)
timeout = 4000000; /* 4 sec */ timeout = 4000000; /* 4 sec */
clear_bit(ATKBD_FLAG_CMD, &atkbd->flags);
if (receive && param) if (receive && param)
for (i = 0; i < receive; i++) for (i = 0; i < receive; i++)
atkbd->cmdbuf[(receive - 1) - i] = param[i]; atkbd->cmdbuf[(receive - 1) - i] = param[i];
atkbd->cmdcnt = receive;
if (command & 0xff) if (command & 0xff)
if (atkbd_sendbyte(atkbd, command & 0xff)) if (atkbd_sendbyte(atkbd, command & 0xff))
return -1; goto out;
for (i = 0; i < send; i++) for (i = 0; i < send; i++)
if (atkbd_sendbyte(atkbd, param[i])) if (atkbd_sendbyte(atkbd, param[i]))
return -1; goto out;
while (test_bit(ATKBD_FLAG_CMD, &atkbd->flags) && timeout--) { while (test_bit(ATKBD_FLAG_CMD, &atkbd->flags) && timeout--) {
...@@ -473,7 +471,13 @@ static int atkbd_command(struct atkbd *atkbd, unsigned char *param, int command) ...@@ -473,7 +471,13 @@ static int atkbd_command(struct atkbd *atkbd, unsigned char *param, int command)
if (command == ATKBD_CMD_RESET_BAT && timeout > 100000) if (command == ATKBD_CMD_RESET_BAT && timeout > 100000)
timeout = 100000; timeout = 100000;
if (command == ATKBD_CMD_GETID && !test_bit(ATKBD_FLAG_ID, &atkbd->flags)) { if (command == ATKBD_CMD_GETID &&
atkbd->cmdbuf[receive - 1] != 0xab && atkbd->cmdbuf[receive - 1] != 0xac) {
/*
* Device behind the port is not a keyboard
* so we don't need to wait for the 2nd byte
* of ID response.
*/
clear_bit(ATKBD_FLAG_CMD, &atkbd->flags); clear_bit(ATKBD_FLAG_CMD, &atkbd->flags);
atkbd->cmdcnt = 0; atkbd->cmdcnt = 0;
break; break;
...@@ -483,19 +487,20 @@ static int atkbd_command(struct atkbd *atkbd, unsigned char *param, int command) ...@@ -483,19 +487,20 @@ static int atkbd_command(struct atkbd *atkbd, unsigned char *param, int command)
udelay(1); udelay(1);
} }
clear_bit(ATKBD_FLAG_CMD, &atkbd->flags);
if (param) if (param)
for (i = 0; i < receive; i++) for (i = 0; i < receive; i++)
param[i] = atkbd->cmdbuf[(receive - 1) - i]; param[i] = atkbd->cmdbuf[(receive - 1) - i];
if (command == ATKBD_CMD_RESET_BAT && atkbd->cmdcnt == 1) if (atkbd->cmdcnt && (command != ATKBD_CMD_RESET_BAT || atkbd->cmdcnt != 1))
return 0; goto out;
if (atkbd->cmdcnt) rc = 0;
return -1;
return 0; out:
clear_bit(ATKBD_FLAG_CMD, &atkbd->flags);
clear_bit(ATKBD_FLAG_CMD1, &atkbd->flags);
return rc;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment