lkml.org 
[lkml]   [2020]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 052/112] enetc: Fix HW_VLAN_CTAG_TX|RX toggling
    Date
    From: Claudiu Manoil <claudiu.manoil@nxp.com>

    [ Upstream commit 9deba33f1b7266a3870c9da31f787b605748fc0c ]

    VLAN tag insertion/extraction offload is correctly
    activated at probe time but deactivation of this feature
    (i.e. via ethtool) is broken. Toggling works only for
    Tx/Rx ring 0 of a PF, and is ignored for the other rings,
    including the VF rings.
    To fix this, the existing VLAN offload toggling code
    was extended to all the rings assigned to a netdevice,
    instead of the default ring 0 (likely a leftover from the
    early validation days of this feature). And the code was
    moved to the common set_features() function to fix toggling
    for the VF driver too.

    Fixes: d4fd0404c1c9 ("enetc: Introduce basic PF and VF ENETC ethernet drivers")
    Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/freescale/enetc/enetc.c | 26 +++++++++++++++++++
    .../net/ethernet/freescale/enetc/enetc_hw.h | 16 ++++++------
    .../net/ethernet/freescale/enetc/enetc_pf.c | 9 -------
    3 files changed, 34 insertions(+), 17 deletions(-)

    diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
    index 9ac5cccfe0204..a7e4274d3f402 100644
    --- a/drivers/net/ethernet/freescale/enetc/enetc.c
    +++ b/drivers/net/ethernet/freescale/enetc/enetc.c
    @@ -1587,6 +1587,24 @@ static int enetc_set_psfp(struct net_device *ndev, int en)
    return 0;
    }

    +static void enetc_enable_rxvlan(struct net_device *ndev, bool en)
    +{
    + struct enetc_ndev_priv *priv = netdev_priv(ndev);
    + int i;
    +
    + for (i = 0; i < priv->num_rx_rings; i++)
    + enetc_bdr_enable_rxvlan(&priv->si->hw, i, en);
    +}
    +
    +static void enetc_enable_txvlan(struct net_device *ndev, bool en)
    +{
    + struct enetc_ndev_priv *priv = netdev_priv(ndev);
    + int i;
    +
    + for (i = 0; i < priv->num_tx_rings; i++)
    + enetc_bdr_enable_txvlan(&priv->si->hw, i, en);
    +}
    +
    int enetc_set_features(struct net_device *ndev,
    netdev_features_t features)
    {
    @@ -1595,6 +1613,14 @@ int enetc_set_features(struct net_device *ndev,
    if (changed & NETIF_F_RXHASH)
    enetc_set_rss(ndev, !!(features & NETIF_F_RXHASH));

    + if (changed & NETIF_F_HW_VLAN_CTAG_RX)
    + enetc_enable_rxvlan(ndev,
    + !!(features & NETIF_F_HW_VLAN_CTAG_RX));
    +
    + if (changed & NETIF_F_HW_VLAN_CTAG_TX)
    + enetc_enable_txvlan(ndev,
    + !!(features & NETIF_F_HW_VLAN_CTAG_TX));
    +
    if (changed & NETIF_F_HW_TC)
    enetc_set_psfp(ndev, !!(features & NETIF_F_HW_TC));

    diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
    index 587974862f488..02efda266c468 100644
    --- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
    +++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
    @@ -531,22 +531,22 @@ struct enetc_msg_cmd_header {

    /* Common H/W utility functions */

    -static inline void enetc_enable_rxvlan(struct enetc_hw *hw, int si_idx,
    - bool en)
    +static inline void enetc_bdr_enable_rxvlan(struct enetc_hw *hw, int idx,
    + bool en)
    {
    - u32 val = enetc_rxbdr_rd(hw, si_idx, ENETC_RBMR);
    + u32 val = enetc_rxbdr_rd(hw, idx, ENETC_RBMR);

    val = (val & ~ENETC_RBMR_VTE) | (en ? ENETC_RBMR_VTE : 0);
    - enetc_rxbdr_wr(hw, si_idx, ENETC_RBMR, val);
    + enetc_rxbdr_wr(hw, idx, ENETC_RBMR, val);
    }

    -static inline void enetc_enable_txvlan(struct enetc_hw *hw, int si_idx,
    - bool en)
    +static inline void enetc_bdr_enable_txvlan(struct enetc_hw *hw, int idx,
    + bool en)
    {
    - u32 val = enetc_txbdr_rd(hw, si_idx, ENETC_TBMR);
    + u32 val = enetc_txbdr_rd(hw, idx, ENETC_TBMR);

    val = (val & ~ENETC_TBMR_VIH) | (en ? ENETC_TBMR_VIH : 0);
    - enetc_txbdr_wr(hw, si_idx, ENETC_TBMR, val);
    + enetc_txbdr_wr(hw, idx, ENETC_TBMR, val);
    }

    static inline void enetc_set_bdr_prio(struct enetc_hw *hw, int bdr_idx,
    diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
    index eacd597b55f22..438648a06f2ae 100644
    --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
    +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
    @@ -667,15 +667,6 @@ static int enetc_pf_set_features(struct net_device *ndev,
    netdev_features_t features)
    {
    netdev_features_t changed = ndev->features ^ features;
    - struct enetc_ndev_priv *priv = netdev_priv(ndev);
    -
    - if (changed & NETIF_F_HW_VLAN_CTAG_RX)
    - enetc_enable_rxvlan(&priv->si->hw, 0,
    - !!(features & NETIF_F_HW_VLAN_CTAG_RX));
    -
    - if (changed & NETIF_F_HW_VLAN_CTAG_TX)
    - enetc_enable_txvlan(&priv->si->hw, 0,
    - !!(features & NETIF_F_HW_VLAN_CTAG_TX));

    if (changed & NETIF_F_LOOPBACK)
    enetc_set_loopback(ndev, !!(features & NETIF_F_LOOPBACK));
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-07 17:25    [W:4.903 / U:0.684 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site