From: Wojciech Drewek <wojciech.drewek@intel.com>
To: Ivan Vecera <ivecera@redhat.com>, <netdev@vger.kernel.org>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>,
Tony Nguyen <anthony.l.nguyen@intel.com>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
<intel-wired-lan@lists.osuosl.org>,
<linux-kernel@vger.kernel.org>,
Jacob Keller <jacob.e.keller@intel.com>
Subject: Re: [PATCH iwl-next 1/2] i40e: Remove VF MAC types
Date: Wed, 25 Oct 2023 12:48:37 +0200 [thread overview]
Message-ID: <8a8f54a8-1a18-4797-a592-b57bc6fc45c1@intel.com> (raw)
In-Reply-To: <20231025103315.1149589-2-ivecera@redhat.com>
On 25.10.2023 12:33, Ivan Vecera wrote:
> The i40e_hw.mac.type cannot to be equal to I40E_MAC_VF or
> I40E_MAC_X722_VF so remove helper i40e_is_vf(), simplify
> i40e_adminq_init_regs() and remove enums for these VF MAC types.
>
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_adminq.c | 33 ++++++-------------
> drivers/net/ethernet/intel/i40e/i40e_type.h | 8 -----
> 2 files changed, 10 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
> index 29fc46abf690..896c43905309 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
> @@ -17,29 +17,16 @@ static void i40e_resume_aq(struct i40e_hw *hw);
> static void i40e_adminq_init_regs(struct i40e_hw *hw)
> {
> /* set head and tail registers in our local struct */
> - if (i40e_is_vf(hw)) {
> - hw->aq.asq.tail = I40E_VF_ATQT1;
> - hw->aq.asq.head = I40E_VF_ATQH1;
> - hw->aq.asq.len = I40E_VF_ATQLEN1;
> - hw->aq.asq.bal = I40E_VF_ATQBAL1;
> - hw->aq.asq.bah = I40E_VF_ATQBAH1;
> - hw->aq.arq.tail = I40E_VF_ARQT1;
> - hw->aq.arq.head = I40E_VF_ARQH1;
> - hw->aq.arq.len = I40E_VF_ARQLEN1;
> - hw->aq.arq.bal = I40E_VF_ARQBAL1;
> - hw->aq.arq.bah = I40E_VF_ARQBAH1;
What about removing those I40E_VF_* defines?
This is their only usage here, right?
> - } else {
> - hw->aq.asq.tail = I40E_PF_ATQT;
> - hw->aq.asq.head = I40E_PF_ATQH;
> - hw->aq.asq.len = I40E_PF_ATQLEN;
> - hw->aq.asq.bal = I40E_PF_ATQBAL;
> - hw->aq.asq.bah = I40E_PF_ATQBAH;
> - hw->aq.arq.tail = I40E_PF_ARQT;
> - hw->aq.arq.head = I40E_PF_ARQH;
> - hw->aq.arq.len = I40E_PF_ARQLEN;
> - hw->aq.arq.bal = I40E_PF_ARQBAL;
> - hw->aq.arq.bah = I40E_PF_ARQBAH;
> - }
> + hw->aq.asq.tail = I40E_PF_ATQT;
> + hw->aq.asq.head = I40E_PF_ATQH;
> + hw->aq.asq.len = I40E_PF_ATQLEN;
> + hw->aq.asq.bal = I40E_PF_ATQBAL;
> + hw->aq.asq.bah = I40E_PF_ATQBAH;
> + hw->aq.arq.tail = I40E_PF_ARQT;
> + hw->aq.arq.head = I40E_PF_ARQH;
> + hw->aq.arq.len = I40E_PF_ARQLEN;
> + hw->aq.arq.bal = I40E_PF_ARQBAL;
> + hw->aq.arq.bah = I40E_PF_ARQBAH;
> }
>
> /**
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
> index 9fda0cb6bdbe..7eaf8b013125 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_type.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
> @@ -64,9 +64,7 @@ typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct i40e_aq_desc *);
> enum i40e_mac_type {
> I40E_MAC_UNKNOWN = 0,
> I40E_MAC_XL710,
> - I40E_MAC_VF,
> I40E_MAC_X722,
> - I40E_MAC_X722_VF,
> I40E_MAC_GENERIC,
> };
>
> @@ -588,12 +586,6 @@ struct i40e_hw {
> char err_str[16];
> };
>
> -static inline bool i40e_is_vf(struct i40e_hw *hw)
> -{
> - return (hw->mac.type == I40E_MAC_VF ||
> - hw->mac.type == I40E_MAC_X722_VF);
> -}
> -
> /**
> * i40e_is_aq_api_ver_ge
> * @hw: pointer to i40e_hw structure
next prev parent reply other threads:[~2023-10-25 10:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 10:33 [PATCH iwl-next 0/2] Remove VF MAC types and move helpers from i40e_type.h Ivan Vecera
2023-10-25 10:33 ` [PATCH iwl-next 1/2] i40e: Remove VF MAC types Ivan Vecera
2023-10-25 10:48 ` Wojciech Drewek [this message]
2023-10-25 12:16 ` Jiri Pirko
2023-10-25 12:20 ` Jiri Pirko
2023-10-25 12:27 ` Wojciech Drewek
2023-10-25 17:43 ` Jacob Keller
2023-10-26 0:20 ` Jacob Keller
2023-10-25 14:39 ` Ivan Vecera
2023-10-25 17:44 ` Jacob Keller
2023-10-26 9:42 ` Wojciech Drewek
2023-10-30 9:09 ` [Intel-wired-lan] " Pucha, HimasekharX Reddy
2023-10-25 10:33 ` [PATCH iwl-next 2/2] i40e: Move inline helpers to i40e_prototype.h Ivan Vecera
2023-10-25 10:44 ` Wojciech Drewek
2023-10-30 9:10 ` [Intel-wired-lan] " Pucha, HimasekharX Reddy
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=8a8f54a8-1a18-4797-a592-b57bc6fc45c1@intel.com \
--to=wojciech.drewek@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=ivecera@redhat.com \
--cc=jacob.e.keller@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox