RDMA/efa: Rename admin queue attributes struct name for extendability

As preparation for adding a second queue attributes query, change the
name of the existing queue attributes.

Reviewed-by: Michael Margolin <mrgolin@amazon.com>
Signed-off-by: Yonatan Nachum <ynachum@amazon.com>
Link: https://patch.msgid.link/20260217112304.36849-2-ynachum@amazon.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/hw/efa/efa_admin_cmds_defs.h b/drivers/infiniband/hw/efa/efa_admin_cmds_defs.h
index 57178dad5eb7bfc3274108a17e21d34fd6697476..5bbc765b6e3f36fb48deb1fa4a97db8b82f2522d 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_admin_cmds_defs.h
+++ b/drivers/infiniband/hw/efa/efa_admin_cmds_defs.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */
 /*
- * Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All rights reserved.
+ * Copyright 2018-2026 Amazon.com, Inc. or its affiliates. All rights reserved.
  */
 
 #ifndef _EFA_ADMIN_CMDS_H_
@@ -38,7 +38,7 @@ enum efa_admin_aq_feature_id {
        EFA_ADMIN_DEVICE_ATTR                       = 1,
        EFA_ADMIN_AENQ_CONFIG                       = 2,
        EFA_ADMIN_NETWORK_ATTR                      = 3,
-       EFA_ADMIN_QUEUE_ATTR                        = 4,
+       EFA_ADMIN_QUEUE_ATTR_1                      = 4,
        EFA_ADMIN_HW_HINTS                          = 5,
        EFA_ADMIN_HOST_INFO                         = 6,
        EFA_ADMIN_EVENT_QUEUE_ATTR                  = 7,
@@ -744,7 +744,7 @@ struct efa_admin_feature_device_attr_desc {
        u32 reserved1;
 };
 
-struct efa_admin_feature_queue_attr_desc {
+struct efa_admin_feature_queue_attr_desc_1 {
        /* The maximum number of queue pairs supported */
        u32 max_qp;
 
@@ -872,7 +872,7 @@ struct efa_admin_get_feature_resp {
 
                struct efa_admin_feature_network_attr_desc network_attr;
 
-               struct efa_admin_feature_queue_attr_desc queue_attr;
+               struct efa_admin_feature_queue_attr_desc_1 queue_attr_1;
 
                struct efa_admin_event_queue_attr_desc event_queue_attr;
 

diff --git a/drivers/infiniband/hw/efa/efa_com_cmd.c b/drivers/infiniband/hw/efa/efa_com_cmd.c
index 9ead02800ac7ce585cc241f7730ca94c1c3b2b3d..592c420e4473ced4a4ee8777240fa4ab25044c5a 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_com_cmd.c
+++ b/drivers/infiniband/hw/efa/efa_com_cmd.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
 /*
- * Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All rights reserved.
+ * Copyright 2018-2026 Amazon.com, Inc. or its affiliates. All rights reserved.
  */
 
 #include "efa_com.h"
@@ -479,31 +479,31 @@ int efa_com_get_device_attr(struct efa_com_dev *edev,
 
        edev->supported_features = resp.u.device_attr.supported_features;
        err = efa_com_get_feature(edev, &resp,
-                                 EFA_ADMIN_QUEUE_ATTR);
+                                 EFA_ADMIN_QUEUE_ATTR_1);
        if (err) {
                ibdev_err_ratelimited(edev->efa_dev,
-                                     "Failed to get queue attributes %d\n",
+                                     "Failed to get queue attributes1 %d\n",
                                      err);
                return err;
        }
 
-       result->max_qp = resp.u.queue_attr.max_qp;
-       result->max_sq_depth = resp.u.queue_attr.max_sq_depth;
-       result->max_rq_depth = resp.u.queue_attr.max_rq_depth;
-       result->max_cq = resp.u.queue_attr.max_cq;
-       result->max_cq_depth = resp.u.queue_attr.max_cq_depth;
-       result->inline_buf_size = resp.u.queue_attr.inline_buf_size;
-       result->max_sq_sge = resp.u.queue_attr.max_wr_send_sges;
-       result->max_rq_sge = resp.u.queue_attr.max_wr_recv_sges;
-       result->max_mr = resp.u.queue_attr.max_mr;
-       result->max_mr_pages = resp.u.queue_attr.max_mr_pages;
-       result->max_pd = resp.u.queue_attr.max_pd;
-       result->max_ah = resp.u.queue_attr.max_ah;
-       result->max_llq_size = resp.u.queue_attr.max_llq_size;
-       result->sub_cqs_per_cq = resp.u.queue_attr.sub_cqs_per_cq;
-       result->max_wr_rdma_sge = resp.u.queue_attr.max_wr_rdma_sges;
-       result->max_tx_batch = resp.u.queue_attr.max_tx_batch;
-       result->min_sq_depth = resp.u.queue_attr.min_sq_depth;
+       result->max_qp = resp.u.queue_attr_1.max_qp;
+       result->max_sq_depth = resp.u.queue_attr_1.max_sq_depth;
+       result->max_rq_depth = resp.u.queue_attr_1.max_rq_depth;
+       result->max_cq = resp.u.queue_attr_1.max_cq;
+       result->max_cq_depth = resp.u.queue_attr_1.max_cq_depth;
+       result->inline_buf_size = resp.u.queue_attr_1.inline_buf_size;
+       result->max_sq_sge = resp.u.queue_attr_1.max_wr_send_sges;
+       result->max_rq_sge = resp.u.queue_attr_1.max_wr_recv_sges;
+       result->max_mr = resp.u.queue_attr_1.max_mr;
+       result->max_mr_pages = resp.u.queue_attr_1.max_mr_pages;
+       result->max_pd = resp.u.queue_attr_1.max_pd;
+       result->max_ah = resp.u.queue_attr_1.max_ah;
+       result->max_llq_size = resp.u.queue_attr_1.max_llq_size;
+       result->sub_cqs_per_cq = resp.u.queue_attr_1.sub_cqs_per_cq;
+       result->max_wr_rdma_sge = resp.u.queue_attr_1.max_wr_rdma_sges;
+       result->max_tx_batch = resp.u.queue_attr_1.max_tx_batch;
+       result->min_sq_depth = resp.u.queue_attr_1.min_sq_depth;
 
        err = efa_com_get_feature(edev, &resp, EFA_ADMIN_NETWORK_ATTR);
        if (err) {