Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 385a0995 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: add port 802.1Q mode setter 



Add port functions to set the port 802.1Q mode.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77064f37

drivers/net/dsa/mv88e6xxx/chip.c

+2 −31
Original line number Diff line number Diff line
@@ -1806,48 +1806,19 @@ static int mv88e6xxx_port_check_hw_vlan(struct dsa_switch *ds, int port, 
	return err;

}



static const char * const mv88e6xxx_port_8021q_mode_names[] = {

	[PORT_CONTROL_2_8021Q_DISABLED] = "Disabled",

	[PORT_CONTROL_2_8021Q_FALLBACK] = "Fallback",

	[PORT_CONTROL_2_8021Q_CHECK] = "Check",

	[PORT_CONTROL_2_8021Q_SECURE] = "Secure",

};



static int mv88e6xxx_port_vlan_filtering(struct dsa_switch *ds, int port,

					 bool vlan_filtering)

{

	struct mv88e6xxx_chip *chip = ds->priv;

	u16 old, new = vlan_filtering ? PORT_CONTROL_2_8021Q_SECURE :

	u16 mode = vlan_filtering ? PORT_CONTROL_2_8021Q_SECURE :

		PORT_CONTROL_2_8021Q_DISABLED;

	u16 reg;

	int err;



	if (!mv88e6xxx_has(chip, MV88E6XXX_FLAG_VTU))

		return -EOPNOTSUPP;



	mutex_lock(&chip->reg_lock);



	err = mv88e6xxx_port_read(chip, port, PORT_CONTROL_2, &reg);

	if (err)

		goto unlock;



	old = reg & PORT_CONTROL_2_8021Q_MASK;



	if (new != old) {

		reg &= ~PORT_CONTROL_2_8021Q_MASK;

		reg |= new & PORT_CONTROL_2_8021Q_MASK;



		err = mv88e6xxx_port_write(chip, port, PORT_CONTROL_2, reg);

		if (err)

			goto unlock;



		netdev_dbg(ds->ports[port].netdev, "802.1Q Mode %s (was %s)\n",

			   mv88e6xxx_port_8021q_mode_names[new],

			   mv88e6xxx_port_8021q_mode_names[old]);

	}



	err = 0;

unlock:

	err = mv88e6xxx_port_set_8021q_mode(chip, port, mode);

	mutex_unlock(&chip->reg_lock);



	return err;

drivers/net/dsa/mv88e6xxx/port.c

+32 −0
Original line number Diff line number Diff line
@@ -190,3 +190,35 @@ int mv88e6xxx_port_set_pvid(struct mv88e6xxx_chip *chip, int port, u16 pvid) 


	return 0;

}



/* Offset 0x08: Port Control 2 Register */



static const char * const mv88e6xxx_port_8021q_mode_names[] = {

	[PORT_CONTROL_2_8021Q_DISABLED] = "Disabled",

	[PORT_CONTROL_2_8021Q_FALLBACK] = "Fallback",

	[PORT_CONTROL_2_8021Q_CHECK] = "Check",

	[PORT_CONTROL_2_8021Q_SECURE] = "Secure",

};



int mv88e6xxx_port_set_8021q_mode(struct mv88e6xxx_chip *chip, int port,

				  u16 mode)

{

	u16 reg;

	int err;



	err = mv88e6xxx_port_read(chip, port, PORT_CONTROL_2, &reg);

	if (err)

		return err;



	reg &= ~PORT_CONTROL_2_8021Q_MASK;

	reg |= mode & PORT_CONTROL_2_8021Q_MASK;



	err = mv88e6xxx_port_write(chip, port, PORT_CONTROL_2, reg);

	if (err)

		return err;



	netdev_dbg(chip->ds->ports[port].netdev, "802.1QMode set to %s\n",

		   mv88e6xxx_port_8021q_mode_names[mode]);



	return 0;

}

drivers/net/dsa/mv88e6xxx/port.h

+3 −0
Original line number Diff line number Diff line
@@ -31,4 +31,7 @@ int mv88e6xxx_port_set_fid(struct mv88e6xxx_chip *chip, int port, u16 fid); 
int mv88e6xxx_port_get_pvid(struct mv88e6xxx_chip *chip, int port, u16 *pvid);

int mv88e6xxx_port_set_pvid(struct mv88e6xxx_chip *chip, int port, u16 pvid);



int mv88e6xxx_port_set_8021q_mode(struct mv88e6xxx_chip *chip, int port,

				  u16 mode);



#endif /* _MV88E6XXX_PORT_H */