git: e713398043b8 - stable/15 - ena: Upgrade ena-com to freebsd v2.8.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 04 Nov 2026 21:15:14 UTC
The branch stable/15 has been updated by akiyano:
URL: https://cgit.FreeBSD.org/src/commit/?id=e713398043b8b05fc0fbafab455fcefa84078646
commit e713398043b8b05fc0fbafab455fcefa84078646
Author: Arthur Kiyanovski <akiyano@FreeBSD.org>
AuthorDate: 2026-10-29 02:53:22 +0000
Commit: Arthur Kiyanovski <akiyano@FreeBSD.org>
CommitDate: 2026-11-04 20:52:56 +0000
ena: Upgrade ena-com to freebsd v2.8.5
Merge commit 'c51345cf234c029abf8b5f1655f65f6c2ffaaec9'
Reviewed by: cperciva
MFC after: 3 days
Sponsored by: Amazon, Inc.
(cherry picked from commit 0f6f75189f5e55a5846e3b20eec18db93cfafa89)
---
sys/contrib/ena-com/ena_com.c | 62 +++++++++++++++------------
sys/contrib/ena-com/ena_com.h | 5 ++-
sys/contrib/ena-com/ena_defs/ena_admin_defs.h | 5 +++
sys/contrib/ena-com/ena_plat.h | 2 +-
4 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/sys/contrib/ena-com/ena_com.c b/sys/contrib/ena-com/ena_com.c
index ae952c4e4435..68d6fa639178 100644
--- a/sys/contrib/ena-com/ena_com.c
+++ b/sys/contrib/ena-com/ena_com.c
@@ -76,6 +76,8 @@
#define ENA_MAX_ADMIN_POLL_US 5000
+#define ENA_MAX_INDIR_TABLE_LOG_SIZE 16
+
/* PHC definitions */
#define ENA_PHC_DEFAULT_EXPIRE_TIMEOUT_USEC 10
#define ENA_PHC_DEFAULT_BLOCK_TIMEOUT_USEC 1000
@@ -1074,6 +1076,12 @@ static bool ena_com_check_supported_feature_id(struct ena_com_dev *ena_dev,
return true;
}
+bool ena_com_indirection_table_config_supported(struct ena_com_dev *ena_dev)
+{
+ return ena_com_check_supported_feature_id(ena_dev,
+ ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG);
+}
+
static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,
struct ena_admin_get_feat_resp *get_resp,
enum ena_admin_aq_feature_id feature_id,
@@ -1219,55 +1227,55 @@ static void ena_com_hash_ctrl_destroy(struct ena_com_dev *ena_dev)
rss->hash_ctrl = NULL;
}
-static int ena_com_indirect_table_allocate(struct ena_com_dev *ena_dev,
- u16 log_size)
+static int ena_com_indirect_table_allocate(struct ena_com_dev *ena_dev)
{
- struct ena_rss *rss = &ena_dev->rss;
struct ena_admin_get_feat_resp get_resp;
- size_t tbl_size;
+ struct ena_rss *rss = &ena_dev->rss;
+ u16 requested_log_tbl_size;
+ int requested_tbl_size;
int ret;
ret = ena_com_get_feature(ena_dev, &get_resp,
- ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG, 0);
+ ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG,
+ ENA_ADMIN_RSS_FEATURE_VERSION_1);
+
if (unlikely(ret))
return ret;
- if ((get_resp.u.ind_table.min_size > log_size) ||
- (get_resp.u.ind_table.max_size < log_size)) {
- ena_trc_err(ena_dev, "Indirect table size doesn't fit. requested size: %d while min is:%d and max %d\n",
- 1 << log_size,
- 1 << get_resp.u.ind_table.min_size,
- 1 << get_resp.u.ind_table.max_size);
+ requested_log_tbl_size = get_resp.u.ind_table.max_size;
+
+ if (requested_log_tbl_size > ENA_MAX_INDIR_TABLE_LOG_SIZE) {
+ ena_trc_err(ena_dev, "Requested indirect table size too large. Requested log size: %u.\n",
+ requested_log_tbl_size);
return ENA_COM_INVAL;
}
- tbl_size = (1ULL << log_size) *
- sizeof(struct ena_admin_rss_ind_table_entry);
-
+ requested_tbl_size = (1ULL << requested_log_tbl_size) *
+ sizeof(struct ena_admin_rss_ind_table_entry);
ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev,
- tbl_size,
- rss->rss_ind_tbl,
- rss->rss_ind_tbl_dma_addr,
- rss->rss_ind_tbl_mem_handle);
+ requested_tbl_size,
+ rss->rss_ind_tbl,
+ rss->rss_ind_tbl_dma_addr,
+ rss->rss_ind_tbl_mem_handle);
if (unlikely(!rss->rss_ind_tbl))
goto mem_err1;
- tbl_size = (1ULL << log_size) * sizeof(u16);
+ requested_tbl_size = (1ULL << requested_log_tbl_size) *
+ sizeof(u16);
rss->host_rss_ind_tbl =
- ENA_MEM_ALLOC(ena_dev->dmadev, tbl_size);
+ ENA_MEM_ALLOC(ena_dev->dmadev,
+ requested_tbl_size);
if (unlikely(!rss->host_rss_ind_tbl))
goto mem_err2;
- rss->tbl_log_size = log_size;
+ rss->tbl_log_size = requested_log_tbl_size;
return 0;
mem_err2:
- tbl_size = (1ULL << log_size) *
- sizeof(struct ena_admin_rss_ind_table_entry);
-
ENA_MEM_FREE_COHERENT(ena_dev->dmadev,
- tbl_size,
+ (1ULL << requested_log_tbl_size) *
+ sizeof(struct ena_admin_rss_ind_table_entry),
rss->rss_ind_tbl,
rss->rss_ind_tbl_dma_addr,
rss->rss_ind_tbl_mem_handle);
@@ -3248,13 +3256,13 @@ int ena_com_indirect_table_get(struct ena_com_dev *ena_dev, u32 *ind_tbl)
return 0;
}
-int ena_com_rss_init(struct ena_com_dev *ena_dev, u16 indr_tbl_log_size)
+int ena_com_rss_init(struct ena_com_dev *ena_dev)
{
int rc;
memset(&ena_dev->rss, 0x0, sizeof(ena_dev->rss));
- rc = ena_com_indirect_table_allocate(ena_dev, indr_tbl_log_size);
+ rc = ena_com_indirect_table_allocate(ena_dev);
if (unlikely(rc))
goto err_indr_tbl;
diff --git a/sys/contrib/ena-com/ena_com.h b/sys/contrib/ena-com/ena_com.h
index 87d0662351b0..bf901d862738 100644
--- a/sys/contrib/ena-com/ena_com.h
+++ b/sys/contrib/ena-com/ena_com.h
@@ -801,7 +801,6 @@ int ena_com_get_offload_settings(struct ena_com_dev *ena_dev,
/* ena_com_rss_init - Init RSS
* @ena_dev: ENA communication layer struct
- * @log_size: indirection log size
*
* Allocate RSS/RFS resources.
* The caller then can configure rss using ena_com_set_hash_function,
@@ -809,7 +808,7 @@ int ena_com_get_offload_settings(struct ena_com_dev *ena_dev,
*
* @return: 0 on Success and negative value otherwise.
*/
-int ena_com_rss_init(struct ena_com_dev *ena_dev, u16 log_size);
+int ena_com_rss_init(struct ena_com_dev *ena_dev);
/* ena_com_rss_destroy - Destroy rss
* @ena_dev: ENA communication layer struct
@@ -1174,6 +1173,8 @@ static inline void ena_com_disable_adaptive_moderation(struct ena_com_dev *ena_d
ena_dev->adaptive_coalescing = false;
}
+bool ena_com_indirection_table_config_supported(struct ena_com_dev *ena_dev);
+
/* ena_com_get_cap - query whether device supports a capability.
* @ena_dev: ENA communication layer struct
* @cap_id: enum value representing the capability
diff --git a/sys/contrib/ena-com/ena_defs/ena_admin_defs.h b/sys/contrib/ena-com/ena_defs/ena_admin_defs.h
index 5437f629712f..76de0fd711c5 100644
--- a/sys/contrib/ena-com/ena_defs/ena_admin_defs.h
+++ b/sys/contrib/ena-com/ena_defs/ena_admin_defs.h
@@ -868,6 +868,11 @@ struct ena_admin_feature_offload_desc {
uint32_t rx_enabled;
};
+enum ena_admin_rss_feature_version {
+ /* Support RSS configuration based on device advertised values */
+ ENA_ADMIN_RSS_FEATURE_VERSION_1 = 1,
+};
+
enum ena_admin_hash_functions {
ENA_ADMIN_TOEPLITZ = 1,
ENA_ADMIN_CRC32 = 2,
diff --git a/sys/contrib/ena-com/ena_plat.h b/sys/contrib/ena-com/ena_plat.h
index 0c6b89aad062..cc50025c9c8d 100644
--- a/sys/contrib/ena-com/ena_plat.h
+++ b/sys/contrib/ena-com/ena_plat.h
@@ -391,7 +391,7 @@ ena_reg_read32(struct ena_bus *bus, bus_size_t offset)
#define ENA_MEM_FREE_COHERENT(dmadev, size, virt, phys, dma) \
do { \
- (void)size; \
+ ((void)(size)); \
bus_dmamap_unload((dma).tag, (dma).map); \
bus_dmamem_free((dma).tag, (virt), (dma).map); \
bus_dma_tag_destroy((dma).tag); \