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

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

net: dsa: mv88e6xxx: factorize EEPROM access 



Add a MV88E6XXX_FLAG_EEPROM flag to describe switch models featuring an
EEPROM and distribute the EEPROM access routines to all models.

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

drivers/net/dsa/mv88e6123.c

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ struct dsa_switch_driver mv88e6123_switch_driver = { 
#ifdef CONFIG_NET_DSA_HWMON

	.get_temp		= mv88e6xxx_get_temp,

#endif

	.get_eeprom		= mv88e6xxx_get_eeprom,

	.set_eeprom		= mv88e6xxx_set_eeprom,

	.get_regs_len		= mv88e6xxx_get_regs_len,

	.get_regs		= mv88e6xxx_get_regs,

};

drivers/net/dsa/mv88e6131.c

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ struct dsa_switch_driver mv88e6131_switch_driver = { 
	.get_strings		= mv88e6xxx_get_strings,

	.get_ethtool_stats	= mv88e6xxx_get_ethtool_stats,

	.get_sset_count		= mv88e6xxx_get_sset_count,

	.get_eeprom		= mv88e6xxx_get_eeprom,

	.set_eeprom		= mv88e6xxx_set_eeprom,

	.adjust_link		= mv88e6xxx_adjust_link,

	.port_bridge_join	= mv88e6xxx_port_bridge_join,

	.port_bridge_leave	= mv88e6xxx_port_bridge_leave,

drivers/net/dsa/mv88e6171.c

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ struct dsa_switch_driver mv88e6171_switch_driver = { 
#ifdef CONFIG_NET_DSA_HWMON

	.get_temp               = mv88e6xxx_get_temp,

#endif

	.get_eeprom		= mv88e6xxx_get_eeprom,

	.set_eeprom		= mv88e6xxx_set_eeprom,

	.get_regs_len		= mv88e6xxx_get_regs_len,

	.get_regs		= mv88e6xxx_get_regs,

	.port_bridge_join	= mv88e6xxx_port_bridge_join,

drivers/net/dsa/mv88e6352.c

+2 −205
Original line number Diff line number Diff line
@@ -125,8 +125,6 @@ static int mv88e6352_setup(struct dsa_switch *ds) 
	if (ret < 0)

		return ret;



	mutex_init(&ps->eeprom_mutex);



	ret = mv88e6xxx_switch_reset(ps, true);

	if (ret < 0)

		return ret;
@@ -138,207 +136,6 @@ static int mv88e6352_setup(struct dsa_switch *ds) 
	return mv88e6xxx_setup_ports(ds);

}



static int mv88e6352_read_eeprom_word(struct dsa_switch *ds, int addr)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;



	mutex_lock(&ps->eeprom_mutex);



	ret = mv88e6xxx_reg_write(ps, REG_GLOBAL2, GLOBAL2_EEPROM_OP,

				  GLOBAL2_EEPROM_OP_READ |

				  (addr & GLOBAL2_EEPROM_OP_ADDR_MASK));

	if (ret < 0)

		goto error;



	ret = mv88e6xxx_eeprom_busy_wait(ds);

	if (ret < 0)

		goto error;



	ret = mv88e6xxx_reg_read(ps, REG_GLOBAL2, GLOBAL2_EEPROM_DATA);

error:

	mutex_unlock(&ps->eeprom_mutex);

	return ret;

}



static int mv88e6352_get_eeprom(struct dsa_switch *ds,

				struct ethtool_eeprom *eeprom, u8 *data)

{

	int offset;

	int len;

	int ret;



	offset = eeprom->offset;

	len = eeprom->len;

	eeprom->len = 0;



	eeprom->magic = 0xc3ec4951;



	ret = mv88e6xxx_eeprom_load_wait(ds);

	if (ret < 0)

		return ret;



	if (offset & 1) {

		int word;



		word = mv88e6352_read_eeprom_word(ds, offset >> 1);

		if (word < 0)

			return word;



		*data++ = (word >> 8) & 0xff;



		offset++;

		len--;

		eeprom->len++;

	}



	while (len >= 2) {

		int word;



		word = mv88e6352_read_eeprom_word(ds, offset >> 1);

		if (word < 0)

			return word;



		*data++ = word & 0xff;

		*data++ = (word >> 8) & 0xff;



		offset += 2;

		len -= 2;

		eeprom->len += 2;

	}



	if (len) {

		int word;



		word = mv88e6352_read_eeprom_word(ds, offset >> 1);

		if (word < 0)

			return word;



		*data++ = word & 0xff;



		offset++;

		len--;

		eeprom->len++;

	}



	return 0;

}



static int mv88e6352_eeprom_is_readonly(struct dsa_switch *ds)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;



	ret = mv88e6xxx_reg_read(ps, REG_GLOBAL2, GLOBAL2_EEPROM_OP);

	if (ret < 0)

		return ret;



	if (!(ret & GLOBAL2_EEPROM_OP_WRITE_EN))

		return -EROFS;



	return 0;

}



static int mv88e6352_write_eeprom_word(struct dsa_switch *ds, int addr,

				       u16 data)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;



	mutex_lock(&ps->eeprom_mutex);



	ret = mv88e6xxx_reg_write(ps, REG_GLOBAL2, GLOBAL2_EEPROM_DATA, data);

	if (ret < 0)

		goto error;



	ret = mv88e6xxx_reg_write(ps, REG_GLOBAL2, GLOBAL2_EEPROM_OP,

				  GLOBAL2_EEPROM_OP_WRITE |

				  (addr & GLOBAL2_EEPROM_OP_ADDR_MASK));

	if (ret < 0)

		goto error;



	ret = mv88e6xxx_eeprom_busy_wait(ds);

error:

	mutex_unlock(&ps->eeprom_mutex);

	return ret;

}



static int mv88e6352_set_eeprom(struct dsa_switch *ds,

				struct ethtool_eeprom *eeprom, u8 *data)

{

	int offset;

	int ret;

	int len;



	if (eeprom->magic != 0xc3ec4951)

		return -EINVAL;



	ret = mv88e6352_eeprom_is_readonly(ds);

	if (ret)

		return ret;



	offset = eeprom->offset;

	len = eeprom->len;

	eeprom->len = 0;



	ret = mv88e6xxx_eeprom_load_wait(ds);

	if (ret < 0)

		return ret;



	if (offset & 1) {

		int word;



		word = mv88e6352_read_eeprom_word(ds, offset >> 1);

		if (word < 0)

			return word;



		word = (*data++ << 8) | (word & 0xff);



		ret = mv88e6352_write_eeprom_word(ds, offset >> 1, word);

		if (ret < 0)

			return ret;



		offset++;

		len--;

		eeprom->len++;

	}



	while (len >= 2) {

		int word;



		word = *data++;

		word |= *data++ << 8;



		ret = mv88e6352_write_eeprom_word(ds, offset >> 1, word);

		if (ret < 0)

			return ret;



		offset += 2;

		len -= 2;

		eeprom->len += 2;

	}



	if (len) {

		int word;



		word = mv88e6352_read_eeprom_word(ds, offset >> 1);

		if (word < 0)

			return word;



		word = (word & 0xff00) | *data++;



		ret = mv88e6352_write_eeprom_word(ds, offset >> 1, word);

		if (ret < 0)

			return ret;



		offset++;

		len--;

		eeprom->len++;

	}



	return 0;

}



struct dsa_switch_driver mv88e6352_switch_driver = {

	.tag_protocol		= DSA_TAG_PROTO_EDSA,

	.probe			= mv88e6352_drv_probe,
@@ -358,8 +155,8 @@ struct dsa_switch_driver mv88e6352_switch_driver = { 
	.set_temp_limit		= mv88e6xxx_set_temp_limit,

	.get_temp_alarm		= mv88e6xxx_get_temp_alarm,

#endif

	.get_eeprom		= mv88e6352_get_eeprom,

	.set_eeprom		= mv88e6352_set_eeprom,

	.get_eeprom		= mv88e6xxx_get_eeprom,

	.set_eeprom		= mv88e6xxx_set_eeprom,

	.get_regs_len		= mv88e6xxx_get_regs_len,

	.get_regs		= mv88e6xxx_get_regs,

	.port_bridge_join	= mv88e6xxx_port_bridge_join,

drivers/net/dsa/mv88e6xxx.c

+214 −2
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ static int _mv88e6xxx_phy_wait(struct mv88e6xxx_priv_state *ps) 
			       GLOBAL2_SMI_OP_BUSY);

}



int mv88e6xxx_eeprom_load_wait(struct dsa_switch *ds)

static int mv88e6xxx_eeprom_load_wait(struct dsa_switch *ds)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
@@ -831,7 +831,7 @@ int mv88e6xxx_eeprom_load_wait(struct dsa_switch *ds) 
			      GLOBAL2_EEPROM_OP_LOAD);

}



int mv88e6xxx_eeprom_busy_wait(struct dsa_switch *ds)

static int mv88e6xxx_eeprom_busy_wait(struct dsa_switch *ds)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
@@ -839,6 +839,215 @@ int mv88e6xxx_eeprom_busy_wait(struct dsa_switch *ds) 
			      GLOBAL2_EEPROM_OP_BUSY);

}



static int mv88e6xxx_read_eeprom_word(struct dsa_switch *ds, int addr)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;



	mutex_lock(&ps->eeprom_mutex);



	ret = mv88e6xxx_reg_write(ps, REG_GLOBAL2, GLOBAL2_EEPROM_OP,

				  GLOBAL2_EEPROM_OP_READ |

				  (addr & GLOBAL2_EEPROM_OP_ADDR_MASK));

	if (ret < 0)

		goto error;



	ret = mv88e6xxx_eeprom_busy_wait(ds);

	if (ret < 0)

		goto error;



	ret = mv88e6xxx_reg_read(ps, REG_GLOBAL2, GLOBAL2_EEPROM_DATA);

error:

	mutex_unlock(&ps->eeprom_mutex);

	return ret;

}



int mv88e6xxx_get_eeprom(struct dsa_switch *ds, struct ethtool_eeprom *eeprom,

			 u8 *data)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int offset;

	int len;

	int ret;



	if (!mv88e6xxx_has(ps, MV88E6XXX_FLAG_EEPROM))

		return -EOPNOTSUPP;



	offset = eeprom->offset;

	len = eeprom->len;

	eeprom->len = 0;



	eeprom->magic = 0xc3ec4951;



	ret = mv88e6xxx_eeprom_load_wait(ds);

	if (ret < 0)

		return ret;



	if (offset & 1) {

		int word;



		word = mv88e6xxx_read_eeprom_word(ds, offset >> 1);

		if (word < 0)

			return word;



		*data++ = (word >> 8) & 0xff;



		offset++;

		len--;

		eeprom->len++;

	}



	while (len >= 2) {

		int word;



		word = mv88e6xxx_read_eeprom_word(ds, offset >> 1);

		if (word < 0)

			return word;



		*data++ = word & 0xff;

		*data++ = (word >> 8) & 0xff;



		offset += 2;

		len -= 2;

		eeprom->len += 2;

	}



	if (len) {

		int word;



		word = mv88e6xxx_read_eeprom_word(ds, offset >> 1);

		if (word < 0)

			return word;



		*data++ = word & 0xff;



		offset++;

		len--;

		eeprom->len++;

	}



	return 0;

}



static int mv88e6xxx_eeprom_is_readonly(struct dsa_switch *ds)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;



	ret = mv88e6xxx_reg_read(ps, REG_GLOBAL2, GLOBAL2_EEPROM_OP);

	if (ret < 0)

		return ret;



	if (!(ret & GLOBAL2_EEPROM_OP_WRITE_EN))

		return -EROFS;



	return 0;

}



static int mv88e6xxx_write_eeprom_word(struct dsa_switch *ds, int addr,

				       u16 data)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;



	mutex_lock(&ps->eeprom_mutex);



	ret = mv88e6xxx_reg_write(ps, REG_GLOBAL2, GLOBAL2_EEPROM_DATA, data);

	if (ret < 0)

		goto error;



	ret = mv88e6xxx_reg_write(ps, REG_GLOBAL2, GLOBAL2_EEPROM_OP,

				  GLOBAL2_EEPROM_OP_WRITE |

				  (addr & GLOBAL2_EEPROM_OP_ADDR_MASK));

	if (ret < 0)

		goto error;



	ret = mv88e6xxx_eeprom_busy_wait(ds);

error:

	mutex_unlock(&ps->eeprom_mutex);

	return ret;

}



int mv88e6xxx_set_eeprom(struct dsa_switch *ds, struct ethtool_eeprom *eeprom,

			 u8 *data)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int offset;

	int ret;

	int len;



	if (!mv88e6xxx_has(ps, MV88E6XXX_FLAG_EEPROM))

		return -EOPNOTSUPP;



	if (eeprom->magic != 0xc3ec4951)

		return -EINVAL;



	ret = mv88e6xxx_eeprom_is_readonly(ds);

	if (ret)

		return ret;



	offset = eeprom->offset;

	len = eeprom->len;

	eeprom->len = 0;



	ret = mv88e6xxx_eeprom_load_wait(ds);

	if (ret < 0)

		return ret;



	if (offset & 1) {

		int word;



		word = mv88e6xxx_read_eeprom_word(ds, offset >> 1);

		if (word < 0)

			return word;



		word = (*data++ << 8) | (word & 0xff);



		ret = mv88e6xxx_write_eeprom_word(ds, offset >> 1, word);

		if (ret < 0)

			return ret;



		offset++;

		len--;

		eeprom->len++;

	}



	while (len >= 2) {

		int word;



		word = *data++;

		word |= *data++ << 8;



		ret = mv88e6xxx_write_eeprom_word(ds, offset >> 1, word);

		if (ret < 0)

			return ret;



		offset += 2;

		len -= 2;

		eeprom->len += 2;

	}



	if (len) {

		int word;



		word = mv88e6xxx_read_eeprom_word(ds, offset >> 1);

		if (word < 0)

			return word;



		word = (word & 0xff00) | *data++;



		ret = mv88e6xxx_write_eeprom_word(ds, offset >> 1, word);

		if (ret < 0)

			return ret;



		offset++;

		len--;

		eeprom->len++;

	}



	return 0;

}



static int _mv88e6xxx_atu_wait(struct mv88e6xxx_priv_state *ps)

{

	return _mv88e6xxx_wait(ps, REG_GLOBAL, GLOBAL_ATU_OP,
@@ -2596,6 +2805,9 @@ int mv88e6xxx_setup_common(struct mv88e6xxx_priv_state *ps) 


	INIT_WORK(&ps->bridge_work, mv88e6xxx_bridge_work);



	if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_EEPROM))

		mutex_init(&ps->eeprom_mutex);



	if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_PPU))

		mv88e6xxx_ppu_state_init(ps);