From: Abhimanyu Saini <absa...@amd.com>
Change cidx and pidx definition to mean used queue and avail
queue index respectively.
Signed-off-by: Abhimanyu Saini <absa...@amd.com>
---
drivers/common/sfc_efx/base/efx.h | 12 ++++++------
drivers/common/sfc_efx/base/rhead_virtio.c | 16 ++++++++--------
drivers/vdpa/sfc/sfc_vdpa_ops.c | 4 ++--
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/common/sfc_efx/base/efx.h
b/drivers/common/sfc_efx/base/efx.h
index 95f5fb6..c19205c 100644
--- a/drivers/common/sfc_efx/base/efx.h
+++ b/drivers/common/sfc_efx/base/efx.h
@@ -4886,17 +4886,17 @@ extern __checkReturn __success(return != B_FALSE)
boolean_t
typedef struct efx_virtio_vq_dyncfg_s {
/*
- * If queue is being created to be migrated then this
- * should be the FINAL_PIDX value returned by MC_CMD_VIRTIO_FINI_QUEUE
+ * If queue is being created to be migrated then this should be
+ * the FINAL_AVAIL_IDX value returned by MC_CMD_VIRTIO_FINI_QUEUE
* of the queue being migrated from. Otherwise, it should be zero.
*/
- uint32_t evvd_vq_pidx;
+ uint32_t evvd_vq_avail_idx;
/*
- * If this queue is being created to be migrated then this
- * should be the FINAL_CIDX value returned by MC_CMD_VIRTIO_FINI_QUEUE
+ * If queue is being created to be migrated then this should be
+ * the FINAL_USED_IDX value returned by MC_CMD_VIRTIO_FINI_QUEUE
* of the queue being migrated from. Otherwise, it should be zero.
*/
- uint32_t evvd_vq_cidx;
+ uint32_t evvd_vq_used_idx;
} efx_virtio_vq_dyncfg_t;
/*
diff --git a/drivers/common/sfc_efx/base/rhead_virtio.c
b/drivers/common/sfc_efx/base/rhead_virtio.c
index 7f08717..5a2ebe8 100644
--- a/drivers/common/sfc_efx/base/rhead_virtio.c
+++ b/drivers/common/sfc_efx/base/rhead_virtio.c
@@ -95,10 +95,10 @@
evvcp->evcc_features >> 32);
if (evvdp != NULL) {
- MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_PIDX,
- evvdp->evvd_vq_pidx);
- MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_CIDX,
- evvdp->evvd_vq_cidx);
+ MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_AVAIL_IDX,
+ evvdp->evvd_vq_avail_idx);
+ MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_INITIAL_USED_IDX,
+ evvdp->evvd_vq_used_idx);
}
MCDI_IN_SET_DWORD(req, VIRTIO_INIT_QUEUE_REQ_MPORT_SELECTOR,
@@ -161,10 +161,10 @@
}
if (evvdp != NULL) {
- evvdp->evvd_vq_pidx =
- MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_PIDX);
- evvdp->evvd_vq_cidx =
- MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_CIDX);
+ evvdp->evvd_vq_avail_idx =
+ MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_AVAIL_IDX);
+ evvdp->evvd_vq_used_idx =
+ MCDI_OUT_DWORD(req, VIRTIO_FINI_QUEUE_RESP_FINAL_USED_IDX);
}
return (0);
diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c
index e4cde34..426c7ac 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_ops.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c
@@ -260,8 +260,8 @@
vq_cfg.evvc_used_ring_addr = vring.used;
vq_cfg.evvc_vq_size = vring.size;
- vq_dyncfg.evvd_vq_pidx = vring.last_used_idx;
- vq_dyncfg.evvd_vq_cidx = vring.last_avail_idx;
+ vq_dyncfg.evvd_vq_used_idx = vring.last_used_idx;
+ vq_dyncfg.evvd_vq_avail_idx = vring.last_avail_idx;
/* MSI-X vector is function-relative */
vq_cfg.evvc_msix_vector = RTE_INTR_VEC_RXTX_OFFSET + vq_num;
--
1.8.3.1
