Skip to content

Commit 92c91c4

Browse files
committed
net: wireless: rockchip_wlan: bcmdhd: Update driver to 101.10.591.68.32
1 parent ce20815 commit 92c91c4

File tree

263 files changed

+10267
-2780
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+10267
-2780
lines changed

drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Kconfig

100644100755
Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
#
2-
# Copyright (C) 2023, Broadcom.
2+
# Copyright (C) 2024 Synaptics Incorporated. All rights reserved.
3+
#
4+
# This software is licensed to you under the terms of the
5+
# GNU General Public License version 2 (the "GPL") with Broadcom special exception.
6+
#
7+
# INFORMATION CONTAINED IN THIS DOCUMENT IS PROVIDED "AS-IS," AND SYNAPTICS
8+
# EXPRESSLY DISCLAIMS ALL EXPRESS AND IMPLIED WARRANTIES, INCLUDING ANY
9+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE,
10+
# AND ANY WARRANTIES OF NON-INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS.
11+
# IN NO EVENT SHALL SYNAPTICS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
12+
# SPECIAL, PUNITIVE, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR IN CONNECTION
13+
# WITH THE USE OF THE INFORMATION CONTAINED IN THIS DOCUMENT, HOWEVER CAUSED
14+
# AND BASED ON ANY THEORY OF LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
15+
# NEGLIGENCE OR OTHER TORTIOUS ACTION, AND EVEN IF SYNAPTICS WAS ADVISED OF
16+
# THE POSSIBILITY OF SUCH DAMAGE. IF A TRIBUNAL OF COMPETENT JURISDICTION
17+
# DOES NOT PERMIT THE DISCLAIMER OF DIRECT DAMAGES OR ANY OTHER DAMAGES,
18+
# SYNAPTICS' TOTAL CUMULATIVE LIABILITY TO ANY PARTY SHALL NOT
19+
# EXCEED ONE HUNDRED U.S. DOLLARS
20+
#
21+
# Copyright (C) 2024, Broadcom.
322
#
423
# Unless you and Broadcom execute a separate written software license
524
# agreement governing use of this software, this software is licensed to you

drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile

100644100755
Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
# bcmdhd
22
#
3-
# Copyright (C) 2023, Broadcom.
3+
# Copyright (C) 2024 Synaptics Incorporated. All rights reserved.
4+
#
5+
# This software is licensed to you under the terms of the
6+
# GNU General Public License version 2 (the "GPL") with Broadcom special exception.
7+
#
8+
# INFORMATION CONTAINED IN THIS DOCUMENT IS PROVIDED "AS-IS," AND SYNAPTICS
9+
# EXPRESSLY DISCLAIMS ALL EXPRESS AND IMPLIED WARRANTIES, INCLUDING ANY
10+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE,
11+
# AND ANY WARRANTIES OF NON-INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS.
12+
# IN NO EVENT SHALL SYNAPTICS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
13+
# SPECIAL, PUNITIVE, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR IN CONNECTION
14+
# WITH THE USE OF THE INFORMATION CONTAINED IN THIS DOCUMENT, HOWEVER CAUSED
15+
# AND BASED ON ANY THEORY OF LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
16+
# NEGLIGENCE OR OTHER TORTIOUS ACTION, AND EVEN IF SYNAPTICS WAS ADVISED OF
17+
# THE POSSIBILITY OF SUCH DAMAGE. IF A TRIBUNAL OF COMPETENT JURISDICTION
18+
# DOES NOT PERMIT THE DISCLAIMER OF DIRECT DAMAGES OR ANY OTHER DAMAGES,
19+
# SYNAPTICS' TOTAL CUMULATIVE LIABILITY TO ANY PARTY SHALL NOT
20+
# EXCEED ONE HUNDRED U.S. DOLLARS
21+
#
22+
# Copyright (C) 2024, Broadcom.
423
#
524
# Unless you and Broadcom execute a separate written software license
625
# agreement governing use of this software, this software is licensed to you
@@ -31,10 +50,9 @@ CONFIG_BCMDHD_OOB := y
3150
#CONFIG_BCMDHD_CUSB := y
3251
#CONFIG_BCMDHD_NO_POWER_OFF := y
3352
CONFIG_BCMDHD_PROPTXSTATUS := y
34-
CONFIG_BCMDHD_AG := y
3553
CONFIG_DHD_USE_STATIC_BUF := y
3654
CONFIG_BCMDHD_STATIC_BUF_IN_DHD := y
37-
#CONFIG_BCMDHD_ANDROID_VERSION := 14
55+
CONFIG_BCMDHD_ANDROID_VERSION := 14
3856
CONFIG_BCMDHD_AUTO_SELECT := y
3957
CONFIG_BCMDHD_DEBUG := y
4058
#CONFIG_BCMDHD_RECONNECT := y
@@ -62,7 +80,7 @@ DHDCFLAGS = -Wall -Wstrict-prototypes -Wno-date-time -Wno-strict-prototypes \
6280
-DKEEP_ALIVE -DPKT_FILTER_SUPPORT -DDHDTCPACK_SUPPRESS \
6381
-DDHD_DONOT_FORWARD_BCMEVENT_AS_NETWORK_PKT -DOEM_ANDROID \
6482
-DMULTIPLE_SUPPLICANT -DTSQ_MULTIPLIER -DMFP -DDHD_8021X_DUMP \
65-
-DPOWERUP_MAX_RETRY=0 -DIFACE_HANG_FORCE_DEV_CLOSE -DWAIT_DEQUEUE \
83+
-DPOWERUP_MAX_RETRY=1 -DIFACE_HANG_FORCE_DEV_CLOSE -DWAIT_DEQUEUE \
6684
-DUSE_NEW_RSPEC_DEFS \
6785
-DWL_EXT_IAPSTA -DWL_ESCAN -DCCODE_LIST -DSUSPEND_EVENT \
6886
-DKEY_INSTALL_CHECK \
@@ -90,7 +108,11 @@ ifneq ($(CONFIG_CFG80211),)
90108
DHDOFILES += dhd_cfg80211.o wl_cfgvif.o wl_roam.o
91109
DHDCFLAGS += -DWL_CFG80211 -DWLP2P -DWL_CFG80211_STA_EVENT
92110
DHDCFLAGS += -DWL_CFG80211_GON_COLLISION
93-
DHDCFLAGS += -DWL_CAP_HE -DWL_6G_BAND -DWL_5P9G
111+
# DHDCFLAGS += -DCFG80211_INFO_CHANDEF
112+
# DHDCFLAGS += -DAP_P2P_CONCURRENT
113+
DHDCFLAGS += -DCONFIG_CFG80211_INTERNAL_REGDB #-DEXT_REG_INFO
114+
DHDCFLAGS += -DWL_CAP_HE -DWL_6G_BAND -DWL_5P9G -DWL_P2P_6G
115+
DHDCFLAGS += -DWL11U
94116
# DHDCFLAGS += -DCONFIG_6GHZ_BKPORT
95117
DHDCFLAGS += -DWL_IFACE_COMB_NUM_CHANNELS
96118
DHDCFLAGS += -DCUSTOM_PNO_EVENT_LOCK_xTIME=10
@@ -99,21 +121,24 @@ ifneq ($(CONFIG_CFG80211),)
99121
DHDCFLAGS += -DESCAN_RESULT_PATCH -DESCAN_BUF_OVERFLOW_MGMT
100122
DHDCFLAGS += -DVSDB -DWL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST
101123
DHDCFLAGS += -DWLTDLS -DMIRACAST_AMPDU_SIZE=8
102-
# DHDCFLAGS += -DHOSTAPD_BW_SUPPORT
103-
DHDCFLAGS += -DWL_VIRTUAL_APSTA -DSTA_MGMT -DSOFTAP_UAPSD_OFF
104-
DHDCFLAGS += -DWL_SOFTAP_ACS
124+
# DHDCFLAGS += -DHOSTAPD_BW_SUPPORT
125+
DHDCFLAGS += -DWL_VIRTUAL_APSTA -DSOFTAP_UAPSD_OFF #-DSTA_MGMT
126+
DHDCFLAGS += -DWL_SOFTAP_ACS #-DACS_MONITOR
105127
DHDCFLAGS += -DNUM_SCB_MAX_PROBE=3
106128
DHDCFLAGS += -DWL_SCB_TIMEOUT=10
129+
# DHDCFLAGS += -DWL_BEACON_RATE
107130
DHDCFLAGS += -DEXPLICIT_DISCIF_CLEANUP
108-
DHDCFLAGS += -DDHD_USE_SCAN_WAKELOCK
131+
DHDCFLAGS += -DDHD_USE_SCAN_WAKELOCK #DHD_DEBUG_SCAN_WAKELOCK
109132
DHDCFLAGS += -DSPECIFIC_MAC_GEN_SCHEME
110133
DHDCFLAGS += -DWL_IFACE_MGMT
111134
DHDCFLAGS += -DSUPPORT_RSSI_SUM_REPORT
112135
DHDCFLAGS += -DWLFBT -DWL_GCMP_SUPPORT -DWL_OWE -DWL_SAE_FT
113136
DHDCFLAGS += -DROAM_CHANNEL_CACHE -DDHD_LOSSLESS_ROAMING
137+
# DHDCFLAGS += -DWL_SKIP_CONNECT_HINTS
114138
# DHDCFLAGS += -DWL_CFGVENDOR_SEND_HANG_EVENT
115139
DHDCFLAGS += -DGTK_OFFLOAD_SUPPORT
116-
#DHDCFLAGS += -DWL_STATIC_IF #-DDHD_MAX_STATIC_IFS=2
140+
# DHDCFLAGS += -DWL_STATIC_IF #-DDHD_MAX_STATIC_IFS=2
141+
# DHDCFLAGS += -DWL_STATIC_IFNAME_PREFIX=\"sap%d\"
117142
DHDCFLAGS += -DWL_CLIENT_SAE
118143
DHDCFLAGS += -DCONNECT_INFO_WAR -DWL_ROAM_WAR
119144
DHDCFLAGS += -DVNDR_IE_WAR
@@ -125,11 +150,12 @@ ifneq ($(CONFIG_BCMDHD_SDIO),)
125150
BUS_TYPE := sdio
126151
DHDCFLAGS += -DBCMSDIO -DMMC_SDIO_ABORT -DUSE_SDIOFIFO_IOVAR -DBCMLXSDMMC \
127152
-DSDTEST -DBDC -DDHD_USE_IDLECOUNT -DCUSTOM_SDIO_F2_BLKSIZE=256 \
128-
-DBCMSDIOH_TXGLOM -DBCMSDIOH_TXGLOM_EXT -DBCMSDIOH_STATIC_COPY_BUF \
153+
-DBCMSDIOH_TXGLOM -DDHD_SI_WD_RESET -DBCMSDIOH_STATIC_COPY_BUF \
129154
-DRXFRAME_THREAD -DDHDENABLE_TAILPAD -DSUPPORT_P2P_GO_PS \
130155
-DBCMSDIO_RXLIM_POST -DBCMSDIO_TXSEQ_SYNC -DCONSOLE_DPC \
131156
-DBCMSDIO_INTSTATUS_WAR
132157
DHDCFLAGS += -DMMC_HW_RESET #-DMMC_SW_RESET #-DBUS_POWER_RESTORE
158+
#DHDCFLAGS += -DDEVICE_PM_CALLBACK
133159
ifeq ($(CONFIG_BCMDHD_OOB),y)
134160
DHDCFLAGS += -DOOB_INTR_ONLY -DCUSTOMER_OOB -DHW_OOB
135161
ifeq ($(CONFIG_BCMDHD_DISABLE_WOWLAN),y)
@@ -150,6 +176,7 @@ BUS_TYPE := pcie
150176
DHDCFLAGS += -DDHD_LB -DDHD_LB_RXP -DDHD_LB_STATS -DDHD_LB_TXP
151177
DHDCFLAGS += -DDHD_LB_PRIMARY_CPUS=0xF0 -DDHD_LB_SECONDARY_CPUS=0x0E
152178
# DHDCFLAGS += -DDHD_PKTID_AUDIT_ENABLED
179+
DHDCFLAGS += -DBCMPCIE_CTO_PREVENTION
153180
DHDCFLAGS += -DEAPOL_PKT_PRIO -DENABLE_DHD_GRO
154181
DHDCFLAGS += -DDHD_SKIP_DONGLE_RESET_IN_ATTACH
155182
DHDCFLAGS += -DDHD_DONGLE_TRAP_IN_DETACH
@@ -234,8 +261,8 @@ endif
234261
endif
235262

236263
ifeq ($(CONFIG_64BIT),y)
237-
DHDCFLAGS := $(filter-out -DBCMDMA32,$(DHDCFLAGS))
238-
DHDCFLAGS += -DBCMDMA64OSL
264+
DHDCFLAGS := $(filter-out -DBCMDMA32,$(DHDCFLAGS))
265+
DHDCFLAGS += -DBCMDMA64OSL
239266
endif
240267

241268
# For Android VTS
@@ -245,19 +272,21 @@ ifneq ($(CONFIG_BCMDHD_ANDROID_VERSION),)
245272
DHDCFLAGS += -DANDROID_BKPORT
246273
ifneq ($(CONFIG_CFG80211),)
247274
DHDCFLAGS += -DPNO_SUPPORT
248-
DHDCFLAGS += -DWL_SCHED_SCAN
275+
DHDCFLAGS += -DWL_SCHED_SCAN
249276
DHDCFLAGS += -DWL_P2P_RAND
250277
DHDCFLAGS += -DGSCAN_SUPPORT -DRTT_SUPPORT
251278
DHDCFLAGS += -DLINKSTAT_SUPPORT -DLINKSTAT_EXT_SUPPORT
252279
DHDCFLAGS += -DCUSTOM_COUNTRY_CODE -DDHD_GET_VALID_CHANNELS
253-
DHDCFLAGS += -DDEBUGABILITY -DDEBUGABILITY_DISABLE_MEMDUMP -DDBG_PKT_MON
280+
DHDCFLAGS += -DDEBUGABILITY -DDBG_PKT_MON -DDEBUGABILITY_DISABLE_MEMDUMP
254281
DHDCFLAGS += -DDHD_LOG_DUMP -DDHD_FW_COREDUMP
255-
# DHDCFLAGS += -DDHD_PKT_LOGGING_DBGRING
282+
DHDCFLAGS += -DWIFI_TURNON_USE_HALINIT
283+
DHDCFLAGS += -DDHD_PKT_LOGGING_DBGRING -DDHD_PKT_LOGGING
256284
DHDCFLAGS += -DAPF -DNDO_CONFIG_SUPPORT -DRSSI_MONITOR_SUPPORT
257285
DHDCFLAGS += -DDHD_WAKE_STATUS
258-
DHDCFLAGS += -DWL_LATENCY_MODE
286+
DHDCFLAGS += -DWL_LATENCY_MODE -DWL_USABLE_CHAN -DWL_SAR_TX_POWER
259287
DHDOFILES += dhd_rtt.o
260288
DHDOFILES += dhd_log_dump.o
289+
DHDOFILES += dhd_pktlog.o
261290
endif
262291
else
263292
DHDCFLAGS += -DANDROID_VERSION=0
@@ -321,7 +350,7 @@ ifneq ($(CONFIG_CFG80211),)
321350
ifneq ($(CONFIG_BCMDHD_SDIO),)
322351
DHDCFLAGS += -DRXF_DEQUEUE_ON_BUSY
323352
endif
324-
#DHDCFLAGS += -DWL_STATIC_IF
353+
DHDCFLAGS += -DWL_STATIC_IF
325354
endif
326355
endif
327356

@@ -364,10 +393,8 @@ endif
364393
# For WAPI
365394
ifeq ($(CONFIG_BCMDHD_WAPI),y)
366395
DHDCFLAGS += -DBCMWAPI_WPI -DBCMWAPI_WAI
367-
ifeq ($(CONFIG_BCMDHD_ANDROID_VERSION),11)
368396
DHDCFLAGS += -DCFG80211_WAPI_BKPORT
369397
endif
370-
endif
371398

372399
# For scan random mac
373400
ifneq ($(CONFIG_BCMDHD_RANDOM_MAC),)
@@ -410,12 +437,13 @@ ifeq ($(CONFIG_BCMDHD_DTS),y)
410437
endif
411438
DHDCFLAGS += -DCUSTOMER_HW -DDHD_OF_SUPPORT
412439
DHDCFLAGS += -DCUSTOMER_HW_ROCKCHIP
413-
# DHDCFLAGS += -DCUSTOMER_HW_ROCKCHIP_RK3588
440+
DHDCFLAGS += -DBLOCK_IPV6_PACKET
414441
DHDCFLAGS += -DBCM_USE_PLATFORM_STRLCPY
442+
# DHDCFLAGS += -DGET_CUSTOM_MAC_ENABLE
415443
endif
416444

417445
ifneq ($(CONFIG_BCMDHD_PCIE),)
418-
ifneq ($(filter -DCUSTOMER_HW_ROCKCHIP_RK3588, $(DHDCFLAGS)),)
446+
ifeq ($(CONFIG_PCIEASPM_ROCKCHIP_WIFI_EXTENSION),y)
419447
DHDCFLAGS += -DDHD_CONTROL_PCIE_ASPM_WIFI_TURNON
420448
endif
421449
endif
@@ -442,10 +470,6 @@ ifeq ($(CONFIG_BCMDHD_FW_SIGNATURE),y)
442470
DHDCFLAGS += -DBL_HEAP_START_GAP_SIZE=0x1000 -DBL_HEAP_SIZE=0x10000
443471
endif
444472

445-
ifeq ($(CONFIG_BCMDHD_AG),y)
446-
DHDCFLAGS += -DBAND_AG
447-
endif
448-
449473
ifeq ($(CONFIG_DHD_USE_STATIC_BUF),y)
450474
ifeq ($(CONFIG_BCMDHD_STATIC_BUF_IN_DHD),y)
451475
DHDOFILES += dhd_static_buf.o

drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/aiutils.c

100644100755
Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,26 @@
22
* Misc utility routines for accessing chip-specific features
33
* of the SiliconBackplane-based Broadcom chips.
44
*
5-
* Copyright (C) 2022, Broadcom.
5+
* Copyright (C) 2024 Synaptics Incorporated. All rights reserved.
6+
*
7+
* This software is licensed to you under the terms of the
8+
* GNU General Public License version 2 (the "GPL") with Broadcom special exception.
9+
*
10+
* INFORMATION CONTAINED IN THIS DOCUMENT IS PROVIDED "AS-IS," AND SYNAPTICS
11+
* EXPRESSLY DISCLAIMS ALL EXPRESS AND IMPLIED WARRANTIES, INCLUDING ANY
12+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE,
13+
* AND ANY WARRANTIES OF NON-INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS.
14+
* IN NO EVENT SHALL SYNAPTICS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
15+
* SPECIAL, PUNITIVE, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR IN CONNECTION
16+
* WITH THE USE OF THE INFORMATION CONTAINED IN THIS DOCUMENT, HOWEVER CAUSED
17+
* AND BASED ON ANY THEORY OF LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
18+
* NEGLIGENCE OR OTHER TORTIOUS ACTION, AND EVEN IF SYNAPTICS WAS ADVISED OF
19+
* THE POSSIBILITY OF SUCH DAMAGE. IF A TRIBUNAL OF COMPETENT JURISDICTION
20+
* DOES NOT PERMIT THE DISCLAIMER OF DIRECT DAMAGES OR ANY OTHER DAMAGES,
21+
* SYNAPTICS' TOTAL CUMULATIVE LIABILITY TO ANY PARTY SHALL NOT
22+
* EXCEED ONE HUNDRED U.S. DOLLARS
23+
*
24+
* Copyright (C) 2024, Broadcom.
625
*
726
* Unless you and Broadcom execute a separate written software license
827
* agreement governing use of this software, this software is licensed to you
@@ -1238,8 +1257,8 @@ ai_core_disable(const si_t *sih, uint32 bits)
12381257
* bits - core specific bits that are set during and after reset sequence
12391258
* resetbits - core specific bits that are set only during reset sequence
12401259
*/
1241-
static void
1242-
BCMPOSTTRAPFN(_ai_core_reset)(const si_t *sih, uint32 bits, uint32 resetbits)
1260+
static bool
1261+
_ai_core_reset(const si_t *sih, uint32 bits, uint32 resetbits)
12431262
{
12441263
const si_info_t *sii = SI_INFO(sih);
12451264
aidmp_t *ai;
@@ -1249,6 +1268,12 @@ BCMPOSTTRAPFN(_ai_core_reset)(const si_t *sih, uint32 bits, uint32 resetbits)
12491268
ASSERT(GOODREGS(sii->curwrap));
12501269
ai = sii->curwrap;
12511270

1271+
if (R_REG(sii->osh, &ai->resetstatus) == 0xffffffff &&
1272+
R_REG(sii->osh, &ai->ioctrl) == 0xffffffff &&
1273+
R_REG(sii->osh, &ai->resetctrl) == 0xffffffff) {
1274+
SI_ERROR(("%s: fail, resetstatus&ioctrl&resetctrl is 0xffffffff\n", __func__));
1275+
return FALSE;
1276+
}
12521277
/* ensure there are no pending backplane operations */
12531278
SPINWAIT(((dummy = R_REG(sii->osh, &ai->resetstatus)) != 0), 300);
12541279

@@ -1258,6 +1283,12 @@ BCMPOSTTRAPFN(_ai_core_reset)(const si_t *sih, uint32 bits, uint32 resetbits)
12581283
}
12591284
#endif /* BCMDBG_ERR */
12601285

1286+
SI_ERROR(("%s: &ai->ioctrl = 0x%x, &ai->resetctrl = 0x%x, &ai->resetstatus = 0x%x\n",
1287+
__func__,
1288+
R_REG(sii->osh, &ai->ioctrl),
1289+
R_REG(sii->osh, &ai->resetctrl),
1290+
R_REG(sii->osh, &ai->resetstatus)));
1291+
12611292
/* put core into reset state */
12621293
W_REG(sii->osh, &ai->resetctrl, AIRC_RESET);
12631294
OSL_DELAY(10);
@@ -1322,28 +1353,31 @@ BCMPOSTTRAPFN(_ai_core_reset)(const si_t *sih, uint32 bits, uint32 resetbits)
13221353
}
13231354
#endif /* UCM_CORRUPTION_WAR */
13241355
OSL_DELAY(1);
1356+
return TRUE;
13251357
}
13261358

1327-
void
1328-
BCMPOSTTRAPFN(ai_core_reset)(si_t *sih, uint32 bits, uint32 resetbits)
1359+
bool
1360+
ai_core_reset(si_t *sih, uint32 bits, uint32 resetbits)
13291361
{
13301362
si_info_t *sii = SI_INFO(sih);
13311363
const si_cores_info_t *cores_info = (const si_cores_info_t *)sii->cores_info;
13321364
uint idx = sii->curidx;
1365+
bool ret = TRUE;
13331366

13341367
if (cores_info->wrapba3[idx] != 0) {
13351368
ai_setcoreidx_3rdwrap(sih, idx);
1336-
_ai_core_reset(sih, bits, resetbits);
1369+
ret = _ai_core_reset(sih, bits, resetbits);
13371370
ai_setcoreidx(sih, idx);
13381371
}
13391372

13401373
if (cores_info->wrapba2[idx] != 0) {
13411374
ai_setcoreidx_2ndwrap(sih, idx);
1342-
_ai_core_reset(sih, bits, resetbits);
1375+
ret = _ai_core_reset(sih, bits, resetbits);
13431376
ai_setcoreidx(sih, idx);
13441377
}
13451378

1346-
_ai_core_reset(sih, bits, resetbits);
1379+
ret = _ai_core_reset(sih, bits, resetbits);
1380+
return ret;
13471381
}
13481382

13491383
#ifdef BOOKER_NIC400_INF

drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/bcm_app_utils.c

100644100755
Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,26 @@
33
* Contents are wifi-specific, used by any kernel or app-level
44
* software that might want wifi things as it grows.
55
*
6-
* Copyright (C) 2022, Broadcom.
6+
* Copyright (C) 2024 Synaptics Incorporated. All rights reserved.
7+
*
8+
* This software is licensed to you under the terms of the
9+
* GNU General Public License version 2 (the "GPL") with Broadcom special exception.
10+
*
11+
* INFORMATION CONTAINED IN THIS DOCUMENT IS PROVIDED "AS-IS," AND SYNAPTICS
12+
* EXPRESSLY DISCLAIMS ALL EXPRESS AND IMPLIED WARRANTIES, INCLUDING ANY
13+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE,
14+
* AND ANY WARRANTIES OF NON-INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS.
15+
* IN NO EVENT SHALL SYNAPTICS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
16+
* SPECIAL, PUNITIVE, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR IN CONNECTION
17+
* WITH THE USE OF THE INFORMATION CONTAINED IN THIS DOCUMENT, HOWEVER CAUSED
18+
* AND BASED ON ANY THEORY OF LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
19+
* NEGLIGENCE OR OTHER TORTIOUS ACTION, AND EVEN IF SYNAPTICS WAS ADVISED OF
20+
* THE POSSIBILITY OF SUCH DAMAGE. IF A TRIBUNAL OF COMPETENT JURISDICTION
21+
* DOES NOT PERMIT THE DISCLAIMER OF DIRECT DAMAGES OR ANY OTHER DAMAGES,
22+
* SYNAPTICS' TOTAL CUMULATIVE LIABILITY TO ANY PARTY SHALL NOT
23+
* EXCEED ONE HUNDRED U.S. DOLLARS
24+
*
25+
* Copyright (C) 2024, Broadcom.
726
*
827
* Unless you and Broadcom execute a separate written software license
928
* agreement governing use of this software, this software is licensed to you

drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/bcmbloom.c

100644100755
Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
11
/*
22
* Bloom filter support
33
*
4-
* Copyright (C) 2022, Broadcom.
4+
* Copyright (C) 2024 Synaptics Incorporated. All rights reserved.
5+
*
6+
* This software is licensed to you under the terms of the
7+
* GNU General Public License version 2 (the "GPL") with Broadcom special exception.
8+
*
9+
* INFORMATION CONTAINED IN THIS DOCUMENT IS PROVIDED "AS-IS," AND SYNAPTICS
10+
* EXPRESSLY DISCLAIMS ALL EXPRESS AND IMPLIED WARRANTIES, INCLUDING ANY
11+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE,
12+
* AND ANY WARRANTIES OF NON-INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS.
13+
* IN NO EVENT SHALL SYNAPTICS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
14+
* SPECIAL, PUNITIVE, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR IN CONNECTION
15+
* WITH THE USE OF THE INFORMATION CONTAINED IN THIS DOCUMENT, HOWEVER CAUSED
16+
* AND BASED ON ANY THEORY OF LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
17+
* NEGLIGENCE OR OTHER TORTIOUS ACTION, AND EVEN IF SYNAPTICS WAS ADVISED OF
18+
* THE POSSIBILITY OF SUCH DAMAGE. IF A TRIBUNAL OF COMPETENT JURISDICTION
19+
* DOES NOT PERMIT THE DISCLAIMER OF DIRECT DAMAGES OR ANY OTHER DAMAGES,
20+
* SYNAPTICS' TOTAL CUMULATIVE LIABILITY TO ANY PARTY SHALL NOT
21+
* EXCEED ONE HUNDRED U.S. DOLLARS
22+
*
23+
* Copyright (C) 2024, Broadcom.
524
*
625
* Unless you and Broadcom execute a separate written software license
726
* agreement governing use of this software, this software is licensed to you

0 commit comments

Comments
 (0)