Skip to content

Commit

Permalink
nrf_wifi: Create dedicated memory pools for Wi-Fi
Browse files Browse the repository at this point in the history
Create dedicated memory pools for Wi-Fi data and
management paths. Introduce corresponding memory
allocation/deallocation calls.

Signed-off-by: Ravi Dondaputi <[email protected]>
  • Loading branch information
rado17 committed Jul 25, 2024
1 parent 2143e7b commit 53c4e85
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 6 deletions.
8 changes: 4 additions & 4 deletions nrf_wifi/fw_if/umac_if/src/default/fmac_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static enum nrf_wifi_status nrf_wifi_fmac_init_tx(struct nrf_wifi_fmac_dev_ctx *
def_priv->data_config.max_tx_aggregation *
sizeof(struct nrf_wifi_fmac_buf_map_info));

def_dev_ctx->tx_buf_info = nrf_wifi_osal_mem_zalloc(fmac_dev_ctx->fpriv->opriv,
def_dev_ctx->tx_buf_info = nrf_wifi_osal_data_mem_zalloc(fmac_dev_ctx->fpriv->opriv,
size);

if (!def_dev_ctx->tx_buf_info) {
Expand Down Expand Up @@ -88,7 +88,7 @@ static void nrf_wifi_fmac_deinit_tx(struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx)

tx_deinit(fmac_dev_ctx);

nrf_wifi_osal_mem_free(fmac_dev_ctx->fpriv->opriv,
nrf_wifi_osal_data_mem_free(fmac_dev_ctx->fpriv->opriv,
def_dev_ctx->tx_buf_info);
}

Expand All @@ -109,7 +109,7 @@ static enum nrf_wifi_status nrf_wifi_fmac_init_rx(struct nrf_wifi_fmac_dev_ctx *

size = (def_priv->num_rx_bufs * sizeof(struct nrf_wifi_fmac_buf_map_info));

def_dev_ctx->rx_buf_info = nrf_wifi_osal_mem_zalloc(fmac_dev_ctx->fpriv->opriv,
def_dev_ctx->rx_buf_info = nrf_wifi_osal_data_mem_zalloc(fmac_dev_ctx->fpriv->opriv,
size);

if (!def_dev_ctx->rx_buf_info) {
Expand Down Expand Up @@ -195,7 +195,7 @@ static enum nrf_wifi_status nrf_wifi_fmac_deinit_rx(struct nrf_wifi_fmac_dev_ctx
}
}

nrf_wifi_osal_mem_free(fmac_dev_ctx->fpriv->opriv,
nrf_wifi_osal_data_mem_free(fmac_dev_ctx->fpriv->opriv,
def_dev_ctx->rx_buf_info);

def_dev_ctx->rx_buf_info = NULL;
Expand Down
34 changes: 33 additions & 1 deletion nrf_wifi/os_if/inc/osal_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void *nrf_wifi_osal_mem_alloc(struct nrf_wifi_osal_priv *opriv,
size_t size);

/**
* @brief Allocated zero-initialized memory.
* @brief Allocated zero-initialized memory for configuration.
*
* @param opriv Pointer to the OSAL context returned by the nrf_wifi_osal_init API.
* @param size Size of the memory to be allocated in bytes.
Expand All @@ -66,6 +66,22 @@ void *nrf_wifi_osal_mem_alloc(struct nrf_wifi_osal_priv *opriv,
void *nrf_wifi_osal_mem_zalloc(struct nrf_wifi_osal_priv *opriv,
size_t size);


/**
* @brief Allocated zero-initialized memory for data.
*
* @opriv: Pointer to the OSAL context returned by the @nrf_wifi_osal_init API.
* @size: Size of the memory to be allocated in bytes.
*
* Allocates memory of @size bytes, zeroes it out and returns a pointer to the
* start of the memory allocated.
*
* @return: Pointer to start of allocated memory or NULL.
*/
void *nrf_wifi_osal_data_mem_zalloc(struct nrf_wifi_osal_priv *opriv,
size_t size);


/**
* @brief Free previously allocated memory.
*
Expand All @@ -80,6 +96,22 @@ void *nrf_wifi_osal_mem_zalloc(struct nrf_wifi_osal_priv *opriv,
void nrf_wifi_osal_mem_free(struct nrf_wifi_osal_priv *opriv,
void *buf);


/**
* @brief Free previously allocated memory for data.
*
* @opriv: Pointer to the OSAL context returned by the @nrf_wifi_osal_init API.
* @buf: Pointer to the memory to be freed.
*
* Free up memory which has been allocated using @nrf_wifi_osal_mem_alloc or
* @nrf_wifi_osal_mem_zalloc.
*
* @return: None.
*/
void nrf_wifi_osal_data_mem_free(struct nrf_wifi_osal_priv *opriv,
void *buf);


/**
* @brief Copy contents from one memory location to another.
*
Expand Down
17 changes: 16 additions & 1 deletion nrf_wifi/os_if/inc/osal_ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct nrf_wifi_osal_ops {
void *(*mem_alloc)(size_t size);

/**
* @brief Allocate zero-initialized memory.
* @brief Allocate zero-initialized memory for control messages.
*
* @param size The size of the memory to allocate.
* @return A pointer to the start of the allocated memory.
Expand All @@ -48,6 +48,21 @@ struct nrf_wifi_osal_ops {
*/
void (*mem_free)(void *buf);

/**
* @brief Allocate zero-initialized memory for data.
*
* @param size The size of the memory to allocate.
* @return A pointer to the start of the allocated memory.
*/
void *(*data_mem_zalloc)(size_t size);

/**
* @brief Free allocated memory.
*
* @param buf A pointer to the memory to free.
*/
void (*data_mem_free)(void *buf);

/**
* @brief Copy memory.
*
Expand Down
14 changes: 14 additions & 0 deletions nrf_wifi/os_if/src/osal.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,27 @@ void *nrf_wifi_osal_mem_zalloc(struct nrf_wifi_osal_priv *opriv,
}


void *nrf_wifi_osal_data_mem_zalloc(struct nrf_wifi_osal_priv *opriv,
size_t size)
{
return opriv->ops->data_mem_zalloc(size);
}


void nrf_wifi_osal_mem_free(struct nrf_wifi_osal_priv *opriv,
void *buf)
{
opriv->ops->mem_free(buf);
}


void nrf_wifi_osal_data_mem_free(struct nrf_wifi_osal_priv *opriv,
void *buf)
{
opriv->ops->data_mem_free(buf);
}


void *nrf_wifi_osal_mem_cpy(struct nrf_wifi_osal_priv *opriv,
void *dest,
const void *src,
Expand Down

0 comments on commit 53c4e85

Please sign in to comment.