drop queue-5.10/net-ipa-holb-register-sometimes-must-be-written-twic.patch

diff --git a/queue-5.10/net-ipa-disable-holb-drop-when-updating-timer.patch b/queue-5.10/net-ipa-disable-holb-drop-when-updating-timer.patch
index 129e1db26802f25d5c9e9b52f0702a7a81ee2a52..86eed05e2300f08d9ec8ed66e99eafea7dd88aa0 100644 (file)
--- a/queue-5.10/net-ipa-disable-holb-drop-when-updating-timer.patch
+++ b/queue-5.10/net-ipa-disable-holb-drop-when-updating-timer.patch
@@ -20,14 +20,12 @@ Signed-off-by: Alex Elder <elder@linaro.org>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ipa/ipa_endpoint.c | 2 ++
+ drivers/net/ipa/ipa_endpoint.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
-index b7ec9b3ce3129..b0637774ad29c 100644
 --- a/drivers/net/ipa/ipa_endpoint.c
 +++ b/drivers/net/ipa/ipa_endpoint.c
-@@ -703,6 +703,7 @@ static void ipa_endpoint_init_hol_block_timer(struct ipa_endpoint *endpoint,
+@@ -703,6 +703,7 @@ static void ipa_endpoint_init_hol_block_
        u32 offset;
        u32 val;
  
@@ -35,7 +33,7 @@ index b7ec9b3ce3129..b0637774ad29c 100644
        offset = IPA_REG_ENDP_INIT_HOL_BLOCK_TIMER_N_OFFSET(endpoint_id);
        val = ipa_reg_init_hol_block_timer_val(ipa, microseconds);
        iowrite32(val, ipa->reg_virt + offset);
-@@ -733,6 +734,7 @@ void ipa_endpoint_modem_hol_block_clear_all(struct ipa *ipa)
+@@ -730,6 +731,7 @@ void ipa_endpoint_modem_hol_block_clear_
                if (endpoint->toward_ipa || endpoint->ee_id != GSI_EE_MODEM)
                        continue;
  
@@ -43,6 +41,3 @@ index b7ec9b3ce3129..b0637774ad29c 100644
                ipa_endpoint_init_hol_block_timer(endpoint, 0);
                ipa_endpoint_init_hol_block_enable(endpoint, true);
        }
--- 
-2.33.0
-

diff --git a/queue-5.10/net-ipa-holb-register-sometimes-must-be-written-twic.patch b/queue-5.10/net-ipa-holb-register-sometimes-must-be-written-twic.patch
deleted file mode 100644 (file)
index da18a59..0000000
--- a/queue-5.10/net-ipa-holb-register-sometimes-must-be-written-twic.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bb5ce29ab5c594d95ff9d87c4b1a1e61355a1657 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 12 Nov 2021 16:22:09 -0600
-Subject: net: ipa: HOLB register sometimes must be written twice
-
-From: Alex Elder <elder@linaro.org>
-
-[ Upstream commit 6e228d8cbb1cc6ba78022d406340e901e08d26e0 ]
-
-Starting with IPA v4.5, the HOL_BLOCK_EN register must be written
-twice when enabling head-of-line blocking avoidance.
-
-Fixes: 84f9bd12d46db ("soc: qcom: ipa: IPA endpoints")
-Signed-off-by: Alex Elder <elder@linaro.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ipa/ipa_endpoint.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
-index b40b711cf4bd5..b7ec9b3ce3129 100644
---- a/drivers/net/ipa/ipa_endpoint.c
-+++ b/drivers/net/ipa/ipa_endpoint.c
-@@ -718,6 +718,9 @@ ipa_endpoint_init_hol_block_enable(struct ipa_endpoint *endpoint, bool enable)
-       val = enable ? HOL_BLOCK_EN_FMASK : 0;
-       offset = IPA_REG_ENDP_INIT_HOL_BLOCK_EN_N_OFFSET(endpoint_id);
-       iowrite32(val, endpoint->ipa->reg_virt + offset);
-+      /* When enabling, the register must be written twice for IPA v4.5+ */
-+      if (enable && endpoint->ipa->version >= IPA_VERSION_4_5)
-+              iowrite32(val, endpoint->ipa->reg_virt + offset);
- }
- 
- void ipa_endpoint_modem_hol_block_clear_all(struct ipa *ipa)
--- 
-2.33.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 3f431a72a2e2d875b25cbad2dd851fe4ab7714b8..26590d71a84b6b19c06d670f441410a7f10582dd 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -70,7 +70,6 @@ net-zerocopy-copy-straggler-unaligned-data-for-tcp-r.patch
 net-zerocopy-refactor-skb-frag-fast-forward-op.patch
 tcp-fix-uninitialized-access-in-skb-frags-array-for-.patch
 tracing-add-length-protection-to-histogram-string-co.patch
-net-ipa-holb-register-sometimes-must-be-written-twic.patch
 net-ipa-disable-holb-drop-when-updating-timer.patch
 net-bnx2x-fix-variable-dereferenced-before-check.patch
 bnxt_en-reject-indirect-blk-offload-when-hw-tc-offlo.patch