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

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

net: dsa: mv88e6xxx: Add MV88E6165 AVB register access 



The MV88E6165 PTP registers are all in AVB bank F, unlike newer
generations which spread them over AVB bank E and F. Implement AVB ops
for the MV88E6165 which hides this difference.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d2ac8ee

drivers/net/dsa/mv88e6xxx/chip.c

+2 −0
Original line number Diff line number Diff line
@@ -2810,6 +2810,7 @@ static const struct mv88e6xxx_ops mv88e6161_ops = { 
	.reset = mv88e6352_g1_reset,

	.vtu_getnext = mv88e6352_g1_vtu_getnext,

	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.avb_ops = &mv88e6165_avb_ops,

};



static const struct mv88e6xxx_ops mv88e6165_ops = {
@@ -2838,6 +2839,7 @@ static const struct mv88e6xxx_ops mv88e6165_ops = { 
	.reset = mv88e6352_g1_reset,

	.vtu_getnext = mv88e6352_g1_vtu_getnext,

	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.avb_ops = &mv88e6165_avb_ops,

};



static const struct mv88e6xxx_ops mv88e6171_ops = {

drivers/net/dsa/mv88e6xxx/global2.h

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
#define MV88E6390_G2_AVB_CMD_OP_WRITE		0x6000

#define MV88E6352_G2_AVB_CMD_PORT_MASK		0x0f00

#define MV88E6352_G2_AVB_CMD_PORT_TAIGLOBAL	0xe

#define MV88E6165_G2_AVB_CMD_PORT_PTPGLOBAL	0xf

#define MV88E6352_G2_AVB_CMD_PORT_PTPGLOBAL	0xf

#define MV88E6390_G2_AVB_CMD_PORT_MASK		0x1f00

#define MV88E6390_G2_AVB_CMD_PORT_TAIGLOBAL	0x1e
@@ -335,6 +336,7 @@ int mv88e6xxx_g2_device_mapping_write(struct mv88e6xxx_chip *chip, int target, 
extern const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops;

extern const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops;



extern const struct mv88e6xxx_avb_ops mv88e6165_avb_ops;

extern const struct mv88e6xxx_avb_ops mv88e6352_avb_ops;

extern const struct mv88e6xxx_avb_ops mv88e6390_avb_ops;
@@ -484,6 +486,7 @@ static inline int mv88e6xxx_g2_pot_clear(struct mv88e6xxx_chip *chip) 
static const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops = {};

static const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops = {};



static const struct mv88e6xxx_avb_ops mv88e6165_avb_ops = {};

static const struct mv88e6xxx_avb_ops mv88e6352_avb_ops = {};

static const struct mv88e6xxx_avb_ops mv88e6390_avb_ops = {};

drivers/net/dsa/mv88e6xxx/global2_avb.c

+25 −0
Original line number Diff line number Diff line
@@ -130,6 +130,31 @@ const struct mv88e6xxx_avb_ops mv88e6352_avb_ops = { 
	.tai_write		= mv88e6352_g2_avb_tai_write,

};



static int mv88e6165_g2_avb_tai_read(struct mv88e6xxx_chip *chip, int addr,

				     u16 *data, int len)

{

	return mv88e6352_g2_avb_port_ptp_read(chip,

					MV88E6165_G2_AVB_CMD_PORT_PTPGLOBAL,

					addr, data, len);

}



static int mv88e6165_g2_avb_tai_write(struct mv88e6xxx_chip *chip, int addr,

				      u16 data)

{

	return mv88e6352_g2_avb_port_ptp_write(chip,

					MV88E6165_G2_AVB_CMD_PORT_PTPGLOBAL,

					addr, data);

}



const struct mv88e6xxx_avb_ops mv88e6165_avb_ops = {

	.port_ptp_read		= mv88e6352_g2_avb_port_ptp_read,

	.port_ptp_write		= mv88e6352_g2_avb_port_ptp_write,

	.ptp_read		= mv88e6352_g2_avb_ptp_read,

	.ptp_write		= mv88e6352_g2_avb_ptp_write,

	.tai_read		= mv88e6165_g2_avb_tai_read,

	.tai_write		= mv88e6165_g2_avb_tai_write,

};



static int mv88e6390_g2_avb_port_ptp_read(struct mv88e6xxx_chip *chip,

					  int port, int addr, u16 *data,

					  int len)