Commit 4b0c4817 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: prefix Global Switch MAC macros 



Prefix and document the Global Switch MAC Address Register macros and
give clear 16-bit register representation.

At the same time, move mv88e6xxx_g1_set_switch_mac in global1.c, where
it belongs.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82466921

drivers/net/dsa/mv88e6xxx/chip.c

+0 −19
Original line number Diff line number Diff line
@@ -1979,25 +1979,6 @@ static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port, 
	mutex_unlock(&chip->reg_lock);

}



static int mv88e6xxx_g1_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr)

{

	int err;



	err = mv88e6xxx_g1_write(chip, GLOBAL_MAC_01, (addr[0] << 8) | addr[1]);

	if (err)

		return err;



	err = mv88e6xxx_g1_write(chip, GLOBAL_MAC_23, (addr[2] << 8) | addr[3]);

	if (err)

		return err;



	err = mv88e6xxx_g1_write(chip, GLOBAL_MAC_45, (addr[4] << 8) | addr[5]);

	if (err)

		return err;



	return 0;

}



static int mv88e6xxx_set_ageing_time(struct dsa_switch *ds,

				     unsigned int ageing_time)

{

drivers/net/dsa/mv88e6xxx/global1.c

+27 −0
Original line number Diff line number Diff line
@@ -125,6 +125,33 @@ static int mv88e6xxx_g1_wait_init_ready(struct mv88e6xxx_chip *chip) 
	return 0;

}



/* Offset 0x01: Switch MAC Address Register Bytes 0 & 1

 * Offset 0x02: Switch MAC Address Register Bytes 2 & 3

 * Offset 0x03: Switch MAC Address Register Bytes 4 & 5

 */

int mv88e6xxx_g1_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr)

{

	u16 reg;

	int err;



	reg = (addr[0] << 8) | addr[1];

	err = mv88e6xxx_g1_write(chip, MV88E6XXX_G1_MAC_01, reg);

	if (err)

		return err;



	reg = (addr[2] << 8) | addr[3];

	err = mv88e6xxx_g1_write(chip, MV88E6XXX_G1_MAC_23, reg);

	if (err)

		return err;



	reg = (addr[4] << 8) | addr[5];

	err = mv88e6xxx_g1_write(chip, MV88E6XXX_G1_MAC_45, reg);

	if (err)

		return err;



	return 0;

}



/* Offset 0x04: Switch Global Control Register */



int mv88e6185_g1_reset(struct mv88e6xxx_chip *chip)

drivers/net/dsa/mv88e6xxx/global1.h

+10 −3
Original line number Diff line number Diff line
@@ -36,9 +36,14 @@ 
#define MV88E6XXX_G1_STS_IRQ_TCAM_DONE			1

#define MV88E6XXX_G1_STS_IRQ_EEPROM_DONE		0



#define GLOBAL_MAC_01		0x01

#define GLOBAL_MAC_23		0x02

#define GLOBAL_MAC_45		0x03

/* Offset 0x01: Switch MAC Address Register Bytes 0 & 1

 * Offset 0x02: Switch MAC Address Register Bytes 2 & 3

 * Offset 0x03: Switch MAC Address Register Bytes 4 & 5

 */

#define MV88E6XXX_G1_MAC_01		0x01

#define MV88E6XXX_G1_MAC_23		0x02

#define MV88E6XXX_G1_MAC_45		0x03



#define GLOBAL_ATU_FID		0x01

#define GLOBAL_VTU_FID		0x02

#define GLOBAL_VTU_FID_MASK	0xfff
@@ -164,6 +169,8 @@ int mv88e6xxx_g1_read(struct mv88e6xxx_chip *chip, int reg, u16 *val); 
int mv88e6xxx_g1_write(struct mv88e6xxx_chip *chip, int reg, u16 val);

int mv88e6xxx_g1_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask);



int mv88e6xxx_g1_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr);



int mv88e6185_g1_reset(struct mv88e6xxx_chip *chip);

int mv88e6352_g1_reset(struct mv88e6xxx_chip *chip);

CRA Git | Maintained and supported by SUSTech CRA and CCSE