evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "diag: Set new context for peripheral error response"

Browse source
This commit is contained in:
Linux Build Service Account 2018-06-24 20:40:31 -07:00 • committed by Gerrit - the friendly Code Review server
commit 657cccf862
1 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
drivers/char/diag/diagfwd.c
View file

@ -48,6 +48,7 @@
#define STM_RSP_SUPPORTED_INDEX 7 #define STM_RSP_SUPPORTED_INDEX 7
#define STM_RSP_STATUS_INDEX 8 #define STM_RSP_STATUS_INDEX 8
#define STM_RSP_NUM_BYTES 9 #define STM_RSP_NUM_BYTES 9
#define RETRY_MAX_COUNT 1000
struct diag_md_hdlc_reset_work { struct diag_md_hdlc_reset_work {
int pid; int pid;
@ -272,28 +273,22 @@ static void pack_rsp_and_send(unsigned char *buf, int len,
diag_md_session_get_peripheral(APPS_DATA); diag_md_session_get_peripheral(APPS_DATA);
if (info && info->peripheral_mask) { if (info && info->peripheral_mask) {
if (info->peripheral_mask == DIAG_CON_ALL || for (i = 0; i < NUM_MD_SESSIONS; i++) {
(info->peripheral_mask & (1 << APPS_DATA)) || if (info->peripheral_mask & (1 << i))
(info->peripheral_mask & (1 << PERIPHERAL_MODEM))) { break;
rsp_ctxt = SET_BUF_CTXT(APPS_DATA, TYPE_CMD, 1);
} else {
for (i = 0; i <= NUM_PERIPHERALS; i++) {
if (info->peripheral_mask & (1 << i))
break;
}
rsp_ctxt = SET_BUF_CTXT(i, TYPE_CMD, 1);
} }
rsp_ctxt = SET_BUF_CTXT(i, TYPE_CMD, TYPE_CMD);
} else } else
rsp_ctxt = driver->rsp_buf_ctxt; rsp_ctxt = driver->rsp_buf_ctxt;
mutex_unlock(&driver->md_session_lock); mutex_unlock(&driver->md_session_lock);
/* /*
* Keep trying till we get the buffer back. It should probably * Keep trying till we get the buffer back. It should probably
* take one or two iterations. When this loops till UINT_MAX, it * take one or two iterations. When this loops till RETRY_MAX_COUNT, it
* means we did not get a write complete for the previous * means we did not get a write complete for the previous
* response. * response.
*/ */
while (retry_count < UINT_MAX) { while (retry_count < RETRY_MAX_COUNT) {
if (!driver->rsp_buf_busy) if (!driver->rsp_buf_busy)
break; break;
/* /*
@ -366,27 +361,21 @@ static void encode_rsp_and_send(unsigned char *buf, int len,
diag_md_session_get_peripheral(APPS_DATA); diag_md_session_get_peripheral(APPS_DATA);
if (info && info->peripheral_mask) { if (info && info->peripheral_mask) {
if (info->peripheral_mask == DIAG_CON_ALL || for (i = 0; i < NUM_MD_SESSIONS; i++) {
(info->peripheral_mask & (1 << APPS_DATA)) || if (info->peripheral_mask & (1 << i))
(info->peripheral_mask & (1 << PERIPHERAL_MODEM))) { break;
rsp_ctxt = SET_BUF_CTXT(APPS_DATA, TYPE_CMD, 1);
} else {
for (i = 0; i <= NUM_PERIPHERALS; i++) {
if (info->peripheral_mask & (1 << i))
break;
}
rsp_ctxt = SET_BUF_CTXT(i, TYPE_CMD, 1);
} }
rsp_ctxt = SET_BUF_CTXT(i, TYPE_CMD, TYPE_CMD);
} else } else
rsp_ctxt = driver->rsp_buf_ctxt; rsp_ctxt = driver->rsp_buf_ctxt;
mutex_unlock(&driver->md_session_lock); mutex_unlock(&driver->md_session_lock);
/* /*
* Keep trying till we get the buffer back. It should probably * Keep trying till we get the buffer back. It should probably
* take one or two iterations. When this loops till UINT_MAX, it * take one or two iterations. When this loops till RETRY_MAX_COUNT, it
* means we did not get a write complete for the previous * means we did not get a write complete for the previous
* response. * response.
*/ */
while (retry_count < UINT_MAX) { while (retry_count < RETRY_MAX_COUNT) {
if (!driver->rsp_buf_busy) if (!driver->rsp_buf_busy)
break; break;
/* /*
@ -1754,11 +1743,18 @@ static int diagfwd_mux_write_done(unsigned char *buf, int len, int buf_ctxt,
} }
break; break;
case TYPE_CMD: case TYPE_CMD:
if (peripheral >= 0 && peripheral < NUM_PERIPHERALS) { if (peripheral >= 0 && peripheral < NUM_PERIPHERALS &&
num != TYPE_CMD) {
DIAG_LOG(DIAG_DEBUG_PERIPHERALS,
"Marking buffer as free after write done p: %d, t: %d, buf_num: %d\n",
peripheral, type, num);
diagfwd_write_done(peripheral, type, num); diagfwd_write_done(peripheral, type, num);
} } else if (peripheral == APPS_DATA ||
if (peripheral == APPS_DATA || (peripheral >= 0 && peripheral < NUM_PERIPHERALS &&
ctxt == DIAG_MEMORY_DEVICE_MODE) { num == TYPE_CMD)) {
DIAG_LOG(DIAG_DEBUG_PERIPHERALS,
"Marking APPS response buffer free after write done for p: %d, t: %d, buf_num: %d\n",
peripheral, type, num);
spin_lock_irqsave(&driver->rsp_buf_busy_lock, flags); spin_lock_irqsave(&driver->rsp_buf_busy_lock, flags);
driver->rsp_buf_busy = 0; driver->rsp_buf_busy = 0;
driver->encoded_rsp_len = 0; driver->encoded_rsp_len = 0;