From: Qi Zhang <qi.z.zhang@intel.com> To: xiaolong.ye@intel.com Cc: haiyue.wang@intel.com, dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>, Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com> Subject: [dpdk-dev] [PATCH 06/17] net/iavf/base: remove unnecessary compile option Date: Tue, 3 Dec 2019 15:03:07 +0800 Message-ID: <20191203070318.39620-7-qi.z.zhang@intel.com> (raw) In-Reply-To: <20191203070318.39620-1-qi.z.zhang@intel.com> Remove compile option INTEGRATED_VF. Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> --- drivers/net/iavf/base/iavf_adminq.c | 19 ------------------- drivers/net/iavf/base/iavf_common.c | 9 ++------- drivers/net/iavf/base/iavf_type.h | 8 -------- 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c index 68c51daac..ef352ac4c 100644 --- a/drivers/net/iavf/base/iavf_adminq.c +++ b/drivers/net/iavf/base/iavf_adminq.c @@ -262,14 +262,8 @@ STATIC enum iavf_status iavf_config_asq_regs(struct iavf_hw *hw) wr32(hw, hw->aq.asq.tail, 0); /* set starting point */ -#ifdef INTEGRATED_VF - if (iavf_is_vf(hw)) - wr32(hw, hw->aq.asq.len, (hw->aq.num_asq_entries | - IAVF_VF_ATQLEN1_ATQENABLE_MASK)); -#else wr32(hw, hw->aq.asq.len, (hw->aq.num_asq_entries | IAVF_VF_ATQLEN1_ATQENABLE_MASK)); -#endif /* INTEGRATED_VF */ wr32(hw, hw->aq.asq.bal, IAVF_LO_DWORD(hw->aq.asq.desc_buf.pa)); wr32(hw, hw->aq.asq.bah, IAVF_HI_DWORD(hw->aq.asq.desc_buf.pa)); @@ -297,14 +291,8 @@ STATIC enum iavf_status iavf_config_arq_regs(struct iavf_hw *hw) wr32(hw, hw->aq.arq.tail, 0); /* set starting point */ -#ifdef INTEGRATED_VF - if (iavf_is_vf(hw)) - wr32(hw, hw->aq.arq.len, (hw->aq.num_arq_entries | - IAVF_VF_ARQLEN1_ARQENABLE_MASK)); -#else wr32(hw, hw->aq.arq.len, (hw->aq.num_arq_entries | IAVF_VF_ARQLEN1_ARQENABLE_MASK)); -#endif /* INTEGRATED_VF */ wr32(hw, hw->aq.arq.bal, IAVF_LO_DWORD(hw->aq.arq.desc_buf.pa)); wr32(hw, hw->aq.arq.bah, IAVF_HI_DWORD(hw->aq.arq.desc_buf.pa)); @@ -897,14 +885,7 @@ enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw, } /* set next_to_use to head */ -#ifdef INTEGRATED_VF - if (!iavf_is_vf(hw)) - ntu = rd32(hw, hw->aq.arq.head) & IAVF_PF_ARQH_ARQH_MASK; - else - ntu = rd32(hw, hw->aq.arq.head) & IAVF_VF_ARQH1_ARQH_MASK; -#else ntu = rd32(hw, hw->aq.arq.head) & IAVF_VF_ARQH1_ARQH_MASK; -#endif /* INTEGRATED_VF */ if (ntu == ntc) { /* nothing to do - shouldn't need to update ring's values */ ret_code = IAVF_ERR_ADMIN_QUEUE_NO_WORK; diff --git a/drivers/net/iavf/base/iavf_common.c b/drivers/net/iavf/base/iavf_common.c index 926081e87..53e877732 100644 --- a/drivers/net/iavf/base/iavf_common.c +++ b/drivers/net/iavf/base/iavf_common.c @@ -331,15 +331,10 @@ void iavf_debug_aq(struct iavf_hw *hw, enum iavf_debug_mask mask, void *desc, bool iavf_check_asq_alive(struct iavf_hw *hw) { if (hw->aq.asq.len) -#ifdef INTEGRATED_VF - if (iavf_is_vf(hw)) - return !!(rd32(hw, hw->aq.asq.len) & - IAVF_VF_ATQLEN1_ATQENABLE_MASK); -#else return !!(rd32(hw, hw->aq.asq.len) & IAVF_VF_ATQLEN1_ATQENABLE_MASK); -#endif /* INTEGRATED_VF */ - return false; + else + return false; } /** diff --git a/drivers/net/iavf/base/iavf_type.h b/drivers/net/iavf/base/iavf_type.h index 487352f51..c1910ff75 100644 --- a/drivers/net/iavf/base/iavf_type.h +++ b/drivers/net/iavf/base/iavf_type.h @@ -20,14 +20,8 @@ #define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) (_p); (_q); (_r); (_s); #define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) (_p); (_q); (_r); (_s); (_t); -#ifndef LINUX_MACROS -#ifndef BIT #define BIT(a) (1UL << (a)) -#endif /* BIT */ -#ifndef BIT_ULL #define BIT_ULL(a) (1ULL << (a)) -#endif /* BIT_ULL */ -#endif /* LINUX_MACROS */ /* IAVF_MASK is a macro used on 32 bit registers */ #define IAVF_MASK(mask, shift) (mask << shift) @@ -56,9 +50,7 @@ struct iavf_hw; typedef void (*IAVF_ADMINQ_CALLBACK)(struct iavf_hw *, struct iavf_aq_desc *); -#ifndef ETH_ALEN #define ETH_ALEN 6 -#endif /* Data type manipulation macros. */ #define IAVF_HI_DWORD(x) ((u32)((((x) >> 16) >> 16) & 0xFFFFFFFF)) #define IAVF_LO_DWORD(x) ((u32)((x) & 0xFFFFFFFF)) -- 2.13.6
next prev parent reply index Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-03 7:03 [dpdk-dev] [PATCH 00/17] iavf base code update Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 01/17] net/iavf/base: remove unnecessary header file Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 02/17] net/iavf/base: rename error code enum Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 03/17] net/iavf/base: rename register macro Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 04/17] net/iavf/base: update device id Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 05/17] net/iavf/base: remove unused code Qi Zhang 2019-12-03 7:03 ` Qi Zhang [this message] 2019-12-03 7:03 ` [dpdk-dev] [PATCH 07/17] net/iavf/base: rename functions Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 08/17] net/iavf/base: update virtual channel Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 09/17] net/iavf/base: adjust code indent Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 10/17] net/iavf/base: increase max VSI count for VFs Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 11/17] net/iavf/base: fix command buffer memory free Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 12/17] net/iavf/base: update FW API version for X722 Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 13/17] net/iavf/base: add more link speed support Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 14/17] net/iavf/base: update copyright date Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 15/17] net/iavf/base: fix send adminq return value Qi Zhang 2020-01-02 2:48 ` Yang, Qiming 2019-12-03 7:03 ` [dpdk-dev] [PATCH 16/17] net/iavf: move device state flag Qi Zhang 2019-12-03 7:03 ` [dpdk-dev] [PATCH 17/17] net/ice/base: update version info Qi Zhang 2020-01-02 2:50 ` [dpdk-dev] [PATCH 00/17] iavf base code update Yang, Qiming 2020-01-02 3:14 ` Ye Xiaolong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191203070318.39620-7-qi.z.zhang@intel.com \ --to=qi.z.zhang@intel.com \ --cc=dev@dpdk.org \ --cc=haiyue.wang@intel.com \ --cc=paul.m.stillwell.jr@intel.com \ --cc=xiaolong.ye@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK-dev Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/dpdk-dev/0 dpdk-dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dpdk-dev dpdk-dev/ https://lore.kernel.org/dpdk-dev \ dev@dpdk.org public-inbox-index dpdk-dev Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git