drivers: wifi: AIROC: add support of new devices

- add support Wi-Fi Host Driver (WHD) 4.2.1
- add Country configuration from Kconfig

Support new devices:
 -- CYW43022
 -- CYW55500 (WIFI6)
 -- CYW55572 (WIFI6)

Support new modules:
 -- CYW43022CUB
 -- CYW955573M2IPA1_SM
 -- CYW955513SDM2WLIPA_SM
 -- CYW4373_MURATA_2BC
 -- CYW4373_MURATA_2AE
 -- CYW43439_STERLING_LWBPLUS

Signed-off-by: Nazar Palamar <[email protected]>

Author: npal-cy

drivers/wifi/infineon/Kconfig.airoc

@@ -35,6 +35,9 @@ config AIROC_WIFI_BUS_SPI
 	help
 	  Enable SPI bus support
 
+config AIROC_WIFI6
+	bool
+
 config AIROC_WIFI_EVENT_TASK_STACK_SIZE
 	int "Event Task Stack Size"
 	default 4096
@@ -48,6 +51,14 @@ config AIROC_WLAN_MFG_FIRMWARE
 	help
 	  Enable WLAN Manufacturing Firmware.
 
+config WHD_WIFI_COUNTRY
+	string "Wifi couuntry option"
+	default "WHD_COUNTRY_UNITED_STATES" if CYW55572 || CYW55500
+	default "WHD_COUNTRY_AUSTRALIA"
+	help
+	  Sets the country, this will operate in for wifi initialization
+	  parameters. See the wifi-host-driver's whd_country_code_t for legal options.
+
 config AIROC_WIFI_CUSTOM
 	bool "Custom CYW43xx device/module"
 	help
@@ -80,6 +91,13 @@ config CYW43012
 	  More information about CYW43012 device you can find on
 	  https://www.infineon.com/cms/en/product/wireless-connectivity/airoc-wi-fi-plus-bluetooth-combos/cyw43012/
 
+config CYW43022
+	bool "CYW43022"
+	help
+	  Enable Infineon AIROC CYW43022 Wi-Fi connectivity,
+	  More information about CYW43022 device you can find on
+	  https://www.infineon.com/cms/en/product/wireless-connectivity/airoc-wi-fi-plus-bluetooth-combos/wi-fi-5-802.11ac/cyw43022/
+
 config CYW43438
 	bool "CYW43438"
 	help
@@ -93,6 +111,23 @@ config CYW43439
 	  Enable Infineon AIROC CYW43439 Wi-Fi connectivity,
 	  More information about CYW43439 device you can find on
 	  https://www.infineon.com/cms/en/product/wireless-connectivity/airoc-wi-fi-plus-bluetooth-combos/cyw43439/
+
+config CYW55500
+	bool "CYW55500"
+	select AIROC_WIFI6
+	help
+	  Enable Infineon AIROC CYW55500 Wi-Fi connectivity,
+	  More information about CYW55500 device you can find on
+	  https://www.infineon.com/cms/en/product/wireless-connectivity/airoc-wi-fi-plus-bluetooth-combos/wi-fi-6-6e-802.11ax/cyw55511/
+
+config CYW55572
+	bool "CYW55572"
+	select AIROC_WIFI6
+	help
+	  Enable Infineon AIROC CYW55572 Wi-Fi connectivity,
+	  More information about CYW55572 device you can find on
+	  https://www.infineon.com/cms/en/product/wireless-connectivity/airoc-wi-fi-plus-bluetooth-combos/wi-fi-6-6e-802.11ax/cyw55572/
+
 endchoice
 
 choice CYW43012_MODULE
@@ -111,6 +146,19 @@ config CYW43012_MURATA_1LV
 	  https://www.murata.com/en-us/products/connectivitymodule/wi-fi-bluetooth/overview/lineup/type1lv
 endchoice
 
+choice CYW43022_MODULE
+	prompt "Select CYW43022 module"
+	depends on CYW43022 && !AIROC_WIFI_CUSTOM
+
+config CYW43022CUB
+	bool "CYW43022CUB"
+	help
+	  Infineon CYW43022CUB M2 module
+
+	  Detailed information about CYW43022CUB module you can find on
+	  https://www.infineon.com/cms/en/product/wireless-connectivity/airoc-wi-fi-plus-bluetooth-combos/wi-fi-5-802.11ac/cyw43022/
+endchoice
+
 choice CYW4343W_MODULE
 	prompt "Select CYW4343W module"
 	depends on CYW4343W && !AIROC_WIFI_CUSTOM
@@ -131,13 +179,30 @@ choice CYW4373_MODULE
 	prompt "Select CYW4373 module"
 	depends on CYW4373 && !AIROC_WIFI_CUSTOM
 
+
+config CYW4373_MURATA_2AE
+	bool "CYW4373_MURATA_2AE"
+	help
+	  Murata Type 2AE modules based on Infineon CYW4373 combo chipset
+
+	  Detailed information about Murata Type 2AE module you can find on
+	  https://www.murata.com/en-us/products/connectivitymodule/wi-fi-bluetooth/overview/lineup/type2ae
+
+config CYW4373_MURATA_2BC
+	bool "CYW4373_MURATA_2BC"
+	help
+	  Murata Type 2BC modules based on Infineon CYW4373 combo chipset
+
+	  Detailed information about Murata Type 2BC module you can find on
+	  https://www.murata.com/en-us/products/connectivitymodule/wi-fi-bluetooth/overview/lineup/type2bc
+
 config CYW4373_STERLING_LWB5PLUS
 	bool "STERLING-LWB5plus"
 	help
 	  Ezurio Sterling LWB5+ 802.11ac / Bluetooth 5.0 M.2 Carrier Board
 	  (E-Type Key w/ SDIO/UART)
 
-	  Detailed information about Type Sterling LWB5+ module you can find on
+	  Detailed information about Sterling LWB5+ module you can find on
 	  https://www.ezurio.com/wireless-modules/wifi-modules-bluetooth/sterling-lwb5-plus-wifi-5-bluetooth-5-module
 endchoice
 
@@ -155,6 +220,34 @@ config CYW43439_MURATA_1YN
 
 	  Detailed information about Murata Type 1YN module you can find on
 	  https://www.murata.com/en-us/products/connectivitymodule/wi-fi-bluetooth/overview/lineup/type1yn
+
+config CYW43439_STERLING_LWBPLUS
+	bool "STERLING-LWBplus"
+	help
+	  Ezurio Sterling-LWB+ WiFi 4 with Bluetooth 5.2 module
+	  Detailed information about this module you can find on
+	  https://www.ezurio.com/wireless-modules/wifi-modules-bluetooth/sterling-lwb-wifi-4-and-bluetooth-52-modules
+
+endchoice
+
+choice CYW55500_MODULE
+	prompt "Select CYW55500 module"
+	depends on CYW55500 && !AIROC_WIFI_CUSTOM
+
+config CYW955513SDM2WLIPA_SM
+	bool "CYW955513SDM2WLIPA_SM"
+	help
+	  Infineon CYW955513SDM2WLIPA (SM) module
+endchoice
+
+choice CYW55572_MODULE
+	prompt "Select CYW55572 module"
+	depends on CYW55572 && !AIROC_WIFI_CUSTOM
+
+config CYW955573M2IPA1_SM
+	bool "CYW955573M2IPA1_SM"
+	help
+	  Infineon CYW955573M2IPA1 (SM) module
 endchoice
 
 endif # AIROC_WIFI

drivers/wifi/infineon/airoc_whd_hal_common.c

@@ -64,21 +64,31 @@ int airoc_wifi_power_on(const struct device *dev)
  * Implement WHD memory wrappers
  */
 
-void *whd_mem_malloc(size_t size)
+inline void *whd_mem_malloc(size_t size)
 {
 	return k_malloc(size);
 }
 
-void *whd_mem_calloc(size_t nitems, size_t size)
+inline void *whd_mem_calloc(size_t nitems, size_t size)
 {
 	return k_calloc(nitems, size);
 }
 
-void whd_mem_free(void *ptr)
+inline void whd_mem_free(void *ptr)
 {
 	k_free(ptr);
 }
 
+inline void whd_mem_memcpy(void *dest, const void *src, size_t len)
+{
+	memcpy(dest, src, len);
+}
+
+inline void whd_mem_memset(void *buf, int val, size_t len)
+{
+	memset(buf, val, len);
+}
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

drivers/wifi/infineon/airoc_whd_hal_sdio.c

@@ -73,6 +73,11 @@ int airoc_wifi_init_primary(const struct device *dev, whd_interface_t *interface
 	}
 
 	/* Init SDIO functions */
+	ret = sdio_init_func(&data->card, &data->card.func0, BUS_FUNCTION);
+	if (ret) {
+		LOG_ERR("sdio_enable_func BUS_FUNCTION, error: %x", ret);
+		return ret;
+	}
 	ret = sdio_init_func(&data->card, &data->sdio_func1, BACKPLANE_FUNCTION);
 	if (ret) {
 		LOG_ERR("sdio_enable_func BACKPLANE_FUNCTION, error: %x", ret);
@@ -93,6 +98,11 @@ int airoc_wifi_init_primary(const struct device *dev, whd_interface_t *interface
 		LOG_ERR("Can't set block size for WLAN_FUNCTION, error: %x", ret);
 		return ret;
 	}
+	ret = sdio_set_block_size(&data->card.func0, data->card.func0.cis.max_blk_size);
+	if (ret) {
+		LOG_ERR("Can't set block size for BUS_FUNCTION, error: %x", ret);
+		return ret;
+	}
 
 	/* Init wifi host driver (whd) */
 	cy_rslt_t whd_ret = whd_init(&data->whd_drv, &init_config_default, &resource_ops, buffer_if,

drivers/wifi/infineon/airoc_wifi.c

@@ -152,11 +152,15 @@ static int convert_whd_security_to_zephyr(whd_security_t security)
 	case WHD_SECURITY_OPEN:
 		zephyr_security = WIFI_SECURITY_TYPE_NONE;
 		break;
+
 	case WHD_SECURITY_WEP_PSK:
 		zephyr_security = WIFI_SECURITY_TYPE_WEP;
 		break;
 
 	case WHD_SECURITY_WPA3_WPA2_PSK:
+		zephyr_security = WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL;
+		break;
+
 	case WHD_SECURITY_WPA2_AES_PSK:
 		zephyr_security = WIFI_SECURITY_TYPE_PSK;
 		break;
@@ -199,7 +203,7 @@ static void scan_callback(whd_scan_result_t **result_ptr, void *user_data, whd_s
 {
 	struct airoc_wifi_data *data = user_data;
 	whd_scan_result_t whd_scan_result;
-	struct wifi_scan_result zephyr_scan_result;
+	struct wifi_scan_result zephyr_scan_result = {0};
 
 	if (status == WHD_SCAN_COMPLETED_SUCCESSFULLY || status == WHD_SCAN_ABORTED) {
 		data->scan_rslt_cb(data->iface, 0, NULL);
@@ -550,6 +554,11 @@ static int airoc_mgmt_connect(const struct device *dev, struct wifi_connect_req_
 		goto error;
 	}
 
+	if (usr_result.security == WHD_SECURITY_WPA3_WPA2_PSK)
+	{
+		usr_result.security = WHD_SECURITY_WPA2_AES_PSK;
+	}
+
 	/* Connect to the network */
 	if (whd_wifi_join(airoc_sta_if, &usr_result.SSID, usr_result.security, params->psk,
 			  params->psk_length) != WHD_SUCCESS) {