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

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

net: dsa: mv88e6xxx: add ATU setup helper 



Move the configuration of the default ageing time in a new
mv88e6xxx_atu_setup function.

That function will be extended later to contain all ATU related
configuration bits.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 720c6343

drivers/net/dsa/mv88e6xxx/chip.c

+9 −4
Original line number Diff line number Diff line
@@ -1306,6 +1306,11 @@ static void mv88e6xxx_port_stp_state_set(struct dsa_switch *ds, int port, 
		netdev_err(ds->ports[port].netdev, "failed to update state\n");

}



static int mv88e6xxx_atu_setup(struct mv88e6xxx_chip *chip)

{

	return mv88e6xxx_g1_atu_set_age_time(chip, 300000);

}



static void mv88e6xxx_port_fast_age(struct dsa_switch *ds, int port)

{

	struct mv88e6xxx_chip *chip = ds->priv;
@@ -2756,10 +2761,6 @@ static int mv88e6xxx_g1_setup(struct mv88e6xxx_chip *chip) 
	if (err)

		return err;



	err = mv88e6xxx_g1_atu_set_age_time(chip, 300000);

	if (err)

		return err;



	/* Clear all ATU entries */

	err = _mv88e6xxx_atu_flush(chip, 0, true);

	if (err)
@@ -2845,6 +2846,10 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) 
			goto unlock;

	}



	err = mv88e6xxx_atu_setup(chip);

	if (err)

		goto unlock;



	/* Some generations have the configuration of sending reserved

	 * management frames to the CPU in global2, others in

	 * global1. Hence it does not fit the two setup functions