Skip to content

Commit 925c26c

Browse files
committed
net: wireless: rockchip_wlan: Reset to d1c3ffc
Revert the following commits: be3b8d0 net: wireless: rockchip_wlan: bcmdhd: Remove missing rockchip_dw_pcie_pm_ctrl_for_user call 92c91c4 net: wireless: rockchip_wlan: bcmdhd: Update driver to 101.10.591.68.32 2bf46ac net: wireless: rockchip_wlan: bcmdhd: Update to 101.10.591.x Signed-off-by: Khusika Dhamar Gusti <[email protected]>
1 parent fb528a6 commit 925c26c

File tree

262 files changed

+3798
-17279
lines changed

Some content is hidden

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

262 files changed

+3798
-17279
lines changed

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
#
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.
2+
# Copyright (C) 2023, Broadcom.
223
#
234
# Unless you and Broadcom execute a separate written software license
245
# agreement governing use of this software, this software is licensed to you

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

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,6 @@
11
# bcmdhd
22
#
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.
3+
# Copyright (C) 2023, Broadcom.
234
#
245
# Unless you and Broadcom execute a separate written software license
256
# agreement governing use of this software, this software is licensed to you
@@ -50,9 +31,10 @@ CONFIG_BCMDHD_OOB := y
5031
#CONFIG_BCMDHD_CUSB := y
5132
#CONFIG_BCMDHD_NO_POWER_OFF := y
5233
CONFIG_BCMDHD_PROPTXSTATUS := y
34+
CONFIG_BCMDHD_AG := y
5335
CONFIG_DHD_USE_STATIC_BUF := y
5436
CONFIG_BCMDHD_STATIC_BUF_IN_DHD := y
55-
CONFIG_BCMDHD_ANDROID_VERSION := 14
37+
#CONFIG_BCMDHD_ANDROID_VERSION := 14
5638
CONFIG_BCMDHD_AUTO_SELECT := y
5739
CONFIG_BCMDHD_DEBUG := y
5840
#CONFIG_BCMDHD_RECONNECT := y
@@ -80,7 +62,7 @@ DHDCFLAGS = -Wall -Wstrict-prototypes -Wno-date-time -Wno-strict-prototypes \
8062
-DKEEP_ALIVE -DPKT_FILTER_SUPPORT -DDHDTCPACK_SUPPRESS \
8163
-DDHD_DONOT_FORWARD_BCMEVENT_AS_NETWORK_PKT -DOEM_ANDROID \
8264
-DMULTIPLE_SUPPLICANT -DTSQ_MULTIPLIER -DMFP -DDHD_8021X_DUMP \
83-
-DPOWERUP_MAX_RETRY=1 -DIFACE_HANG_FORCE_DEV_CLOSE -DWAIT_DEQUEUE \
65+
-DPOWERUP_MAX_RETRY=0 -DIFACE_HANG_FORCE_DEV_CLOSE -DWAIT_DEQUEUE \
8466
-DUSE_NEW_RSPEC_DEFS \
8567
-DWL_EXT_IAPSTA -DWL_ESCAN -DCCODE_LIST -DSUSPEND_EVENT \
8668
-DKEY_INSTALL_CHECK \
@@ -108,11 +90,7 @@ ifneq ($(CONFIG_CFG80211),)
10890
DHDOFILES += dhd_cfg80211.o wl_cfgvif.o wl_roam.o
10991
DHDCFLAGS += -DWL_CFG80211 -DWLP2P -DWL_CFG80211_STA_EVENT
11092
DHDCFLAGS += -DWL_CFG80211_GON_COLLISION
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
93+
DHDCFLAGS += -DWL_CAP_HE -DWL_6G_BAND -DWL_5P9G
11694
# DHDCFLAGS += -DCONFIG_6GHZ_BKPORT
11795
DHDCFLAGS += -DWL_IFACE_COMB_NUM_CHANNELS
11896
DHDCFLAGS += -DCUSTOM_PNO_EVENT_LOCK_xTIME=10
@@ -121,24 +99,20 @@ ifneq ($(CONFIG_CFG80211),)
12199
DHDCFLAGS += -DESCAN_RESULT_PATCH -DESCAN_BUF_OVERFLOW_MGMT
122100
DHDCFLAGS += -DVSDB -DWL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST
123101
DHDCFLAGS += -DWLTDLS -DMIRACAST_AMPDU_SIZE=8
124-
# DHDCFLAGS += -DHOSTAPD_BW_SUPPORT
125-
DHDCFLAGS += -DWL_VIRTUAL_APSTA -DSOFTAP_UAPSD_OFF #-DSTA_MGMT
126-
DHDCFLAGS += -DWL_SOFTAP_ACS #-DACS_MONITOR
102+
# DHDCFLAGS += -DHOSTAPD_BW_SUPPORT
103+
DHDCFLAGS += -DWL_VIRTUAL_APSTA -DSTA_MGMT -DSOFTAP_UAPSD_OFF
127104
DHDCFLAGS += -DNUM_SCB_MAX_PROBE=3
128105
DHDCFLAGS += -DWL_SCB_TIMEOUT=10
129-
# DHDCFLAGS += -DWL_BEACON_RATE
130106
DHDCFLAGS += -DEXPLICIT_DISCIF_CLEANUP
131-
DHDCFLAGS += -DDHD_USE_SCAN_WAKELOCK #DHD_DEBUG_SCAN_WAKELOCK
107+
DHDCFLAGS += -DDHD_USE_SCAN_WAKELOCK
132108
DHDCFLAGS += -DSPECIFIC_MAC_GEN_SCHEME
133109
DHDCFLAGS += -DWL_IFACE_MGMT
134110
DHDCFLAGS += -DSUPPORT_RSSI_SUM_REPORT
135111
DHDCFLAGS += -DWLFBT -DWL_GCMP_SUPPORT -DWL_OWE -DWL_SAE_FT
136112
DHDCFLAGS += -DROAM_CHANNEL_CACHE -DDHD_LOSSLESS_ROAMING
137-
# DHDCFLAGS += -DWL_SKIP_CONNECT_HINTS
138113
# DHDCFLAGS += -DWL_CFGVENDOR_SEND_HANG_EVENT
139114
DHDCFLAGS += -DGTK_OFFLOAD_SUPPORT
140115
# DHDCFLAGS += -DWL_STATIC_IF #-DDHD_MAX_STATIC_IFS=2
141-
# DHDCFLAGS += -DWL_STATIC_IFNAME_PREFIX=\"sap%d\"
142116
DHDCFLAGS += -DWL_CLIENT_SAE
143117
DHDCFLAGS += -DCONNECT_INFO_WAR -DWL_ROAM_WAR
144118
DHDCFLAGS += -DVNDR_IE_WAR
@@ -150,12 +124,11 @@ ifneq ($(CONFIG_BCMDHD_SDIO),)
150124
BUS_TYPE := sdio
151125
DHDCFLAGS += -DBCMSDIO -DMMC_SDIO_ABORT -DUSE_SDIOFIFO_IOVAR -DBCMLXSDMMC \
152126
-DSDTEST -DBDC -DDHD_USE_IDLECOUNT -DCUSTOM_SDIO_F2_BLKSIZE=256 \
153-
-DBCMSDIOH_TXGLOM -DDHD_SI_WD_RESET -DBCMSDIOH_STATIC_COPY_BUF \
127+
-DBCMSDIOH_TXGLOM -DBCMSDIOH_TXGLOM_EXT -DBCMSDIOH_STATIC_COPY_BUF \
154128
-DRXFRAME_THREAD -DDHDENABLE_TAILPAD -DSUPPORT_P2P_GO_PS \
155129
-DBCMSDIO_RXLIM_POST -DBCMSDIO_TXSEQ_SYNC -DCONSOLE_DPC \
156130
-DBCMSDIO_INTSTATUS_WAR
157-
DHDCFLAGS += -DMMC_HW_RESET #-DMMC_SW_RESET #-DBUS_POWER_RESTORE
158-
#DHDCFLAGS += -DDEVICE_PM_CALLBACK
131+
DHDCFLAGS += -DMMC_HW_RESET -DMMC_SW_RESET #-DBUS_POWER_RESTORE
159132
ifeq ($(CONFIG_BCMDHD_OOB),y)
160133
DHDCFLAGS += -DOOB_INTR_ONLY -DCUSTOMER_OOB -DHW_OOB
161134
ifeq ($(CONFIG_BCMDHD_DISABLE_WOWLAN),y)
@@ -176,7 +149,6 @@ BUS_TYPE := pcie
176149
DHDCFLAGS += -DDHD_LB -DDHD_LB_RXP -DDHD_LB_STATS -DDHD_LB_TXP
177150
DHDCFLAGS += -DDHD_LB_PRIMARY_CPUS=0xF0 -DDHD_LB_SECONDARY_CPUS=0x0E
178151
# DHDCFLAGS += -DDHD_PKTID_AUDIT_ENABLED
179-
DHDCFLAGS += -DBCMPCIE_CTO_PREVENTION
180152
DHDCFLAGS += -DEAPOL_PKT_PRIO -DENABLE_DHD_GRO
181153
DHDCFLAGS += -DDHD_SKIP_DONGLE_RESET_IN_ATTACH
182154
DHDCFLAGS += -DDHD_DONGLE_TRAP_IN_DETACH
@@ -261,8 +233,8 @@ endif
261233
endif
262234

263235
ifeq ($(CONFIG_64BIT),y)
264-
DHDCFLAGS := $(filter-out -DBCMDMA32,$(DHDCFLAGS))
265-
DHDCFLAGS += -DBCMDMA64OSL
236+
DHDCFLAGS := $(filter-out -DBCMDMA32,$(DHDCFLAGS))
237+
DHDCFLAGS += -DBCMDMA64OSL
266238
endif
267239

268240
# For Android VTS
@@ -277,16 +249,14 @@ ifneq ($(CONFIG_CFG80211),)
277249
DHDCFLAGS += -DGSCAN_SUPPORT -DRTT_SUPPORT
278250
DHDCFLAGS += -DLINKSTAT_SUPPORT -DLINKSTAT_EXT_SUPPORT
279251
DHDCFLAGS += -DCUSTOM_COUNTRY_CODE -DDHD_GET_VALID_CHANNELS
280-
DHDCFLAGS += -DDEBUGABILITY -DDBG_PKT_MON -DDEBUGABILITY_DISABLE_MEMDUMP
252+
DHDCFLAGS += -DDEBUGABILITY -DDBG_PKT_MON
281253
DHDCFLAGS += -DDHD_LOG_DUMP -DDHD_FW_COREDUMP
282-
DHDCFLAGS += -DWIFI_TURNON_USE_HALINIT
283-
DHDCFLAGS += -DDHD_PKT_LOGGING_DBGRING -DDHD_PKT_LOGGING
284254
DHDCFLAGS += -DAPF -DNDO_CONFIG_SUPPORT -DRSSI_MONITOR_SUPPORT
285255
DHDCFLAGS += -DDHD_WAKE_STATUS
286-
DHDCFLAGS += -DWL_LATENCY_MODE -DWL_USABLE_CHAN -DWL_SAR_TX_POWER
256+
DHDCFLAGS += -DWL_SOFTAP_ACS
257+
DHDCFLAGS += -DWL_LATENCY_MODE
287258
DHDOFILES += dhd_rtt.o
288259
DHDOFILES += dhd_log_dump.o
289-
DHDOFILES += dhd_pktlog.o
290260
endif
291261
else
292262
DHDCFLAGS += -DANDROID_VERSION=0
@@ -350,7 +320,7 @@ ifneq ($(CONFIG_CFG80211),)
350320
ifneq ($(CONFIG_BCMDHD_SDIO),)
351321
DHDCFLAGS += -DRXF_DEQUEUE_ON_BUSY
352322
endif
353-
DHDCFLAGS += -DWL_STATIC_IF
323+
# DHDCFLAGS += -DWL_STATIC_IF
354324
endif
355325
endif
356326

@@ -393,8 +363,10 @@ endif
393363
# For WAPI
394364
ifeq ($(CONFIG_BCMDHD_WAPI),y)
395365
DHDCFLAGS += -DBCMWAPI_WPI -DBCMWAPI_WAI
366+
ifeq ($(CONFIG_BCMDHD_ANDROID_VERSION),11)
396367
DHDCFLAGS += -DCFG80211_WAPI_BKPORT
397368
endif
369+
endif
398370

399371
# For scan random mac
400372
ifneq ($(CONFIG_BCMDHD_RANDOM_MAC),)
@@ -437,13 +409,12 @@ ifeq ($(CONFIG_BCMDHD_DTS),y)
437409
endif
438410
DHDCFLAGS += -DCUSTOMER_HW -DDHD_OF_SUPPORT
439411
DHDCFLAGS += -DCUSTOMER_HW_ROCKCHIP
440-
DHDCFLAGS += -DBLOCK_IPV6_PACKET
412+
# DHDCFLAGS += -DCUSTOMER_HW_ROCKCHIP_RK3588
441413
DHDCFLAGS += -DBCM_USE_PLATFORM_STRLCPY
442-
# DHDCFLAGS += -DGET_CUSTOM_MAC_ENABLE
443414
endif
444415

445416
ifneq ($(CONFIG_BCMDHD_PCIE),)
446-
ifeq ($(CONFIG_PCIEASPM_ROCKCHIP_WIFI_EXTENSION),y)
417+
ifneq ($(filter -DCUSTOMER_HW_ROCKCHIP_RK3588, $(DHDCFLAGS)),)
447418
DHDCFLAGS += -DDHD_CONTROL_PCIE_ASPM_WIFI_TURNON
448419
endif
449420
endif
@@ -470,6 +441,10 @@ ifeq ($(CONFIG_BCMDHD_FW_SIGNATURE),y)
470441
DHDCFLAGS += -DBL_HEAP_START_GAP_SIZE=0x1000 -DBL_HEAP_SIZE=0x10000
471442
endif
472443

444+
ifeq ($(CONFIG_BCMDHD_AG),y)
445+
DHDCFLAGS += -DBAND_AG
446+
endif
447+
473448
ifeq ($(CONFIG_DHD_USE_STATIC_BUF),y)
474449
ifeq ($(CONFIG_BCMDHD_STATIC_BUF_IN_DHD),y)
475450
DHDOFILES += dhd_static_buf.o
@@ -495,7 +470,7 @@ BCMDHD_ROOT = $(src)
495470
#$(warning "BCMDHD_ROOT=$(BCMDHD_ROOT)")
496471
EXTRA_CFLAGS = $(DHDCFLAGS)
497472
EXTRA_CFLAGS += -DDHD_COMPILED=\"$(BCMDHD_ROOT)\"
498-
EXTRA_CFLAGS += -I$(BCMDHD_ROOT)/include/ -I$(BCMDHD_ROOT)/
473+
EXTRA_CFLAGS += -I$(srctree)/$(BCMDHD_ROOT)/include/ -I$(srctree)/$(BCMDHD_ROOT)/
499474
ifeq ($(CONFIG_AP6XXX),m)
500475
EXTRA_LDFLAGS += --strip-debug
501476
endif

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

Lines changed: 8 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,7 @@
22
* Misc utility routines for accessing chip-specific features
33
* of the SiliconBackplane-based Broadcom chips.
44
*
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.
5+
* Copyright (C) 2022, Broadcom.
256
*
267
* Unless you and Broadcom execute a separate written software license
278
* agreement governing use of this software, this software is licensed to you
@@ -1257,8 +1238,8 @@ ai_core_disable(const si_t *sih, uint32 bits)
12571238
* bits - core specific bits that are set during and after reset sequence
12581239
* resetbits - core specific bits that are set only during reset sequence
12591240
*/
1260-
static bool
1261-
_ai_core_reset(const si_t *sih, uint32 bits, uint32 resetbits)
1241+
static void
1242+
BCMPOSTTRAPFN(_ai_core_reset)(const si_t *sih, uint32 bits, uint32 resetbits)
12621243
{
12631244
const si_info_t *sii = SI_INFO(sih);
12641245
aidmp_t *ai;
@@ -1268,12 +1249,6 @@ _ai_core_reset(const si_t *sih, uint32 bits, uint32 resetbits)
12681249
ASSERT(GOODREGS(sii->curwrap));
12691250
ai = sii->curwrap;
12701251

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-
}
12771252
/* ensure there are no pending backplane operations */
12781253
SPINWAIT(((dummy = R_REG(sii->osh, &ai->resetstatus)) != 0), 300);
12791254

@@ -1283,12 +1258,6 @@ _ai_core_reset(const si_t *sih, uint32 bits, uint32 resetbits)
12831258
}
12841259
#endif /* BCMDBG_ERR */
12851260

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-
12921261
/* put core into reset state */
12931262
W_REG(sii->osh, &ai->resetctrl, AIRC_RESET);
12941263
OSL_DELAY(10);
@@ -1353,31 +1322,28 @@ _ai_core_reset(const si_t *sih, uint32 bits, uint32 resetbits)
13531322
}
13541323
#endif /* UCM_CORRUPTION_WAR */
13551324
OSL_DELAY(1);
1356-
return TRUE;
13571325
}
13581326

1359-
bool
1360-
ai_core_reset(si_t *sih, uint32 bits, uint32 resetbits)
1327+
void
1328+
BCMPOSTTRAPFN(ai_core_reset)(si_t *sih, uint32 bits, uint32 resetbits)
13611329
{
13621330
si_info_t *sii = SI_INFO(sih);
13631331
const si_cores_info_t *cores_info = (const si_cores_info_t *)sii->cores_info;
13641332
uint idx = sii->curidx;
1365-
bool ret = TRUE;
13661333

13671334
if (cores_info->wrapba3[idx] != 0) {
13681335
ai_setcoreidx_3rdwrap(sih, idx);
1369-
ret = _ai_core_reset(sih, bits, resetbits);
1336+
_ai_core_reset(sih, bits, resetbits);
13701337
ai_setcoreidx(sih, idx);
13711338
}
13721339

13731340
if (cores_info->wrapba2[idx] != 0) {
13741341
ai_setcoreidx_2ndwrap(sih, idx);
1375-
ret = _ai_core_reset(sih, bits, resetbits);
1342+
_ai_core_reset(sih, bits, resetbits);
13761343
ai_setcoreidx(sih, idx);
13771344
}
13781345

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

13831349
#ifdef BOOKER_NIC400_INF

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,7 @@
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) 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.
6+
* Copyright (C) 2022, Broadcom.
267
*
278
* Unless you and Broadcom execute a separate written software license
289
* agreement governing use of this software, this software is licensed to you

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,7 @@
11
/*
22
* Bloom filter support
33
*
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.
4+
* Copyright (C) 2022, Broadcom.
245
*
256
* Unless you and Broadcom execute a separate written software license
267
* agreement governing use of this software, this software is licensed to you

0 commit comments

Comments
 (0)