Commit 7a6c5cb9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mv88e6390-batch-two' 



Andrew Lunn says:

====================
MV88E6390 batch two

This is the second batch of patches adding support for the
MV88e6390. They are not sufficient to make it work properly.

The mv88e6390 has a much expanded set of priority maps. Refactor the
existing code, and implement basic support for the new device.

Similarly, the monitor control register has been reworked.

The mv88e6390 has something odd in its EDSA tagging implementation,
which means it is not possible to use it. So we need to use DSA
tagging. This is the first device with EDSA support where we need to
use DSA, and the code does not support this. So two patches refactor
the existing code. The two different register definitions are
separated out, and using DSA on an EDSA capable device is added.

v2:
Add port prefix
Add helper function for 6390
Add _IEEE_ into #defines
Split monitor_ctrl into a number of separate ops.
Remove 6390 code which is management, used in a later patch
s/EGREES/EGRESS/.
Broke up setup_port_dsa() and set_port_dsa() into a number of ops

v3:
Verify mandatory ops for port setup
Don't set ether type for DSA port.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 69248719 56995cbc

drivers/net/dsa/mv88e6xxx/chip.c

+276 −75

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/dsa/mv88e6xxx/global1.c

+69 −0
Original line number Diff line number Diff line
@@ -33,6 +33,75 @@ int mv88e6xxx_g1_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask) 
	return mv88e6xxx_wait(chip, chip->info->global1_addr, reg, mask);

}



/* Offset 0x1a: Monitor Control */

/* Offset 0x1a: Monitor & MGMT Control on some devices */



int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port)

{

	u16 reg;

	int err;



	err = mv88e6xxx_g1_read(chip, GLOBAL_MONITOR_CONTROL, &reg);

	if (err)

		return err;



	reg &= ~(GLOBAL_MONITOR_CONTROL_INGRESS_MASK |

		 GLOBAL_MONITOR_CONTROL_EGRESS_MASK);



	reg |= port << GLOBAL_MONITOR_CONTROL_INGRESS_SHIFT |

		port << GLOBAL_MONITOR_CONTROL_EGRESS_SHIFT;



	return mv88e6xxx_g1_write(chip, GLOBAL_MONITOR_CONTROL, reg);

}



/* Older generations also call this the ARP destination. It has been

 * generalized in more modern devices such that more than ARP can

 * egress it

 */

int mv88e6095_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port)

{

	u16 reg;

	int err;



	err = mv88e6xxx_g1_read(chip, GLOBAL_MONITOR_CONTROL, &reg);

	if (err)

		return err;



	reg &= ~GLOBAL_MONITOR_CONTROL_ARP_MASK;

	reg |= port << GLOBAL_MONITOR_CONTROL_ARP_SHIFT;



	return mv88e6xxx_g1_write(chip, GLOBAL_MONITOR_CONTROL, reg);

}



static int mv88e6390_g1_monitor_write(struct mv88e6xxx_chip *chip,

				      u16 pointer, u8 data)

{

	u16 reg;



	reg = GLOBAL_MONITOR_CONTROL_UPDATE | pointer | data;



	return mv88e6xxx_g1_write(chip, GLOBAL_MONITOR_CONTROL, reg);

}



int mv88e6390_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port)

{

	int err;



	err = mv88e6390_g1_monitor_write(chip, GLOBAL_MONITOR_CONTROL_INGRESS,

					 port);

	if (err)

		return err;



	return mv88e6390_g1_monitor_write(chip, GLOBAL_MONITOR_CONTROL_EGRESS,

					  port);

}



int mv88e6390_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port)

{

	return mv88e6390_g1_monitor_write(chip, GLOBAL_MONITOR_CONTROL_CPU_DEST,

					  port);

}



/* Offset 0x1c: Global Control 2 */



int mv88e6390_g1_stats_set_histogram(struct mv88e6xxx_chip *chip)

drivers/net/dsa/mv88e6xxx/global1.h

+4 −0
Original line number Diff line number Diff line
@@ -25,5 +25,9 @@ int mv88e6320_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port); 
int mv88e6390_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port);

int mv88e6390_g1_stats_set_histogram(struct mv88e6xxx_chip *chip);

void mv88e6xxx_g1_stats_read(struct mv88e6xxx_chip *chip, int stat, u32 *val);

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);



#endif /* _MV88E6XXX_GLOBAL1_H */

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

+49 −13
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ 
#define PORT_CONTROL_EGRESS_UNTAGGED	(0x1 << 12)

#define PORT_CONTROL_EGRESS_TAGGED	(0x2 << 12)

#define PORT_CONTROL_EGRESS_ADD_TAG	(0x3 << 12)

#define PORT_CONTROL_EGRESS_MASK	(0x3 << 12)

#define PORT_CONTROL_HEADER		BIT(11)

#define PORT_CONTROL_IGMP_MLD_SNOOP	BIT(10)

#define PORT_CONTROL_DOUBLE_TAG		BIT(9)
@@ -117,6 +118,7 @@ 
#define PORT_CONTROL_FRAME_MODE_DSA		(0x1 << 8)

#define PORT_CONTROL_FRAME_MODE_PROVIDER	(0x2 << 8)

#define PORT_CONTROL_FRAME_ETHER_TYPE_DSA	(0x3 << 8)

#define PORT_CONTROL_FRAME_MASK			(0x3 << 8)

#define PORT_CONTROL_DSA_TAG		BIT(8)

#define PORT_CONTROL_VLAN_TUNNEL	BIT(7)

#define PORT_CONTROL_TAG_IF_BOTH	BIT(6)
@@ -124,6 +126,10 @@ 
#define PORT_CONTROL_USE_TAG		BIT(4)

#define PORT_CONTROL_FORWARD_UNKNOWN_MC	BIT(3)

#define PORT_CONTROL_FORWARD_UNKNOWN	BIT(2)

#define PORT_CONTROL_NOT_EGRESS_UNKNOWN_DA		(0x0 << 2)

#define PORT_CONTROL_NOT_EGRESS_UNKNOWN_MULTICAST_DA	(0x1 << 2)

#define PORT_CONTROL_NOT_EGRESS_UNKNOWN_UNITCAST_DA	(0x2 << 2)

#define PORT_CONTROL_EGRESS_ALL_UNKNOWN_DA		(0x3 << 2)

#define PORT_CONTROL_STATE_MASK		0x03

#define PORT_CONTROL_STATE_DISABLED	0x00

#define PORT_CONTROL_STATE_BLOCKING	0x01
@@ -172,6 +178,16 @@ 
#define PORT_OUT_FILTERED	0x13

#define PORT_TAG_REGMAP_0123	0x18

#define PORT_TAG_REGMAP_4567	0x19

#define PORT_IEEE_PRIO_MAP_TABLE	0x18    /* 6390 */

#define PORT_IEEE_PRIO_MAP_TABLE_UPDATE		BIT(15)

#define PORT_IEEE_PRIO_MAP_TABLE_INGRESS_PCP		(0x0 << 12)

#define PORT_IEEE_PRIO_MAP_TABLE_EGRESS_GREEN_PCP	(0x1 << 12)

#define PORT_IEEE_PRIO_MAP_TABLE_EGRESS_YELLOW_PCP	(0x2 << 12)

#define PORT_IEEE_PRIO_MAP_TABLE_EGRESS_AVB_PCP		(0x3 << 12)

#define PORT_IEEE_PRIO_MAP_TABLE_EGRESS_GREEN_DSCP	(0x5 << 12)

#define PORT_IEEE_PRIO_MAP_TABLE_EGRESS_YELLOW_DSCP	(0x6 << 12)

#define PORT_IEEE_PRIO_MAP_TABLE_EGRESS_AVB_DSCP	(0x7 << 12)

#define PORT_IEEE_PRIO_MAP_TABLE_POINTER_SHIFT		9



#define GLOBAL_STATUS		0x00

#define GLOBAL_STATUS_PPU_STATE BIT(15) /* 6351 and 6171 */
@@ -277,10 +293,21 @@ 
#define GLOBAL_CORE_TAG_TYPE	0x19

#define GLOBAL_MONITOR_CONTROL	0x1a

#define GLOBAL_MONITOR_CONTROL_INGRESS_SHIFT	12

#define GLOBAL_MONITOR_CONTROL_INGRESS_MASK	(0xf << 12)

#define GLOBAL_MONITOR_CONTROL_EGRESS_SHIFT	8

#define GLOBAL_MONITOR_CONTROL_EGRESS_MASK	(0xf << 8)

#define GLOBAL_MONITOR_CONTROL_ARP_SHIFT	4

#define GLOBAL_MONITOR_CONTROL_ARP_MASK	        (0xf << 4)

#define GLOBAL_MONITOR_CONTROL_MIRROR_SHIFT	0

#define GLOBAL_MONITOR_CONTROL_ARP_DISABLED	(0xf0)

#define GLOBAL_MONITOR_CONTROL_UPDATE			BIT(15)

#define GLOBAL_MONITOR_CONTROL_0180C280000000XLO	(0x00 << 8)

#define GLOBAL_MONITOR_CONTROL_0180C280000000XHI	(0x01 << 8)

#define GLOBAL_MONITOR_CONTROL_0180C280000002XLO	(0x02 << 8)

#define GLOBAL_MONITOR_CONTROL_0180C280000002XHI	(0x03 << 8)

#define GLOBAL_MONITOR_CONTROL_INGRESS			(0x20 << 8)

#define GLOBAL_MONITOR_CONTROL_EGRESS			(0x21 << 8)

#define GLOBAL_MONITOR_CONTROL_CPU_DEST			(0x30 << 8)

#define GLOBAL_CONTROL_2	0x1c

#define GLOBAL_CONTROL_2_NO_CASCADE		0xe000

#define GLOBAL_CONTROL_2_MULTIPLE_CASCADE	0xf000
@@ -375,6 +402,13 @@ 


#define MV88E6XXX_N_FID		4096



enum mv88e6xxx_frame_mode {

	MV88E6XXX_FRAME_MODE_NORMAL,

	MV88E6XXX_FRAME_MODE_DSA,

	MV88E6XXX_FRAME_MODE_PROVIDER,

	MV88E6XXX_FRAME_MODE_ETHERTYPE,

};



/* List of supported models */

enum mv88e6xxx_model {

	MV88E6085,
@@ -417,12 +451,6 @@ enum mv88e6xxx_family { 
};



enum mv88e6xxx_cap {

	/* Two different tag protocols can be used by the driver. All

	 * switches support DSA, but only later generations support

	 * EDSA.

	 */

	MV88E6XXX_CAP_EDSA,



	/* Energy Efficient Ethernet.

	 */

	MV88E6XXX_CAP_EEE,
@@ -485,7 +513,6 @@ enum mv88e6xxx_cap { 
};



/* Bitmask of capabilities */

#define MV88E6XXX_FLAG_EDSA		BIT_ULL(MV88E6XXX_CAP_EDSA)

#define MV88E6XXX_FLAG_EEE		BIT_ULL(MV88E6XXX_CAP_EEE)



#define MV88E6XXX_FLAG_SMI_CMD		BIT_ULL(MV88E6XXX_CAP_SMI_CMD)
@@ -580,8 +607,7 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_VTU)



#define MV88E6XXX_FLAGS_FAMILY_6320	\

	(MV88E6XXX_FLAG_EDSA |		\

	 MV88E6XXX_FLAG_EEE |		\

	(MV88E6XXX_FLAG_EEE |		\

	 MV88E6XXX_FLAG_GLOBAL2 |	\

	 MV88E6XXX_FLAG_G2_MGMT_EN_2X |	\

	 MV88E6XXX_FLAG_G2_MGMT_EN_0X |	\
@@ -595,8 +621,7 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAGS_PVT)



#define MV88E6XXX_FLAGS_FAMILY_6351	\

	(MV88E6XXX_FLAG_EDSA |		\

	 MV88E6XXX_FLAG_G1_ATU_FID |	\

	(MV88E6XXX_FLAG_G1_ATU_FID |	\

	 MV88E6XXX_FLAG_G1_VTU_FID |	\

	 MV88E6XXX_FLAG_GLOBAL2 |	\

	 MV88E6XXX_FLAG_G2_INT |	\
@@ -612,8 +637,7 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAGS_PVT)



#define MV88E6XXX_FLAGS_FAMILY_6352	\

	(MV88E6XXX_FLAG_EDSA |		\

	 MV88E6XXX_FLAG_EEE |		\

	(MV88E6XXX_FLAG_EEE |		\

	 MV88E6XXX_FLAG_G1_ATU_FID |	\

	 MV88E6XXX_FLAG_G1_VTU_FID |	\

	 MV88E6XXX_FLAG_GLOBAL2 |	\
@@ -655,6 +679,7 @@ struct mv88e6xxx_info { 
	unsigned int global1_addr;

	unsigned int age_time_coeff;

	unsigned int g1_irqs;

	enum dsa_tag_protocol tag_protocol;

	unsigned long long flags;

	const struct mv88e6xxx_ops *ops;

};
@@ -800,6 +825,15 @@ struct mv88e6xxx_ops { 
	 */

	int (*port_set_speed)(struct mv88e6xxx_chip *chip, int port, int speed);



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



	int (*port_set_frame_mode)(struct mv88e6xxx_chip *chip, int port,

				   enum mv88e6xxx_frame_mode mode);

	int (*port_set_egress_unknowns)(struct mv88e6xxx_chip *chip, int port,

					bool on);

	int (*port_set_ether_type)(struct mv88e6xxx_chip *chip, int port,

				   u16 etype);



	/* Snapshot the statistics for a port. The statistics can then

	 * be read back a leisure but still with a consistent view.

	 */
@@ -815,6 +849,8 @@ struct mv88e6xxx_ops { 
	void (*stats_get_strings)(struct mv88e6xxx_chip *chip,  uint8_t *data);

	void (*stats_get_stats)(struct mv88e6xxx_chip *chip,  int port,

				uint64_t *data);

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

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

};



#define STATS_TYPE_PORT		BIT(0)

drivers/net/dsa/mv88e6xxx/port.c

+181 −0
Original line number Diff line number Diff line
@@ -335,6 +335,116 @@ int mv88e6xxx_port_set_state(struct mv88e6xxx_chip *chip, int port, u8 state) 
	return 0;

}



int mv88e6xxx_port_set_egress_mode(struct mv88e6xxx_chip *chip, int port,

				   u16 mode)

{

	int err;

	u16 reg;



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

	if (err)

		return err;



	reg &= ~PORT_CONTROL_EGRESS_MASK;

	reg |= mode;



	return mv88e6xxx_port_write(chip, port, PORT_CONTROL, reg);

}



int mv88e6085_port_set_frame_mode(struct mv88e6xxx_chip *chip, int port,

				  enum mv88e6xxx_frame_mode mode)

{

	int err;

	u16 reg;



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

	if (err)

		return err;



	reg &= ~PORT_CONTROL_FRAME_MODE_DSA;



	switch (mode) {

	case MV88E6XXX_FRAME_MODE_NORMAL:

		reg |= PORT_CONTROL_FRAME_MODE_NORMAL;

		break;

	case MV88E6XXX_FRAME_MODE_DSA:

		reg |= PORT_CONTROL_FRAME_MODE_DSA;

		break;

	default:

		return -EINVAL;

	}



	return mv88e6xxx_port_write(chip, port, PORT_CONTROL, reg);

}



int mv88e6351_port_set_frame_mode(struct mv88e6xxx_chip *chip, int port,

				  enum mv88e6xxx_frame_mode mode)

{

	int err;

	u16 reg;



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

	if (err)

		return err;



	reg &= ~PORT_CONTROL_FRAME_MASK;



	switch (mode) {

	case MV88E6XXX_FRAME_MODE_NORMAL:

		reg |= PORT_CONTROL_FRAME_MODE_NORMAL;

		break;

	case MV88E6XXX_FRAME_MODE_DSA:

		reg |= PORT_CONTROL_FRAME_MODE_DSA;

		break;

	case MV88E6XXX_FRAME_MODE_PROVIDER:

		reg |= PORT_CONTROL_FRAME_MODE_PROVIDER;

		break;

	case MV88E6XXX_FRAME_MODE_ETHERTYPE:

		reg |= PORT_CONTROL_FRAME_ETHER_TYPE_DSA;

		break;

	default:

		return -EINVAL;

	}



	return mv88e6xxx_port_write(chip, port, PORT_CONTROL, reg);

}



int mv88e6085_port_set_egress_unknowns(struct mv88e6xxx_chip *chip, int port,

				       bool on)

{

	int err;

	u16 reg;



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

	if (err)

		return err;



	if (on)

		reg |= PORT_CONTROL_FORWARD_UNKNOWN;

	else

		reg &= ~PORT_CONTROL_FORWARD_UNKNOWN;



	return mv88e6xxx_port_write(chip, port, PORT_CONTROL, reg);

}



int mv88e6351_port_set_egress_unknowns(struct mv88e6xxx_chip *chip, int port,

				       bool on)

{

	int err;

	u16 reg;



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

	if (err)

		return err;



	if (on)

		reg |= PORT_CONTROL_EGRESS_ALL_UNKNOWN_DA;

	else

		reg &= ~PORT_CONTROL_EGRESS_ALL_UNKNOWN_DA;



	return mv88e6xxx_port_write(chip, port, PORT_CONTROL, reg);

}



/* Offset 0x05: Port Control 1 */



/* Offset 0x06: Port Based VLAN Map */
@@ -496,3 +606,74 @@ int mv88e6xxx_port_set_8021q_mode(struct mv88e6xxx_chip *chip, int port, 


	return 0;

}



/* Offset 0x0f: Port Ether type */



int mv88e6351_port_set_ether_type(struct mv88e6xxx_chip *chip, int port,

				  u16 etype)

{

	return mv88e6xxx_port_write(chip, port, PORT_ETH_TYPE, etype);

}



/* Offset 0x18: Port IEEE Priority Remapping Registers [0-3]

 * Offset 0x19: Port IEEE Priority Remapping Registers [4-7]

 */



int mv88e6095_port_tag_remap(struct mv88e6xxx_chip *chip, int port)

{

	int err;



	/* Use a direct priority mapping for all IEEE tagged frames */

	err = mv88e6xxx_port_write(chip, port, PORT_TAG_REGMAP_0123, 0x3210);

	if (err)

		return err;



	return mv88e6xxx_port_write(chip, port, PORT_TAG_REGMAP_4567, 0x7654);

}



static int mv88e6xxx_port_ieeepmt_write(struct mv88e6xxx_chip *chip,

					int port, u16 table,

					u8 pointer, u16 data)

{

	u16 reg;



	reg = PORT_IEEE_PRIO_MAP_TABLE_UPDATE |

		table |

		(pointer << PORT_IEEE_PRIO_MAP_TABLE_POINTER_SHIFT) |

		data;



	return mv88e6xxx_port_write(chip, port, PORT_IEEE_PRIO_MAP_TABLE, reg);

}



int mv88e6390_port_tag_remap(struct mv88e6xxx_chip *chip, int port)

{

	int err, i;



	for (i = 0; i <= 7; i++) {

		err = mv88e6xxx_port_ieeepmt_write(

			chip, port, PORT_IEEE_PRIO_MAP_TABLE_INGRESS_PCP,

			i, (i | i << 4));

		if (err)

			return err;



		err = mv88e6xxx_port_ieeepmt_write(

			chip, port, PORT_IEEE_PRIO_MAP_TABLE_EGRESS_GREEN_PCP,

			i, i);

		if (err)

			return err;



		err = mv88e6xxx_port_ieeepmt_write(

			chip, port, PORT_IEEE_PRIO_MAP_TABLE_EGRESS_YELLOW_PCP,

			i, i);

		if (err)

			return err;



		err = mv88e6xxx_port_ieeepmt_write(

			chip, port, PORT_IEEE_PRIO_MAP_TABLE_EGRESS_AVB_PCP,

			i, i);

		if (err)

			return err;

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE