From 29f18bec5fb46a592b08709ca8739208c5ec3b59 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Apr 17 2023 11:24:34 +0000 Subject: ath10k: Fix error handling in case of CE pipe init failure (git-fixes). --- diff --git a/patches.suse/ath10k-Fix-error-handling-in-case-of-CE-pipe-init-fa.patch b/patches.suse/ath10k-Fix-error-handling-in-case-of-CE-pipe-init-fa.patch new file mode 100644 index 0000000..af6c00e --- /dev/null +++ b/patches.suse/ath10k-Fix-error-handling-in-case-of-CE-pipe-init-fa.patch @@ -0,0 +1,45 @@ +From 31561e8557cd1eeba5806ac9ce820f8323b2201b Mon Sep 17 00:00:00 2001 +From: Rakesh Pillai +Date: Sat, 12 Dec 2020 00:30:10 +0530 +Subject: [PATCH] ath10k: Fix error handling in case of CE pipe init failure +Git-commit: 31561e8557cd1eeba5806ac9ce820f8323b2201b +References: git-fixes +Patch-mainline: v5.12-rc1 + +Currently if the copy engine pipe init fails for snoc based +chipsets, the rri is not freed. + +Fix this error handling for copy engine pipe init +failure. + +Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1 + +Fixes: 4945af5b264f ("ath10k: enable SRRI/DRRI support on ddr for WCN3990") +Signed-off-by: Rakesh Pillai +Reviewed-by: Brian Norris +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/1607713210-18320-1-git-send-email-pillair@codeaurora.org +Signed-off-by: Oliver Neukum +--- + drivers/net/wireless/ath/ath10k/snoc.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/ath/ath10k/snoc.c ++++ b/drivers/net/wireless/ath/ath10k/snoc.c +@@ -789,13 +789,14 @@ static int ath10k_snoc_hif_power_up(stru + ret = ath10k_snoc_init_pipes(ar); + if (ret) { + ath10k_err(ar, "failed to initialize CE: %d\n", ret); +- goto err_wlan_enable; ++ goto err_free_rri; + } + + napi_enable(&ar->napi); + return 0; + +-err_wlan_enable: ++err_free_rri: ++ ath10k_ce_free_rri(ar); + ath10k_snoc_wlan_disable(ar); + + return ret; diff --git a/series.conf b/series.conf index 5de5e0f..a62dfa6 100644 --- a/series.conf +++ b/series.conf @@ -59604,6 +59604,7 @@ patches.suse/vmxnet3-Remove-buf_info-from-device-accessible-struc.patch patches.suse/ibmvnic-rework-to-ensure-SCRQ-entry-reads-are-proper.patch patches.suse/ibmvnic-remove-unnecessary-rmb-inside-ibmvnic_poll.patch + patches.suse/ath10k-Fix-error-handling-in-case-of-CE-pipe-init-fa.patch patches.suse/ath-Use-safer-key-clearing-with-key-cache-entries.patch patches.suse/ath9k-Clear-key-cache-explicitly-on-disabling-hardwa.patch patches.suse/ath-Export-ath_hw_keysetmac.patch