| Message ID | 20240318143058.287014-2-ivecera@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | i40e: cleanups & refactors | expand |
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On > Behalf Of Ivan Vecera > Sent: Monday, March 18, 2024 3:31 PM > To: intel-wired-lan@lists.osuosl.org > Cc: open list:NETWORKING DRIVERS <netdev@vger.kernel.org>; open > list <linux-kernel@vger.kernel.org>; Eric Dumazet > <edumazet@google.com>; Nguyen, Anthony L > <anthony.l.nguyen@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/7] i40e: Remove flags > field from i40e_veb > > The field is initialized always to zero and it is never read. > Remove it. > > Signed-off-by: Ivan Vecera <ivecera@redhat.com> > --- Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com> > drivers/net/ethernet/intel/i40e/i40e.h | 3 +-- > drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- > drivers/net/ethernet/intel/i40e/i40e_main.c | 13 +++++-------- > 3 files changed, 7 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/ethernet/intel/i40e/i40e.h > b/drivers/net/ethernet/intel/i40e/i40e.h > index 2fbabcdb5bb5..5248e78f7849 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e.h > +++ b/drivers/net/ethernet/intel/i40e/i40e.h > @@ -788,7 +788,6 @@ struct i40e_veb { > u16 stats_idx; /* index of VEB parent */ > u8 enabled_tc; > u16 bridge_mode; /* Bridge Mode (VEB/VEPA) */ > - u16 flags; > u16 bw_limit; > u8 bw_max_quanta; > bool is_abs_credits; > @@ -1213,7 +1212,7 @@ void i40e_vsi_stop_rings(struct i40e_vsi > *vsi); void i40e_vsi_stop_rings_no_wait(struct i40e_vsi *vsi); > int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi); int > i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count); - > struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, u16 > uplink_seid, > +struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 > uplink_seid, > u16 downlink_seid, u8 enabled_tc); > void i40e_veb_release(struct i40e_veb *veb); > > diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c > b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c > index f9ba45f596c9..6147c5f128e8 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c > @@ -867,7 +867,7 @@ static ssize_t i40e_dbg_command_write(struct > file *filp, > goto command_write_done; > } > > - veb = i40e_veb_setup(pf, 0, uplink_seid, vsi_seid, > enabled_tc); > + veb = i40e_veb_setup(pf, uplink_seid, vsi_seid, > enabled_tc); > if (veb) > dev_info(&pf->pdev->dev, "added relay %d\n", veb- > >seid); > else > diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c > b/drivers/net/ethernet/intel/i40e/i40e_main.c > index 663b2237eb4e..2f1604ae78c7 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -13138,7 +13138,7 @@ static int i40e_ndo_bridge_setlink(struct > net_device *dev, > > /* Insert a new HW bridge */ > if (!veb) { > - veb = i40e_veb_setup(pf, 0, vsi->uplink_seid, > vsi->seid, > + veb = i40e_veb_setup(pf, vsi->uplink_seid, vsi- > >seid, > vsi->tc_config.enabled_tc); > if (veb) { > veb->bridge_mode = mode; > @@ -14394,10 +14394,10 @@ struct i40e_vsi *i40e_vsi_setup(struct > i40e_pf *pf, u8 type, > } > > if (vsi->uplink_seid == pf->mac_seid) > - veb = i40e_veb_setup(pf, 0, pf->mac_seid, vsi- > >seid, > + veb = i40e_veb_setup(pf, pf->mac_seid, vsi->seid, > vsi->tc_config.enabled_tc); > else if ((vsi->flags & I40E_VSI_FLAG_VEB_OWNER) == 0) > - veb = i40e_veb_setup(pf, 0, vsi->uplink_seid, > vsi->seid, > + veb = i40e_veb_setup(pf, vsi->uplink_seid, vsi- > >seid, > vsi->tc_config.enabled_tc); > if (veb) { > if (vsi->seid != pf->vsi[pf->lan_vsi]->seid) { @@ > -14791,7 +14791,6 @@ static int i40e_add_veb(struct i40e_veb *veb, > struct i40e_vsi *vsi) > /** > * i40e_veb_setup - Set up a VEB > * @pf: board private structure > - * @flags: VEB setup flags > * @uplink_seid: the switch element to link to > * @vsi_seid: the initial VSI seid > * @enabled_tc: Enabled TC bit-map > @@ -14804,9 +14803,8 @@ static int i40e_add_veb(struct i40e_veb > *veb, struct i40e_vsi *vsi) > * Returns pointer to the successfully allocated VEB sw struct on > * success, otherwise returns NULL on failure. > **/ > -struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, > - u16 uplink_seid, u16 vsi_seid, > - u8 enabled_tc) > +struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 > uplink_seid, > + u16 vsi_seid, u8 enabled_tc) > { > struct i40e_vsi *vsi = NULL; > struct i40e_veb *veb; > @@ -14837,7 +14835,6 @@ struct i40e_veb *i40e_veb_setup(struct > i40e_pf *pf, u16 flags, > if (veb_idx < 0) > goto err_alloc; > veb = pf->veb[veb_idx]; > - veb->flags = flags; > veb->uplink_seid = uplink_seid; > veb->enabled_tc = (enabled_tc ? enabled_tc : 0x1); > > -- > 2.43.0
On Mon, Mar 18, 2024 at 8:01 PM Ivan Vecera <ivecera@redhat.com> wrote: > > The field is initialized always to zero and it is never read. > Remove it. > > Signed-off-by: Ivan Vecera <ivecera@redhat.com> > --- LGTM Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> > drivers/net/ethernet/intel/i40e/i40e.h | 3 +-- > drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- > drivers/net/ethernet/intel/i40e/i40e_main.c | 13 +++++-------- > 3 files changed, 7 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h > index 2fbabcdb5bb5..5248e78f7849 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e.h > +++ b/drivers/net/ethernet/intel/i40e/i40e.h > @@ -788,7 +788,6 @@ struct i40e_veb { > u16 stats_idx; /* index of VEB parent */ > u8 enabled_tc; > u16 bridge_mode; /* Bridge Mode (VEB/VEPA) */ > - u16 flags; > u16 bw_limit; > u8 bw_max_quanta; > bool is_abs_credits; > @@ -1213,7 +1212,7 @@ void i40e_vsi_stop_rings(struct i40e_vsi *vsi); > void i40e_vsi_stop_rings_no_wait(struct i40e_vsi *vsi); > int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi); > int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count); > -struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, u16 uplink_seid, > +struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 uplink_seid, > u16 downlink_seid, u8 enabled_tc); > void i40e_veb_release(struct i40e_veb *veb); > > diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c > index f9ba45f596c9..6147c5f128e8 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c > @@ -867,7 +867,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, > goto command_write_done; > } > > - veb = i40e_veb_setup(pf, 0, uplink_seid, vsi_seid, enabled_tc); > + veb = i40e_veb_setup(pf, uplink_seid, vsi_seid, enabled_tc); > if (veb) > dev_info(&pf->pdev->dev, "added relay %d\n", veb->seid); > else > diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c > index 663b2237eb4e..2f1604ae78c7 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -13138,7 +13138,7 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev, > > /* Insert a new HW bridge */ > if (!veb) { > - veb = i40e_veb_setup(pf, 0, vsi->uplink_seid, vsi->seid, > + veb = i40e_veb_setup(pf, vsi->uplink_seid, vsi->seid, > vsi->tc_config.enabled_tc); > if (veb) { > veb->bridge_mode = mode; > @@ -14394,10 +14394,10 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, > } > > if (vsi->uplink_seid == pf->mac_seid) > - veb = i40e_veb_setup(pf, 0, pf->mac_seid, vsi->seid, > + veb = i40e_veb_setup(pf, pf->mac_seid, vsi->seid, > vsi->tc_config.enabled_tc); > else if ((vsi->flags & I40E_VSI_FLAG_VEB_OWNER) == 0) > - veb = i40e_veb_setup(pf, 0, vsi->uplink_seid, vsi->seid, > + veb = i40e_veb_setup(pf, vsi->uplink_seid, vsi->seid, > vsi->tc_config.enabled_tc); > if (veb) { > if (vsi->seid != pf->vsi[pf->lan_vsi]->seid) { > @@ -14791,7 +14791,6 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi) > /** > * i40e_veb_setup - Set up a VEB > * @pf: board private structure > - * @flags: VEB setup flags > * @uplink_seid: the switch element to link to > * @vsi_seid: the initial VSI seid > * @enabled_tc: Enabled TC bit-map > @@ -14804,9 +14803,8 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi) > * Returns pointer to the successfully allocated VEB sw struct on > * success, otherwise returns NULL on failure. > **/ > -struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, > - u16 uplink_seid, u16 vsi_seid, > - u8 enabled_tc) > +struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 uplink_seid, > + u16 vsi_seid, u8 enabled_tc) > { > struct i40e_vsi *vsi = NULL; > struct i40e_veb *veb; > @@ -14837,7 +14835,6 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, > if (veb_idx < 0) > goto err_alloc; > veb = pf->veb[veb_idx]; > - veb->flags = flags; > veb->uplink_seid = uplink_seid; > veb->enabled_tc = (enabled_tc ? enabled_tc : 0x1); > > -- > 2.43.0 > >
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index 2fbabcdb5bb5..5248e78f7849 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -788,7 +788,6 @@ struct i40e_veb { u16 stats_idx; /* index of VEB parent */ u8 enabled_tc; u16 bridge_mode; /* Bridge Mode (VEB/VEPA) */ - u16 flags; u16 bw_limit; u8 bw_max_quanta; bool is_abs_credits; @@ -1213,7 +1212,7 @@ void i40e_vsi_stop_rings(struct i40e_vsi *vsi); void i40e_vsi_stop_rings_no_wait(struct i40e_vsi *vsi); int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi); int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count); -struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, u16 uplink_seid, +struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 uplink_seid, u16 downlink_seid, u8 enabled_tc); void i40e_veb_release(struct i40e_veb *veb); diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c index f9ba45f596c9..6147c5f128e8 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c +++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c @@ -867,7 +867,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, goto command_write_done; } - veb = i40e_veb_setup(pf, 0, uplink_seid, vsi_seid, enabled_tc); + veb = i40e_veb_setup(pf, uplink_seid, vsi_seid, enabled_tc); if (veb) dev_info(&pf->pdev->dev, "added relay %d\n", veb->seid); else diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 663b2237eb4e..2f1604ae78c7 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -13138,7 +13138,7 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev, /* Insert a new HW bridge */ if (!veb) { - veb = i40e_veb_setup(pf, 0, vsi->uplink_seid, vsi->seid, + veb = i40e_veb_setup(pf, vsi->uplink_seid, vsi->seid, vsi->tc_config.enabled_tc); if (veb) { veb->bridge_mode = mode; @@ -14394,10 +14394,10 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, } if (vsi->uplink_seid == pf->mac_seid) - veb = i40e_veb_setup(pf, 0, pf->mac_seid, vsi->seid, + veb = i40e_veb_setup(pf, pf->mac_seid, vsi->seid, vsi->tc_config.enabled_tc); else if ((vsi->flags & I40E_VSI_FLAG_VEB_OWNER) == 0) - veb = i40e_veb_setup(pf, 0, vsi->uplink_seid, vsi->seid, + veb = i40e_veb_setup(pf, vsi->uplink_seid, vsi->seid, vsi->tc_config.enabled_tc); if (veb) { if (vsi->seid != pf->vsi[pf->lan_vsi]->seid) { @@ -14791,7 +14791,6 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi) /** * i40e_veb_setup - Set up a VEB * @pf: board private structure - * @flags: VEB setup flags * @uplink_seid: the switch element to link to * @vsi_seid: the initial VSI seid * @enabled_tc: Enabled TC bit-map @@ -14804,9 +14803,8 @@ static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi) * Returns pointer to the successfully allocated VEB sw struct on * success, otherwise returns NULL on failure. **/ -struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, - u16 uplink_seid, u16 vsi_seid, - u8 enabled_tc) +struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 uplink_seid, + u16 vsi_seid, u8 enabled_tc) { struct i40e_vsi *vsi = NULL; struct i40e_veb *veb; @@ -14837,7 +14835,6 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, if (veb_idx < 0) goto err_alloc; veb = pf->veb[veb_idx]; - veb->flags = flags; veb->uplink_seid = uplink_seid; veb->enabled_tc = (enabled_tc ? enabled_tc : 0x1);
The field is initialized always to zero and it is never read. Remove it. Signed-off-by: Ivan Vecera <ivecera@redhat.com> --- drivers/net/ethernet/intel/i40e/i40e.h | 3 +-- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 13 +++++-------- 3 files changed, 7 insertions(+), 11 deletions(-)