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

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

net: dsa: mv88e6xxx: move trunk setup 



Move the trunking setup out of Global 2 specific setup into the top
level mv88e6xxx_setup function.

Note that the 88E6390 family calls this LAG instead of Trunk and
supports 32 possible ID routing vectors, with LAG ID bit 4 being placed
in Global 2 register 0x1D...

We don't need Trunk (or LAG) IDs for the moment, thus keep it simple.

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

drivers/net/dsa/mv88e6xxx/chip.c

+13 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,15 @@ static void mv88e6xxx_port_stp_state_set(struct dsa_switch *ds, int port, 
		dev_err(ds->dev, "p%d: failed to update state\n", port);

}



static int mv88e6xxx_trunk_setup(struct mv88e6xxx_chip *chip)

{

	/* Clear all trunk masks and mapping */

	if (chip->info->global2_addr)

		return mv88e6xxx_g2_trunk_clear(chip);



	return 0;

}



static int mv88e6xxx_pot_setup(struct mv88e6xxx_chip *chip)

{

	if (chip->info->ops->pot_clear)
@@ -2239,6 +2248,10 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) 
	if (err)

		goto unlock;



	err = mv88e6xxx_trunk_setup(chip);

	if (err)

		goto unlock;



	/* Setup PTP Hardware Clock and timestamping */

	if (chip->info->ptp_support) {

		err = mv88e6xxx_ptp_setup(chip);

drivers/net/dsa/mv88e6xxx/global2.c

+1 −6
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int mv88e6xxx_g2_trunk_mapping_write(struct mv88e6xxx_chip *chip, int id, 
	return mv88e6xxx_g2_update(chip, MV88E6XXX_G2_TRUNK_MAPPING, val);

}



static int mv88e6xxx_g2_clear_trunk(struct mv88e6xxx_chip *chip)

int mv88e6xxx_g2_trunk_clear(struct mv88e6xxx_chip *chip)

{

	const u16 port_mask = BIT(mv88e6xxx_num_ports(chip)) - 1;

	int i, err;
@@ -1159,10 +1159,5 @@ int mv88e6xxx_g2_setup(struct mv88e6xxx_chip *chip) 
	if (err)

		return err;



	/* Clear all trunk masks and mapping. */

	err = mv88e6xxx_g2_clear_trunk(chip);

	if (err)

		return err;



	return 0;

}

drivers/net/dsa/mv88e6xxx/global2.h

+7 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ int mv88e6352_g2_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip); 


int mv88e6xxx_g2_pot_clear(struct mv88e6xxx_chip *chip);



int mv88e6xxx_g2_trunk_clear(struct mv88e6xxx_chip *chip);



extern const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops;

extern const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops;
@@ -495,6 +497,11 @@ static inline int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip, 
	return -EOPNOTSUPP;

}



static inline int mv88e6xxx_g2_trunk_clear(struct mv88e6xxx_chip *chip)

{

	return -EOPNOTSUPP;

}



#endif /* CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */



#endif /* _MV88E6XXX_GLOBAL2_H */