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

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

net: dsa: mv88e6xxx: Differentiate between 6390 and 6390X cmodes 



The X family variants support additional ports modes, for 10G
operation, which the non-X variants don't have. Add a port_set_cmode()
for non-X variants to enforce this.

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

drivers/net/dsa/mv88e6xxx/chip.c

+5 −2
Original line number Diff line number Diff line
@@ -3234,6 +3234,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { 
	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,

	.port_link_state = mv88e6352_port_link_state,

	.port_get_cmode = mv88e6352_port_get_cmode,

	.port_set_cmode = mv88e6390_port_set_cmode,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
@@ -3276,6 +3277,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { 
	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,

	.port_link_state = mv88e6352_port_link_state,

	.port_get_cmode = mv88e6352_port_get_cmode,

	.port_set_cmode = mv88e6390x_port_set_cmode,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
@@ -3318,6 +3320,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { 
	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,

	.port_link_state = mv88e6352_port_link_state,

	.port_get_cmode = mv88e6352_port_get_cmode,

	.port_set_cmode = mv88e6390_port_set_cmode,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
@@ -3409,7 +3412,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { 
	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,

	.port_link_state = mv88e6352_port_link_state,

	.port_get_cmode = mv88e6352_port_get_cmode,

	.port_set_cmode = mv88e6390x_port_set_cmode,

	.port_set_cmode = mv88e6390_port_set_cmode,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
@@ -3714,7 +3717,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { 
	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,

	.port_link_state = mv88e6352_port_link_state,

	.port_get_cmode = mv88e6352_port_get_cmode,

	.port_set_cmode = mv88e6390x_port_set_cmode,

	.port_set_cmode = mv88e6390_port_set_cmode,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,

drivers/net/dsa/mv88e6xxx/port.c

+15 −0
Original line number Diff line number Diff line
@@ -437,6 +437,21 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, 
	return 0;

}



int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			     phy_interface_t mode)

{

	switch (mode) {

	case PHY_INTERFACE_MODE_XGMII:

	case PHY_INTERFACE_MODE_XAUI:

	case PHY_INTERFACE_MODE_RXAUI:

		return -EINVAL;

	default:

		break;

	}



	return mv88e6390x_port_set_cmode(chip, port, mode);

}



int mv88e6185_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode)

{

	int err;

drivers/net/dsa/mv88e6xxx/port.h

+2 −0
Original line number Diff line number Diff line
@@ -310,6 +310,8 @@ int mv88e6097_port_pause_limit(struct mv88e6xxx_chip *chip, int port, u8 in, 
			       u8 out);

int mv88e6390_port_pause_limit(struct mv88e6xxx_chip *chip, int port, u8 in,

			       u8 out);

int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			     phy_interface_t mode);

int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			      phy_interface_t mode);

int mv88e6185_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode);