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

Commit e073782a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-mv88e6xxx-ops-cosmetics' 



Vivien Didelot says:

====================
net: dsa: mv88e6xxx: ops cosmetics

This patchset brings no functional changes. It is a first step in a
bigger cosmetics change to the driver. It simplifies print messages and
polishes data types and chip operations.

The next patchs will only prefix and document the port registers macros.

Changes in v2:
  - KISS and simply use dev_* since chip->ds may not be initialized
  - add reviewers tags
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fff88030 bec90b6d

drivers/net/dsa/mv88e6xxx/chip.c

+120 −139

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/dsa/mv88e6xxx/chip.h

+13 −4
Original line number Diff line number Diff line
@@ -39,6 +39,13 @@ 
#define MV88E6XXX_MAX_PVT_SWITCHES	32

#define MV88E6XXX_MAX_PVT_PORTS		16



enum mv88e6xxx_egress_mode {

	MV88E6XXX_EGRESS_MODE_UNMODIFIED,

	MV88E6XXX_EGRESS_MODE_UNTAGGED,

	MV88E6XXX_EGRESS_MODE_TAGGED,

	MV88E6XXX_EGRESS_MODE_ETHERTYPE,

};



enum mv88e6xxx_frame_mode {

	MV88E6XXX_FRAME_MODE_NORMAL,

	MV88E6XXX_FRAME_MODE_DSA,
@@ -415,10 +422,12 @@ struct mv88e6xxx_ops { 
				      bool unicast, bool multicast);

	int (*port_set_ether_type)(struct mv88e6xxx_chip *chip, int port,

				   u16 etype);

	int (*port_jumbo_config)(struct mv88e6xxx_chip *chip, int port);

	int (*port_set_jumbo_size)(struct mv88e6xxx_chip *chip, int port,

				   size_t size);



	int (*port_egress_rate_limiting)(struct mv88e6xxx_chip *chip, int port);

	int (*port_pause_config)(struct mv88e6xxx_chip *chip, int port);

	int (*port_pause_limit)(struct mv88e6xxx_chip *chip, int port, u8 in,

				u8 out);

	int (*port_disable_learn_limit)(struct mv88e6xxx_chip *chip, int port);

	int (*port_disable_pri_override)(struct mv88e6xxx_chip *chip, int port);
@@ -449,8 +458,8 @@ struct mv88e6xxx_ops { 
	void (*stats_get_strings)(struct mv88e6xxx_chip *chip,  uint8_t *data);

	void (*stats_get_stats)(struct mv88e6xxx_chip *chip,  int port,

				uint64_t *data);

	int (*g1_set_cpu_port)(struct mv88e6xxx_chip *chip, int port);

	int (*g1_set_egress_port)(struct mv88e6xxx_chip *chip, int port);

	int (*set_cpu_port)(struct mv88e6xxx_chip *chip, int port);

	int (*set_egress_port)(struct mv88e6xxx_chip *chip, int port);

	const struct mv88e6xxx_irq_ops *watchdog_ops;



	/* Can be either in g1 or g2, so don't use a prefix */

drivers/net/dsa/mv88e6xxx/phy.c

+6 −5
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ int mv88e6xxx_phy_write(struct mv88e6xxx_chip *chip, int phy, int reg, u16 val) 


static int mv88e6xxx_phy_page_get(struct mv88e6xxx_chip *chip, int phy, u8 page)

{

	return mv88e6xxx_phy_write(chip, phy, PHY_PAGE, page);

	return mv88e6xxx_phy_write(chip, phy, MV88E6XXX_PHY_PAGE, page);

}



static void mv88e6xxx_phy_page_put(struct mv88e6xxx_chip *chip, int phy)
@@ -72,7 +72,8 @@ static void mv88e6xxx_phy_page_put(struct mv88e6xxx_chip *chip, int phy) 
	/* Restore PHY page Copper 0x0 for access via the registered

	 * MDIO bus

	 */

	err = mv88e6xxx_phy_write(chip, phy, PHY_PAGE, PHY_PAGE_COPPER);

	err = mv88e6xxx_phy_write(chip, phy, MV88E6XXX_PHY_PAGE,

				  MV88E6XXX_PHY_PAGE_COPPER);

	if (unlikely(err)) {

		dev_err(chip->dev,

			"failed to restore PHY %d page Copper (%d)\n",
@@ -86,7 +87,7 @@ int mv88e6xxx_phy_page_read(struct mv88e6xxx_chip *chip, int phy, 
	int err;



	/* There is no paging for registers 22 */

	if (reg == PHY_PAGE)

	if (reg == MV88E6XXX_PHY_PAGE)

		return -EINVAL;



	err = mv88e6xxx_phy_page_get(chip, phy, page);
@@ -104,12 +105,12 @@ int mv88e6xxx_phy_page_write(struct mv88e6xxx_chip *chip, int phy, 
	int err;



	/* There is no paging for registers 22 */

	if (reg == PHY_PAGE)

	if (reg == MV88E6XXX_PHY_PAGE)

		return -EINVAL;



	err = mv88e6xxx_phy_page_get(chip, phy, page);

	if (!err) {

		err = mv88e6xxx_phy_write(chip, phy, PHY_PAGE, page);

		err = mv88e6xxx_phy_write(chip, phy, MV88E6XXX_PHY_PAGE, page);

		mv88e6xxx_phy_page_put(chip, phy);

	}

drivers/net/dsa/mv88e6xxx/phy.h

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#ifndef _MV88E6XXX_PHY_H

#define _MV88E6XXX_PHY_H



#define PHY_PAGE		0x16

#define PHY_PAGE_COPPER		0x00

#define MV88E6XXX_PHY_PAGE		0x16

#define MV88E6XXX_PHY_PAGE_COPPER	0x00



/* PHY Registers accesses implementations */

int mv88e6165_phy_read(struct mv88e6xxx_chip *chip, struct mii_bus *bus,

drivers/net/dsa/mv88e6xxx/port.c

+75 −30
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 * (at your option) any later version.

 */



#include <linux/if_bridge.h>

#include <linux/phy.h>



#include "chip.h"
@@ -76,7 +77,7 @@ static int mv88e6xxx_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port, 
	if (err)

		return err;



	netdev_dbg(chip->ds->ports[port].netdev, "delay RXCLK %s, TXCLK %s\n",

	dev_dbg(chip->dev, "p%d: delay RXCLK %s, TXCLK %s\n", port,

		reg & PORT_PCS_CTRL_RGMII_DELAY_RXCLK ? "yes" : "no",

		reg & PORT_PCS_CTRL_RGMII_DELAY_TXCLK ? "yes" : "no");
@@ -130,7 +131,7 @@ int mv88e6xxx_port_set_link(struct mv88e6xxx_chip *chip, int port, int link) 
	if (err)

		return err;



	netdev_dbg(chip->ds->ports[port].netdev, "%s link %s\n",

	dev_dbg(chip->dev, "p%d: %s link %s\n", port,

		reg & PORT_PCS_CTRL_FORCE_LINK ? "Force" : "Unforce",

		reg & PORT_PCS_CTRL_LINK_UP ? "up" : "down");
@@ -166,7 +167,7 @@ int mv88e6xxx_port_set_duplex(struct mv88e6xxx_chip *chip, int port, int dup) 
	if (err)

		return err;



	netdev_dbg(chip->ds->ports[port].netdev, "%s %s duplex\n",

	dev_dbg(chip->dev, "p%d: %s %s duplex\n", port,

		reg & PORT_PCS_CTRL_FORCE_DUPLEX ? "Force" : "Unforce",

		reg & PORT_PCS_CTRL_DUPLEX_FULL ? "full" : "half");
@@ -226,10 +227,9 @@ static int mv88e6xxx_port_set_speed(struct mv88e6xxx_chip *chip, int port, 
		return err;



	if (speed)

		netdev_dbg(chip->ds->ports[port].netdev,

			   "Speed set to %d Mbps\n", speed);

		dev_dbg(chip->dev, "p%d: Speed set to %d Mbps\n", port, speed);

	else

		netdev_dbg(chip->ds->ports[port].netdev, "Speed unforced\n");

		dev_dbg(chip->dev, "p%d: Speed unforced\n", port);



	return 0;

}
@@ -376,22 +376,24 @@ int mv88e6xxx_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode) 
 * the remote end or the period of time that this port can pause the

 * remote end.

 */

int mv88e6097_port_pause_config(struct mv88e6xxx_chip *chip, int port)

int mv88e6097_port_pause_limit(struct mv88e6xxx_chip *chip, int port, u8 in,

			       u8 out)

{

	return mv88e6xxx_port_write(chip, port, PORT_PAUSE_CTRL, 0x0000);

	return mv88e6xxx_port_write(chip, port, PORT_PAUSE_CTRL, out << 8 | in);

}



int mv88e6390_port_pause_config(struct mv88e6xxx_chip *chip, int port)

int mv88e6390_port_pause_limit(struct mv88e6xxx_chip *chip, int port, u8 in,

			       u8 out)

{

	int err;



	err = mv88e6xxx_port_write(chip, port, PORT_PAUSE_CTRL,

				   PORT_FLOW_CTRL_LIMIT_IN | 0);

				   PORT_FLOW_CTRL_LIMIT_IN | in);

	if (err)

		return err;



	return mv88e6xxx_port_write(chip, port, PORT_PAUSE_CTRL,

				    PORT_FLOW_CTRL_LIMIT_OUT | 0);

				    PORT_FLOW_CTRL_LIMIT_OUT | out);

}



/* Offset 0x04: Port Control Register */
@@ -413,20 +415,39 @@ int mv88e6xxx_port_set_state(struct mv88e6xxx_chip *chip, int port, u8 state) 
		return err;



	reg &= ~PORT_CONTROL_STATE_MASK;



	switch (state) {

	case BR_STATE_DISABLED:

		state = PORT_CONTROL_STATE_DISABLED;

		break;

	case BR_STATE_BLOCKING:

	case BR_STATE_LISTENING:

		state = PORT_CONTROL_STATE_BLOCKING;

		break;

	case BR_STATE_LEARNING:

		state = PORT_CONTROL_STATE_LEARNING;

		break;

	case BR_STATE_FORWARDING:

		state = PORT_CONTROL_STATE_FORWARDING;

		break;

	default:

		return -EINVAL;

	}



	reg |= state;



	err = mv88e6xxx_port_write(chip, port, PORT_CONTROL, reg);

	if (err)

		return err;



	netdev_dbg(chip->ds->ports[port].netdev, "PortState set to %s\n",

	dev_dbg(chip->dev, "p%d: PortState set to %s\n", port,

		mv88e6xxx_port_state_names[state]);



	return 0;

}



int mv88e6xxx_port_set_egress_mode(struct mv88e6xxx_chip *chip, int port,

				   u16 mode)

				   enum mv88e6xxx_egress_mode mode)

{

	int err;

	u16 reg;
@@ -436,7 +457,23 @@ int mv88e6xxx_port_set_egress_mode(struct mv88e6xxx_chip *chip, int port, 
		return err;



	reg &= ~PORT_CONTROL_EGRESS_MASK;

	reg |= mode;



	switch (mode) {

	case MV88E6XXX_EGRESS_MODE_UNMODIFIED:

		reg |= PORT_CONTROL_EGRESS_UNMODIFIED;

		break;

	case MV88E6XXX_EGRESS_MODE_UNTAGGED:

		reg |= PORT_CONTROL_EGRESS_UNTAGGED;

		break;

	case MV88E6XXX_EGRESS_MODE_TAGGED:

		reg |= PORT_CONTROL_EGRESS_TAGGED;

		break;

	case MV88E6XXX_EGRESS_MODE_ETHERTYPE:

		reg |= PORT_CONTROL_EGRESS_ADD_TAG;

		break;

	default:

		return -EINVAL;

	}



	return mv88e6xxx_port_write(chip, port, PORT_CONTROL, reg);

}
@@ -580,8 +617,7 @@ int mv88e6xxx_port_set_vlan_map(struct mv88e6xxx_chip *chip, int port, u16 map) 
	if (err)

		return err;



	netdev_dbg(chip->ds->ports[port].netdev, "VLANTable set to %.3x\n",

		   map);

	dev_dbg(chip->dev, "p%d: VLANTable set to %.3x\n", port, map);



	return 0;

}
@@ -646,7 +682,7 @@ int mv88e6xxx_port_set_fid(struct mv88e6xxx_chip *chip, int port, u16 fid) 
			return err;

	}



	netdev_dbg(chip->ds->ports[port].netdev, "FID set to %u\n", fid);

	dev_dbg(chip->dev, "p%d: FID set to %u\n", port, fid);



	return 0;

}
@@ -683,8 +719,7 @@ int mv88e6xxx_port_set_pvid(struct mv88e6xxx_chip *chip, int port, u16 pvid) 
	if (err)

		return err;



	netdev_dbg(chip->ds->ports[port].netdev, "DefaultVID set to %u\n",

		   pvid);

	dev_dbg(chip->dev, "p%d: DefaultVID set to %u\n", port, pvid);



	return 0;

}
@@ -761,7 +796,7 @@ int mv88e6xxx_port_set_8021q_mode(struct mv88e6xxx_chip *chip, int port, 
	if (err)

		return err;



	netdev_dbg(chip->ds->ports[port].netdev, "802.1QMode set to %s\n",

	dev_dbg(chip->dev, "p%d: 802.1QMode set to %s\n", port,

		mv88e6xxx_port_8021q_mode_names[mode]);



	return 0;
@@ -781,7 +816,8 @@ int mv88e6xxx_port_set_map_da(struct mv88e6xxx_chip *chip, int port) 
	return mv88e6xxx_port_write(chip, port, PORT_CONTROL_2, reg);

}



int mv88e6165_port_jumbo_config(struct mv88e6xxx_chip *chip, int port)

int mv88e6165_port_set_jumbo_size(struct mv88e6xxx_chip *chip, int port,

				  size_t size)

{

	u16 reg;

	int err;
@@ -790,7 +826,16 @@ int mv88e6165_port_jumbo_config(struct mv88e6xxx_chip *chip, int port) 
	if (err)

		return err;



	reg &= ~PORT_CONTROL_2_JUMBO_MASK;



	if (size <= 1522)

		reg |= PORT_CONTROL_2_JUMBO_1522;

	else if (size <= 2048)

		reg |= PORT_CONTROL_2_JUMBO_2048;

	else if (size <= 10240)

		reg |= PORT_CONTROL_2_JUMBO_10240;

	else

		return -ERANGE;



	return mv88e6xxx_port_write(chip, port, PORT_CONTROL_2, reg);

}