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

Commit 6e55f698 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: Reserved Management frames to CPU 



Older devices have a couple of registers in global2. The mv88e6390
family has a single register in global1 behind which hides similar
configuration. Implement and op for this.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7a6c5cb9

drivers/net/dsa/mv88e6xxx/chip.c

+35 −0
Original line number Diff line number Diff line
@@ -2899,6 +2899,17 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) 
			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

	 * above.

	 */

	if (chip->info->ops->mgmt_rsvd2cpu) {

		err = chip->info->ops->mgmt_rsvd2cpu(chip);

		if (err)

			goto unlock;

	}



unlock:

	mutex_unlock(&chip->reg_lock);
@@ -3221,6 +3232,7 @@ static const struct mv88e6xxx_ops mv88e6085_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6095_ops = {
@@ -3237,6 +3249,7 @@ static const struct mv88e6xxx_ops mv88e6095_ops = { 
	.stats_get_sset_count = mv88e6095_stats_get_sset_count,

	.stats_get_strings = mv88e6095_stats_get_strings,

	.stats_get_stats = mv88e6095_stats_get_stats,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6097_ops = {
@@ -3257,6 +3270,7 @@ static const struct mv88e6xxx_ops mv88e6097_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6123_ops = {
@@ -3275,6 +3289,7 @@ static const struct mv88e6xxx_ops mv88e6123_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6131_ops = {
@@ -3295,6 +3310,7 @@ static const struct mv88e6xxx_ops mv88e6131_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6161_ops = {
@@ -3315,6 +3331,7 @@ static const struct mv88e6xxx_ops mv88e6161_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6165_ops = {
@@ -3331,6 +3348,7 @@ static const struct mv88e6xxx_ops mv88e6165_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6171_ops = {
@@ -3352,6 +3370,7 @@ static const struct mv88e6xxx_ops mv88e6171_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6172_ops = {
@@ -3375,6 +3394,7 @@ static const struct mv88e6xxx_ops mv88e6172_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6175_ops = {
@@ -3396,6 +3416,7 @@ static const struct mv88e6xxx_ops mv88e6175_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6176_ops = {
@@ -3419,6 +3440,7 @@ static const struct mv88e6xxx_ops mv88e6176_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6185_ops = {
@@ -3437,6 +3459,7 @@ static const struct mv88e6xxx_ops mv88e6185_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6190_ops = {
@@ -3459,6 +3482,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { 
	.stats_get_stats = mv88e6390_stats_get_stats,

	.g1_set_cpu_port = mv88e6390_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6390_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6190x_ops = {
@@ -3481,6 +3505,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { 
	.stats_get_stats = mv88e6390_stats_get_stats,

	.g1_set_cpu_port = mv88e6390_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6390_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6191_ops = {
@@ -3503,6 +3528,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { 
	.stats_get_stats = mv88e6390_stats_get_stats,

	.g1_set_cpu_port = mv88e6390_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6390_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6240_ops = {
@@ -3526,6 +3552,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6290_ops = {
@@ -3548,6 +3575,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { 
	.stats_get_stats = mv88e6390_stats_get_stats,

	.g1_set_cpu_port = mv88e6390_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6390_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6320_ops = {
@@ -3570,6 +3598,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { 
	.stats_get_stats = mv88e6320_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6321_ops = {
@@ -3613,6 +3642,7 @@ static const struct mv88e6xxx_ops mv88e6350_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6351_ops = {
@@ -3634,6 +3664,7 @@ static const struct mv88e6xxx_ops mv88e6351_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6352_ops = {
@@ -3657,6 +3688,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = { 
	.stats_get_stats = mv88e6095_stats_get_stats,

	.g1_set_cpu_port = mv88e6095_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6095_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6095_g2_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6390_ops = {
@@ -3679,6 +3711,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { 
	.stats_get_stats = mv88e6390_stats_get_stats,

	.g1_set_cpu_port = mv88e6390_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6390_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6390x_ops = {
@@ -3701,6 +3734,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = { 
	.stats_get_stats = mv88e6390_stats_get_stats,

	.g1_set_cpu_port = mv88e6390_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6390_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,

};



static const struct mv88e6xxx_ops mv88e6391_ops = {
@@ -3723,6 +3757,7 @@ static const struct mv88e6xxx_ops mv88e6391_ops = { 
	.stats_get_stats = mv88e6390_stats_get_stats,

	.g1_set_cpu_port = mv88e6390_g1_set_cpu_port,

	.g1_set_egress_port = mv88e6390_g1_set_egress_port,

	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,

};



static int mv88e6xxx_verify_madatory_ops(struct mv88e6xxx_chip *chip,

drivers/net/dsa/mv88e6xxx/global1.c

+27 −0
Original line number Diff line number Diff line
@@ -102,6 +102,33 @@ int mv88e6390_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port) 
					  port);

}



int mv88e6390_g1_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip)

{

	int err;



	/* 01:c2:80:00:00:00:00-01:c2:80:00:00:00:07 are Management */

	err = mv88e6390_g1_monitor_write(

		chip, GLOBAL_MONITOR_CONTROL_0180C280000000XLO, 0xff);

	if (err)

		return err;



	/* 01:c2:80:00:00:00:08-01:c2:80:00:00:00:0f are Management */

	err = mv88e6390_g1_monitor_write(

		chip, GLOBAL_MONITOR_CONTROL_0180C280000000XHI, 0xff);

	if (err)

		return err;



	/* 01:c2:80:00:00:00:20-01:c2:80:00:00:00:27 are Management */

	err = mv88e6390_g1_monitor_write(

		chip, GLOBAL_MONITOR_CONTROL_0180C280000002XLO, 0xff);

	if (err)

		return err;



	/* 01:c2:80:00:00:00:28-01:c2:80:00:00:00:2f are Management */

	return mv88e6390_g1_monitor_write(

		chip, GLOBAL_MONITOR_CONTROL_0180C280000002XHI, 0xff);

}



/* Offset 0x1c: Global Control 2 */



int mv88e6390_g1_stats_set_histogram(struct mv88e6xxx_chip *chip)

drivers/net/dsa/mv88e6xxx/global1.h

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port); 
int mv88e6390_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port);

int mv88e6095_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port);

int mv88e6390_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port);

int mv88e6390_g1_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip);



#endif /* _MV88E6XXX_GLOBAL1_H */

drivers/net/dsa/mv88e6xxx/global2.c

+25 −18
Original line number Diff line number Diff line
@@ -38,6 +38,31 @@ static int mv88e6xxx_g2_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask) 
	return mv88e6xxx_wait(chip, ADDR_GLOBAL2, reg, mask);

}



/* Offset 0x02: Management Enable 2x */

/* Offset 0x03: Management Enable 0x */



int mv88e6095_g2_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip)

{

	int err;



	/* Consider the frames with reserved multicast destination

	 * addresses matching 01:80:c2:00:00:2x as MGMT.

	 */

	if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_G2_MGMT_EN_2X)) {

		err = mv88e6xxx_g2_write(chip, GLOBAL2_MGMT_EN_2X, 0xffff);

		if (err)

			return err;

	}



	/* Consider the frames with reserved multicast destination

	 * addresses matching 01:80:c2:00:00:0x as MGMT.

	 */

	if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_G2_MGMT_EN_0X))

		return mv88e6xxx_g2_write(chip, GLOBAL2_MGMT_EN_0X, 0xffff);



	return 0;

}



/* Offset 0x06: Device Mapping Table register */



static int mv88e6xxx_g2_device_mapping_write(struct mv88e6xxx_chip *chip,
@@ -567,24 +592,6 @@ int mv88e6xxx_g2_setup(struct mv88e6xxx_chip *chip) 
	u16 reg;

	int err;



	if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_G2_MGMT_EN_2X)) {

		/* Consider the frames with reserved multicast destination

		 * addresses matching 01:80:c2:00:00:2x as MGMT.

		 */

		err = mv88e6xxx_g2_write(chip, GLOBAL2_MGMT_EN_2X, 0xffff);

		if (err)

			return err;

	}



	if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_G2_MGMT_EN_0X)) {

		/* Consider the frames with reserved multicast destination

		 * addresses matching 01:80:c2:00:00:0x as MGMT.

		 */

		err = mv88e6xxx_g2_write(chip, GLOBAL2_MGMT_EN_0X, 0xffff);

		if (err)

			return err;

	}



	/* Ignore removed tag data on doubly tagged packets, disable

	 * flow control messages, force flow control priority to the

	 * highest, and send all special multicast frames to the CPU

drivers/net/dsa/mv88e6xxx/global2.h

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ int mv88e6xxx_g2_set_eeprom16(struct mv88e6xxx_chip *chip, 
int mv88e6xxx_g2_setup(struct mv88e6xxx_chip *chip);

int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip);

void mv88e6xxx_g2_irq_free(struct mv88e6xxx_chip *chip);

int mv88e6095_g2_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip);



#else /* !CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */
@@ -94,6 +95,11 @@ static inline void mv88e6xxx_g2_irq_free(struct mv88e6xxx_chip *chip) 
{

}



static inline int mv88e6095_g2_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip)

{

	return -EOPNOTSUPP;

}



#endif /* CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */



#endif /* _MV88E6XXX_GLOBAL2_H */