Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1533661

[PATCH net-next 1/6] net: dsa: mv88e6xxx: add helper to disable ports

Show all headers | View raw

Before resetting a switch, the ports should be set to the Disabled state
and the transmit queues should be drained.

Add an helper to explicit that.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index ce2f7ff..c89701e 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2361,6 +2361,26 @@ static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port)
 	mutex_unlock(&chip->reg_lock);
 }
 
+static int mv88e6xxx_disable_ports(struct mv88e6xxx_chip *chip)
+{
+	int i, err;
+
+	/* Set all ports to the Disabled state */
+	for (i = 0; i < mv88e6xxx_num_ports(chip); i++) {
+		err = mv88e6xxx_port_set_state(chip, i,
+					       PORT_CONTROL_STATE_DISABLED);
+		if (err)
+			return err;
+	}
+
+	/* Wait for transmit queues to drain,
+	 * i.e. 2ms for a maximum frame to be transmitted at 10 Mbps.
+	 */
+	usleep_range(2000, 4000);
+
+	return 0;
+}
+
 static int mv88e6xxx_switch_reset(struct mv88e6xxx_chip *chip)
 {
 	bool ppu_active = mv88e6xxx_has(chip, MV88E6XXX_FLAG_PPU_ACTIVE);
@@ -2369,18 +2389,10 @@ static int mv88e6xxx_switch_reset(struct mv88e6xxx_chip *chip)
 	unsigned long timeout;
 	u16 reg;
 	int err;
-	int i;
 
-	/* Set all ports to the disabled state. */
-	for (i = 0; i < mv88e6xxx_num_ports(chip); i++) {
-		err = mv88e6xxx_port_set_state(chip, i,
-					       PORT_CONTROL_STATE_DISABLED);
-		if (err)
-			return err;
-	}
-
-	/* Wait for transmit queues to drain. */
-	usleep_range(2000, 4000);
+	err = mv88e6xxx_disable_ports(chip);
+	if (err)
+		return err;
 
 	/* If there is a gpio connected to the reset pin, toggle it */
 	if (gpiod) {
-- 
2.10.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next 0/6] net: dsa: mv88e6xxx: rework reset and PPU code Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-12-01 00:10 +0100
  [PATCH net-next 6/6] net: dsa: mv88e6xxx: add PPU enable/disable ops Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-12-01 00:10 +0100
  [PATCH net-next 2/6] net: dsa: mv88e6xxx: add helper to hardware reset Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-12-01 00:10 +0100
    Re: [PATCH net-next 2/6] net: dsa: mv88e6xxx: add helper to hardware  reset Andrew Lunn <andrew@lunn.ch> - 2016-12-01 00:30 +0100
  [PATCH net-next 1/6] net: dsa: mv88e6xxx: add helper to disable ports Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-12-01 00:10 +0100
    Re: [PATCH net-next 1/6] net: dsa: mv88e6xxx: add helper to disable  ports Andrew Lunn <andrew@lunn.ch> - 2016-12-01 00:30 +0100
  [PATCH net-next 3/6] net: dsa: mv88e6xxx: add a software reset op Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-12-01 00:10 +0100
    Re: [PATCH net-next 3/6] net: dsa: mv88e6xxx: add a software reset op Andrew Lunn <andrew@lunn.ch> - 2016-12-01 00:30 +0100
      Re: [PATCH net-next 3/6] net: dsa: mv88e6xxx: add a software reset op Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-12-01 21:50 +0100
        Re: [PATCH net-next 3/6] net: dsa: mv88e6xxx: add a software reset op Andrew Lunn <andrew@lunn.ch> - 2016-12-02 16:50 +0100
          Re: [PATCH net-next 3/6] net: dsa: mv88e6xxx: add a software reset op Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-12-02 18:40 +0100
    Re: [PATCH net-next 3/6] net: dsa: mv88e6xxx: add a software reset  op David Miller <davem@davemloft.net> - 2016-12-02 18:30 +0100
  [PATCH net-next 5/6] net: dsa: mv88e6xxx: add helper for switch ready Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-12-01 00:10 +0100
    Re: [PATCH net-next 5/6] net: dsa: mv88e6xxx: add helper for switch  ready Andrew Lunn <andrew@lunn.ch> - 2016-12-01 00:40 +0100
      Re: [PATCH net-next 5/6] net: dsa: mv88e6xxx: add helper for switch ready Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-12-01 21:40 +0100
  [PATCH net-next 4/6] net: dsa: mv88e6xxx: add a PPU polling op Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-12-01 00:10 +0100

csiph-web