Commit a8492cd8 authored by Shannon Nelson's avatar Shannon Nelson Committed by Michael S. Tsirkin
Browse files

pds_vdpa: move enum from common to adminq header 



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: default avatarShannon Nelson <shannon.nelson@amd.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Message-Id: <20230519215632.12343-5-shannon.nelson@amd.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent a16291b5

include/linux/pds/pds_adminq.h

+21 −0
Original line number Diff line number Diff line
@@ -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)

include/linux/pds/pds_common.h

+0 −21
Original line number Diff line number Diff line
@@ -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);