Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport v3.7.99-ncs1-branch] wifi: Fixes from RC1 testing #2225

Merged
merged 6 commits into from
Nov 5, 2024
Merged

[Backport v3.7.99-ncs1-branch] wifi: Fixes from RC1 testing #2225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
adbc2d8
Revert "[nrf fromlist] manifest: hal_nordic: Pull RX processing fixes"
krish2718 Nov 4, 2024
370d4fd
[nrf fromlist] manifest: hal_nordic: Pull logging level fix
krish2718 Nov 4, 2024
5c760a8
[nrf fromlist] drivers: nrfwifi: Add a NULL check for FMAC context
krish2718 Nov 4, 2024
d474935
[nrf fromlist] drivers: nrfiwif: Enable recovery by default
krish2718 Nov 4, 2024
aab97de
[nrf fromlist] drivers/wifi/nrfwifi: Add buffer for discard bytes
hongquan-prog Nov 3, 2024
0ff755c
[nrf fromlist] drivers: nrfwifi: Fix CSUM support
krish2718 Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions drivers/wifi/nrfwifi/Kconfig.nrfwifi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@ config NRF_WIFI_AP_DEAD_DETECT_TIMEOUT
config NRF_WIFI_RPU_RECOVERY
bool "RPU recovery mechanism"
depends on NRF_WIFI_LOW_POWER
default y
select EXPERIMENTAL
help
Enable RPU recovery mechanism to recover from RPU (nRF70) hang.
Expand Down
15 changes: 14 additions & 1 deletion drivers/wifi/nrfwifi/src/net_if.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@
}

rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
if (!rpu_ctx_zep) {
if (!rpu_ctx_zep || !rpu_ctx_zep->rpu_ctx) {
LOG_ERR("%s: rpu_ctx_zep is NULL",
__func__);
goto unlock;
Expand Down Expand Up @@ -980,10 +980,23 @@
goto unlock;
}

memset(config, 0, sizeof(struct ethernet_config));

if (type == ETHERNET_CONFIG_TYPE_TXINJECTION_MODE) {
config->txinjection_mode =
def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode;
}
#ifdef CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
if (type == ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT ||
type == ETHERNET_CONFIG_TYPE_RX_CHECKSUM_SUPPORT) {

Check notice on line 991 in drivers/wifi/nrfwifi/src/net_if.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/wifi/nrfwifi/src/net_if.c:991 
-	if (type  == ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT ||
+	if (type == ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT ||
config->chksum_support = ETHERNET_CHECKSUM_SUPPORT_IPV4_HEADER |
ETHERNET_CHECKSUM_SUPPORT_IPV4_ICMP |
ETHERNET_CHECKSUM_SUPPORT_IPV6_HEADER |
ETHERNET_CHECKSUM_SUPPORT_IPV6_ICMP |
ETHERNET_CHECKSUM_SUPPORT_TCP |
ETHERNET_CHECKSUM_SUPPORT_UDP;
}
#endif
ret = 0;
unlock:
k_mutex_unlock(&vif_ctx_zep->vif_lock);
Expand Down
8 changes: 7 additions & 1 deletion drivers/wifi/nrfwifi/src/qspi/src/spi_if.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
addr & 0xFF,
0 /* dummy byte */
};
uint8_t discard[sizeof(hdr) + 2 * 4];

const struct spi_buf tx_buf[] = {
{.buf = hdr, .len = sizeof(hdr) },
Expand All @@ -67,12 +68,17 @@
const struct spi_buf_set tx = { .buffers = tx_buf, .count = 2 };

const struct spi_buf rx_buf[] = {
{.buf = NULL, .len = sizeof(hdr) + discard_bytes},
{.buf = discard, .len = sizeof(hdr) + discard_bytes},
{.buf = data, .len = len },
};

Check notice on line 73 in drivers/wifi/nrfwifi/src/qspi/src/spi_if.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/wifi/nrfwifi/src/qspi/src/spi_if.c:73 
-		{.buf = discard,  .len = sizeof(hdr) + discard_bytes},
-		{.buf = data, .len = len },
+		{.buf = discard, .len = sizeof(hdr) + discard_bytes},
+		{.buf = data, .len = len},

const struct spi_buf_set rx = { .buffers = rx_buf, .count = 2 };

if (rx_buf[0].len > sizeof(discard)) {
LOG_ERR("Discard bytes too large, please adjust buf size");
return -EINVAL;
}

return spi_transceive_dt(&spi_spec, &tx, &rx);
}

Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ manifest:
groups:
- hal
- name: hal_nordic
revision: 0a753f99ea4899cfbb56e29ae40b4ded95a3ab77
revision: 2d78179cc4f0601a891553132b13184fa51b6ef9
path: modules/hal/nordic
groups:
- hal
Expand Down
Loading