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

Merge "msm: ipa: Fix updating the repl_trig_thresh for LAN_CONS"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-08 15:47:21 -08:00 • committed by Gerrit - the friendly Code Review server
commit 2e21181dde
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/platform/msm/ipa/ipa_v2/ipa_dp.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -3147,6 +3147,8 @@ static int ipa_assign_policy_v2(struct ipa_sys_connect_params *in,
IPA_GENERIC_AGGR_TIME_LIMIT; IPA_GENERIC_AGGR_TIME_LIMIT;
if (in->client == IPA_CLIENT_APPS_LAN_CONS) { if (in->client == IPA_CLIENT_APPS_LAN_CONS) {
sys->pyld_hdlr = ipa_lan_rx_pyld_hdlr; sys->pyld_hdlr = ipa_lan_rx_pyld_hdlr;
sys->rx_pool_sz =
ipa_ctx->lan_rx_ring_size;
if (nr_cpu_ids > 1) { if (nr_cpu_ids > 1) {
sys->repl_hdlr = sys->repl_hdlr =
ipa_fast_replenish_rx_cache; ipa_fast_replenish_rx_cache;
@ -3156,8 +3158,6 @@ static int ipa_assign_policy_v2(struct ipa_sys_connect_params *in,
sys->repl_hdlr = sys->repl_hdlr =
ipa_replenish_rx_cache; ipa_replenish_rx_cache;
} }
sys->rx_pool_sz =
ipa_ctx->lan_rx_ring_size;
in->ipa_ep_cfg.aggr.aggr_byte_limit = in->ipa_ep_cfg.aggr.aggr_byte_limit =
IPA_GENERIC_AGGR_BYTE_LIMIT; IPA_GENERIC_AGGR_BYTE_LIMIT;
in->ipa_ep_cfg.aggr.aggr_pkt_limit = in->ipa_ep_cfg.aggr.aggr_pkt_limit =

3
drivers/platform/msm/ipa/ipa_v2/ipa_utils.c
View file

@ -5161,7 +5161,8 @@ int ipa2_bind_api_controller(enum ipa_hw_type ipa_hw_type,
*/ */
u32 ipa_get_sys_yellow_wm(struct ipa_sys_context *sys) u32 ipa_get_sys_yellow_wm(struct ipa_sys_context *sys)
{ {
if (ipa_ctx->ipa_hw_type == IPA_HW_v2_6L) { if (ipa_ctx->ipa_hw_type == IPA_HW_v2_6L &&
ipa_ctx->ipa_uc_monitor_holb) {
return ipa_read_reg(ipa_ctx->mmio, return ipa_read_reg(ipa_ctx->mmio,
IPA_YELLOW_MARKER_SYS_CFG_OFST); IPA_YELLOW_MARKER_SYS_CFG_OFST);
} else { } else {