Merge "msm: ipa: Fix updating the repl_trig_thresh for LAN_CONS" into msm-4.9 (47d9972f) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/platform/msm/ipa/ipa_v2/ipa_dp.c

+3 −3

Original line number	Diff line number	Diff line
		/* 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
		* it under the terms of the GNU General Public License version 2 and
		@@ -3142,6 +3142,8 @@ static int ipa_assign_policy_v2(struct ipa_sys_connect_params *in,
		IPA_GENERIC_AGGR_TIME_LIMIT;
		if (in->client == IPA_CLIENT_APPS_LAN_CONS) {
		sys->pyld_hdlr = ipa_lan_rx_pyld_hdlr;
		sys->rx_pool_sz =
		ipa_ctx->lan_rx_ring_size;
		if (nr_cpu_ids > 1) {
		sys->repl_hdlr =
		ipa_fast_replenish_rx_cache;
		@@ -3151,8 +3153,6 @@ static int ipa_assign_policy_v2(struct ipa_sys_connect_params *in,
		sys->repl_hdlr =
		ipa_replenish_rx_cache;
		}
		sys->rx_pool_sz =
		ipa_ctx->lan_rx_ring_size;
		in->ipa_ep_cfg.aggr.aggr_byte_limit =
		IPA_GENERIC_AGGR_BYTE_LIMIT;
		in->ipa_ep_cfg.aggr.aggr_pkt_limit =

+2 −1

Original line number	Diff line number	Diff line
		@@ -5156,7 +5156,8 @@ int ipa2_bind_api_controller(enum ipa_hw_type ipa_hw_type,
		*/
		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,
		IPA_YELLOW_MARKER_SYS_CFG_OFST);
		} else {