[iwl-next,1/6] i40e: Remove unused flags
Commit Message
The flag I40E_FLAG_RX_CSUM_ENABLED and I40E_HW_FLAG_DROP_MODE are
set and never read. Remove them.
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
---
drivers/net/ethernet/intel/i40e/i40e.h | 57 +++++++++----------
drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 +-
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +-
drivers/net/ethernet/intel/i40e/i40e_type.h | 3 +-
4 files changed, 31 insertions(+), 37 deletions(-)
Comments
On 10/20/2023 12:37 PM, Ivan Vecera wrote:
> The flag I40E_FLAG_RX_CSUM_ENABLED and I40E_HW_FLAG_DROP_MODE are
> set and never read. Remove them.
>
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> ---
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
You could leave the bit positions as gaps in this patch to avoid the
clutter of re-numbering them since the series is converting them to be
automatically defined.
Not worth a re-roll over that though.
Thanks,
Jake
On 10/20/2023 12:37 PM, Ivan Vecera wrote:
> The flag I40E_FLAG_RX_CSUM_ENABLED and I40E_HW_FLAG_DROP_MODE are
> set and never read. Remove them.
>
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> ---
In case others are interested, both of these were literally never used
in the driver besides setting:
I40E_HW_FLAG_DROP was introduced in commit d802c760ab87 ("i40e: Add drop
mode parameter to set mac config") (v5.4) and was never used.
I40E_RX_CSUM_ENABLED was introduced in commit 41c445ff0f48 ("i40e: main
driver core") (v3.12) and was never used.
Thanks,
Jake
> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Ivan Vecera
> Sent: Saturday, October 21, 2023 1:08 AM
> To: netdev@vger.kernel.org
> Cc: Eric Dumazet <edumazet@google.com>; dacampbe@redhat.com; Brandeburg, Jesse <jesse.brandeburg@intel.com>; open list <linux-kernel@vger.kernel.org>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>; moderated list:INTEL ETHERNET DRIVERS <intel-wired-lan@lists.osuosl.org>; Keller, Jacob E <jacob.e.keller@intel.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; David S. Miller <davem@davemloft.net>
> Subject: [Intel-wired-lan] [PATCH iwl-next 1/6] i40e: Remove unused flags
>
> The flag I40E_FLAG_RX_CSUM_ENABLED and I40E_HW_FLAG_DROP_MODE are
> set and never read. Remove them.
>
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e.h | 57 +++++++++----------
> drivers/net/ethernet/intel/i40e/i40e_adminq.c | 4 +-
> drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +-
> drivers/net/ethernet/intel/i40e/i40e_type.h | 3 +-
> 4 files changed, 31 insertions(+), 37 deletions(-)
>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
@@ -501,33 +501,32 @@ struct i40e_pf {
#define I40E_HW_RESTART_AUTONEG BIT(18)
u32 flags;
-#define I40E_FLAG_RX_CSUM_ENABLED BIT(0)
-#define I40E_FLAG_MSI_ENABLED BIT(1)
-#define I40E_FLAG_MSIX_ENABLED BIT(2)
-#define I40E_FLAG_RSS_ENABLED BIT(3)
-#define I40E_FLAG_VMDQ_ENABLED BIT(4)
-#define I40E_FLAG_SRIOV_ENABLED BIT(5)
-#define I40E_FLAG_DCB_CAPABLE BIT(6)
-#define I40E_FLAG_DCB_ENABLED BIT(7)
-#define I40E_FLAG_FD_SB_ENABLED BIT(8)
-#define I40E_FLAG_FD_ATR_ENABLED BIT(9)
-#define I40E_FLAG_MFP_ENABLED BIT(10)
-#define I40E_FLAG_HW_ATR_EVICT_ENABLED BIT(11)
-#define I40E_FLAG_VEB_MODE_ENABLED BIT(12)
-#define I40E_FLAG_VEB_STATS_ENABLED BIT(13)
-#define I40E_FLAG_LINK_POLLING_ENABLED BIT(14)
-#define I40E_FLAG_TRUE_PROMISC_SUPPORT BIT(15)
-#define I40E_FLAG_LEGACY_RX BIT(16)
-#define I40E_FLAG_PTP BIT(17)
-#define I40E_FLAG_IWARP_ENABLED BIT(18)
-#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED BIT(19)
-#define I40E_FLAG_SOURCE_PRUNING_DISABLED BIT(20)
-#define I40E_FLAG_TC_MQPRIO BIT(21)
-#define I40E_FLAG_FD_SB_INACTIVE BIT(22)
-#define I40E_FLAG_FD_SB_TO_CLOUD_FILTER BIT(23)
-#define I40E_FLAG_DISABLE_FW_LLDP BIT(24)
-#define I40E_FLAG_RS_FEC BIT(25)
-#define I40E_FLAG_BASE_R_FEC BIT(26)
+#define I40E_FLAG_MSI_ENABLED BIT(0)
+#define I40E_FLAG_MSIX_ENABLED BIT(1)
+#define I40E_FLAG_RSS_ENABLED BIT(2)
+#define I40E_FLAG_VMDQ_ENABLED BIT(3)
+#define I40E_FLAG_SRIOV_ENABLED BIT(4)
+#define I40E_FLAG_DCB_CAPABLE BIT(5)
+#define I40E_FLAG_DCB_ENABLED BIT(6)
+#define I40E_FLAG_FD_SB_ENABLED BIT(7)
+#define I40E_FLAG_FD_ATR_ENABLED BIT(8)
+#define I40E_FLAG_MFP_ENABLED BIT(9)
+#define I40E_FLAG_HW_ATR_EVICT_ENABLED BIT(10)
+#define I40E_FLAG_VEB_MODE_ENABLED BIT(11)
+#define I40E_FLAG_VEB_STATS_ENABLED BIT(12)
+#define I40E_FLAG_LINK_POLLING_ENABLED BIT(13)
+#define I40E_FLAG_TRUE_PROMISC_SUPPORT BIT(14)
+#define I40E_FLAG_LEGACY_RX BIT(15)
+#define I40E_FLAG_PTP BIT(16)
+#define I40E_FLAG_IWARP_ENABLED BIT(17)
+#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED BIT(18)
+#define I40E_FLAG_SOURCE_PRUNING_DISABLED BIT(19)
+#define I40E_FLAG_TC_MQPRIO BIT(20)
+#define I40E_FLAG_FD_SB_INACTIVE BIT(21)
+#define I40E_FLAG_FD_SB_TO_CLOUD_FILTER BIT(22)
+#define I40E_FLAG_DISABLE_FW_LLDP BIT(23)
+#define I40E_FLAG_RS_FEC BIT(24)
+#define I40E_FLAG_BASE_R_FEC BIT(25)
/* TOTAL_PORT_SHUTDOWN
* Allows to physically disable the link on the NIC's port.
* If enabled, (after link down request from the OS)
@@ -549,8 +548,8 @@ struct i40e_pf {
* the link is being brought down by clearing bit (I40E_AQ_PHY_ENABLE_LINK)
* in abilities field of i40e_aq_set_phy_config structure
*/
-#define I40E_FLAG_TOTAL_PORT_SHUTDOWN_ENABLED BIT(27)
-#define I40E_FLAG_VF_VLAN_PRUNING BIT(28)
+#define I40E_FLAG_TOTAL_PORT_SHUTDOWN_ENABLED BIT(26)
+#define I40E_FLAG_VF_VLAN_PRUNING BIT(27)
struct i40e_client_instance *cinst;
bool stat_offsets_loaded;
@@ -555,10 +555,8 @@ static void i40e_set_hw_flags(struct i40e_hw *hw)
if (aq->api_maj_ver > 1 ||
(aq->api_maj_ver == 1 &&
- aq->api_min_ver >= 8)) {
+ aq->api_min_ver >= 8))
hw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;
- hw->flags |= I40E_HW_FLAG_DROP_MODE;
- }
if (aq->api_maj_ver > 1 ||
(aq->api_maj_ver == 1 &&
@@ -12733,9 +12733,7 @@ static int i40e_sw_init(struct i40e_pf *pf)
u16 pow;
/* Set default capability flags */
- pf->flags = I40E_FLAG_RX_CSUM_ENABLED |
- I40E_FLAG_MSI_ENABLED |
- I40E_FLAG_MSIX_ENABLED;
+ pf->flags = I40E_FLAG_MSI_ENABLED | I40E_FLAG_MSIX_ENABLED;
/* Set default ITR */
pf->rx_itr_default = I40E_ITR_RX_DEF;
@@ -553,8 +553,7 @@ struct i40e_hw {
#define I40E_HW_FLAG_FW_LLDP_STOPPABLE BIT_ULL(4)
#define I40E_HW_FLAG_FW_LLDP_PERSISTENT BIT_ULL(5)
#define I40E_HW_FLAG_AQ_PHY_ACCESS_EXTENDED BIT_ULL(6)
-#define I40E_HW_FLAG_DROP_MODE BIT_ULL(7)
-#define I40E_HW_FLAG_X722_FEC_REQUEST_CAPABLE BIT_ULL(8)
+#define I40E_HW_FLAG_X722_FEC_REQUEST_CAPABLE BIT_ULL(7)
u64 flags;
/* Used in set switch config AQ command */