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

diag: Fix feature mask mismatch for peripherals

Browse source 
This patch adds a way to publish APPS support
of untagging header only to selected peripherals.

CRs-Fixed: 2030651
Change-Id: I2a2a03d0a6d441d23ec093ff5de9bef5e9799d24
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
This commit is contained in:
Manoj Prabhu B 2017-04-07 16:42:14 +05:30
parent 6319cf033b
commit 67d53d08d8
4 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/char/diag/diag_masks.c
View file

@ -456,8 +456,13 @@ static void diag_send_feature_mask_update(uint8_t peripheral)
DIAG_SET_FEATURE_MASK(F_DIAG_REQ_RSP_SUPPORT); DIAG_SET_FEATURE_MASK(F_DIAG_REQ_RSP_SUPPORT);
if (driver->supports_apps_hdlc_encoding) if (driver->supports_apps_hdlc_encoding)
DIAG_SET_FEATURE_MASK(F_DIAG_APPS_HDLC_ENCODE); DIAG_SET_FEATURE_MASK(F_DIAG_APPS_HDLC_ENCODE);
if (driver->supports_apps_header_untagging) if (driver->supports_apps_header_untagging) {
if (peripheral == PERIPHERAL_MODEM) {
DIAG_SET_FEATURE_MASK(F_DIAG_PKT_HEADER_UNTAG); DIAG_SET_FEATURE_MASK(F_DIAG_PKT_HEADER_UNTAG);
driver->peripheral_untag[peripheral] =
ENABLE_PKT_HEADER_UNTAGGING;
}
}
DIAG_SET_FEATURE_MASK(F_DIAG_MASK_CENTRALIZATION); DIAG_SET_FEATURE_MASK(F_DIAG_MASK_CENTRALIZATION);
if (driver->supports_sockets) if (driver->supports_sockets)
DIAG_SET_FEATURE_MASK(F_DIAG_SOCKETS_ENABLED); DIAG_SET_FEATURE_MASK(F_DIAG_SOCKETS_ENABLED);

1
drivers/char/diag/diagchar.h
View file

@ -503,6 +503,7 @@ struct diagchar_dev {
int supports_separate_cmdrsp; int supports_separate_cmdrsp;
int supports_apps_hdlc_encoding; int supports_apps_hdlc_encoding;
int supports_apps_header_untagging; int supports_apps_header_untagging;
int peripheral_untag[NUM_PERIPHERALS];
int supports_sockets; int supports_sockets;
/* The state requested in the STM command */ /* The state requested in the STM command */
int stm_state_requested[NUM_STM_PROCESSORS]; int stm_state_requested[NUM_STM_PROCESSORS];

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

@ -1588,6 +1588,8 @@ int diagfwd_init(void)
driver->supports_separate_cmdrsp = 1; driver->supports_separate_cmdrsp = 1;
driver->supports_apps_hdlc_encoding = 1; driver->supports_apps_hdlc_encoding = 1;
driver->supports_apps_header_untagging = 1; driver->supports_apps_header_untagging = 1;
for (i = 0; i < NUM_PERIPHERALS; i++)
driver->peripheral_untag[i] = 0;
mutex_init(&driver->diag_hdlc_mutex); mutex_init(&driver->diag_hdlc_mutex);
mutex_init(&driver->diag_cntl_mutex); mutex_init(&driver->diag_cntl_mutex);
mutex_init(&driver->mode_lock); mutex_init(&driver->mode_lock);

13
drivers/char/diag/diagfwd_peripheral.c
View file

@ -351,7 +351,8 @@ static void diagfwd_data_read_untag_done(struct diagfwd_info *fwd_info,
} }
if (driver->feature[fwd_info->peripheral].encode_hdlc && if (driver->feature[fwd_info->peripheral].encode_hdlc &&
driver->feature[fwd_info->peripheral].untag_header) { driver->feature[fwd_info->peripheral].untag_header &&
driver->peripheral_untag[fwd_info->peripheral]) {
mutex_lock(&driver->diagfwd_untag_mutex); mutex_lock(&driver->diagfwd_untag_mutex);
temp_buf_cpd = buf; temp_buf_cpd = buf;
temp_buf_main = buf; temp_buf_main = buf;
@ -1300,6 +1301,7 @@ static void diagfwd_queue_read(struct diagfwd_info *fwd_info)
void diagfwd_buffers_init(struct diagfwd_info *fwd_info) void diagfwd_buffers_init(struct diagfwd_info *fwd_info)
{ {
unsigned char *temp_buf; unsigned char *temp_buf;
uint8_t peripheral;
if (!fwd_info) if (!fwd_info)
return; return;
@ -1311,6 +1313,9 @@ void diagfwd_buffers_init(struct diagfwd_info *fwd_info)
} }
mutex_lock(&fwd_info->buf_mutex); mutex_lock(&fwd_info->buf_mutex);
peripheral = fwd_info->peripheral;
if (!fwd_info->buf_1) { if (!fwd_info->buf_1) {
fwd_info->buf_1 = kzalloc(sizeof(struct diagfwd_buf_t), fwd_info->buf_1 = kzalloc(sizeof(struct diagfwd_buf_t),
GFP_KERNEL); GFP_KERNEL);
@ -1352,7 +1357,8 @@ void diagfwd_buffers_init(struct diagfwd_info *fwd_info)
fwd_info->type, 2); fwd_info->type, 2);
} }
if (driver->feature[fwd_info->peripheral].untag_header) { if (driver->feature[peripheral].untag_header &&
driver->peripheral_untag[peripheral]) {
if (!fwd_info->buf_upd_1_a) { if (!fwd_info->buf_upd_1_a) {
fwd_info->buf_upd_1_a = fwd_info->buf_upd_1_a =
kzalloc(sizeof(struct diagfwd_buf_t), kzalloc(sizeof(struct diagfwd_buf_t),
@ -1426,7 +1432,8 @@ void diagfwd_buffers_init(struct diagfwd_info *fwd_info)
} }
if (driver->feature[fwd_info->peripheral]. if (driver->feature[fwd_info->peripheral].
untag_header) { untag_header &&
driver->peripheral_untag[peripheral]) {
if (!fwd_info->buf_upd_1_a->data_raw) { if (!fwd_info->buf_upd_1_a->data_raw) {
fwd_info->buf_upd_1_a->data_raw = fwd_info->buf_upd_1_a->data_raw =
kzalloc(PERIPHERAL_BUF_SZ + kzalloc(PERIPHERAL_BUF_SZ +