[1/5] brcmfmac: increase default max WOWL patterns to 16

Message ID	20220914033102.27893-2-ian.lin@infineon.com (mailing list archive)
State	Changes Requested
Delegated to:	Kalle Valo
Headers	show Return-Path: <linux-wireless-owner@kernel.org> mailrelay-external-outbound: True From: Ian Lin <ian.lin@infineon.com> To: <linux-wireless@vger.kernel.org> CC: <brcm80211-dev-list@broadcom.com>, <brcm80211-dev-list@cypress.com>, <franky.lin@broadcom.com>, <hante.meuleman@broadcom.com>, <kvalo@kernel.org>, <Double.Lo@infineon.com>, <ian.lin@infineon.com> Subject: [PATCH 1/5] brcmfmac: increase default max WOWL patterns to 16 Date: Tue, 13 Sep 2022 22:30:58 -0500 Message-ID: <20220914033102.27893-2-ian.lin@infineon.com> In-Reply-To: <20220914033102.27893-1-ian.lin@infineon.com> References: <20220914033102.27893-1-ian.lin@infineon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: bulk
Series	New chip support and update fw capabilities series \| expand [0/5] New chip support and update fw capabilities series [1/5] brcmfmac: increase default max WOWL patterns to 16 [2/5] brcmfmac: Support 89459 pcie [3/5] brcmfmac: increase dcmd maximum buffer size [4/5] brcmfmac: add 54591 PCIE device [5/5] brcmfmac: Remove the call to "dtim_assoc" IOVAR

Message ID

20220914033102.27893-2-ian.lin@infineon.com (mailing list archive)

State

Changes Requested

Delegated to:

Kalle Valo

Headers

mailrelay-external-outbound: True
From: Ian Lin <ian.lin@infineon.com>
To: <linux-wireless@vger.kernel.org>
CC: <brcm80211-dev-list@broadcom.com>,
        <brcm80211-dev-list@cypress.com>, <franky.lin@broadcom.com>,
        <hante.meuleman@broadcom.com>, <kvalo@kernel.org>,
        <Double.Lo@infineon.com>, <ian.lin@infineon.com>
Subject: [PATCH 1/5] brcmfmac: increase default max WOWL patterns to 16
Date: Tue, 13 Sep 2022 22:30:58 -0500
Message-ID: <20220914033102.27893-2-ian.lin@infineon.com>
In-Reply-To: <20220914033102.27893-1-ian.lin@infineon.com>
References: <20220914033102.27893-1-ian.lin@infineon.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk

Series

New chip support and update fw capabilities series | expand

Commit Message

Ian Lin Sept. 14, 2022, 3:30 a.m. UTC

From: Ryohei Kondo <ryohei.kondo@cypress.com>

4373 has support of 16 WOWL patterns thus increasing the default value

Signed-off-by: Ryohei Kondo <ryohei.kondo@cypress.com>
Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
Signed-off-by: Ian Lin <ian.lin@infineon.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kalle Valo Sept. 22, 2022, 6:10 a.m. UTC | #1

Ian Lin <ian.lin@infineon.com> wrote:

> From: Ryohei Kondo <ryohei.kondo@cypress.com>
> 
> 4373 has support of 16 WOWL patterns thus increasing the default value
> 
> Signed-off-by: Ryohei Kondo <ryohei.kondo@cypress.com>
> Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
> Signed-off-by: Ian Lin <ian.lin@infineon.com>

Failed to apply, please rebase on top of latest wireless-next.

Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c'
Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c'
Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: brcmfmac: Support 89459 pcie
Using index info to reconstruct a base tree...
M	drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
M	drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
M	drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
Patch failed at 0001 brcmfmac: Support 89459 pcie

5 patches set to Changes Requested.

12975535 [1/5] brcmfmac: increase default max WOWL patterns to 16
12975536 [2/5] brcmfmac: Support 89459 pcie
12975537 [3/5] brcmfmac: increase dcmd maximum buffer size
12975539 [4/5] brcmfmac: add 54591 PCIE device
12975538 [5/5] brcmfmac: Remove the call to "dtim_assoc" IOVAR

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
index c87b829adb0d..f518e025d6e4 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
@@ -135,7 +135,7 @@ 
 /* Link Down indication in WoWL mode: */
 #define BRCMF_WOWL_LINKDOWN		(1 << 31)
 
-#define BRCMF_WOWL_MAXPATTERNS		8
+#define BRCMF_WOWL_MAXPATTERNS		16
 #define BRCMF_WOWL_MAXPATTERNSIZE	128
 
 #define BRCMF_COUNTRY_BUF_SZ		4