From d6f5cac19197bc264eb9c3b0ab440d791e6a7480 Mon Sep 17 00:00:00 2001 From: Helin Zhang Date: Thu, 30 Apr 2015 23:03:11 +0800 Subject: [PATCH] i40e/base: support building both PF and VF driver together Macros of PF_DRIVER, VF_DRIVER and INTEGRATED_VF were defined to support building both PF and VF driver together. PF_DRIVER needs to be defined if a build is for PF only, while VF_DRIVER for VF only. PF_DRIVER, VF_DRIVER and INTEGRATED_VF are all needed for building both PF and VF driver together. Test report: http://www.dpdk.org/ml/archives/dev/2015-May/017384.html Signed-off-by: Helin Zhang Acked-by: Jingjing Wu Acked-by: Jijiang Liu Tested-by: Min Cao --- lib/librte_pmd_i40e/Makefile | 2 +- lib/librte_pmd_i40e/i40e/i40e_adminq.c | 20 ++++++++++---------- lib/librte_pmd_i40e/i40e/i40e_common.c | 6 ++++-- lib/librte_pmd_i40e/i40e/i40e_prototype.h | 4 ++-- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/librte_pmd_i40e/Makefile b/lib/librte_pmd_i40e/Makefile index 86be3f75a8..75b5120c41 100644 --- a/lib/librte_pmd_i40e/Makefile +++ b/lib/librte_pmd_i40e/Makefile @@ -37,7 +37,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_pmd_i40e.a CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) +CFLAGS += $(WERROR_FLAGS) -DPF_DRIVER -DVF_DRIVER -DINTEGRATED_VF EXPORT_MAP := rte_pmd_i40e_version.map diff --git a/lib/librte_pmd_i40e/i40e/i40e_adminq.c b/lib/librte_pmd_i40e/i40e/i40e_adminq.c index e8e762f5b2..bbc6b65b18 100644 --- a/lib/librte_pmd_i40e/i40e/i40e_adminq.c +++ b/lib/librte_pmd_i40e/i40e/i40e_adminq.c @@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "i40e_adminq.h" #include "i40e_prototype.h" -#ifndef VF_DRIVER +#ifdef PF_DRIVER /** * i40e_is_nvm_update_op - return true if this is an NVM update operation * @desc: API request descriptor @@ -48,7 +48,7 @@ STATIC INLINE bool i40e_is_nvm_update_op(struct i40e_aq_desc *desc) desc->opcode == CPU_TO_LE16(i40e_aqc_opc_nvm_update)); } -#endif /* VF_DRIVER */ +#endif /* PF_DRIVER */ /** * i40e_adminq_init_regs - Initialize AdminQ registers * @hw: pointer to the hardware structure @@ -559,7 +559,7 @@ enum i40e_status_code i40e_shutdown_arq(struct i40e_hw *hw) enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw) { enum i40e_status_code ret_code; -#ifndef VF_DRIVER +#ifdef PF_DRIVER u16 eetrack_lo, eetrack_hi; int retry = 0; #endif @@ -593,7 +593,7 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw) if (ret_code != I40E_SUCCESS) goto init_adminq_free_asq; -#ifndef VF_DRIVER +#ifdef PF_DRIVER /* There are some cases where the firmware may not be quite ready * for AdminQ operations, so we retry the AdminQ setup a few times * if we see timeouts in this first AQ call. @@ -633,13 +633,13 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw) I40E_HMC_PROFILE_DEFAULT, 0, NULL); +#endif /* PF_DRIVER */ ret_code = I40E_SUCCESS; -#endif /* VF_DRIVER */ /* success! */ goto init_adminq_exit; -#ifndef VF_DRIVER +#ifdef PF_DRIVER init_adminq_free_arq: i40e_shutdown_arq(hw); #endif @@ -772,7 +772,7 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw *hw, goto asq_send_command_exit; } -#ifndef VF_DRIVER +#ifdef PF_DRIVER if (i40e_is_nvm_update_op(desc) && hw->aq.nvm_busy) { i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, "AQTX: NVM busy.\n"); status = I40E_ERR_NVM; @@ -931,11 +931,11 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw *hw, status = I40E_ERR_ADMIN_QUEUE_TIMEOUT; } -#ifndef VF_DRIVER +#ifdef PF_DRIVER if (!status && i40e_is_nvm_update_op(desc)) hw->aq.nvm_busy = true; -#endif /* VF_DRIVER */ +#endif /* PF_DRIVER */ asq_send_command_error: i40e_release_spinlock(&hw->aq.asq_spinlock); asq_send_command_exit: @@ -1053,7 +1053,7 @@ clean_arq_element_out: *pending = (ntc > ntu ? hw->aq.arq.count : 0) + (ntu - ntc); i40e_release_spinlock(&hw->aq.arq_spinlock); -#ifndef VF_DRIVER +#ifdef PF_DRIVER if (i40e_is_nvm_update_op(&e->desc)) { hw->aq.nvm_busy = false; if (hw->aq.nvm_release_on_done) { diff --git a/lib/librte_pmd_i40e/i40e/i40e_common.c b/lib/librte_pmd_i40e/i40e/i40e_common.c index 23f14c10a5..491ffa8684 100644 --- a/lib/librte_pmd_i40e/i40e/i40e_common.c +++ b/lib/librte_pmd_i40e/i40e/i40e_common.c @@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE. * This function sets the mac type of the adapter based on the * vendor ID and device ID stored in the hw structure. **/ -#ifdef VF_DRIVER +#if defined(INTEGRATED_VF) || defined(VF_DRIVER) enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw) #else STATIC enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw) @@ -547,7 +547,7 @@ struct i40e_rx_ptype_decoded i40e_ptype_lookup[] = { I40E_PTT_UNUSED_ENTRY(255) }; -#ifndef VF_DRIVER +#ifdef PF_DRIVER /** * i40e_init_shared_code - Initialize the shared code @@ -4692,6 +4692,8 @@ enum i40e_status_code i40e_aq_configure_partition_bw(struct i40e_hw *hw, return status; } +#endif /* PF_DRIVER */ +#ifdef VF_DRIVER /** * i40e_aq_send_msg_to_pf diff --git a/lib/librte_pmd_i40e/i40e/i40e_prototype.h b/lib/librte_pmd_i40e/i40e/i40e_prototype.h index 24e8d2176f..979adb909b 100644 --- a/lib/librte_pmd_i40e/i40e/i40e_prototype.h +++ b/lib/librte_pmd_i40e/i40e/i40e_prototype.h @@ -77,7 +77,7 @@ void i40e_resume_aq(struct i40e_hw *hw); bool i40e_check_asq_alive(struct i40e_hw *hw); enum i40e_status_code i40e_aq_queue_shutdown(struct i40e_hw *hw, bool unloading); -#ifndef VF_DRIVER +#ifdef PF_DRIVER u32 i40e_led_get(struct i40e_hw *hw); void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink); @@ -392,7 +392,7 @@ enum i40e_status_code i40e_nvmupd_command(struct i40e_hw *hw, struct i40e_nvm_access *cmd, u8 *bytes, int *); void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status); -#endif /* VF_DRIVER */ +#endif /* PF_DRIVER */ #if defined(I40E_QV) || defined(VF_DRIVER) enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw); -- 2.20.1