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

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

Merge branch 'dsa-mv88e6xxx-port-operation-refine' 



Vivien Didelot says:

====================
net: dsa: mv88e6xxx: refine port operations

The Marvell chips have one internal SMI device per port, containing a
set of registers used to configure a port's link, STP state, default
VLAN or addresses database, etc.

This patchset creates port files to implement the port operations as
described in datasheets, and extend the chip ops structure with them.

Patches 1 to 6 implement accessors for port's STP state, port based VLAN
map, default FID, default VID, and 802.1Q mode.

Patches 7 to 11 implement the port's MAC setup of link state, duplex
mode, RGMII delay and speed, all accessed through port's register 0x01.

The new port's MAC setup code is used to re-implement the adjust_link
code and correctly force the link down before changing any of the MAC
settings, as requested by the datasheets.

The port's MAC accessors use values compatible with struct phy_device
(e.g. DUPLEX_FULL) and extend them when needed (e.g. SPEED_MAX).

Changes in v2:

  - Strictly use new _UNFORCED values instead of re-using _UNKNOWN ones.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5976c5f4 d78343d2

drivers/net/dsa/mv88e6xxx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o 
mv88e6xxx-objs := chip.o

mv88e6xxx-objs += global1.o

mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_GLOBAL2) += global2.o

mv88e6xxx-objs += port.o

drivers/net/dsa/mv88e6xxx/chip.c

+132 −304

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

+45 −4
Original line number Diff line number Diff line
@@ -61,16 +61,22 @@ 
#define PORT_PCS_CTRL		0x01

#define PORT_PCS_CTRL_RGMII_DELAY_RXCLK	BIT(15)

#define PORT_PCS_CTRL_RGMII_DELAY_TXCLK	BIT(14)

#define PORT_PCS_CTRL_FORCE_SPEED	BIT(13) /* 6390 */

#define PORT_PCS_CTRL_ALTSPEED		BIT(12) /* 6390 */

#define PORT_PCS_CTRL_200BASE		BIT(12) /* 6352 */

#define PORT_PCS_CTRL_FC		BIT(7)

#define PORT_PCS_CTRL_FORCE_FC		BIT(6)

#define PORT_PCS_CTRL_LINK_UP		BIT(5)

#define PORT_PCS_CTRL_FORCE_LINK	BIT(4)

#define PORT_PCS_CTRL_DUPLEX_FULL	BIT(3)

#define PORT_PCS_CTRL_FORCE_DUPLEX	BIT(2)

#define PORT_PCS_CTRL_10		0x00

#define PORT_PCS_CTRL_100		0x01

#define PORT_PCS_CTRL_1000		0x02

#define PORT_PCS_CTRL_UNFORCED		0x03

#define PORT_PCS_CTRL_SPEED_MASK	(0x03)

#define PORT_PCS_CTRL_SPEED_10		(0x00)

#define PORT_PCS_CTRL_SPEED_100		(0x01)

#define PORT_PCS_CTRL_SPEED_200		(0x02) /* 6065 and non Gb chips */

#define PORT_PCS_CTRL_SPEED_1000	(0x02)

#define PORT_PCS_CTRL_SPEED_10000	(0x03) /* 6390X */

#define PORT_PCS_CTRL_SPEED_UNFORCED	(0x03)

#define PORT_PAUSE_CTRL		0x02

#define PORT_SWITCH_ID		0x03

#define PORT_SWITCH_ID_PROD_NUM_6085	0x04a
@@ -727,6 +733,41 @@ struct mv88e6xxx_ops { 
			u16 *val);

	int (*phy_write)(struct mv88e6xxx_chip *chip, int addr, int reg,

			 u16 val);



	/* RGMII Receive/Transmit Timing Control

	 * Add delay on PHY_INTERFACE_MODE_RGMII_*ID, no delay otherwise.

	 */

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

				    phy_interface_t mode);



#define LINK_FORCED_DOWN	0

#define LINK_FORCED_UP		1

#define LINK_UNFORCED		-2



	/* Port's MAC link state

	 * Use LINK_FORCED_UP or LINK_FORCED_DOWN to force link up or down,

	 * or LINK_UNFORCED for normal link detection.

	 */

	int (*port_set_link)(struct mv88e6xxx_chip *chip, int port, int link);



#define DUPLEX_UNFORCED		-2



	/* Port's MAC duplex mode

	 *

	 * Use DUPLEX_HALF or DUPLEX_FULL to force half or full duplex,

	 * or DUPLEX_UNFORCED for normal duplex detection.

	 */

	int (*port_set_duplex)(struct mv88e6xxx_chip *chip, int port, int dup);



#define SPEED_MAX		INT_MAX

#define SPEED_UNFORCED		-2



	/* Port's MAC speed (in Mbps)

	 *

	 * Depending on the chip, 10, 100, 200, 1000, 2500, 10000 are valid.

	 * Use SPEED_UNFORCED for normal detection, SPEED_MAX for max value.

	 */

	int (*port_set_speed)(struct mv88e6xxx_chip *chip, int port, int speed);

};



enum stat_type {

drivers/net/dsa/mv88e6xxx/port.c

0 → 100644
+497 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/dsa/mv88e6xxx/port.h

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

 * Marvell 88E6xxx Switch Port Registers support

 *

 * Copyright (c) 2008 Marvell Semiconductor

 *

 * Copyright (c) 2016 Vivien Didelot <vivien.didelot@savoirfairelinux.com>

 *

 * 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.

 */



#ifndef _MV88E6XXX_PORT_H

#define _MV88E6XXX_PORT_H



#include "mv88e6xxx.h"



int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg,

			u16 *val);

int mv88e6xxx_port_write(struct mv88e6xxx_chip *chip, int port, int reg,

			 u16 val);



int mv88e6352_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,

				   phy_interface_t mode);

int mv88e6390_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,

				   phy_interface_t mode);



int mv88e6xxx_port_set_link(struct mv88e6xxx_chip *chip, int port, int link);



int mv88e6xxx_port_set_duplex(struct mv88e6xxx_chip *chip, int port, int dup);



int mv88e6065_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);

int mv88e6185_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);

int mv88e6352_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);

int mv88e6390_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);

int mv88e6390x_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);



int mv88e6xxx_port_set_state(struct mv88e6xxx_chip *chip, int port, u8 state);



int mv88e6xxx_port_set_vlan_map(struct mv88e6xxx_chip *chip, int port, u16 map);



int mv88e6xxx_port_get_fid(struct mv88e6xxx_chip *chip, int port, u16 *fid);

int mv88e6xxx_port_set_fid(struct mv88e6xxx_chip *chip, int port, u16 fid);



int mv88e6xxx_port_get_pvid(struct mv88e6xxx_chip *chip, int port, u16 *pvid);

int mv88e6xxx_port_set_pvid(struct mv88e6xxx_chip *chip, int port, u16 pvid);



int mv88e6xxx_port_set_8021q_mode(struct mv88e6xxx_chip *chip, int port,

				  u16 mode);



#endif /* _MV88E6XXX_PORT_H */