kernel-module: Upgrade qca6174 and qca9377 to version 3.0

Signed-off-by: Cristinel Panfir <cristinel.panfir@nxp.com>

4 files changed, 2 insertions, 95 deletions

diff --git a/recipes-kernel/kernel-modules/kernel-module-qca6174/0001-MLK-18491-02-qcacld-2.0-fix-the-overflow-of-bounce-b.patch b/recipes-kernel/kernel-modules/kernel-module-qca6174/0001-MLK-18491-02-qcacld-2.0-fix-the-overflow-of-bounce-b.patch
deleted file mode 100644
index 2c8bce3b..00000000
--- a/recipes-kernel/kernel-modules/kernel-module-qca6174/0001-MLK-18491-02-qcacld-2.0-fix-the-overflow-of-bounce-b.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 16573cbb9c82218f93741a9bc873242c012ac061 Mon Sep 17 00:00:00 2001
-From: Hangtian Zhu <hangtian@qti.qualcomm.com>
-Date: Thu, 14 Jun 2018 11:10:05 +0800
-Subject: [PATCH 22/23] MLK-18491-02 qcacld-2.0: fix the overflow of bounce
- buffer
-
-Patch a41baa51cbc5("MLK-18491 qcacld-2.0: avoid overflow of bounce buffer")
-is not reasonable to fix overflow of bounce buffer issue.
-
-The patch is released by Qualcomm to fix the issue.
-(Case Number:03515221)
-
-Signed-off-by: Hangtian Zhu <hangtian@qti.qualcomm.com>
----
- CORE/SERVICES/HTC/htc.c      |  2 +-
- CORE/SERVICES/HTC/htc_send.c | 28 ++++++++++++++--------------
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/CORE/SERVICES/HTC/htc.c b/CORE/SERVICES/HTC/htc.c
-index 1e2450d..09936a0 100644
---- a/CORE/SERVICES/HTC/htc.c
-+++ b/CORE/SERVICES/HTC/htc.c
-@@ -657,7 +657,7 @@ static void ResetEndpointStates(HTC_TARGET *target)
-         INIT_HTC_PACKET_QUEUE(&pEndpoint->RxBufferHoldQueue);
-         pEndpoint->target = target;
-         //pEndpoint->TxCreditFlowEnabled = (A_BOOL)htc_credit_flow;
--        pEndpoint->TxCreditFlowEnabled = (A_BOOL)0;
-+        pEndpoint->TxCreditFlowEnabled = (A_BOOL)1;
-         adf_os_atomic_init(&pEndpoint->TxProcessCount);
-     }
- }
-diff --git a/CORE/SERVICES/HTC/htc_send.c b/CORE/SERVICES/HTC/htc_send.c
-index 1a3dd28..19d8065 100644
---- a/CORE/SERVICES/HTC/htc_send.c
-+++ b/CORE/SERVICES/HTC/htc_send.c
-@@ -105,12 +105,12 @@ void HTCGetControlEndpointTxHostCredits(HTC_HANDLE HTCHandle, int *credits)
- 
- static INLINE void RestoreTxPacket(HTC_TARGET *target, HTC_PACKET *pPacket)
- {
-+    adf_nbuf_t netbuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket);
-     if (pPacket->PktInfo.AsTx.Flags & HTC_TX_PACKET_FLAG_FIXUP_NETBUF) {
--        adf_nbuf_t netbuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket);
-         adf_nbuf_unmap(target->osdev, netbuf, ADF_OS_DMA_TO_DEVICE);
--        adf_nbuf_pull_head(netbuf, sizeof(HTC_FRAME_HDR));
-         pPacket->PktInfo.AsTx.Flags &= ~HTC_TX_PACKET_FLAG_FIXUP_NETBUF;
-     }
-+    adf_nbuf_pull_head(netbuf, sizeof(HTC_FRAME_HDR));
- 
- }
- 
-@@ -641,12 +641,11 @@ static A_STATUS HTCIssuePackets(HTC_TARGET       *target,
-              * that is already mapped, or a non-data netbuf that needs to be
-              * mapped.
-              */
--            if (pPacket->PktInfo.AsTx.Flags & HTC_TX_PACKET_FLAG_FIXUP_NETBUF) {
--                adf_nbuf_map(
--                        target->osdev,
--                        GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket),
--                        ADF_OS_DMA_TO_DEVICE);
--            }
-+            pPacket->PktInfo.AsTx.Flags |= HTC_TX_PACKET_FLAG_FIXUP_NETBUF;
-+            adf_nbuf_map(
-+                    target->osdev,
-+                    GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket),
-+                    ADF_OS_DMA_TO_DEVICE);
-         }
-         LOCK_HTC_TX(target);
-             /* store in look up queue to match completions */
-@@ -1261,12 +1260,13 @@ A_STATUS HTCSendPktsMultiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue)
-              * mapped.  This only applies to non-data frames, since data frames
-              * were already mapped as they entered into the driver.
-              */
--            adf_nbuf_map(
--                    target->osdev,
--                    GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket),
--                    ADF_OS_DMA_TO_DEVICE);
--
--       pPacket->PktInfo.AsTx.Flags |= HTC_TX_PACKET_FLAG_FIXUP_NETBUF;
-+            if(!IS_TX_CREDIT_FLOW_ENABLED(pEndpoint)) {
-+               pPacket->PktInfo.AsTx.Flags |= HTC_TX_PACKET_FLAG_FIXUP_NETBUF;
-+                adf_nbuf_map(
-+                        target->osdev,
-+                        GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket),
-+                        ADF_OS_DMA_TO_DEVICE);
-+           }
-     } HTC_PACKET_QUEUE_ITERATE_END;
- 
-     HTCTrySend(target,pEndpoint,pPktQueue);
--- 
-1.9.1
-
diff --git a/recipes-kernel/kernel-modules/kernel-module-qca6174_2.1.bb b/recipes-kernel/kernel-modules/kernel-module-qca6174_3.0.bb
index 3bc18124..c59e23f5 100644
--- a/recipes-kernel/kernel-modules/kernel-module-qca6174_2.1.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-qca6174_3.0.bb
@@ -2,8 +2,6 @@ require kernel-module-qcacld-lea.inc
 
 SUMMARY = "Qualcomm WiFi driver for QCA module 6174"
 
-SRC_URI += "file://0001-MLK-18491-02-qcacld-2.0-fix-the-overflow-of-bounce-b.patch"
-
 EXTRA_OEMAKE += " \
     CONFIG_ROME_IF=pci \
     CONFIG_WLAN_FEATURE_11W=y \
diff --git a/recipes-kernel/kernel-modules/kernel-module-qca9377_2.1.bb b/recipes-kernel/kernel-modules/kernel-module-qca9377_3.0.bb
index fbc87ea2..fbc87ea2 100644
--- a/recipes-kernel/kernel-modules/kernel-module-qca9377_2.1.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-qca9377_3.0.bb
diff --git a/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc b/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
index 662975aa..dc48bc5d 100644
--- a/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
+++ b/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc
@@ -3,8 +3,8 @@ LICENSE = "BSD & GPLv2"
 LIC_FILES_CHKSUM = "file://CORE/HDD/src/wlan_hdd_main.c;beginline=1;endline=20;md5=ec8d62116b13db773825ebf7cf91be1d;"
 
 QCACLD_SRC ?= "git://source.codeaurora.org/external/imx/qcacld-2.0-imx.git;protocol=https"
-SRC_URI = "${QCACLD_SRC};branch=IMX_CNSS.LEA.NRT_2.0"
-SRCREV = "e008d2578b09f1f593f65ede48529a52312e3957"
+SRC_URI = "${QCACLD_SRC};branch=IMX_CNSS.LEA.NRT_3.0"
+SRCREV = "2f4ae376ce3db65c3270a4bf7e804f3e86052c8c"
 
 S = "${WORKDIR}/git"