samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

Revert "qcacld-3.0: Fix WDI 1.0 MCC TX SMMU fault"

Bladeren bron 
This reverts commit 2459533, which fixes WDI 1.0 MCC SMMU fault
but it's only a partial fix. And we also need 2490501 to be a
complete fix. But 2490501 has regressions and leads to NULL
dereference, and it's reverted in 2517642 until a new complete
fix is ready.

Based on above, revert 2459533 and WDI 1.0 MCC SMMU datapath
will be a known issue.

Change-Id: I6444bfd8552906d889531b7e77ca6aa6b6fa7d6d
CRs-Fixed: 2352927
This commit is contained in:
jiad
2018-11-20 09:40:34 +08:00
gecommit door nshrivas
bovenliggende 9b92005ee1
commit e772ac75f0
1 gewijzigde bestanden met toevoegingen van 5 en 36 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

41
ipa/core/src/wlan_ipa_core.c
Bestand weergeven

@@ -205,13 +205,8 @@ static void wlan_ipa_send_pkt_to_tl(
qdf_ipa_rx_data_t *ipa_tx_desc)
{
struct wlan_ipa_priv *ipa_ctx = iface_context->ipa_ctx;
struct wlan_objmgr_pdev *pdev = ipa_ctx->pdev;
struct wlan_objmgr_psoc *psoc = wlan_pdev_get_psoc(pdev);
qdf_device_t osdev = wlan_psoc_get_qdf_dev(psoc);
qdf_nbuf_t skb;
struct wlan_ipa_tx_desc *tx_desc;
qdf_dma_addr_t paddr;
QDF_STATUS status;
qdf_spin_lock_bh(&iface_context->interface_lock);
/*
@@ -228,14 +223,6 @@ static void wlan_ipa_send_pkt_to_tl(
return;
}
}
if (!osdev) {
ipa_free_skb(ipa_tx_desc);
iface_context->stats.num_tx_drop++;
qdf_spin_unlock_bh(&iface_context->interface_lock);
wlan_ipa_wdi_rm_try_release(ipa_ctx);
return;
}
qdf_spin_unlock_bh(&iface_context->interface_lock);
skb = QDF_IPA_RX_DATA_SKB(ipa_tx_desc);
@@ -244,33 +231,15 @@ static void wlan_ipa_send_pkt_to_tl(
/* Store IPA Tx buffer ownership into SKB CB */
qdf_nbuf_ipa_owned_set(skb);
if (qdf_mem_smmu_s1_enabled(osdev)) {
status = qdf_nbuf_map(osdev, skb, QDF_DMA_TO_DEVICE);
if (QDF_IS_STATUS_SUCCESS(status)) {
paddr = qdf_nbuf_get_frag_paddr(skb, 0);
} else {
ipa_free_skb(ipa_tx_desc);
qdf_spin_lock_bh(&iface_context->interface_lock);
iface_context->stats.num_tx_drop++;
qdf_spin_unlock_bh(&iface_context->interface_lock);
wlan_ipa_wdi_rm_try_release(ipa_ctx);
return;
}
} else {
paddr = QDF_IPA_RX_DATA_DMA_ADDR(ipa_tx_desc);
}
if (wlan_ipa_uc_sta_is_enabled(ipa_ctx->config)) {
qdf_nbuf_mapped_paddr_set(skb,
paddr +
WLAN_IPA_WLAN_FRAG_HEADER +
WLAN_IPA_WLAN_IPA_HEADER);
QDF_IPA_RX_DATA_DMA_ADDR(ipa_tx_desc)
+ WLAN_IPA_WLAN_FRAG_HEADER
+ WLAN_IPA_WLAN_IPA_HEADER);
QDF_IPA_RX_DATA_SKB_LEN(ipa_tx_desc) -=
WLAN_IPA_WLAN_FRAG_HEADER + WLAN_IPA_WLAN_IPA_HEADER;
} else {
qdf_nbuf_mapped_paddr_set(skb, paddr);
}
} else
qdf_nbuf_mapped_paddr_set(skb, ipa_tx_desc->dma_addr);
qdf_spin_lock_bh(&ipa_ctx->q_lock);
/* get free Tx desc and assign ipa_tx_desc pointer */