Commit 8ee51f6b authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: move VTU FID accessors 



Add helpers to access the VTU FID register in the global1_vtu.c file.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b486d7c9

drivers/net/dsa/mv88e6xxx/chip.c

+2 −5
Original line number Diff line number Diff line
@@ -1371,11 +1371,9 @@ static int _mv88e6xxx_vtu_getnext(struct mv88e6xxx_chip *chip, 
			return err;



		if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_G1_VTU_FID)) {

			err = mv88e6xxx_g1_read(chip, GLOBAL_VTU_FID, &val);

			err = mv88e6xxx_g1_vtu_fid_read(chip, &next);

			if (err)

				return err;



			next.fid = val & GLOBAL_VTU_FID_MASK;

		} else if (mv88e6xxx_num_databases(chip) == 256) {

			/* VTU DBNum[7:4] are located in VTU Operation 11:8, and

			 * VTU DBNum[3:0] are located in VTU Operation 3:0
@@ -1491,8 +1489,7 @@ static int _mv88e6xxx_vtu_loadpurge(struct mv88e6xxx_chip *chip, 
	}



	if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_G1_VTU_FID)) {

		reg = entry->fid & GLOBAL_VTU_FID_MASK;

		err = mv88e6xxx_g1_write(chip, GLOBAL_VTU_FID, reg);

		err = mv88e6xxx_g1_vtu_fid_write(chip, entry);

		if (err)

			return err;

	} else if (mv88e6xxx_num_databases(chip) == 256) {

drivers/net/dsa/mv88e6xxx/global1.h

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ int mv88e6xxx_g1_atu_flush(struct mv88e6xxx_chip *chip, u16 fid, bool all); 
int mv88e6xxx_g1_atu_remove(struct mv88e6xxx_chip *chip, u16 fid, int port,

			    bool all);



int mv88e6xxx_g1_vtu_fid_read(struct mv88e6xxx_chip *chip,

			      struct mv88e6xxx_vtu_entry *entry);

int mv88e6xxx_g1_vtu_fid_write(struct mv88e6xxx_chip *chip,

			       struct mv88e6xxx_vtu_entry *entry);

int mv88e6xxx_g1_vtu_op_wait(struct mv88e6xxx_chip *chip);

int mv88e6xxx_g1_vtu_op(struct mv88e6xxx_chip *chip, u16 op);

int mv88e6xxx_g1_vtu_flush(struct mv88e6xxx_chip *chip);

drivers/net/dsa/mv88e6xxx/global1_vtu.c

+25 −0
Original line number Diff line number Diff line
@@ -14,6 +14,31 @@ 
#include "mv88e6xxx.h"

#include "global1.h"



/* Offset 0x02: VTU FID Register */



int mv88e6xxx_g1_vtu_fid_read(struct mv88e6xxx_chip *chip,

			      struct mv88e6xxx_vtu_entry *entry)

{

	u16 val;

	int err;



	err = mv88e6xxx_g1_read(chip, GLOBAL_VTU_FID, &val);

	if (err)

		return err;



	entry->fid = val & GLOBAL_VTU_FID_MASK;



	return 0;

}



int mv88e6xxx_g1_vtu_fid_write(struct mv88e6xxx_chip *chip,

			       struct mv88e6xxx_vtu_entry *entry)

{

	u16 val = entry->fid & GLOBAL_VTU_FID_MASK;



	return mv88e6xxx_g1_write(chip, GLOBAL_VTU_FID, val);

}



/* Offset 0x05: VTU Operation Register */



int mv88e6xxx_g1_vtu_op_wait(struct mv88e6xxx_chip *chip)

CRA Git | Maintained and supported by SUSTech CRA and CCSE