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

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

Merge branch 'xgene-gpio' 



Iyappan Subramanian says:

====================
drivers: net: xgene: fix: Use GPIO to get link status

Since the link value reported by the link status register is not
reliable if no SPF module inserted, this patchset fixes the issue by
using GPIO to determine the link status when no module inserted.
====================

Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Signed-off-by: default avatarQuan Nguyen <qnguyen@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c66549ff d2561ed3

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ CONFIG_GPIO_DWAPB=y 
CONFIG_GPIO_PL061=y

CONFIG_GPIO_RCAR=y

CONFIG_GPIO_XGENE=y

CONFIG_GPIO_XGENE_SB=y

CONFIG_GPIO_PCA953X=y

CONFIG_GPIO_PCA953X_IRQ=y

CONFIG_GPIO_MAX77620=y

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+5 −1
Original line number Diff line number Diff line
@@ -1381,9 +1381,13 @@ static void xgene_enet_gpiod_get(struct xgene_enet_pdata *pdata) 
{

	struct device *dev = &pdata->pdev->dev;



	if (pdata->phy_mode != PHY_INTERFACE_MODE_XGMII)

	pdata->sfp_gpio_en = false;

	if (pdata->phy_mode != PHY_INTERFACE_MODE_XGMII ||

	    (!device_property_present(dev, "sfp-gpios") &&

	     !device_property_present(dev, "rxlos-gpios")))

		return;



	pdata->sfp_gpio_en = true;

	pdata->sfp_rdy = gpiod_get(dev, "rxlos", GPIOD_IN);

	if (IS_ERR(pdata->sfp_rdy))

		pdata->sfp_rdy = gpiod_get(dev, "sfp", GPIOD_IN);

drivers/net/ethernet/apm/xgene/xgene_enet_main.h

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ struct xgene_enet_pdata { 
	u8 rx_delay;

	bool mdio_driver;

	struct gpio_desc *sfp_rdy;

	bool sfp_gpio_en;

};



struct xgene_indirect_ctl {

drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c

+17 −2
Original line number Diff line number Diff line
@@ -415,16 +415,31 @@ static void xgene_enet_clear(struct xgene_enet_pdata *pdata, 
	xgene_enet_wr_ring_if(pdata, addr, data);

}



static int xgene_enet_gpio_lookup(struct xgene_enet_pdata *pdata)

{

	struct device *dev = &pdata->pdev->dev;



	pdata->sfp_rdy = gpiod_get(dev, "rxlos", GPIOD_IN);

	if (IS_ERR(pdata->sfp_rdy))

		pdata->sfp_rdy = gpiod_get(dev, "sfp", GPIOD_IN);



	if (IS_ERR(pdata->sfp_rdy))

		return -ENODEV;



	return 0;

}



static void xgene_enet_link_state(struct work_struct *work)

{

	struct xgene_enet_pdata *pdata = container_of(to_delayed_work(work),

					 struct xgene_enet_pdata, link_work);

	struct gpio_desc *sfp_rdy = pdata->sfp_rdy;

	struct net_device *ndev = pdata->ndev;

	u32 link_status, poll_interval;



	link_status = xgene_enet_link_status(pdata);

	if (link_status && !IS_ERR(sfp_rdy) && !gpiod_get_value(sfp_rdy))

	if (pdata->sfp_gpio_en && link_status &&

	    (!IS_ERR(pdata->sfp_rdy) || !xgene_enet_gpio_lookup(pdata)) &&

	    !gpiod_get_value(pdata->sfp_rdy))

		link_status = 0;



	if (link_status) {