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

Merge branch 'at803x' 



Daniel Mack says:

====================
Handle stuck TX queue bug in AT8030 PHY

These three small patches circument a hardware bug in AT8030 PHYs that
leads to stuck TX FIFO queues when the link goes away while there are
pending patches in der outbound queue. This bug has been confirmed by
the vendor, and their only proposed fix is to apply a hardware reset
every time the link goes down.

v1 -> v2:
	* Rename phy device callback from adjust_state to link_change_notify
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 916c1689 13a56b44

drivers/net/phy/at803x.c

+151 −44
Original line number Diff line number Diff line
@@ -16,9 +16,13 @@ 
#include <linux/string.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/of_gpio.h>

#include <linux/gpio/consumer.h>



#define AT803X_INTR_ENABLE			0x12

#define AT803X_INTR_STATUS			0x13

#define AT803X_SMART_SPEED			0x14

#define AT803X_LED_CONTROL			0x18

#define AT803X_WOL_ENABLE			0x01

#define AT803X_DEVICE_ADDR			0x03

#define AT803X_LOC_MAC_ADDR_0_15_OFFSET		0x804C
@@ -35,10 +39,52 @@ 
#define AT803X_DEBUG_SYSTEM_MODE_CTRL		0x05

#define AT803X_DEBUG_RGMII_TX_CLK_DLY		BIT(8)



#define ATH8030_PHY_ID 0x004dd076

#define ATH8031_PHY_ID 0x004dd074

#define ATH8035_PHY_ID 0x004dd072



MODULE_DESCRIPTION("Atheros 803x PHY driver");

MODULE_AUTHOR("Matus Ujhelyi");

MODULE_LICENSE("GPL");



struct at803x_priv {

	bool phy_reset:1;

	struct gpio_desc *gpiod_reset;

};



struct at803x_context {

	u16 bmcr;

	u16 advertise;

	u16 control1000;

	u16 int_enable;

	u16 smart_speed;

	u16 led_control;

};



/* save relevant PHY registers to private copy */

static void at803x_context_save(struct phy_device *phydev,

				struct at803x_context *context)

{

	context->bmcr = phy_read(phydev, MII_BMCR);

	context->advertise = phy_read(phydev, MII_ADVERTISE);

	context->control1000 = phy_read(phydev, MII_CTRL1000);

	context->int_enable = phy_read(phydev, AT803X_INTR_ENABLE);

	context->smart_speed = phy_read(phydev, AT803X_SMART_SPEED);

	context->led_control = phy_read(phydev, AT803X_LED_CONTROL);

}



/* restore relevant PHY registers from private copy */

static void at803x_context_restore(struct phy_device *phydev,

				   const struct at803x_context *context)

{

	phy_write(phydev, MII_BMCR, context->bmcr);

	phy_write(phydev, MII_ADVERTISE, context->advertise);

	phy_write(phydev, MII_CTRL1000, context->control1000);

	phy_write(phydev, AT803X_INTR_ENABLE, context->int_enable);

	phy_write(phydev, AT803X_SMART_SPEED, context->smart_speed);

	phy_write(phydev, AT803X_LED_CONTROL, context->led_control);

}



static int at803x_set_wol(struct phy_device *phydev,

			  struct ethtool_wolinfo *wol)

{
@@ -142,6 +188,26 @@ static int at803x_resume(struct phy_device *phydev) 
	return 0;

}



static int at803x_probe(struct phy_device *phydev)

{

	struct device *dev = &phydev->dev;

	struct at803x_priv *priv;



	priv = devm_kzalloc(dev, sizeof(priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	priv->gpiod_reset = devm_gpiod_get(dev, "reset");

	if (IS_ERR(priv->gpiod_reset))

		priv->gpiod_reset = NULL;

	else

		gpiod_direction_output(priv->gpiod_reset, 1);



	phydev->priv = priv;



	return 0;

}



static int at803x_config_init(struct phy_device *phydev)

{

	int ret;
@@ -189,13 +255,50 @@ static int at803x_config_intr(struct phy_device *phydev) 
	return err;

}



static void at803x_link_change_notify(struct phy_device *phydev)

{

	struct at803x_priv *priv = phydev->priv;



	/*

	 * Conduct a hardware reset for AT8030 every time a link loss is

	 * signalled. This is necessary to circumvent a hardware bug that

	 * occurs when the cable is unplugged while TX packets are pending

	 * in the FIFO. In such cases, the FIFO enters an error mode it

	 * cannot recover from by software.

	 */

	if (phydev->drv->phy_id == ATH8030_PHY_ID) {

		if (phydev->state == PHY_NOLINK) {

			if (priv->gpiod_reset && !priv->phy_reset) {

				struct at803x_context context;



				at803x_context_save(phydev, &context);



				gpiod_set_value(priv->gpiod_reset, 0);

				msleep(1);

				gpiod_set_value(priv->gpiod_reset, 1);

				msleep(1);



				at803x_context_restore(phydev, &context);



				dev_dbg(&phydev->dev, "%s(): phy was reset\n",

					__func__);

				priv->phy_reset = true;

			}

		} else {

			priv->phy_reset = false;

		}

	}

}



static struct phy_driver at803x_driver[] = {

{

	/* ATHEROS 8035 */

	.phy_id		= 0x004dd072,

	.phy_id			= ATH8035_PHY_ID,

	.name			= "Atheros 8035 ethernet",

	.phy_id_mask		= 0xffffffef,

	.probe			= at803x_probe,

	.config_init		= at803x_config_init,

	.link_change_notify	= at803x_link_change_notify,

	.set_wol		= at803x_set_wol,

	.get_wol		= at803x_get_wol,

	.suspend		= at803x_suspend,
@@ -209,10 +312,12 @@ static struct phy_driver at803x_driver[] = { 
	},

}, {

	/* ATHEROS 8030 */

	.phy_id		= 0x004dd076,

	.phy_id			= ATH8030_PHY_ID,

	.name			= "Atheros 8030 ethernet",

	.phy_id_mask		= 0xffffffef,

	.probe			= at803x_probe,

	.config_init		= at803x_config_init,

	.link_change_notify	= at803x_link_change_notify,

	.set_wol		= at803x_set_wol,

	.get_wol		= at803x_get_wol,

	.suspend		= at803x_suspend,
@@ -226,10 +331,12 @@ static struct phy_driver at803x_driver[] = { 
	},

}, {

	/* ATHEROS 8031 */

	.phy_id		= 0x004dd074,

	.phy_id			= ATH8031_PHY_ID,

	.name			= "Atheros 8031 ethernet",

	.phy_id_mask		= 0xffffffef,

	.probe			= at803x_probe,

	.config_init		= at803x_config_init,

	.link_change_notify	= at803x_link_change_notify,

	.set_wol		= at803x_set_wol,

	.get_wol		= at803x_get_wol,

	.suspend		= at803x_suspend,
@@ -260,9 +367,9 @@ module_init(atheros_init); 
module_exit(atheros_exit);



static struct mdio_device_id __maybe_unused atheros_tbl[] = {

	{ 0x004dd076, 0xffffffef },

	{ 0x004dd074, 0xffffffef },

	{ 0x004dd072, 0xffffffef },

	{ ATH8030_PHY_ID, 0xffffffef },

	{ ATH8031_PHY_ID, 0xffffffef },

	{ ATH8035_PHY_ID, 0xffffffef },

	{ }

};

drivers/net/phy/phy.c

+3 −0
Original line number Diff line number Diff line
@@ -720,6 +720,9 @@ void phy_state_machine(struct work_struct *work) 


	mutex_lock(&phydev->lock);



	if (phydev->drv->link_change_notify)

		phydev->drv->link_change_notify(phydev);



	switch (phydev->state) {

	case PHY_DOWN:

	case PHY_STARTING:

include/linux/phy.h

+9 −0
Original line number Diff line number Diff line
@@ -536,6 +536,15 @@ struct phy_driver { 
	/* See set_wol, but for checking whether Wake on LAN is enabled. */

	void (*get_wol)(struct phy_device *dev, struct ethtool_wolinfo *wol);



	/*

	 * Called to inform a PHY device driver when the core is about to

	 * change the link state. This callback is supposed to be used as

	 * fixup hook for drivers that need to take action when the link

	 * state changes. Drivers are by no means allowed to mess with the

	 * PHY device structure in their implementations.

	 */

	void (*link_change_notify)(struct phy_device *dev);



	struct device_driver driver;

};

#define to_phy_driver(d) container_of(d, struct phy_driver, driver)

CRA Git | Maintained and supported by SUSTech CRA and CCSE