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

Commit 720c6343 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: move ATU ageing time setter 



Move the ATU ageing time setter code in a new global1_atu.c file, which
will be extended in future patches to contains all consequent Global (1)
ATU support code.

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

drivers/net/dsa/mv88e6xxx/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o

mv88e6xxx-objs := chip.o

mv88e6xxx-objs += global1.o

mv88e6xxx-objs += global1_atu.o

mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_GLOBAL2) += global2.o

mv88e6xxx-objs += port.o

drivers/net/dsa/mv88e6xxx/chip.c

+2 −29
Original line number Diff line number Diff line
@@ -2697,33 +2697,6 @@ static int mv88e6xxx_g1_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr) 
	return 0;

}



static int mv88e6xxx_g1_set_age_time(struct mv88e6xxx_chip *chip,

				     unsigned int msecs)

{

	const unsigned int coeff = chip->info->age_time_coeff;

	const unsigned int min = 0x01 * coeff;

	const unsigned int max = 0xff * coeff;

	u8 age_time;

	u16 val;

	int err;



	if (msecs < min || msecs > max)

		return -ERANGE;



	/* Round to nearest multiple of coeff */

	age_time = (msecs + coeff / 2) / coeff;



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

	if (err)

		return err;



	/* AgeTime is 11:4 bits */

	val &= ~0xff0;

	val |= age_time << 4;



	return mv88e6xxx_g1_write(chip, GLOBAL_ATU_CONTROL, val);

}



static int mv88e6xxx_set_ageing_time(struct dsa_switch *ds,

				     unsigned int ageing_time)

{
@@ -2731,7 +2704,7 @@ static int mv88e6xxx_set_ageing_time(struct dsa_switch *ds, 
	int err;



	mutex_lock(&chip->reg_lock);

	err = mv88e6xxx_g1_set_age_time(chip, ageing_time);

	err = mv88e6xxx_g1_atu_set_age_time(chip, ageing_time);

	mutex_unlock(&chip->reg_lock);



	return err;
@@ -2783,7 +2756,7 @@ static int mv88e6xxx_g1_setup(struct mv88e6xxx_chip *chip) 
	if (err)

		return err;



	err = mv88e6xxx_g1_set_age_time(chip, 300000);

	err = mv88e6xxx_g1_atu_set_age_time(chip, 300000);

	if (err)

		return err;

drivers/net/dsa/mv88e6xxx/global1.h

+3 −0
Original line number Diff line number Diff line
@@ -38,4 +38,7 @@ int mv88e6095_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port); 
int mv88e6390_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port);

int mv88e6390_g1_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip);



int mv88e6xxx_g1_atu_set_age_time(struct mv88e6xxx_chip *chip,

				  unsigned int msecs);



#endif /* _MV88E6XXX_GLOBAL1_H */

drivers/net/dsa/mv88e6xxx/global1_atu.c

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Marvell 88E6xxx Address Translation Unit (ATU) support

 *

 * Copyright (c) 2008 Marvell Semiconductor

 * Copyright (c) 2017 Savoir-faire Linux, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include "mv88e6xxx.h"

#include "global1.h"



/* Offset 0x0A: ATU Control Register */



int mv88e6xxx_g1_atu_set_age_time(struct mv88e6xxx_chip *chip,

				  unsigned int msecs)

{

	const unsigned int coeff = chip->info->age_time_coeff;

	const unsigned int min = 0x01 * coeff;

	const unsigned int max = 0xff * coeff;

	u8 age_time;

	u16 val;

	int err;



	if (msecs < min || msecs > max)

		return -ERANGE;



	/* Round to nearest multiple of coeff */

	age_time = (msecs + coeff / 2) / coeff;



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

	if (err)

		return err;



	/* AgeTime is 11:4 bits */

	val &= ~0xff0;

	val |= age_time << 4;



	return mv88e6xxx_g1_write(chip, GLOBAL_ATU_CONTROL, val);

}