Commit 82882bd5 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Jakub Kicinski
Browse files

net: ethernet: ti: cpsw_ale: add cpsw_ale_vlan_del_modify() 



Add/export cpsw_ale_vlan_del_modify() and use it in cpsw_switchdev instead
of generic cpsw_ale_del_vlan() to avoid mixing 8021Q and switchdev VLAN
offload. This is preparation patch equired by follow up changes.

Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6a40e289

drivers/net/ethernet/ti/cpsw_ale.c

+21 −3
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ int cpsw_ale_add_vlan(struct cpsw_ale *ale, u16 vid, int port_mask, int untag, 
	return 0;

}



static void cpsw_ale_del_vlan_modify(struct cpsw_ale *ale, u32 *ale_entry,

static void cpsw_ale_vlan_del_modify_int(struct cpsw_ale *ale,  u32 *ale_entry,

					 u16 vid, int port_mask)

{

	int reg_mcast, unreg_mcast;
@@ -644,6 +644,7 @@ static void cpsw_ale_del_vlan_modify(struct cpsw_ale *ale, u32 *ale_entry, 
					ALE_ENT_VID_MEMBER_LIST);

	members &= ~port_mask;

	if (!members) {

		cpsw_ale_set_vlan_untag(ale, ale_entry, vid, 0);

		cpsw_ale_set_entry_type(ale_entry, ALE_TYPE_FREE);

		return;

	}
@@ -673,6 +674,23 @@ static void cpsw_ale_del_vlan_modify(struct cpsw_ale *ale, u32 *ale_entry, 
			      ALE_ENT_VID_MEMBER_LIST, members);

}



int cpsw_ale_vlan_del_modify(struct cpsw_ale *ale, u16 vid, int port_mask)

{

	u32 ale_entry[ALE_ENTRY_WORDS] = {0, 0, 0};

	int idx;



	idx = cpsw_ale_match_vlan(ale, vid);

	if (idx < 0)

		return -ENOENT;



	cpsw_ale_read(ale, idx, ale_entry);



	cpsw_ale_vlan_del_modify_int(ale, ale_entry, vid, port_mask);

	cpsw_ale_write(ale, idx, ale_entry);



	return 0;

}



int cpsw_ale_del_vlan(struct cpsw_ale *ale, u16 vid, int port_mask)

{

	u32 ale_entry[ALE_ENTRY_WORDS] = {0, 0, 0};
@@ -685,7 +703,7 @@ int cpsw_ale_del_vlan(struct cpsw_ale *ale, u16 vid, int port_mask) 
	cpsw_ale_read(ale, idx, ale_entry);



	if (port_mask) {

		cpsw_ale_del_vlan_modify(ale, ale_entry, vid, port_mask);

		cpsw_ale_vlan_del_modify_int(ale, ale_entry, vid, port_mask);

	} else {

		cpsw_ale_set_vlan_untag(ale, ale_entry, vid, 0);

		cpsw_ale_set_entry_type(ale_entry, ALE_TYPE_FREE);

drivers/net/ethernet/ti/cpsw_ale.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static inline int cpsw_ale_get_vlan_p0_untag(struct cpsw_ale *ale, u16 vid) 


int cpsw_ale_vlan_add_modify(struct cpsw_ale *ale, u16 vid, int port_mask,

			     int untag_mask, int reg_mcast, int unreg_mcast);

int cpsw_ale_vlan_del_modify(struct cpsw_ale *ale, u16 vid, int port_mask);

void cpsw_ale_set_unreg_mcast(struct cpsw_ale *ale, int unreg_mcast_mask,

			      bool add);

drivers/net/ethernet/ti/cpsw_switchdev.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static int cpsw_port_vlan_del(struct cpsw_priv *priv, u16 vid, 
	else

		port_mask = BIT(priv->emac_port);



	ret = cpsw_ale_del_vlan(cpsw->ale, vid, port_mask);

	ret = cpsw_ale_vlan_del_modify(cpsw->ale, vid, port_mask);

	if (ret != 0)

		return ret;