drivers: wifi: infineon: Add SPI support to AIROC WiFi driver #78773

ThreeEights · 2024-09-20T15:02:06Z

Added support for SPI to the Infineon AIROC WiFi driver (drivers/wifi/infineon). Includes support for 3-wire SPI required by the Raspberry Pi Pico W.

Configuration for the Pico W is updated to activate the WiFi chip on that board.

parthitce

split the changes. bindings, driver and consumer

dts/bindings/wifi/infineon,airoc-wifi-spi.yaml

parthitce · 2024-09-21T17:17:11Z

dts/bindings/wifi/infineon,airoc-wifi-common.yaml

+ by the WiFi section of AIROC Wi-Fi device.
+ type: phandle-array
+
+ wifi-host-wake-gpios:


can be renamed to interrupt IMO

"WIFI_HOST_WAKE" comes from the chip datasheet, and that's how Infineon defined the property. I didn't want to change it.

yeah, same is called interrupt in Linux Kernel context, so was my suggestion. prefix wifi- is implicit already, so can be removed

The names:

wifi_host_wake

wifi_dev_wake

wifi_reg_on

bt_reg_on

are already in use in the Infineon WiFi and Bluetooth drivers, and match names used throughout modules/hal/infineon and zephyr/modules/hal_infineon, as well as following the naming convention used in their hardware datasheets. Since I'm not part of Infineon, and I'm only adding a new capability on top of their existing driver, I think it's not my role to modify their names.

dts/bindings/wifi/infineon,airoc-wifi-common.yaml

modules/hal_infineon/wifi-host-driver/CMakeLists.txt

drivers/wifi/infineon/airoc_wifi.h

ThreeEights · 2024-09-23T17:30:54Z

@parthitce - You wrote "split the changes. bindings, driver and consumer". Do you mean create 3 separate pull requests? Or do you mean something else?

parthitce · 2024-09-24T06:00:04Z

@parthitce - You wrote "split the changes. bindings, driver and consumer". Do you mean create 3 separate pull requests? Or do you mean something else?

No, split into multiple commits in this PR

Additional bindings to configure SPI support. Signed-off-by: Steve Boylan <stephen.boylan@beechwoods.com>

ThreeEights · 2024-09-24T15:31:27Z

@parthitce - I divided this into 3 commits as you requested. Please let me know if these meet your expectations.

Unfortunately, these changes depend on a pull request for modules/hal/infineon, which is still being reviewed by Infineon. I'll keep following that change so this can proceed.

soburi · 2024-09-27T12:43:42Z

drivers/wifi/infineon/Kconfig.airoc

@@ -17,6 +16,24 @@ menuconfig WIFI_AIROC

 if WIFI_AIROC

+choice


Can this configuration replace with DT_ON_BUS?

yes looks like it a good idea to select spi/sdio(sdhc) by DT_ON_BUS, so it will simplify bus configuration. For now we need disable one, enable another...:

CONFIG_AIROC_WIFI_BUS_SDIO=n CONFIG_AIROC_WIFI_BUS_SPI=y

@soburi - Looks like most of the cases can be replaced with DT_ON_BUS(). The two I don't know how to address are in CMakeLists.txt, where the appropriate bus interface source file is selected, and making the option AIROC_WIFI_BUS_SPI_DATA_IRQ_MUX available in Kconfig.airoc. The latter enables logic to change use of the GPIO line in the special case where the SPI data and IRQ are shared, which is the case for the Pico W.
Do you have any suggestions for how to handle those?

Can it be configured by pinctrl?
IMO, The pin function should not be configured in the wifi driver.

yes looks like it a good idea to select spi/sdio(sdhc) by DT_ON_BUS, so it will simplify bus configuration. For now we need disable one, enable another...:

CONFIG_AIROC_WIFI_BUS_SDIO=n CONFIG_AIROC_WIFI_BUS_SPI=y

@npal-cy - Yes, that's why I made it a choice. Now that I know about DT_ON_BUS, yes, that makes things cleaner ... if we can figure out how to configure cmake and the data/IRQ multiplexing.

Can it be configured by pinctrl?
IMO, The pin function should not be configured in the wifi driver.

I struggled with this issue. On the Pico W, GPIO 24 is used for bidirectional data as well as HOST_WAKE. In order to make this work, the pin has to be assigned to SIO (function 5) when serving as an interrupt, but switched to the PIO (function 6 or 7, depending) when used for SPI data. The Pico SPI driver doesn't know about this silliness; it seems to belong in the layer within the WiFi driver that deals with the SPI bus. This was the best compromise I could come up with. I'd be happy to hear any cleaner solutions.

@npal-cy - Yes, that's why I made it a choice. Now that I know about DT_ON_BUS, yes, that makes things cleaner ... if we can figure out how to configure cmake and the data/IRQ multiplexing.

I mean to keep AIROC_WIFI_BUS_SPI/AIROC_WIFI_BUS_SDIO, make them hidden and automatically enabled by on_bus, something like snipped below (not tested...)

config AIROC_WIFI_BUS_SDIO bool default $(dt_compat_on_bus,$(DT_COMPAT_INFINEON_AIROC_WIFI),sd) select SDIO_STACK select SDHC config AIROC_WIFI_BUS_SPI bool default $(dt_compat_on_bus,$(DT_COMPAT_INFINEON_AIROC_WIFI),spi) select SPI

@ThreeEights

Do you have any suggestions for how to handle those?

We can use pinctrl_apply_state with a private state.

zephyr/drivers/sdhc/imx_usdhc.c

Line 176 in 2f47de6

ret = pinctrl_apply_state(cfg->pincfg, PINCTRL_STATE_NOPULL);

npal-cy · 2024-09-23T22:44:53Z

drivers/wifi/infineon/airoc_whd_hal_spi.c

+#include <bus_protocols/whd_bus_spi_protocol.h>
+#include <bus_protocols/whd_spi.h>
+#include <whd_wifi_api.h>
+#include <hardware/gpio.h>


hardware/gpio.h is it something specific to RPI_PICO?

Ooops! Yes, that's Pico W specific. I wrapped it in #if/#endif.

npal-cy · 2024-09-23T22:49:14Z

drivers/wifi/infineon/airoc_whd_hal_spi.c

+#include <hardware/gpio.h>
+#include <zephyr/drivers/spi.h>
+
+#define DT_DRV_COMPAT infineon_airoc_wifi


can we move define DT_DRV_COMPAT infineon_airoc_wifi to airoc_w....common.h and remove from airoc_w....common.c, ***sdio.c, ***spi.c?

Good point. I've moved it as you suggested.

npal-cy · 2024-09-24T07:25:27Z

boards/raspberrypi/rpi_pico/rpi_pico_rp2040_w_defconfig

+CONFIG_AIROC_WIFI_BUS_SDIO=n
+CONFIG_AIROC_WIFI_BUS_SPI=y
+CONFIG_AIROC_WIFI_BUS_SPI_DATA_IRQ_MUX=y
+CONFIG_CYW43439=y


CONFIG_CYW43439 will select FW:

# CYW43439 firmware if(CONFIG_CYW43439 AND NOT CONFIG_AIROC_WIFI_CUSTOM) zephyr_include_directories(${hal_wifi_dir_resources}/firmware/COMPONENT_43439) # firmware if(CONFIG_AIROC_WLAN_MFG_FIRMWARE) set(cyw43xx_fw_bin ${hal_blobs_dir}/firmware/COMPONENT_43439/43439A0-mfgtest.bin) zephyr_library_sources(${hal_wifi_dir_resources}/firmware/COMPONENT_43439/43439A0-mfgtest_bin.c) else() set(cyw43xx_fw_bin ${hal_blobs_dir}/firmware/COMPONENT_43439/43439a0.bin) zephyr_library_sources(${hal_wifi_dir_resources}/firmware/COMPONENT_43439/43439a0_bin.c) endif() endif()

But it doesn't select any CLM, NVRAM as in e.g CONFIG_CYW43439_MURATA_1YN .... Do we missed something here?

# CYW43439_MURATA_1YN if(CONFIG_CYW43439_MURATA_1YN AND NOT CONFIG_AIROC_WIFI_CUSTOM) zephyr_include_directories(${hal_wifi_dir_resources}/clm/COMPONENT_43439) # clm if(CONFIG_AIROC_WLAN_MFG_FIRMWARE) set(cyw43xx_clm_bin ${hal_blobs_dir}/clm/COMPONENT_43439/43439A0-mfgtest.clm_blob) zephyr_library_sources(${hal_wifi_dir_resources}/clm/COMPONENT_43439/43439A0-mfgtest_clm_blob.c) else() set(cyw43xx_clm_bin ${hal_blobs_dir}/clm/COMPONENT_43439/43439A0.clm_blob) zephyr_library_sources(${hal_wifi_dir_resources}/clm/COMPONENT_43439/43439A0_clm_blob.c) endif() # nvram zephyr_include_directories(${hal_wifi_dir_resources}/nvram/COMPONENT_43439/COMPONENT_MURATA-1YN) endif()

Curious - yet the NVRAM image is included in the result ...
... and curiouser, CONFIG_CYW43439_MURATA_1YN is also selected, even though I didn't put it in the configuration for the Pico W:

sboylan@system76-pc:/media/sboylan/LaCie/zephyr/bare-test/build/zephyr$ grep "CYW4343" .config # CONFIG_CYW4343W is not set # CONFIG_CYW43438 is not set CONFIG_CYW43439=y CONFIG_CYW43439_MURATA_1YN=y

yes looks like if you do not select any module it takes default one.. anyway need to double check if for Raspberry Pi Pico W we need to use some specific FW/CLM/Nvram...

npal-cy · 2024-09-24T07:39:20Z

drivers/wifi/infineon/airoc_whd_hal_common.h

+/** Map Zephyr country codes (2 octets) to whd_country_code_t. */
+#if defined(CONFIG_AIROC_WIFI_COUNTRY)
+#if defined(CONFIG_BIG_ENDIAN)
+#define AIROC_MAP_COUNTRY_CODE(code) ((code[1]) + (code[0] << 8))


where do you use AIROC_MAP_COUNTRY_CODE?

Sorry, that's a vestige of an issue that was fixed a long time ago. I took it out.

Added support for SPI in 4-wire and 3-wire configurations to the Infineon AIROC WiFi driver (drivers/wifi/infineon). Review changes: Move DT_DRV_COMPAT to common header file Correct board-specific preprocessor lines Removed AIROC_MAP_COUNTRY_CODE Signed-off-by: Steve Boylan <stephen.boylan@beechwoods.com>

Configure the Raspberry Pi Pico W for WiFi. Signed-off-by: Steve Boylan <stephen.boylan@beechwoods.com>

zephyrbot added platform: Raspberry Pi Pico Raspberry Pi Pico (RPi Pico) platform: Infineon Infineon Technologies AG area: Wi-Fi Wi-Fi labels Sep 20, 2024

zephyrbot requested review from ifyall, jukkar, Kludentwo, krish2718, npal-cy, parthitce, rlubos, soburi, talih0 and yonsch September 20, 2024 15:02

zephyrbot assigned jukkar Sep 20, 2024

ThreeEights force-pushed the airoc-spi-wifi branch from ef2524e to 8d90ab3 Compare September 21, 2024 14:31

parthitce requested changes Sep 21, 2024

View reviewed changes

soburi reviewed Sep 21, 2024

View reviewed changes

modules/hal_infineon/wifi-host-driver/CMakeLists.txt Outdated Show resolved Hide resolved

soburi reviewed Sep 21, 2024

View reviewed changes

drivers/wifi/infineon/airoc_wifi.h Outdated Show resolved Hide resolved

soburi mentioned this pull request Sep 23, 2024

TaskList for Supporting RaspberryPi Pico peripherals #53810

Open

48 tasks

ThreeEights force-pushed the airoc-spi-wifi branch 2 times, most recently from 6b1db29 to f41933d Compare September 23, 2024 15:44

dts: bindings: wifi: Support SPI for Infineon AIROC driver

38a7d0f

Additional bindings to configure SPI support. Signed-off-by: Steve Boylan <stephen.boylan@beechwoods.com>

ThreeEights force-pushed the airoc-spi-wifi branch from f41933d to 38a7d0f Compare September 24, 2024 14:58

ThreeEights force-pushed the airoc-spi-wifi branch from 0e478a2 to d861b7c Compare September 24, 2024 17:45

soburi reviewed Sep 27, 2024

View reviewed changes

npal-cy requested changes Sep 27, 2024

View reviewed changes

boards: rpi_pico: WiFi configuration for Pico W

a2f6bf6

Configure the Raspberry Pi Pico W for WiFi. Signed-off-by: Steve Boylan <stephen.boylan@beechwoods.com>

ThreeEights force-pushed the airoc-spi-wifi branch from d861b7c to a2f6bf6 Compare September 27, 2024 18:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

drivers: wifi: infineon: Add SPI support to AIROC WiFi driver #78773

drivers: wifi: infineon: Add SPI support to AIROC WiFi driver #78773

ThreeEights commented Sep 20, 2024

parthitce left a comment

parthitce Sep 21, 2024

ThreeEights Sep 23, 2024

parthitce Sep 24, 2024

ThreeEights Sep 27, 2024 •

edited

Loading

ThreeEights commented Sep 23, 2024

parthitce commented Sep 24, 2024

ThreeEights commented Sep 24, 2024

soburi Sep 27, 2024

npal-cy Sep 27, 2024

ThreeEights Sep 27, 2024

soburi Sep 27, 2024

ThreeEights Sep 27, 2024

ThreeEights Sep 27, 2024

npal-cy Sep 27, 2024 •

edited

Loading

soburi Sep 28, 2024

npal-cy Sep 23, 2024

ThreeEights Sep 27, 2024

npal-cy Sep 23, 2024

ThreeEights Sep 27, 2024

npal-cy Sep 24, 2024

ThreeEights Sep 27, 2024 •

edited

Loading

npal-cy Sep 27, 2024

npal-cy Sep 24, 2024

ThreeEights Sep 27, 2024

drivers: wifi: infineon: Add SPI support to AIROC WiFi driver #78773

Are you sure you want to change the base?

drivers: wifi: infineon: Add SPI support to AIROC WiFi driver #78773

Conversation

ThreeEights commented Sep 20, 2024

parthitce left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ThreeEights Sep 27, 2024 • edited Loading

Choose a reason for hiding this comment

ThreeEights commented Sep 23, 2024

parthitce commented Sep 24, 2024

ThreeEights commented Sep 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

npal-cy Sep 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ThreeEights Sep 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ThreeEights Sep 27, 2024 •

edited

Loading

npal-cy Sep 27, 2024 •

edited

Loading

ThreeEights Sep 27, 2024 •

edited

Loading