On 03/09, Haiyue Wang wrote: >A new DCF PMD will be introduced, which runs on Intel VF hardware, and >it is a pure software design to control the advance functionality (such >as switch, ACL) for rest of the VFs. > >The DCF (Device Config Function) feature shares the core functions of >the ICE PMD, like it needs to export the DDP definition symbols for the >new DCF PMD use. > >Signed-off-by: Haiyue Wang <haiyue.w...@intel.com> >--- > drivers/net/ice/ice_ethdev.c | 9 +-------- > drivers/net/ice/ice_ethdev.h | 8 ++++++++ > 2 files changed, 9 insertions(+), 8 deletions(-) > >diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c >index b42deb0bc..8b9d211b0 100644 >--- a/drivers/net/ice/ice_ethdev.c >+++ b/drivers/net/ice/ice_ethdev.c >@@ -67,15 +67,8 @@ static struct proto_xtr_ol_flag >ice_proto_xtr_ol_flag_params[] = { > > #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100 > >-/* DDP package search path */ >-#define ICE_PKG_FILE_DEFAULT "/lib/firmware/intel/ice/ddp/ice.pkg" >-#define ICE_PKG_FILE_UPDATES "/lib/firmware/updates/intel/ice/ddp/ice.pkg" >-#define ICE_PKG_FILE_SEARCH_PATH_DEFAULT "/lib/firmware/intel/ice/ddp/" >-#define ICE_PKG_FILE_SEARCH_PATH_UPDATES >"/lib/firmware/updates/intel/ice/ddp/" >- > #define ICE_OS_DEFAULT_PKG_NAME "ICE OS Default Package" > #define ICE_COMMS_PKG_NAME "ICE COMMS Package" >-#define ICE_MAX_PKG_FILENAME_SIZE 256 > #define ICE_MAX_RES_DESC_NUM 1024 > > int ice_logtype_init; >@@ -1833,7 +1826,7 @@ ice_pkg_file_search_path(struct rte_pci_device *pci_dev, >char *pkg_file) > return 0; > } > >-static enum ice_pkg_type >+enum ice_pkg_type > ice_load_pkg_type(struct ice_hw *hw) > { > enum ice_pkg_type package_type; >diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h >index da557a254..7b94a3c3e 100644 >--- a/drivers/net/ice/ice_ethdev.h >+++ b/drivers/net/ice/ice_ethdev.h >@@ -42,6 +42,13 @@ > > #define ICE_MAX_PKT_TYPE 1024 > >+/* DDP package search path */ >+#define ICE_PKG_FILE_DEFAULT "/lib/firmware/intel/ice/ddp/ice.pkg" >+#define ICE_PKG_FILE_UPDATES "/lib/firmware/updates/intel/ice/ddp/ice.pkg" >+#define ICE_PKG_FILE_SEARCH_PATH_DEFAULT "/lib/firmware/intel/ice/ddp/" >+#define ICE_PKG_FILE_SEARCH_PATH_UPDATES >"/lib/firmware/updates/intel/ice/ddp/" >+#define ICE_MAX_PKG_FILENAME_SIZE 256 >+ > /** > * vlan_id is a 12 bit number. > * The VFTA array is actually a 4096 bit array, 128 of 32bit elements. >@@ -457,6 +464,7 @@ struct ice_vsi_vlan_pvid_info { > #define ICE_PF_TO_ETH_DEV(pf) \ > (((struct ice_pf *)pf)->adapter->eth_dev) > >+enum ice_pkg_type ice_load_pkg_type(struct ice_hw *hw); > struct ice_vsi * > ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type); > int >-- >2.25.1 >
Acked-by: Xiaolong Ye <xiaolong...@intel.com>