Merge branch 'master' into 31479-updated-dem-xml-to-take-latest-spec-…

…changes

examples/platform/silabs/SiWx917/SiWx917/wfx_rsi_host.c

@@ -25,7 +25,6 @@
 #include "silabs_utils.h"
 #include "sl_status.h"
 #include "task.h"
-
 #include "wfx_host_events.h"
 #include "wfx_rsi.h"
 

examples/platform/silabs/efr32/BUILD.gn

@@ -281,7 +281,7 @@ source_set("efr32-common") {
   }
 
   if (chip_enable_wifi) {
-    if (use_rs9116 || use_SiWx917) {
+    if (use_rs9116) {
       sources += rs911x_src_plat
 
       # All the stuff from wiseconnect
@@ -290,6 +290,14 @@ source_set("efr32-common") {
 
       #add compilation flags for rs991x build. This will be addressed directly in wiseconnect sdk in the next version release of that sdk
       cflags = rs911x_cflags
+    } else if (use_SiWx917) {
+      sources += rs911x_src_plat
+
+      # All the stuff from wiseconnect
+      sources += rs9117_src_sapi
+      include_dirs += rs9117_inc_plat
+
+      #add compilation flags for rs991x build. This will be addressed directly in wiseconnect sdk in the next version release of that sdk
     } else if (use_wf200) {
       sources += wf200_plat_src
       include_dirs += wf200_plat_incs

examples/platform/silabs/efr32/rs911x/hal/efx32_ncp_host.c

@@ -0,0 +1,302 @@
+/*******************************************************************************
+ * @file  efx32_ncp_host.c
+ * @brief
+ *******************************************************************************
+ * # License
+ * <b>Copyright 2023 Silicon Laboratories Inc. www.silabs.com</b>
+ *******************************************************************************
+ *
+ * The licensor of this software is Silicon Laboratories Inc. Your use of this
+ * software is governed by the terms of Silicon Labs Master Software License
+ * Agreement (MSLA) available at
+ * www.silabs.com/about-us/legal/master-software-license-agreement. This
+ * software is distributed to you in Source Code format and is governed by the
+ * sections of the MSLA applicable to Source Code.
+ *
+ ******************************************************************************/
+
+#include "FreeRTOS.h"
+#include "cmsis_os2.h"
+#include "dmadrv.h"
+#include "em_cmu.h"
+#include "em_core.h"
+#include "em_gpio.h"
+#include "em_usart.h"
+#include "gpiointerrupt.h"
+#include "sl_board_configuration_SiWx917.h"
+#include "sl_constants.h"
+#include "sl_rsi_utility.h"
+#include "sl_si91x_host_interface.h"
+#include "sl_si91x_status.h"
+#include "sl_status.h"
+#include "sl_wifi_constants.h"
+#include <stdbool.h>
+#include <string.h>
+
+#if defined(SL_CATLOG_POWER_MANAGER_PRESENT)
+#include "sl_power_manager.h"
+#endif
+
+static bool dma_callback(unsigned int channel, unsigned int sequenceNo, void * userParam);
+
+unsigned int rx_ldma_channel;
+unsigned int tx_ldma_channel;
+osMutexId_t spi_transfer_mutex = 0;
+
+static uint32_t dummy_buffer;
+
+// LDMA descriptor and transfer configuration structures for USART TX channel
+LDMA_Descriptor_t ldmaTXDescriptor;
+LDMA_TransferCfg_t ldmaTXConfig;
+
+// LDMA descriptor and transfer configuration structures for USART RX channel
+LDMA_Descriptor_t ldmaRXDescriptor;
+LDMA_TransferCfg_t ldmaRXConfig;
+
+static osSemaphoreId_t transfer_done_semaphore = NULL;
+
+static bool dma_callback(unsigned int channel, unsigned int sequenceNo, void * userParam)
+{
+    UNUSED_PARAMETER(channel);
+    UNUSED_PARAMETER(sequenceNo);
+    UNUSED_PARAMETER(userParam);
+#if defined(SL_CATLOG_POWER_MANAGER_PRESENT)
+    sl_power_manager_remove_em_requirement(SL_POWER_MANAGER_EM1);
+#endif
+    osSemaphoreRelease(transfer_done_semaphore);
+    return false;
+}
+
+static void gpio_interrupt(uint8_t interrupt_number)
+{
+    UNUSED_PARAMETER(interrupt_number);
+    sl_si91x_host_set_bus_event(NCP_HOST_BUS_RX_EVENT);
+    //  GPIO_IntClear(0xAAAA);
+}
+
+void sl_si91x_host_set_sleep_indicator(void)
+{
+    GPIO_PinOutSet(SLEEP_CONFIRM_PIN.port, SLEEP_CONFIRM_PIN.pin);
+}
+
+void sl_si91x_host_clear_sleep_indicator(void)
+{
+    GPIO_PinOutClear(SLEEP_CONFIRM_PIN.port, SLEEP_CONFIRM_PIN.pin);
+}
+
+uint32_t sl_si91x_host_get_wake_indicator(void)
+{
+    return GPIO_PinInGet(WAKE_INDICATOR_PIN.port, WAKE_INDICATOR_PIN.pin);
+}
+
+sl_status_t sl_si91x_host_init(void)
+{
+    // Enable clock (not needed on xG21)
+    CMU_ClockEnable(cmuClock_GPIO, true);
+
+#if SL_SPICTRL_MUX
+    spi_board_init();
+#endif
+    // Configure SPI bus pins
+    GPIO_PinModeSet(SPI_MISO_PIN.port, SPI_MISO_PIN.pin, gpioModeInput, 0);
+    GPIO_PinModeSet(SPI_MOSI_PIN.port, SPI_MOSI_PIN.pin, gpioModePushPull, 0);
+    GPIO_PinModeSet(SPI_CLOCK_PIN.port, SPI_CLOCK_PIN.pin, gpioModePushPullAlternate, 0);
+    GPIO_PinModeSet(SPI_CS_PIN.port, SPI_CS_PIN.pin, gpioModePushPull, 1);
+    // Enable clock (not needed on xG21)
+    CMU_ClockEnable(SPI_USART_CMU_CLOCK, true);
+
+    // Default asynchronous initializer (master mode, 1 Mbps, 8-bit data)
+    USART_InitSync_TypeDef init = USART_INITSYNC_DEFAULT;
+
+    init.msbf         = true; // MSB first transmission for SPI compatibility
+    init.autoCsEnable = true; // Allow the USART to assert CS
+    init.baudrate     = 12500000;
+    /*
+     * Route USART RX, TX, and CLK to the specified pins.  Note that CS is
+     * not controlled by USART so there is no write to the corresponding
+     * USARTROUTE register to do this.
+     */
+    GPIO->USARTROUTE[SPI_USART_ROUTE_INDEX].RXROUTE =
+        (SPI_MISO_PIN.port << _GPIO_USART_RXROUTE_PORT_SHIFT) | (SPI_MISO_PIN.pin << _GPIO_USART_RXROUTE_PIN_SHIFT);
+    GPIO->USARTROUTE[SPI_USART_ROUTE_INDEX].TXROUTE =
+        (SPI_MOSI_PIN.port << _GPIO_USART_TXROUTE_PORT_SHIFT) | (SPI_MOSI_PIN.pin << _GPIO_USART_TXROUTE_PIN_SHIFT);
+    GPIO->USARTROUTE[SPI_USART_ROUTE_INDEX].CLKROUTE =
+        (SPI_CLOCK_PIN.port << _GPIO_USART_CLKROUTE_PORT_SHIFT) | (SPI_CLOCK_PIN.pin << _GPIO_USART_CLKROUTE_PIN_SHIFT);
+    GPIO->USARTROUTE[SPI_USART_ROUTE_INDEX].CSROUTE =
+        (SPI_CS_PIN.port << _GPIO_USART_CSROUTE_PORT_SHIFT) | (SPI_CS_PIN.pin << _GPIO_USART_CSROUTE_PIN_SHIFT);
+
+    // Enable USART interface pins
+    GPIO->USARTROUTE[SPI_USART_ROUTE_INDEX].ROUTEEN = GPIO_USART_ROUTEEN_RXPEN | // MISO
+        GPIO_USART_ROUTEEN_TXPEN |                                               // MOSI
+        GPIO_USART_ROUTEEN_CLKPEN | GPIO_USART_ROUTEEN_CSPEN;
+
+    // Set slew rate for alternate usage pins
+    GPIO_SlewrateSet(SPI_CLOCK_PIN.port, 7, 7);
+
+    // Configure and enable USART
+    USART_InitSync(SPI_USART, &init);
+
+    SPI_USART->TIMING |= /*USART_TIMING_TXDELAY_ONE | USART_TIMING_CSSETUP_ONE |*/ USART_TIMING_CSHOLD_ONE;
+
+    // SPI_USART->CTRL_SET |= USART_CTRL_SMSDELAY;
+    if (transfer_done_semaphore == NULL)
+    {
+        transfer_done_semaphore = osSemaphoreNew(1, 0, NULL);
+    }
+
+    if (spi_transfer_mutex == 0)
+    {
+        spi_transfer_mutex = osMutexNew(NULL);
+    }
+
+    DMADRV_Init();
+    DMADRV_AllocateChannel(&rx_ldma_channel, NULL);
+    DMADRV_AllocateChannel(&tx_ldma_channel, NULL);
+
+    // Start reset line low
+    GPIO_PinModeSet(RESET_PIN.port, RESET_PIN.pin, gpioModePushPull, 0);
+
+    // configure packet pending interrupt priority
+    NVIC_SetPriority(GPIO_ODD_IRQn, PACKET_PENDING_INT_PRI);
+
+    // Configure interrupt, sleep and wake confirmation pins
+    GPIOINT_CallbackRegister(INTERRUPT_PIN.pin, gpio_interrupt);
+    GPIO_PinModeSet(INTERRUPT_PIN.port, INTERRUPT_PIN.pin, gpioModeInputPullFilter, 0);
+    GPIO_ExtIntConfig(INTERRUPT_PIN.port, INTERRUPT_PIN.pin, INTERRUPT_PIN.pin, true, false, true);
+    GPIO_PinModeSet(SLEEP_CONFIRM_PIN.port, SLEEP_CONFIRM_PIN.pin, gpioModeWiredOrPullDown, 1);
+    GPIO_PinModeSet(WAKE_INDICATOR_PIN.port, WAKE_INDICATOR_PIN.pin, gpioModeWiredOrPullDown, 0);
+
+    return SL_STATUS_OK;
+}
+
+sl_status_t sl_si91x_host_deinit(void)
+{
+    return SL_STATUS_OK;
+}
+
+void sl_si91x_host_enable_high_speed_bus()
+{
+    //  SPI_USART->CTRL_SET |= USART_CTRL_SMSDELAY | USART_CTRL_SSSEARLY;
+    //  USART_BaudrateSyncSet(SPI_USART, 0, 20000000);
+}
+
+/*==================================================================*/
+/**
+ * @fn         sl_status_t sl_si91x_host_spi_transfer(const void *tx_buffer, void *rx_buffer, uint16_t buffer_length)
+ * @param[in]  uint8_t *tx_buff, pointer to the buffer with the data to be transferred
+ * @param[in]  uint8_t *rx_buff, pointer to the buffer to store the data received
+ * @param[in]  uint16_t transfer_length, Number of bytes to send and receive
+ * @param[in]  uint8_t mode, To indicate mode 8 BIT/32 BIT mode transfers.
+ * @param[out] None
+ * @return     0, 0=success
+ * @section description
+ * This API is used to transfer/receive data to the Wi-Fi module through the SPI interface.
+ */
+sl_status_t sl_si91x_host_spi_transfer(const void * tx_buffer, void * rx_buffer, uint16_t buffer_length)
+{
+    osMutexAcquire(spi_transfer_mutex, 0xFFFFFFFFUL);
+
+#if SL_SPICTRL_MUX
+    sl_wfx_host_spi_cs_assert();
+#endif // SL_SPICTRL_MUX
+
+    if (buffer_length < 16)
+    {
+        uint8_t * tx = (tx_buffer != NULL) ? (uint8_t *) tx_buffer : (uint8_t *) &dummy_buffer;
+        uint8_t * rx = (rx_buffer != NULL) ? (uint8_t *) rx_buffer : (uint8_t *) &dummy_buffer;
+        while (buffer_length > 0)
+        {
+            while (!(SPI_USART->STATUS & USART_STATUS_TXBL))
+            {
+            }
+            SPI_USART->TXDATA = (uint32_t) *tx;
+            while (!(SPI_USART->STATUS & USART_STATUS_TXC))
+            {
+            }
+            *rx = (uint8_t) SPI_USART->RXDATA;
+            if (tx_buffer != NULL)
+            {
+                tx++;
+            }
+            if (rx_buffer != NULL)
+            {
+                rx++;
+            }
+            buffer_length--;
+        }
+    }
+    else
+    {
+        if (tx_buffer == NULL)
+        {
+            dummy_buffer = 0;
+            ldmaTXDescriptor =
+                (LDMA_Descriptor_t) LDMA_DESCRIPTOR_SINGLE_P2P_BYTE(&dummy_buffer, &(SPI_USART->TXDATA), buffer_length);
+        }
+        else
+        {
+            ldmaTXDescriptor = (LDMA_Descriptor_t) LDMA_DESCRIPTOR_SINGLE_M2P_BYTE(tx_buffer, &(SPI_USART->TXDATA), buffer_length);
+        }
+
+        if (rx_buffer == NULL)
+        {
+            ldmaRXDescriptor =
+                (LDMA_Descriptor_t) LDMA_DESCRIPTOR_SINGLE_P2P_BYTE(&(SPI_USART->RXDATA), &dummy_buffer, buffer_length);
+        }
+        else
+        {
+            ldmaRXDescriptor = (LDMA_Descriptor_t) LDMA_DESCRIPTOR_SINGLE_P2M_BYTE(&(SPI_USART->RXDATA), rx_buffer, buffer_length);
+        }
+
+        // Transfer a byte on free space in the USART buffer
+        ldmaTXConfig = (LDMA_TransferCfg_t) LDMA_TRANSFER_CFG_PERIPHERAL(SPI_USART_LDMA_TX);
+
+        // Transfer a byte on receive data valid
+        ldmaRXConfig = (LDMA_TransferCfg_t) LDMA_TRANSFER_CFG_PERIPHERAL(SPI_USART_LDMA_RX);
+
+#if defined(SL_CATLOG_POWER_MANAGER_PRESENT)
+        sl_power_manager_remove_em_requirement(SL_POWER_MANAGER_EM1);
+#endif
+
+        // Start both channels
+        DMADRV_LdmaStartTransfer(rx_ldma_channel, &ldmaRXConfig, &ldmaRXDescriptor, dma_callback, NULL);
+        DMADRV_LdmaStartTransfer(tx_ldma_channel, &ldmaTXConfig, &ldmaTXDescriptor, NULL, NULL);
+
+        if (osSemaphoreAcquire(transfer_done_semaphore, 1000) != osOK)
+        {
+            BREAKPOINT();
+        }
+    }
+
+    osMutexRelease(spi_transfer_mutex);
+#if SL_SPICTRL_MUX
+    sl_wfx_host_spi_cs_deassert();
+#endif // SL_SPICTRL_MUX
+    return SL_STATUS_OK;
+}
+
+void sl_si91x_host_hold_in_reset(void)
+{
+    GPIO_PinModeSet(RESET_PIN.port, RESET_PIN.pin, gpioModePushPull, 1);
+    GPIO_PinOutClear(RESET_PIN.port, RESET_PIN.pin);
+}
+
+void sl_si91x_host_release_from_reset(void)
+{
+    GPIO_PinModeSet(RESET_PIN.port, RESET_PIN.pin, gpioModeWiredOrPullDown, 1);
+}
+
+void sl_si91x_host_enable_bus_interrupt(void)
+{
+    NVIC_EnableIRQ(GPIO_ODD_IRQn);
+}
+
+void sl_si91x_host_disable_bus_interrupt(void)
+{
+    NVIC_DisableIRQ(GPIO_ODD_IRQn);
+}
+
+bool sl_si91x_host_is_in_irq_context(void)
+{
+    return (SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) != 0U;
+}