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

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

Merge branch 'net-dsa-Global-2-cosmetics' 



Vivien Didelot says:

====================
net: dsa: Global 2 cosmetics

Similarly to what has been done for the Port and Global 1 registers,
this patch series prefixes and documents the macros of Global 2.

It brings no functional changes except for 1/10 which fixes the IRL init
for 88E6390 family.

Changes in v2: make *_g2_irl_init_all static inline without
NET_DSA_MV88E6XXX_GLOBAL2 and compile test with and without the symbol.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cc07cb93 1d90016d

drivers/net/dsa/mv88e6xxx/chip.c

+47 −0
Original line number Diff line number Diff line
@@ -941,6 +941,26 @@ static int mv88e6xxx_atu_setup(struct mv88e6xxx_chip *chip) 
	return mv88e6xxx_g1_atu_set_age_time(chip, 300000);

}



static int mv88e6xxx_irl_setup(struct mv88e6xxx_chip *chip)

{

	int port;

	int err;



	if (!chip->info->ops->irl_init_all)

		return 0;



	for (port = 0; port < mv88e6xxx_num_ports(chip); port++) {

		/* Disable ingress rate limiting by resetting all per port

		 * ingress rate limit resources to their initial state.

		 */

		err = chip->info->ops->irl_init_all(chip, port);

		if (err)

			return err;

	}



	return 0;

}



static int mv88e6xxx_pvt_map(struct mv88e6xxx_chip *chip, int dev, int port)

{

	u16 pvlan = 0;
@@ -2102,6 +2122,10 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) 
			goto unlock;

	}



	err = mv88e6xxx_irl_setup(chip);

	if (err)

		goto unlock;



	err = mv88e6xxx_phy_setup(chip);

	if (err)

		goto unlock;
@@ -2339,6 +2363,7 @@ static int mv88e6xxx_set_eeprom(struct dsa_switch *ds, 


static const struct mv88e6xxx_ops mv88e6085_ops = {

	/* MV88E6XXX_FAMILY_6097 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.set_switch_mac = mv88e6xxx_g1_set_switch_mac,

	.phy_read = mv88e6185_phy_ppu_read,

	.phy_write = mv88e6185_phy_ppu_write,
@@ -2393,6 +2418,7 @@ static const struct mv88e6xxx_ops mv88e6095_ops = { 


static const struct mv88e6xxx_ops mv88e6097_ops = {

	/* MV88E6XXX_FAMILY_6097 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,

	.phy_read = mv88e6xxx_g2_smi_phy_read,

	.phy_write = mv88e6xxx_g2_smi_phy_write,
@@ -2423,6 +2449,7 @@ static const struct mv88e6xxx_ops mv88e6097_ops = { 


static const struct mv88e6xxx_ops mv88e6123_ops = {

	/* MV88E6XXX_FAMILY_6165 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,

	.phy_read = mv88e6xxx_g2_smi_phy_read,

	.phy_write = mv88e6xxx_g2_smi_phy_write,
@@ -2479,6 +2506,7 @@ static const struct mv88e6xxx_ops mv88e6131_ops = { 


static const struct mv88e6xxx_ops mv88e6141_ops = {

	/* MV88E6XXX_FAMILY_6341 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom8,

	.set_eeprom = mv88e6xxx_g2_set_eeprom8,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2512,6 +2540,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { 


static const struct mv88e6xxx_ops mv88e6161_ops = {

	/* MV88E6XXX_FAMILY_6165 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,

	.phy_read = mv88e6xxx_g2_smi_phy_read,

	.phy_write = mv88e6xxx_g2_smi_phy_write,
@@ -2542,6 +2571,7 @@ static const struct mv88e6xxx_ops mv88e6161_ops = { 


static const struct mv88e6xxx_ops mv88e6165_ops = {

	/* MV88E6XXX_FAMILY_6165 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,

	.phy_read = mv88e6165_phy_read,

	.phy_write = mv88e6165_phy_write,
@@ -2565,6 +2595,7 @@ static const struct mv88e6xxx_ops mv88e6165_ops = { 


static const struct mv88e6xxx_ops mv88e6171_ops = {

	/* MV88E6XXX_FAMILY_6351 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,

	.phy_read = mv88e6xxx_g2_smi_phy_read,

	.phy_write = mv88e6xxx_g2_smi_phy_write,
@@ -2596,6 +2627,7 @@ static const struct mv88e6xxx_ops mv88e6171_ops = { 


static const struct mv88e6xxx_ops mv88e6172_ops = {

	/* MV88E6XXX_FAMILY_6352 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom16,

	.set_eeprom = mv88e6xxx_g2_set_eeprom16,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2630,6 +2662,7 @@ static const struct mv88e6xxx_ops mv88e6172_ops = { 


static const struct mv88e6xxx_ops mv88e6175_ops = {

	/* MV88E6XXX_FAMILY_6351 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,

	.phy_read = mv88e6xxx_g2_smi_phy_read,

	.phy_write = mv88e6xxx_g2_smi_phy_write,
@@ -2661,6 +2694,7 @@ static const struct mv88e6xxx_ops mv88e6175_ops = { 


static const struct mv88e6xxx_ops mv88e6176_ops = {

	/* MV88E6XXX_FAMILY_6352 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom16,

	.set_eeprom = mv88e6xxx_g2_set_eeprom16,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2722,6 +2756,7 @@ static const struct mv88e6xxx_ops mv88e6185_ops = { 


static const struct mv88e6xxx_ops mv88e6190_ops = {

	/* MV88E6XXX_FAMILY_6390 */

	.irl_init_all = mv88e6390_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom8,

	.set_eeprom = mv88e6xxx_g2_set_eeprom8,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2755,6 +2790,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { 


static const struct mv88e6xxx_ops mv88e6190x_ops = {

	/* MV88E6XXX_FAMILY_6390 */

	.irl_init_all = mv88e6390_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom8,

	.set_eeprom = mv88e6xxx_g2_set_eeprom8,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2788,6 +2824,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { 


static const struct mv88e6xxx_ops mv88e6191_ops = {

	/* MV88E6XXX_FAMILY_6390 */

	.irl_init_all = mv88e6390_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom8,

	.set_eeprom = mv88e6xxx_g2_set_eeprom8,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2821,6 +2858,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { 


static const struct mv88e6xxx_ops mv88e6240_ops = {

	/* MV88E6XXX_FAMILY_6352 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom16,

	.set_eeprom = mv88e6xxx_g2_set_eeprom16,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2855,6 +2893,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = { 


static const struct mv88e6xxx_ops mv88e6290_ops = {

	/* MV88E6XXX_FAMILY_6390 */

	.irl_init_all = mv88e6390_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom8,

	.set_eeprom = mv88e6xxx_g2_set_eeprom8,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2889,6 +2928,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { 


static const struct mv88e6xxx_ops mv88e6320_ops = {

	/* MV88E6XXX_FAMILY_6320 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom16,

	.set_eeprom = mv88e6xxx_g2_set_eeprom16,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2920,6 +2960,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { 


static const struct mv88e6xxx_ops mv88e6321_ops = {

	/* MV88E6XXX_FAMILY_6321 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom16,

	.set_eeprom = mv88e6xxx_g2_set_eeprom16,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2950,6 +2991,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { 


static const struct mv88e6xxx_ops mv88e6341_ops = {

	/* MV88E6XXX_FAMILY_6341 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom8,

	.set_eeprom = mv88e6xxx_g2_set_eeprom8,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -2983,6 +3025,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { 


static const struct mv88e6xxx_ops mv88e6350_ops = {

	/* MV88E6XXX_FAMILY_6351 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,

	.phy_read = mv88e6xxx_g2_smi_phy_read,

	.phy_write = mv88e6xxx_g2_smi_phy_write,
@@ -3014,6 +3057,7 @@ static const struct mv88e6xxx_ops mv88e6350_ops = { 


static const struct mv88e6xxx_ops mv88e6351_ops = {

	/* MV88E6XXX_FAMILY_6351 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,

	.phy_read = mv88e6xxx_g2_smi_phy_read,

	.phy_write = mv88e6xxx_g2_smi_phy_write,
@@ -3045,6 +3089,7 @@ static const struct mv88e6xxx_ops mv88e6351_ops = { 


static const struct mv88e6xxx_ops mv88e6352_ops = {

	/* MV88E6XXX_FAMILY_6352 */

	.irl_init_all = mv88e6352_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom16,

	.set_eeprom = mv88e6xxx_g2_set_eeprom16,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -3079,6 +3124,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = { 


static const struct mv88e6xxx_ops mv88e6390_ops = {

	/* MV88E6XXX_FAMILY_6390 */

	.irl_init_all = mv88e6390_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom8,

	.set_eeprom = mv88e6xxx_g2_set_eeprom8,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
@@ -3115,6 +3161,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { 


static const struct mv88e6xxx_ops mv88e6390x_ops = {

	/* MV88E6XXX_FAMILY_6390 */

	.irl_init_all = mv88e6390_g2_irl_init_all,

	.get_eeprom = mv88e6xxx_g2_get_eeprom8,

	.set_eeprom = mv88e6xxx_g2_set_eeprom8,

	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,

drivers/net/dsa/mv88e6xxx/chip.h

+3 −16
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ enum mv88e6xxx_cap { 
	MV88E6XXX_CAP_G2_INT,		/* (0x00) Interrupt Status */

	MV88E6XXX_CAP_G2_MGMT_EN_2X,	/* (0x02) MGMT Enable Register 2x */

	MV88E6XXX_CAP_G2_MGMT_EN_0X,	/* (0x03) MGMT Enable Register 0x */

	MV88E6XXX_CAP_G2_IRL_CMD,	/* (0x09) Ingress Rate Command */

	MV88E6XXX_CAP_G2_IRL_DATA,	/* (0x0a) Ingress Rate Data */

	MV88E6XXX_CAP_G2_POT,		/* (0x0f) Priority Override Table */



	/* Per VLAN Spanning Tree Unit (STU).
@@ -149,15 +147,8 @@ enum mv88e6xxx_cap { 
#define MV88E6XXX_FLAG_G2_INT		BIT_ULL(MV88E6XXX_CAP_G2_INT)

#define MV88E6XXX_FLAG_G2_MGMT_EN_2X	BIT_ULL(MV88E6XXX_CAP_G2_MGMT_EN_2X)

#define MV88E6XXX_FLAG_G2_MGMT_EN_0X	BIT_ULL(MV88E6XXX_CAP_G2_MGMT_EN_0X)

#define MV88E6XXX_FLAG_G2_IRL_CMD	BIT_ULL(MV88E6XXX_CAP_G2_IRL_CMD)

#define MV88E6XXX_FLAG_G2_IRL_DATA	BIT_ULL(MV88E6XXX_CAP_G2_IRL_DATA)

#define MV88E6XXX_FLAG_G2_POT		BIT_ULL(MV88E6XXX_CAP_G2_POT)



/* Ingress Rate Limit unit */

#define MV88E6XXX_FLAGS_IRL		\

	(MV88E6XXX_FLAG_G2_IRL_CMD |	\

	 MV88E6XXX_FLAG_G2_IRL_DATA)



/* Multi-chip Addressing Mode */

#define MV88E6XXX_FLAGS_MULTI_CHIP	\

	(MV88E6XXX_FLAG_SMI_CMD |	\
@@ -175,7 +166,6 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_G2_MGMT_EN_2X |	\

	 MV88E6XXX_FLAG_G2_MGMT_EN_0X |	\

	 MV88E6XXX_FLAG_G2_POT |	\

	 MV88E6XXX_FLAGS_IRL |		\

	 MV88E6XXX_FLAGS_MULTI_CHIP)



#define MV88E6XXX_FLAGS_FAMILY_6165	\
@@ -185,7 +175,6 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_G2_MGMT_EN_2X |	\

	 MV88E6XXX_FLAG_G2_MGMT_EN_0X |	\

	 MV88E6XXX_FLAG_G2_POT |	\

	 MV88E6XXX_FLAGS_IRL |		\

	 MV88E6XXX_FLAGS_MULTI_CHIP)



#define MV88E6XXX_FLAGS_FAMILY_6185	\
@@ -200,7 +189,6 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_G2_MGMT_EN_2X |	\

	 MV88E6XXX_FLAG_G2_MGMT_EN_0X |	\

	 MV88E6XXX_FLAG_G2_POT |	\

	 MV88E6XXX_FLAGS_IRL |		\

	 MV88E6XXX_FLAGS_MULTI_CHIP)



#define MV88E6XXX_FLAGS_FAMILY_6341	\
@@ -209,7 +197,6 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_GLOBAL2 |	\

	 MV88E6XXX_FLAG_G2_INT |	\

	 MV88E6XXX_FLAG_G2_POT |	\

	 MV88E6XXX_FLAGS_IRL |		\

	 MV88E6XXX_FLAGS_MULTI_CHIP)



#define MV88E6XXX_FLAGS_FAMILY_6351	\
@@ -219,7 +206,6 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_G2_MGMT_EN_2X |	\

	 MV88E6XXX_FLAG_G2_MGMT_EN_0X |	\

	 MV88E6XXX_FLAG_G2_POT |	\

	 MV88E6XXX_FLAGS_IRL |		\

	 MV88E6XXX_FLAGS_MULTI_CHIP)



#define MV88E6XXX_FLAGS_FAMILY_6352	\
@@ -230,14 +216,12 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_G2_MGMT_EN_2X |	\

	 MV88E6XXX_FLAG_G2_MGMT_EN_0X |	\

	 MV88E6XXX_FLAG_G2_POT |	\

	 MV88E6XXX_FLAGS_IRL |		\

	 MV88E6XXX_FLAGS_MULTI_CHIP)



#define MV88E6XXX_FLAGS_FAMILY_6390	\

	(MV88E6XXX_FLAG_EEE |		\

	 MV88E6XXX_FLAG_GLOBAL2 |	\

	 MV88E6XXX_FLAG_G2_INT |        \

	 MV88E6XXX_FLAGS_IRL |		\

	 MV88E6XXX_FLAGS_MULTI_CHIP)



struct mv88e6xxx_ops;
@@ -358,6 +342,9 @@ struct mv88e6xxx_mdio_bus { 
};



struct mv88e6xxx_ops {

	/* Ingress Rate Limit unit (IRL) operations */

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



	int (*get_eeprom)(struct mv88e6xxx_chip *chip,

			  struct ethtool_eeprom *eeprom, u8 *data);

	int (*set_eeprom)(struct mv88e6xxx_chip *chip,