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

Merge branch 'qca8k-improvements' 



Ansuel Smith says:

====================
Multiple improvement to qca8k stability

Currently qca8337 switch are widely used on ipq8064 based router.
On these particular router it was notice a very unstable switch with
port not link detected as link with unknown speed, port dropping
randomly and general unreliability. Lots of testing and comparison
between this dsa driver and the original qsdk driver showed lack of some
additional delay and values. A main difference arised from the original
driver and the dsa one. The original driver didn't use MASTER regs to
read phy status and the dedicated mdio driver worked correctly. Now that
the dsa driver actually use these regs, it was found that these special
read/write operation required mutual exclusion to normal
qca8k_read/write operation. The add of mutex for these operation fixed
the random port dropping and now only the actual linked port randomly
dropped. Adding additional delay for set_page operation and fixing a bug
in the mdio dedicated driver fixed also this problem. The current driver
requires also more time to apply vlan switch. All of these changes and
tweak permit a now very stable and reliable dsa driver and 0 port
dropping. This series is currently tested by at least 5 user with
different routers and all reports positive results and no problems.

Changes v6:
- Fix spelling mistake
- Change ms to ns (confirmed by datasheet)
Changes v5:
- Removed mdio patch (sent separetly to try to reduce the series)
  I know it was asked to reduced this series since it big, but rework
  the new changes to skip and error check looks wrong. Since half of them
  are actually already reviewed I think it's better to keep this series as is.
- Improve rgmii configurable patch
- Move qca8k phy dedicated driver to at803x phy driver
- Add support for dedicated internal mdio driver for qca8k
Changes v4:
- Use iopoll for busy_wait function
- Better describe and split some confusing commits
- Fix bad rgmii delay configurable patch
- Drop phy generic patch to pass flags with phylink_connect_phy
- Add dsa2 patch to declare mdio node in the switch node
- Add dsa patch to permit dsa driver to declare custom get_phys_mii_mask
    Some background about the last 2 patch.
    The qca8k switch doesn't have a 1:1 map between port reg and phy reg.
    Currently it's used a function to convert port to the internal phy reg.
    I added some patch to fix this.
    - The dsa driver now check if the mdio node is present and use the of variant
      of the mdiobus_register
    - A custom phy_mii_mask is required as currently the mask is generated from
      the port reg, but in our case the mask would be different as it should be
      generated from the phy reg. To generalize this I added an extra function
      that driver can provide to pass custom phy_mii_mask.
Changes v3:
- Revert mdio writel changes (use regmap with REGCACHE disabled)
- Split propagate error patch to 4 different patch
Changes v2:
- Implemented phy driver for internal PHYs
  I'm testing cable test functions as I found some documentation that
  actually declare regs about it. Problem is that it doesn't actually
  work. It seems that the value set are ignored by the phy.
- Made the rgmii delay configurable
- Reordered patch
- Split mdio patches to more specific ones
- Reworked mdio driver to use readl/writel instead of regmap
- Reworked the entire driver to make it aware of any read/write error.
- Added phy generic patch to pass flags with phylink_connect_phy
  function
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 709c0314 272833b9

Documentation/devicetree/bindings/net/dsa/qca8k.txt

+40 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
Required properties:



- compatible: should be one of:

    "qca,qca8327"

    "qca,qca8334"

    "qca,qca8337"
@@ -20,6 +21,10 @@ described in dsa/dsa.txt. If the QCA8K switch is connect to a SoC's external 
mdio-bus each subnode describing a port needs to have a valid phandle

referencing the internal PHY it is connected to. This is because there's no

N:N mapping of port and PHY id.

To declare the internal mdio-bus configuration, declare a mdio node in the

switch node and declare the phandle for the port referencing the internal

PHY is connected to. In this config a internal mdio-bus is registered and

the mdio MASTER is used as communication.



Don't use mixed external and internal mdio-bus configurations, as this is

not supported by the hardware.
@@ -149,26 +154,61 @@ for the internal master mdio-bus configuration: 
				port@1 {

					reg = <1>;

					label = "lan1";

					phy-mode = "internal";

					phy-handle = <&phy_port1>;

				};



				port@2 {

					reg = <2>;

					label = "lan2";

					phy-mode = "internal";

					phy-handle = <&phy_port2>;

				};



				port@3 {

					reg = <3>;

					label = "lan3";

					phy-mode = "internal";

					phy-handle = <&phy_port3>;

				};



				port@4 {

					reg = <4>;

					label = "lan4";

					phy-mode = "internal";

					phy-handle = <&phy_port4>;

				};



				port@5 {

					reg = <5>;

					label = "wan";

					phy-mode = "internal";

					phy-handle = <&phy_port5>;

				};

			};



			mdio {

				#address-cells = <1>;

				#size-cells = <0>;



				phy_port1: phy@0 {

					reg = <0>;

				};



				phy_port2: phy@1 {

					reg = <1>;

				};



				phy_port3: phy@2 {

					reg = <2>;

				};



				phy_port4: phy@3 {

					reg = <3>;

				};



				phy_port5: phy@4 {

					reg = <4>;

				};

			};

		};

drivers/net/dsa/qca8k.c

+594 −164

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/dsa/qca8k.h

+51 −7
Original line number Diff line number Diff line
@@ -15,9 +15,13 @@ 
#define QCA8K_NUM_PORTS					7

#define QCA8K_MAX_MTU					9000



#define PHY_ID_QCA8327					0x004dd034

#define QCA8K_ID_QCA8327				0x12

#define PHY_ID_QCA8337					0x004dd036

#define QCA8K_ID_QCA8337				0x13



#define QCA8K_BUSY_WAIT_TIMEOUT				2000



#define QCA8K_NUM_FDB_RECORDS				2048



#define QCA8K_CPU_PORT					0
@@ -26,18 +30,19 @@ 


/* Global control registers */

#define QCA8K_REG_MASK_CTRL				0x000

#define   QCA8K_MASK_CTRL_ID_M				0xff

#define   QCA8K_MASK_CTRL_ID_S				8

#define   QCA8K_MASK_CTRL_REV_ID_MASK			GENMASK(7, 0)

#define   QCA8K_MASK_CTRL_REV_ID(x)			((x) >> 0)

#define   QCA8K_MASK_CTRL_DEVICE_ID_MASK		GENMASK(15, 8)

#define   QCA8K_MASK_CTRL_DEVICE_ID(x)			((x) >> 8)

#define QCA8K_REG_PORT0_PAD_CTRL			0x004

#define QCA8K_REG_PORT5_PAD_CTRL			0x008

#define QCA8K_REG_PORT6_PAD_CTRL			0x00c

#define   QCA8K_PORT_PAD_RGMII_EN			BIT(26)

#define   QCA8K_PORT_PAD_RGMII_TX_DELAY(x)		\

						((0x8 + (x & 0x3)) << 22)

#define   QCA8K_PORT_PAD_RGMII_RX_DELAY(x)		\

						((0x10 + (x & 0x3)) << 20)

#define   QCA8K_MAX_DELAY				3

#define   QCA8K_PORT_PAD_RGMII_TX_DELAY(x)		((x) << 22)

#define   QCA8K_PORT_PAD_RGMII_RX_DELAY(x)		((x) << 20)

#define	  QCA8K_PORT_PAD_RGMII_TX_DELAY_EN		BIT(25)

#define   QCA8K_PORT_PAD_RGMII_RX_DELAY_EN		BIT(24)

#define   QCA8K_MAX_DELAY				3

#define   QCA8K_PORT_PAD_SGMII_EN			BIT(7)

#define QCA8K_REG_PWS					0x010

#define   QCA8K_PWS_SERDES_AEN_DIS			BIT(7)
@@ -164,6 +169,36 @@ 
#define   QCA8K_PORT_LOOKUP_STATE			GENMASK(18, 16)

#define   QCA8K_PORT_LOOKUP_LEARN			BIT(20)



#define QCA8K_REG_GLOBAL_FC_THRESH			0x800

#define   QCA8K_GLOBAL_FC_GOL_XON_THRES(x)		((x) << 16)

#define   QCA8K_GLOBAL_FC_GOL_XON_THRES_S		GENMASK(24, 16)

#define   QCA8K_GLOBAL_FC_GOL_XOFF_THRES(x)		((x) << 0)

#define   QCA8K_GLOBAL_FC_GOL_XOFF_THRES_S		GENMASK(8, 0)



#define QCA8K_REG_PORT_HOL_CTRL0(_i)			(0x970 + (_i) * 0x8)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI0_BUF		GENMASK(3, 0)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI0(x)		((x) << 0)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI1_BUF		GENMASK(7, 4)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI1(x)		((x) << 4)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI2_BUF		GENMASK(11, 8)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI2(x)		((x) << 8)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI3_BUF		GENMASK(15, 12)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI3(x)		((x) << 12)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI4_BUF		GENMASK(19, 16)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI4(x)		((x) << 16)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI5_BUF		GENMASK(23, 20)

#define   QCA8K_PORT_HOL_CTRL0_EG_PRI5(x)		((x) << 20)

#define   QCA8K_PORT_HOL_CTRL0_EG_PORT_BUF		GENMASK(29, 24)

#define   QCA8K_PORT_HOL_CTRL0_EG_PORT(x)		((x) << 24)



#define QCA8K_REG_PORT_HOL_CTRL1(_i)			(0x974 + (_i) * 0x8)

#define   QCA8K_PORT_HOL_CTRL1_ING_BUF			GENMASK(3, 0)

#define   QCA8K_PORT_HOL_CTRL1_ING(x)			((x) << 0)

#define   QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN		BIT(6)

#define   QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN		BIT(7)

#define   QCA8K_PORT_HOL_CTRL1_WRED_EN			BIT(8)

#define   QCA8K_PORT_HOL_CTRL1_EG_MIRROR_EN		BIT(16)



/* Pkt edit registers */

#define QCA8K_EGRESS_VLAN(x)				(0x0c70 + (4 * (x / 2)))
@@ -211,7 +246,16 @@ struct ar8xxx_port_status { 
	int enabled;

};



struct qca8k_match_data {

	u8 id;

};



struct qca8k_priv {

	u8 switch_id;

	u8 switch_revision;

	u8 rgmii_tx_delay;

	u8 rgmii_rx_delay;

	bool legacy_phy_port_mapping;

	struct regmap *regmap;

	struct mii_bus *bus;

	struct ar8xxx_port_status port_sts[QCA8K_NUM_PORTS];

drivers/net/phy/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -247,10 +247,11 @@ config NXP_TJA11XX_PHY 
	  Currently supports the NXP TJA1100 and TJA1101 PHY.



config AT803X_PHY

	tristate "Qualcomm Atheros AR803X PHYs"

	tristate "Qualcomm Atheros AR803X PHYs and QCA833x PHYs"

	depends on REGULATOR

	help

	  Currently supports the AR8030, AR8031, AR8033 and AR8035 model

	  Currently supports the AR8030, AR8031, AR8033, AR8035 and internal

	  QCA8337(Internal qca8k PHY) model



config QSEMI_PHY

	tristate "Quality Semiconductor PHYs"

drivers/net/phy/at803x.c

+147 −15
Original line number Diff line number Diff line
@@ -92,10 +92,16 @@ 
#define AT803X_DEBUG_REG_5			0x05

#define AT803X_DEBUG_TX_CLK_DLY_EN		BIT(8)



#define AT803X_DEBUG_REG_3C			0x3C



#define AT803X_DEBUG_REG_3D			0x3D



#define AT803X_DEBUG_REG_1F			0x1F

#define AT803X_DEBUG_PLL_ON			BIT(2)

#define AT803X_DEBUG_RGMII_1V8			BIT(3)



#define MDIO_AZ_DEBUG				0x800D



/* AT803x supports either the XTAL input pad, an internal PLL or the

 * DSP as clock reference for the clock output pad. The XTAL reference

 * is only used for 25 MHz output, all other frequencies need the PLL.
@@ -144,17 +150,43 @@ 
#define ATH8035_PHY_ID				0x004dd072

#define AT8030_PHY_ID_MASK			0xffffffef



#define QCA8327_PHY_ID				0x004dd034

#define QCA8337_PHY_ID				0x004dd036

#define QCA8K_PHY_ID_MASK			0xffffffff



#define QCA8K_DEVFLAGS_REVISION_MASK		GENMASK(2, 0)



#define AT803X_PAGE_FIBER			0

#define AT803X_PAGE_COPPER			1



/* don't turn off internal PLL */

#define AT803X_KEEP_PLL_ENABLED			BIT(0)

#define AT803X_DISABLE_SMARTEEE			BIT(1)



MODULE_DESCRIPTION("Qualcomm Atheros AR803x PHY driver");

MODULE_AUTHOR("Matus Ujhelyi");

MODULE_LICENSE("GPL");



enum stat_access_type {

	PHY,

	MMD

};



struct at803x_hw_stat {

	const char *string;

	u8 reg;

	u32 mask;

	enum stat_access_type access_type;

};



static struct at803x_hw_stat at803x_hw_stats[] = {

	{ "phy_idle_errors", 0xa, GENMASK(7, 0), PHY},

	{ "phy_receive_errors", 0x15, GENMASK(15, 0), PHY},

	{ "eee_wake_errors", 0x16, GENMASK(15, 0), MMD},

};



struct at803x_priv {

	int flags;

#define AT803X_KEEP_PLL_ENABLED	BIT(0)	/* don't turn off internal PLL */

#define AT803X_DISABLE_SMARTEEE	BIT(1)

	u16 clk_25m_reg;

	u16 clk_25m_mask;

	u8 smarteee_lpi_tw_1g;
@@ -162,6 +194,7 @@ struct at803x_priv { 
	struct regulator_dev *vddio_rdev;

	struct regulator_dev *vddh_rdev;

	struct regulator *vddio;

	u64 stats[ARRAY_SIZE(at803x_hw_stats)];

};



struct at803x_context {
@@ -173,6 +206,17 @@ struct at803x_context { 
	u16 led_control;

};



static int at803x_debug_reg_write(struct phy_device *phydev, u16 reg, u16 data)

{

	int ret;



	ret = phy_write(phydev, AT803X_DEBUG_ADDR, reg);

	if (ret < 0)

		return ret;



	return phy_write(phydev, AT803X_DEBUG_DATA, data);

}



static int at803x_debug_reg_read(struct phy_device *phydev, u16 reg)

{

	int ret;
@@ -335,6 +379,53 @@ static void at803x_get_wol(struct phy_device *phydev, 
		wol->wolopts |= WAKE_MAGIC;

}



static int at803x_get_sset_count(struct phy_device *phydev)

{

	return ARRAY_SIZE(at803x_hw_stats);

}



static void at803x_get_strings(struct phy_device *phydev, u8 *data)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(at803x_hw_stats); i++) {

		strscpy(data + i * ETH_GSTRING_LEN,

			at803x_hw_stats[i].string, ETH_GSTRING_LEN);

	}

}



static u64 at803x_get_stat(struct phy_device *phydev, int i)

{

	struct at803x_hw_stat stat = at803x_hw_stats[i];

	struct at803x_priv *priv = phydev->priv;

	int val;

	u64 ret;



	if (stat.access_type == MMD)

		val = phy_read_mmd(phydev, MDIO_MMD_PCS, stat.reg);

	else

		val = phy_read(phydev, stat.reg);



	if (val < 0) {

		ret = U64_MAX;

	} else {

		val = val & stat.mask;

		priv->stats[i] += val;

		ret = priv->stats[i];

	}



	return ret;

}



static void at803x_get_stats(struct phy_device *phydev,

			     struct ethtool_stats *stats, u64 *data)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(at803x_hw_stats); i++)

		data[i] = at803x_get_stat(phydev, i);

}



static int at803x_suspend(struct phy_device *phydev)

{

	int value;
@@ -1170,6 +1261,34 @@ static int at803x_cable_test_start(struct phy_device *phydev) 
	return 0;

}



static int qca83xx_config_init(struct phy_device *phydev)

{

	u8 switch_revision;



	switch_revision = phydev->dev_flags & QCA8K_DEVFLAGS_REVISION_MASK;



	switch (switch_revision) {

	case 1:

		/* For 100M waveform */

		at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_0, 0x02ea);

		/* Turn on Gigabit clock */

		at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_3D, 0x68a0);

		break;



	case 2:

		phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0x0);

		fallthrough;

	case 4:

		phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_AZ_DEBUG, 0x803f);

		at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_3D, 0x6860);

		at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_5, 0x2c46);

		at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_3C, 0x6000);

		break;

	}



	return 0;

}



static struct phy_driver at803x_driver[] = {

{

	/* Qualcomm Atheros AR8035 */
@@ -1266,7 +1385,20 @@ static struct phy_driver at803x_driver[] = { 
	.read_status		= at803x_read_status,

	.soft_reset		= genphy_soft_reset,

	.config_aneg		= at803x_config_aneg,

} };

}, {

	/* QCA8337 */

	.phy_id = QCA8337_PHY_ID,

	.phy_id_mask = QCA8K_PHY_ID_MASK,

	.name = "QCA PHY 8337",

	/* PHY_GBIT_FEATURES */

	.probe = at803x_probe,

	.flags = PHY_IS_INTERNAL,

	.config_init = qca83xx_config_init,

	.soft_reset = genphy_soft_reset,

	.get_sset_count = at803x_get_sset_count,

	.get_strings = at803x_get_strings,

	.get_stats = at803x_get_stats,

}, };



module_phy_driver(at803x_driver);