[PATCH 04/18] common/idpf: remove qregion struct variables

[Wenjing Qiao <wenjing.qiao@intel.com>]

Existing qregion variables are not well defined and cannot be
used for TC related stuff. Remove them from create vport
struct and add those freed bytes to a new reserved field.

Add appropriate comments on how to use the dynctl and itrn
register spacing variables.

Only VF reference was used in get version comments where it
should be PF/VF.

Note: qregion variables will be added once the requirements
are defined properly.

Signed-off-by: Pavan Kumar Linga <pavan.kumar.linga@intel.com>
Signed-off-by: Wenjing Qiao <wenjing.qiao@intel.com>
---
 drivers/common/idpf/base/virtchnl2.h | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/drivers/common/idpf/base/virtchnl2.h b/drivers/common/idpf/base/virtchnl2.h
index d496f2388e..5c01734b65 100644
--- a/drivers/common/idpf/base/virtchnl2.h
+++ b/drivers/common/idpf/base/virtchnl2.h
@@ -426,13 +426,13 @@
 
 
 /* VIRTCHNL2_OP_VERSION
- * VF posts its version number to the CP. CP responds with its version number
+ * PF/VF posts its version number to the CP. CP responds with its version number
  * in the same format, along with a return code.
- * If there is a major version mismatch, then the VF cannot operate.
- * If there is a minor version mismatch, then the VF can operate but should
+ * If there is a major version mismatch, then the PF/VF cannot operate.
+ * If there is a minor version mismatch, then the PF/VF can operate but should
  * add a warning to the system log.
  *
- * This version opcode  MUST always be specified as == 1, regardless of other
+ * This version opcode MUST always be specified as == 1, regardless of other
  * changes in the API. The CP must always respond to this message without
  * error regardless of version mismatch.
  */
@@ -598,11 +598,7 @@ struct virtchnl2_create_vport {
 	/* see VIRTCHNL2_TX_DESC_IDS definitions */
 	__le64 tx_desc_ids;
 
-#define MAX_Q_REGIONS 16
-	__le32 max_qs_per_qregion[MAX_Q_REGIONS];
-	__le32 qregion_total_qs;
-	__le16 qregion_type;
-	__le16 pad2;
+	u8 reserved1[72];
 
 	/* see VIRTCHNL2_RSS_ALGORITHM definitions */
 	__le32 rss_algorithm;
@@ -665,9 +661,7 @@ struct virtchnl2_txq_info {
 	 */
 	__le16 peer_rx_queue_id;
 
-	/* value ranges from 0 to 15 */
-	__le16 qregion_id;
-	u8 pad[2];
+	u8 pad[4];
 
 	/* Egress pasid is used for SIOV use case */
 	__le32 egress_pasid;
@@ -734,10 +728,7 @@ struct virtchnl2_rxq_info {
 	 * if this field is set
 	 */
 	u8 bufq2_ena;
-	u8 pad2;
-
-	/* value ranges from 0 to 15 */
-	__le16 qregion_id;
+	u8 pad2[3];
 
 	/* Ingress pasid is used for SIOV use case */
 	__le32 ingress_pasid;
@@ -801,9 +792,13 @@ struct virtchnl2_vector_chunk {
 	 * interrupt indices without modifying the state of the interrupt.
 	 */
 	__le32 dynctl_reg_start;
+	/* register spacing to find the next dynctl and itrn register offset
+	 * from the provided dynctl_reg_start and itrn_reg_start respectively
+	 */
 	__le32 dynctl_reg_spacing;
 
 	__le32 itrn_reg_start;
+	/* register spacing to find the individual itrn register where n=0..2 */
 	__le32 itrn_reg_spacing;
 	u8 reserved[8];
 };
-- 
2.25.1