Merge 74fb08d85c on remote branch

Change-Id: I718dfd552603fc863d45745c7d80cfde7c1a535a
Dieser Commit ist enthalten in:
Linux Build Service Account
2024-08-14 07:17:24 -07:00
Commit c08ad74311
2 geänderte Dateien mit 10 neuen und 7 gelöschten Zeilen

Datei anzeigen

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <asm/barrier.h>
@@ -86,12 +86,12 @@ int ipa3_enable_data_path(u32 clnt_hdl)
holb_cfg.tmr_val = IPA_HOLB_TMR_VAL_4_5;
holb_cfg.en = IPA_HOLB_TMR_EN;
} else if ((ipa3_ctx->ipa_hw_type >= IPA_HW_v5_2) &&
(ep->client == IPA_CLIENT_USB_CONS)) {
(ep->client == IPA_CLIENT_USB_CONS ||
ep->client == IPA_CLIENT_APPS_WAN_CONS)) {
holb_cfg.tmr_val = IPA_HOLB_TMR_VAL_4_5;
holb_cfg.en = IPA_HOLB_TMR_EN;
} else if ((ipa3_ctx->ipa_hw_type >= IPA_HW_v5_5) &&
(ep->client == IPA_CLIENT_APPS_WAN_CONS ||
ep->client == IPA_CLIENT_APPS_WAN_COAL_CONS)) {
ep->client == IPA_CLIENT_APPS_WAN_COAL_CONS) {
holb_cfg.tmr_val = IPA_HOLB_TMR_VAL_4_5;
holb_cfg.en = IPA_HOLB_TMR_EN;
} else {

Datei anzeigen

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/debugfs.h>
@@ -1912,13 +1912,16 @@ int ipa_drop_stats_init(void)
pipe_bitmask[reg_idx] |= mask;
}
/* Add drop stats for WAN & WAN_COAL if IPA_HW >=5.5 */
if (ipa3_ctx->ipa_hw_type >= IPA_HW_v5_5) {
/* Add drop stats for WAN if IPA_HW >=5.2 */
if (ipa3_ctx->ipa_hw_type >= IPA_HW_v5_2) {
mask = ipa_hw_stats_get_ep_bit_n_idx(
IPA_CLIENT_APPS_WAN_CONS,
&reg_idx);
pipe_bitmask[reg_idx] |= mask;
}
/* Add drop stats for WAN_COAL as well if IPA_HW >=5.5 */
if (ipa3_ctx->ipa_hw_type >= IPA_HW_v5_5) {
mask = ipa_hw_stats_get_ep_bit_n_idx(
IPA_CLIENT_APPS_WAN_COAL_CONS,
&reg_idx);