Re: [PATCH v5 virtio 04/11] pds_vdpa: move enum from common to adminq header

2023-05-14 Thread Jason Wang 


在 2023/5/4 02:12, Shannon Nelson 写道:

The pds_core_logical_qtype enum and IFNAMSIZ are not needed
in the common PDS header, only needed when working with the
adminq, so move them to the adminq header.

Note: This patch might conflict with pds_vfio patches that are
   in review, depending on which patchset gets pulled first.

Signed-off-by: Shannon Nelson 



Acked-by: Jason Wang 

Thanks



---
  include/linux/pds/pds_adminq.h | 21 +
  include/linux/pds/pds_common.h | 21 -
  2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/include/linux/pds/pds_adminq.h b/include/linux/pds/pds_adminq.h
index 98a60ce87b92..61b0a8634e1a 100644
--- a/include/linux/pds/pds_adminq.h
+++ b/include/linux/pds/pds_adminq.h
@@ -222,6 +222,27 @@ enum pds_core_lif_type {
PDS_CORE_LIF_TYPE_DEFAULT = 0,
  };
  
+#define PDS_CORE_IFNAMSIZ		16

+
+/**
+ * enum pds_core_logical_qtype - Logical Queue Types
+ * @PDS_CORE_QTYPE_ADMINQ:Administrative Queue
+ * @PDS_CORE_QTYPE_NOTIFYQ:   Notify Queue
+ * @PDS_CORE_QTYPE_RXQ:   Receive Queue
+ * @PDS_CORE_QTYPE_TXQ:   Transmit Queue
+ * @PDS_CORE_QTYPE_EQ:Event Queue
+ * @PDS_CORE_QTYPE_MAX:   Max queue type supported
+ */
+enum pds_core_logical_qtype {
+   PDS_CORE_QTYPE_ADMINQ  = 0,
+   PDS_CORE_QTYPE_NOTIFYQ = 1,
+   PDS_CORE_QTYPE_RXQ = 2,
+   PDS_CORE_QTYPE_TXQ = 3,
+   PDS_CORE_QTYPE_EQ  = 4,
+
+   PDS_CORE_QTYPE_MAX = 16   /* don't change - used in struct size */
+};
+
  /**
   * union pds_core_lif_config - LIF configuration
   * @state:LIF state (enum pds_core_lif_state)
diff --git a/include/linux/pds/pds_common.h b/include/linux/pds/pds_common.h
index 2a0d1669cfd0..435c8e8161c2 100644
--- a/include/linux/pds/pds_common.h
+++ b/include/linux/pds/pds_common.h
@@ -41,27 +41,6 @@ enum pds_core_vif_types {
  
  #define PDS_VDPA_DEV_NAME	PDS_CORE_DRV_NAME "." PDS_DEV_TYPE_VDPA_STR
  
-#define PDS_CORE_IFNAMSIZ		16

-
-/**
- * enum pds_core_logical_qtype - Logical Queue Types
- * @PDS_CORE_QTYPE_ADMINQ:Administrative Queue
- * @PDS_CORE_QTYPE_NOTIFYQ:   Notify Queue
- * @PDS_CORE_QTYPE_RXQ:   Receive Queue
- * @PDS_CORE_QTYPE_TXQ:   Transmit Queue
- * @PDS_CORE_QTYPE_EQ:Event Queue
- * @PDS_CORE_QTYPE_MAX:   Max queue type supported
- */
-enum pds_core_logical_qtype {
-   PDS_CORE_QTYPE_ADMINQ  = 0,
-   PDS_CORE_QTYPE_NOTIFYQ = 1,
-   PDS_CORE_QTYPE_RXQ = 2,
-   PDS_CORE_QTYPE_TXQ = 3,
-   PDS_CORE_QTYPE_EQ  = 4,
-
-   PDS_CORE_QTYPE_MAX = 16   /* don't change - used in struct size */
-};
-
  int pdsc_register_notify(struct notifier_block *nb);
  void pdsc_unregister_notify(struct notifier_block *nb);
  void *pdsc_get_pf_struct(struct pci_dev *vf_pdev);


___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

[PATCH v5 virtio 04/11] pds_vdpa: move enum from common to adminq header

2023-05-03 Thread Shannon Nelson via Virtualization 
The pds_core_logical_qtype enum and IFNAMSIZ are not needed
in the common PDS header, only needed when working with the
adminq, so move them to the adminq header.

Note: This patch might conflict with pds_vfio patches that are
  in review, depending on which patchset gets pulled first.

Signed-off-by: Shannon Nelson 
---
 include/linux/pds/pds_adminq.h | 21 +
 include/linux/pds/pds_common.h | 21 -
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/include/linux/pds/pds_adminq.h b/include/linux/pds/pds_adminq.h
index 98a60ce87b92..61b0a8634e1a 100644
--- a/include/linux/pds/pds_adminq.h
+++ b/include/linux/pds/pds_adminq.h
@@ -222,6 +222,27 @@ enum pds_core_lif_type {
PDS_CORE_LIF_TYPE_DEFAULT = 0,
 };
 
+#define PDS_CORE_IFNAMSIZ  16
+
+/**
+ * enum pds_core_logical_qtype - Logical Queue Types
+ * @PDS_CORE_QTYPE_ADMINQ:Administrative Queue
+ * @PDS_CORE_QTYPE_NOTIFYQ:   Notify Queue
+ * @PDS_CORE_QTYPE_RXQ:   Receive Queue
+ * @PDS_CORE_QTYPE_TXQ:   Transmit Queue
+ * @PDS_CORE_QTYPE_EQ:Event Queue
+ * @PDS_CORE_QTYPE_MAX:   Max queue type supported
+ */
+enum pds_core_logical_qtype {
+   PDS_CORE_QTYPE_ADMINQ  = 0,
+   PDS_CORE_QTYPE_NOTIFYQ = 1,
+   PDS_CORE_QTYPE_RXQ = 2,
+   PDS_CORE_QTYPE_TXQ = 3,
+   PDS_CORE_QTYPE_EQ  = 4,
+
+   PDS_CORE_QTYPE_MAX = 16   /* don't change - used in struct size */
+};
+
 /**
  * union pds_core_lif_config - LIF configuration
  * @state: LIF state (enum pds_core_lif_state)
diff --git a/include/linux/pds/pds_common.h b/include/linux/pds/pds_common.h
index 2a0d1669cfd0..435c8e8161c2 100644
--- a/include/linux/pds/pds_common.h
+++ b/include/linux/pds/pds_common.h
@@ -41,27 +41,6 @@ enum pds_core_vif_types {
 
 #define PDS_VDPA_DEV_NAME  PDS_CORE_DRV_NAME "." PDS_DEV_TYPE_VDPA_STR
 
-#define PDS_CORE_IFNAMSIZ  16
-
-/**
- * enum pds_core_logical_qtype - Logical Queue Types
- * @PDS_CORE_QTYPE_ADMINQ:Administrative Queue
- * @PDS_CORE_QTYPE_NOTIFYQ:   Notify Queue
- * @PDS_CORE_QTYPE_RXQ:   Receive Queue
- * @PDS_CORE_QTYPE_TXQ:   Transmit Queue
- * @PDS_CORE_QTYPE_EQ:Event Queue
- * @PDS_CORE_QTYPE_MAX:   Max queue type supported
- */
-enum pds_core_logical_qtype {
-   PDS_CORE_QTYPE_ADMINQ  = 0,
-   PDS_CORE_QTYPE_NOTIFYQ = 1,
-   PDS_CORE_QTYPE_RXQ = 2,
-   PDS_CORE_QTYPE_TXQ = 3,
-   PDS_CORE_QTYPE_EQ  = 4,
-
-   PDS_CORE_QTYPE_MAX = 16   /* don't change - used in struct size */
-};
-
 int pdsc_register_notify(struct notifier_block *nb);
 void pdsc_unregister_notify(struct notifier_block *nb);
 void *pdsc_get_pf_struct(struct pci_dev *vf_pdev);
-- 
2.17.1

___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization