Merge tag 'LA.UM.9.14.r1-22000-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/dataipa into android13-5.4-lahaina

"LA.UM.9.14.r1-22000-LAHAINA.QSSI12.0"

* tag 'LA.UM.9.14.r1-22000-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/dataipa:
  msm: ipa3: Adding changes to increase workqueue priority
  msm: ipa3: fix pointer arithmetic to avoid out-of-bound
  msm: ipa3: Removing assert in halt q6 channel failed cases.

Change-Id: I9e71c61d64302bbbe37297de84e616abd3fd6da1
This commit is contained in:
Michael Bestas 2023-07-11 15:52:40 +03:00
commit ce16abb069
No known key found for this signature in database
GPG Key ID: CC95044519BE6669
2 changed files with 5 additions and 5 deletions

View File

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/clk.h>
@ -3674,7 +3675,6 @@ static void ipa3_halt_q6_gsi_channels(bool prod)
gsi_ep_cfg->ipa_gsi_chan_num,
gsi_ep_cfg->ee,
code);
ipa_assert();
}
}
}
@ -7595,8 +7595,8 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,
atomic_set(&ipa3_ctx->ipa3_active_clients.cnt, 1);
/* Create workqueues for power management */
ipa3_ctx->power_mgmt_wq =
create_singlethread_workqueue("ipa_power_mgmt");
ipa3_ctx->power_mgmt_wq = alloc_workqueue("ipa_power_mgmt",
WQ_MEM_RECLAIM | WQ_UNBOUND | WQ_SYSFS | WQ_HIGHPRI, 1);
if (!ipa3_ctx->power_mgmt_wq) {
IPAERR("failed to create power mgmt wq\n");
result = -ENOMEM;

View File

@ -7281,7 +7281,7 @@ void ipa3_counter_remove_hdl(int hdl)
offset = counter->hw_counter.start_id - 1;
if (offset >= 0 && (offset + counter->hw_counter.num_counters)
< IPA_FLT_RT_HW_COUNTER) {
memset(&ipa3_ctx->flt_rt_counters.used_hw + offset,
memset(&ipa3_ctx->flt_rt_counters.used_hw[offset],
0, counter->hw_counter.num_counters * sizeof(bool));
} else {
IPAERR_RL("unexpected hdl %d\n", hdl);
@ -7290,7 +7290,7 @@ void ipa3_counter_remove_hdl(int hdl)
offset = counter->sw_counter.start_id - 1 - IPA_FLT_RT_HW_COUNTER;
if (offset >= 0 && (offset + counter->sw_counter.num_counters)
< IPA_FLT_RT_SW_COUNTER) {
memset(&ipa3_ctx->flt_rt_counters.used_sw + offset,
memset(&ipa3_ctx->flt_rt_counters.used_sw[offset],
0, counter->sw_counter.num_counters * sizeof(bool));
} else {
IPAERR_RL("unexpected hdl %d\n", hdl);