From b17a74fb0f45c268259ba53b424004a134848d1e Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 3 Jan 2023 13:35:14 -0600 Subject: New concurrent mode patch from SiLabs and bump handle_card_ready patch --- ...0001-fix-rsi_handle_card_ready-card-ready.patch | 36 ---------------------- .../files/0001_concurrent_compilation_fix.patch | 26 ++++++++++++++++ ...0002-fix-rsi_handle_card_ready-card-ready.patch | 36 ++++++++++++++++++++++ recipes-kernel/rsi-91x/rsi-91x_2.5.1.bb | 3 +- recipes-kernel/rsi-91x/rsi-bt91x_2.5.1.bb | 4 ++- 5 files changed, 67 insertions(+), 38 deletions(-) delete mode 100644 recipes-kernel/rsi-91x/files/0001-fix-rsi_handle_card_ready-card-ready.patch create mode 100644 recipes-kernel/rsi-91x/files/0001_concurrent_compilation_fix.patch create mode 100644 recipes-kernel/rsi-91x/files/0002-fix-rsi_handle_card_ready-card-ready.patch diff --git a/recipes-kernel/rsi-91x/files/0001-fix-rsi_handle_card_ready-card-ready.patch b/recipes-kernel/rsi-91x/files/0001-fix-rsi_handle_card_ready-card-ready.patch deleted file mode 100644 index aeed2c9..0000000 --- a/recipes-kernel/rsi-91x/files/0001-fix-rsi_handle_card_ready-card-ready.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 822df5990784ba914a1622e81b2b9ea4e079d5ea Mon Sep 17 00:00:00 2001 -From: Serhii Voloshynov -Date: Thu, 29 Dec 2022 09:36:07 +0200 -Subject: [PATCH] fix 'rsi_handle_card_ready: card ready indication in invalid - state 0.' issue - ---- -rsi_91x_hal.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/rsi_91x_hal.c b/rsi_91x_hal.c -index c3d5823..e3eeec6 100644 ---- a/rsi_91x_hal.c -+++ b/rsi_91x_hal.c -@@ -1703,6 +1703,9 @@ int rsi_hal_device_init(struct rsi_hw *adapter) - - rsi_dbg(ERR_ZONE, "%s: oper_mode = %d, coex_mode = %d\n", __func__, common->oper_mode, common->coex_mode); - -+ adapter->common_hal_fsm = COMMAN_HAL_WAIT_FOR_CARD_READY; -+ common->fsm_state = FSM_CARD_NOT_READY; -+ - switch (adapter->device_model) { - case RSI_DEV_9113: - case RSI_DEV_9116: -@@ -1714,8 +1717,6 @@ int rsi_hal_device_init(struct rsi_hw *adapter) - default: - return -EINVAL; - } -- adapter->common_hal_fsm = COMMAN_HAL_WAIT_FOR_CARD_READY; -- common->fsm_state = FSM_CARD_NOT_READY; - - #if defined(CONFIG_RSI_BT_ALONE) || defined(CONFIG_RSI_COEX_MODE) - adapter->priv->bt_fsm_state = BT_DEVICE_NOT_READY; --- -2.25.1 - diff --git a/recipes-kernel/rsi-91x/files/0001_concurrent_compilation_fix.patch b/recipes-kernel/rsi-91x/files/0001_concurrent_compilation_fix.patch new file mode 100644 index 0000000..5615c78 --- /dev/null +++ b/recipes-kernel/rsi-91x/files/0001_concurrent_compilation_fix.patch @@ -0,0 +1,26 @@ +rs9116 rsi-91x linux driver fails to compile in Station + AP mode + +Silicon labs patch from case 00297277 + +https://community.silabs.com/5008Y000024DTst +================================================== +diff --git a/rsi_91x_per.c b/rsi_91x_per.c +index 031f3fc..d57b8fa 100644 +--- a/rsi_91x_per.c ++++ b/rsi_91x_per.c +@@ -145,7 +145,6 @@ int rsi_send_rx_stats_cmd(struct rsi_hw *adapter, struct nlmsghdr *nlh) + int status = 0; + #endif + +- if (common->driver_mode == E2E_MODE) { + #ifndef CONFIG_STA_PLUS_AP + struct ieee80211_vif *vif = adapter->vifs[0]; + bool assoc = vif && vif->bss_conf.assoc; +@@ -154,6 +153,7 @@ int rsi_send_rx_stats_cmd(struct rsi_hw *adapter, struct nlmsghdr *nlh) + bool assoc = sta_vif && sta_vif->bss_conf.assoc; + #endif + ++ if (common->driver_mode == E2E_MODE) { + if (!assoc && adapter->ps_state == PS_ENABLED) + rsi_disable_ps(adapter); + goto SEND_STATS_FRAME; diff --git a/recipes-kernel/rsi-91x/files/0002-fix-rsi_handle_card_ready-card-ready.patch b/recipes-kernel/rsi-91x/files/0002-fix-rsi_handle_card_ready-card-ready.patch new file mode 100644 index 0000000..aeed2c9 --- /dev/null +++ b/recipes-kernel/rsi-91x/files/0002-fix-rsi_handle_card_ready-card-ready.patch @@ -0,0 +1,36 @@ +From 822df5990784ba914a1622e81b2b9ea4e079d5ea Mon Sep 17 00:00:00 2001 +From: Serhii Voloshynov +Date: Thu, 29 Dec 2022 09:36:07 +0200 +Subject: [PATCH] fix 'rsi_handle_card_ready: card ready indication in invalid + state 0.' issue + +--- +rsi_91x_hal.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/rsi_91x_hal.c b/rsi_91x_hal.c +index c3d5823..e3eeec6 100644 +--- a/rsi_91x_hal.c ++++ b/rsi_91x_hal.c +@@ -1703,6 +1703,9 @@ int rsi_hal_device_init(struct rsi_hw *adapter) + + rsi_dbg(ERR_ZONE, "%s: oper_mode = %d, coex_mode = %d\n", __func__, common->oper_mode, common->coex_mode); + ++ adapter->common_hal_fsm = COMMAN_HAL_WAIT_FOR_CARD_READY; ++ common->fsm_state = FSM_CARD_NOT_READY; ++ + switch (adapter->device_model) { + case RSI_DEV_9113: + case RSI_DEV_9116: +@@ -1714,8 +1717,6 @@ int rsi_hal_device_init(struct rsi_hw *adapter) + default: + return -EINVAL; + } +- adapter->common_hal_fsm = COMMAN_HAL_WAIT_FOR_CARD_READY; +- common->fsm_state = FSM_CARD_NOT_READY; + + #if defined(CONFIG_RSI_BT_ALONE) || defined(CONFIG_RSI_COEX_MODE) + adapter->priv->bt_fsm_state = BT_DEVICE_NOT_READY; +-- +2.25.1 + diff --git a/recipes-kernel/rsi-91x/rsi-91x_2.5.1.bb b/recipes-kernel/rsi-91x/rsi-91x_2.5.1.bb index 96646df..24e79a1 100644 --- a/recipes-kernel/rsi-91x/rsi-91x_2.5.1.bb +++ b/recipes-kernel/rsi-91x/rsi-91x_2.5.1.bb @@ -8,7 +8,8 @@ inherit module SRCREV = "v${PV}" SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \ file://rsi-91x-config.patch;striplevel=2 \ - file://0001-fix-rsi_handle_card_ready-card-ready.patch \ + file://0001_concurrent_compilation_fix.patch \ + file://0002-fix-rsi_handle_card_ready-card-ready.patch \ " S = "${WORKDIR}/git/rsi" diff --git a/recipes-kernel/rsi-91x/rsi-bt91x_2.5.1.bb b/recipes-kernel/rsi-91x/rsi-bt91x_2.5.1.bb index 044ae68..d2cdaa9 100644 --- a/recipes-kernel/rsi-91x/rsi-bt91x_2.5.1.bb +++ b/recipes-kernel/rsi-91x/rsi-bt91x_2.5.1.bb @@ -1,6 +1,6 @@ LICENSE = "GPLv2+|BSD" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -PR = "r1" +PR = "r2" PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" RPROVIDES_kernel-module-rsi-bt91x = "rsi-bt91x" inherit module @@ -8,6 +8,8 @@ inherit module SRCREV = "v${PV}" SRC_URI = "git://github.com/SiliconLabs/RS911X-nLink-OSD.git;protocol=https \ file://rsi-bt91x-config.patch;striplevel=2 \ + file://0001_concurrent_compilation_fix.patch \ + file://0002-fix-rsi_handle_card_ready-card-ready.patch \ " S = "${WORKDIR}/git/rsi" -- cgit v1.2.3