domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

generic: ar8216: add vtu_load_vlan field to ar8xxx_chip

Browse Source 
SVN-Revision: 31002
This commit is contained in:
Gabor Juhos
2012-03-18 22:06:30 +00:00
parent 332310fba2
commit d1c585d4b1
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
target/linux/generic/files/drivers/net/phy/ar8216.c
View File

@@ -45,6 +45,7 @@ struct ar8xxx_chip {
u32 ingress, u32 members, u32 pvid); u32 ingress, u32 members, u32 pvid);
int (*atu_flush)(struct ar8216_priv *priv); int (*atu_flush)(struct ar8216_priv *priv);
void (*vtu_flush)(struct ar8216_priv *priv); void (*vtu_flush)(struct ar8216_priv *priv);
void (*vtu_load_vlan)(struct ar8216_priv *priv, u32 vid, u32 port_mask);
}; };
struct ar8216_priv { struct ar8216_priv {
@@ -489,6 +490,15 @@ ar8216_vtu_flush(struct ar8216_priv *priv)
ar8216_vtu_op(priv, AR8216_VTU_OP_FLUSH, 0); ar8216_vtu_op(priv, AR8216_VTU_OP_FLUSH, 0);
} }
static void
ar8216_vtu_load_vlan(struct ar8216_priv *priv, u32 vid, u32 port_mask)
{
u32 op;
op = AR8216_VTU_OP_LOAD | (vid << AR8216_VTU_VID_S);
ar8216_vtu_op(priv, op, port_mask);
}
static int static int
ar8216_atu_flush(struct ar8216_priv *priv) ar8216_atu_flush(struct ar8216_priv *priv)
{ {
@@ -578,10 +588,8 @@ ar8216_hw_apply(struct switch_dev *dev)
portmask[i] |= vp & ~mask; portmask[i] |= vp & ~mask;
} }
ar8216_vtu_op(priv, priv->chip->vtu_load_vlan(priv, priv->vlan_id[j],
AR8216_VTU_OP_LOAD | priv->vlan_table[j]);
(priv->vlan_id[j] << AR8216_VTU_VID_S),
priv->vlan_table[j]);
} }
} else { } else {
/* vlan disabled: /* vlan disabled:
@@ -768,6 +776,7 @@ static const struct ar8xxx_chip ar8216_chip = {
.setup_port = ar8216_setup_port, .setup_port = ar8216_setup_port,
.atu_flush = ar8216_atu_flush, .atu_flush = ar8216_atu_flush,
.vtu_flush = ar8216_vtu_flush, .vtu_flush = ar8216_vtu_flush,
.vtu_load_vlan = ar8216_vtu_load_vlan,
}; };
static const struct ar8xxx_chip ar8236_chip = { static const struct ar8xxx_chip ar8236_chip = {
@@ -776,6 +785,7 @@ static const struct ar8xxx_chip ar8236_chip = {
.setup_port = ar8236_setup_port, .setup_port = ar8236_setup_port,
.atu_flush = ar8216_atu_flush, .atu_flush = ar8216_atu_flush,
.vtu_flush = ar8216_vtu_flush, .vtu_flush = ar8216_vtu_flush,
.vtu_load_vlan = ar8216_vtu_load_vlan,
}; };
static const struct ar8xxx_chip ar8316_chip = { static const struct ar8xxx_chip ar8316_chip = {
@@ -784,6 +794,7 @@ static const struct ar8xxx_chip ar8316_chip = {
.setup_port = ar8216_setup_port, .setup_port = ar8216_setup_port,
.atu_flush = ar8216_atu_flush, .atu_flush = ar8216_atu_flush,
.vtu_flush = ar8216_vtu_flush, .vtu_flush = ar8216_vtu_flush,
.vtu_load_vlan = ar8216_vtu_load_vlan,
}; };
static int static int