net: stmmac: Add support for VLAN Rx filtering
Subsystems (4)
PATCH 1/1 net: stmmac: Add support for VLAN Rx filtering
Add support for VLAN ID-based filtering by the MAC controller for MAC drivers that support it. Only the 12-bit VID field is used.
Signed-off-by Chuah Kim Tatt <[email protected]>
Signed-off-by Ong Boon Leong <[email protected]>
Signed-off-by Wong Vee Khee <[email protected]>
--- drivers/net/ethernet/stmicro/stmmac/common.h | 2 + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 25 +++ .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 195 ++++++++++++++++++ drivers/net/ethernet/stmicro/stmmac/hwif.h | 14 ++ .../net/ethernet/stmicro/stmmac/stmmac_main.c | 9 + 5 files changed, 245 insertions(+)
drivers/net/ethernet/stmicro/stmmac/common.h +2 -0
@@ -471,6 +471,8 @@ struct mac_device_info {unsigned int pmt;unsigned int ps;unsigned int xlgmac; +unsigned int num_vlan; +u32 vlan_filter[32 ]; };struct stmmac_rx_routing {
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +25 -0
@@ -18,6 +18,7 @@#define GMAC_PACKET_FILTER 0x00000008#define GMAC_HASH_TAB (x) (0x10 + (x) * 4)#define GMAC_VLAN_TAG 0x00000050 +#define GMAC_VLAN_TAG_DATA 0x00000054#define GMAC_VLAN_HASH_TABLE 0x00000058#define GMAC_RX_FLOW_CTRL 0x00000090#define GMAC_VLAN_INCL 0x00000060
@@ -90,6 +91,29 @@#define GMAC_VLAN_VLC GENMASK(17, 16)#define GMAC_VLAN_VLC_SHIFT 16 +/* MAC VLAN Tag */ +#define GMAC_VLAN_TAG_VID GENMASK(15, 0) +#define GMAC_VLAN_TAG_ETV BIT(16) + +/* MAC VLAN Tag Control */ +#define GMAC_VLAN_TAG_CTRL_OB BIT(0) +#define GMAC_VLAN_TAG_CTRL_CT BIT(1) +#define GMAC_VLAN_TAG_CTRL_OFS_MASK GENMASK(6, 2) +#define GMAC_VLAN_TAG_CTRL_OFS_SHIFT 2 +#define GMAC_VLAN_TAG_CTRL_EVLS_MASK GENMASK(22, 21) +#define GMAC_VLAN_TAG_CTRL_EVLS_SHIFT 21 +#define GMAC_VLAN_TAG_CTRL_EVLRXS BIT(24) + +#define GMAC_VLAN_TAG_STRIP_NONE (0x0 << GMAC_VLAN_TAG_CTRL_EVLS_SHIFT) +#define GMAC_VLAN_TAG_STRIP_PASS (0x1 << GMAC_VLAN_TAG_CTRL_EVLS_SHIFT) +#define GMAC_VLAN_TAG_STRIP_FAIL (0x2 << GMAC_VLAN_TAG_CTRL_EVLS_SHIFT) +#define GMAC_VLAN_TAG_STRIP_ALL (0x3 << GMAC_VLAN_TAG_CTRL_EVLS_SHIFT) + +/* MAC VLAN Tag Data/Filter */ +#define GMAC_VLAN_TAG_DATA_VID GENMASK(15, 0) +#define GMAC_VLAN_TAG_DATA_VEN BIT(16) +#define GMAC_VLAN_TAG_DATA_ETV BIT(17) +/* MAC RX Queue Enable */ #define GMAC_RX_QUEUE_CLEAR (queue) ~(GENMASK(1, 0) << ((queue) * 2))#define GMAC_RX_AV_QUEUE_ENABLE (queue) BIT((queue) * 2)
@@ -248,6 +272,7 @@ enum power_event {#define GMAC_HW_FEAT_FRPBS GENMASK(12, 11)#define GMAC_HW_FEAT_FRPSEL BIT(10)#define GMAC_HW_FEAT_DVLAN BIT(5) +#define GMAC_HW_FEAT_NRVF GENMASK(2, 0)/* MAC HW ADDR regs */ #define GMAC_HI_DCS GENMASK(18, 16)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +195 -0
233 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/hwif.h +14 -0
@@ -369,6 +369,14 @@ struct stmmac_ops {void (*update_vlan_hash)(struct mac_device_info *hw,u32 hash,__le16 perfect_match,bool is_double);void (*enable_vlan)(struct mac_device_info *hw,u32 type); +int (*add_hw_vlan_rx_fltr)(struct net_device *dev, +struct mac_device_info *hw, +__be16 proto,u16 vid); +int (*del_hw_vlan_rx_fltr)(struct net_device *dev, +struct mac_device_info *hw, +__be16 proto,u16 vid); +void (*restore_hw_vlan_rx_fltr)(struct net_device *dev, +struct mac_device_info *hw);/* TX Timestamp */ int (*get_mac_tx_timestamp)(struct mac_device_info *hw,u64 *ts);/* Source Address Insertion / Replacement */
@@ -461,6 +469,12 @@ struct stmmac_ops { stmmac_do_void_callback(__priv, mac, update_vlan_hash, __args) #define stmmac_enable_vlan(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, enable_vlan, __args) +#define stmmac_add_hw_vlan_rx_fltr(__priv, __args...) \ + stmmac_do_callback(__priv, mac, add_hw_vlan_rx_fltr, __args) +#define stmmac_del_hw_vlan_rx_fltr(__priv, __args...) \ + stmmac_do_callback(__priv, mac, del_hw_vlan_rx_fltr, __args) +#define stmmac_restore_hw_vlan_rx_fltr(__priv, __args...) \ + stmmac_do_void_callback(__priv, mac, restore_hw_vlan_rx_fltr, __args) #define stmmac_get_mac_tx_timestamp(__priv, __args...) \ stmmac_do_callback(__priv, mac, get_mac_tx_timestamp, __args) #define stmmac_sarc_configure(__priv, __args...) \
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +9 -0
@@ -4566,6 +4566,8 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vidreturn ret; } + ret =stmmac_add_hw_vlan_rx_fltr (priv, ndev, priv->hw, proto, vid); +return ret; }
@@ -4573,11 +4575,16 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi {struct stmmac_priv *priv =netdev_priv (ndev);bool is_double = false; +int ret;if (be16_to_cpu (proto) ==ETH_P_8021AD ) is_double = true;clear_bit (vid, priv->active_vlans); + ret =stmmac_del_hw_vlan_rx_fltr (priv, ndev, priv->hw, proto, vid); +if (ret) +return ret; +return stmmac_vlan_update (priv, is_double); }
@@ -5168,6 +5175,8 @@ int stmmac_resume(struct device *dev)stmmac_init_coalesce (priv);stmmac_set_rx_mode (ndev); +stmmac_restore_hw_vlan_rx_fltr (priv, ndev, priv->hw); +stmmac_enable_all_queues (priv);stmmac_start_all_queues (priv);
Signature · 1 line
2.17.0
From: Wong Vee Khee <[email protected]>
Date: Mon, 30 Mar 2020 23:53:57 +0800
Quoted 6 lines
Add support for VLAN ID-based filtering by the MAC controller for MAC drivers that support it. Only the 12-bit VID field is used.
Signed-off-by Chuah Kim Tatt <[email protected]>Signed-off-by Ong Boon Leong <[email protected]>Signed-off-by Wong Vee Khee <[email protected]>
Applied, thank you.