samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

Merge "msm: ipa3: Fix to avoid gsi/sys len stats mismatch"

Telusuri Sumber
This commit is contained in:
qctecmdr
2020-07-08 08:08:10 -07:00
committed by Gerrit - the friendly Code Review server
orang tua 8bb9e5aa2e dfa193fcfc
melakukan c81a5ae586
2 mengubah file dengan 36 tambahan dan 8 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/platform/msm/gsi/gsi.c
Melihat File

@@ -537,9 +537,14 @@ static void gsi_process_chan(struct gsi_xfer_compl_evt *evt,
ch_ctx->ring.rp_local = rp;
}
/* the element at RP is also processed */
gsi_incr_ring_rp(&ch_ctx->ring);
/*
* Increment RP local only in polling context to avoid
* sys len mismatch.
*/
if (!(callback && ch_ctx->props.dir ==
GSI_CHAN_DIR_FROM_GSI))
/* the element at RP is also processed */
gsi_incr_ring_rp(&ch_ctx->ring);
ch_ctx->ring.rp = ch_ctx->ring.rp_local;
rp_idx = gsi_find_idx_from_addr(&ch_ctx->ring, rp);
@@ -549,11 +554,20 @@ static void gsi_process_chan(struct gsi_xfer_compl_evt *evt,
notify->veid = evt->veid;
}
ch_ctx->stats.completed++;
WARN_ON(!ch_ctx->user_data[rp_idx].valid);
notify->xfer_user_data = ch_ctx->user_data[rp_idx].p;
ch_ctx->user_data[rp_idx].valid = false;
/*
* In suspend just before stopping the channel possible to receive
* the IEOB interrupt and xfer pointer will not be processed in this
* mode and moving channel poll mode. In resume after starting the
* channel will receive the IEOB interrupt and xfer pointer will be
* overwritten. To avoid this process all data in polling context.
*/
if (!(callback && ch_ctx->props.dir == GSI_CHAN_DIR_FROM_GSI)) {
ch_ctx->stats.completed++;
ch_ctx->user_data[rp_idx].valid = false;
}
notify->chan_user_data = ch_ctx->props.chan_user_data;
notify->evt_id = evt->code;
@@ -572,10 +586,18 @@ static void gsi_process_evt_re(struct gsi_evt_ctx *ctx,
struct gsi_chan_xfer_notify *notify, bool callback)
{
struct gsi_xfer_compl_evt *evt;
struct gsi_chan_ctx *ch_ctx;
evt = (struct gsi_xfer_compl_evt *)(ctx->ring.base_va +
ctx->ring.rp_local - ctx->ring.base);
gsi_process_chan(evt, notify, callback);
/*
* Increment RP local only in polling context to avoid
* sys len mismatch.
*/
ch_ctx = &gsi_ctx->chan[evt->chid];
if (callback && ch_ctx->props.dir == GSI_CHAN_DIR_FROM_GSI)
return;
gsi_incr_ring_rp(&ctx->ring);
/* recycle this element */
gsi_incr_ring_wp(&ctx->ring);

12
drivers/platform/msm/ipa/ipa_v3/ipa_dp.c
Melihat File

@@ -4594,8 +4594,14 @@ static void ipa_gsi_irq_rx_notify_cb(struct gsi_chan_xfer_notify *notify)
sys = (struct ipa3_sys_context *)notify->chan_user_data;
sys->ep->xfer_notify_valid = true;
/*
* In suspend just before stopping the channel possible to receive
* the IEOB interrupt and xfer pointer will not be processed in this
* mode and moving channel poll mode. In resume after starting the
* channel will receive the IEOB interrupt and xfer pointer will be
* overwritten. To avoid this process all data in polling context.
*/
sys->ep->xfer_notify_valid = false;
sys->ep->xfer_notify = *notify;
switch (notify->evt_id) {
@@ -4630,7 +4636,7 @@ static void ipa_dma_gsi_irq_rx_notify_cb(struct gsi_chan_xfer_notify *notify)
return;
}
sys->ep->xfer_notify_valid = true;
sys->ep->xfer_notify_valid = false;
sys->ep->xfer_notify = *notify;
switch (notify->evt_id) {