A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 14:13:01 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 3cb33329d4 on remote branch

Browse source 
Change-Id: Ib1689840b6e0758e6f7c5ce4f1d8131659f44d6d
This commit is contained in:
Linux Build Service Account 2021-06-23 05:14:52 -07:00
commit 0953ca8713
3 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/platform/msm/gsi/gsi.h
View file

@ -190,7 +190,7 @@ struct gsi_evt_ring_props {
enum gsi_evt_chtype intf;
enum gsi_intr_type intr;
enum gsi_evt_ring_elem_size re_size;
uint16_t ring_len;
uint32_t ring_len;
uint64_t ring_base_addr;
void *ring_base_vaddr;
uint16_t int_modt;

2
drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c
View file

@ -225,7 +225,7 @@ static struct ipahal_stats_init_pyld *ipahal_generate_init_pyld_flt_rt_v4_5(
void *params, bool is_atomic_ctx)
{
struct ipahal_stats_init_pyld *pyld;
int num = (int)(params);
int num = (uintptr_t)(params);
if (num > IPA_MAX_FLT_RT_CNT_INDEX ||
num <= 0) {

31
drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
View file

@ -1571,13 +1571,14 @@ static int handle3_ingress_format(struct net_device *dev,
}
IPAWANDBG("ingress WAN pipe setup successfully\n");
ret = ipa3_setup_apps_low_lat_cons_pipe();
if (ret)
goto low_lat_fail;
if (ipa3_ctx->rmnet_ctl_enable) {
ret = ipa3_setup_apps_low_lat_cons_pipe();
if (ret)
goto low_lat_fail;
ingress_eps_mask |= IPA_AP_INGRESS_EP_LOW_LAT;
IPAWANDBG("ingress low latency pipe setup successfully\n");
ingress_eps_mask |= IPA_AP_INGRESS_EP_LOW_LAT;
IPAWANDBG("ingress low latency pipe setup successfully\n");
}
low_lat_fail:
mutex_unlock(&rmnet_ipa3_ctx->pipe_handle_guard);
@ -1698,13 +1699,15 @@ static int handle3_egress_format(struct net_device *dev,
return rc;
}
IPAWANDBG("engress WAN pipe setup successfully\n");
rc = ipa3_setup_apps_low_lat_prod_pipe();
if (rc) {
IPAWANERR("failed to setup egress low lat endpoint\n");
mutex_unlock(&rmnet_ipa3_ctx->pipe_handle_guard);
goto low_lat_fail;
if (ipa3_ctx->rmnet_ctl_enable) {
rc = ipa3_setup_apps_low_lat_prod_pipe();
if (rc) {
IPAWANERR("failed to setup egress low lat endpoint\n");
mutex_unlock(&rmnet_ipa3_ctx->pipe_handle_guard);
goto low_lat_fail;
}
IPAWANDBG("engress low lat pipe setup successfully\n");
}
IPAWANDBG("engress low lat pipe setup successfully\n");
mutex_unlock(&rmnet_ipa3_ctx->pipe_handle_guard);
low_lat_fail:
@ -4279,6 +4282,10 @@ void ipa3_broadcast_quota_reach_ind(u32 mux_id,
if (upstream_type == IPA_UPSTEAM_MAX) {
IPAWANERR(" Wrong upstreamIface type %d\n", upstream_type);
return;
} else if (upstream_type == IPA_UPSTEAM_WLAN) {
/* TODO: Fix this case when adding quota on WLAN Backhaul*/
IPAWANERR_RL("Quota indication is not supported for WLAN\n");
return;
} else if (upstream_type == IPA_UPSTEAM_MODEM) {
index = ipa3_find_mux_channel_index(mux_id);
if (index == MAX_NUM_OF_MUX_CHANNEL) {