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

Commit bd466c3f authored by Gavin Shan's avatar Gavin Shan Committed by David S. Miller
Browse files

net/faraday: Support NCSI mode 



This makes ftgmac100 driver support NCSI mode. The NCSI is enabled
on the interface if property "use-nc-si" or "use-ncsi" is found from
the device node in device tree.

   * No PHY device is used when NCSI mode is enabled.
   * The NCSI device (struct ncsi_dev) is created when probing the
     device while it's enabled/started when the interface is brought
     up.
   * Hardware IP checksum dosn't work when NCSI mode is enabled. It
     is disabled on enabled NCSI.

Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Acked-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 113ce107

drivers/net/ethernet/faraday/ftgmac100.c

+75 −10
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/phy.h>

#include <linux/phy.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <net/ip.h>

#include <net/ip.h>

#include <net/ncsi.h>





#include "ftgmac100.h"

#include "ftgmac100.h"
@@ -68,10 +69,13 @@ struct ftgmac100 { 




	struct net_device *netdev;

	struct net_device *netdev;

	struct device *dev;

	struct device *dev;

	struct ncsi_dev *ndev;

	struct napi_struct napi;

	struct napi_struct napi;





	struct mii_bus *mii_bus;

	struct mii_bus *mii_bus;

	int old_speed;

	int old_speed;

	bool use_ncsi;

	bool enabled;

};

};





static int ftgmac100_alloc_rx_page(struct ftgmac100 *priv,

static int ftgmac100_alloc_rx_page(struct ftgmac100 *priv,
@@ -1010,7 +1014,10 @@ static irqreturn_t ftgmac100_interrupt(int irq, void *dev_id) 
	struct net_device *netdev = dev_id;

	struct net_device *netdev = dev_id;

	struct ftgmac100 *priv = netdev_priv(netdev);

	struct ftgmac100 *priv = netdev_priv(netdev);





	if (likely(netif_running(netdev))) {

	/* When running in NCSI mode, the interface should be ready for

	 * receiving or transmitting NCSI packets before it's opened.

	 */

	if (likely(priv->use_ncsi || netif_running(netdev))) {

		/* Disable interrupts for polling */

		/* Disable interrupts for polling */

		iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);

		iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);

		napi_schedule(&priv->napi);

		napi_schedule(&priv->napi);
@@ -1123,17 +1130,33 @@ static int ftgmac100_open(struct net_device *netdev) 
		goto err_hw;

		goto err_hw;





	ftgmac100_init_hw(priv);

	ftgmac100_init_hw(priv);

	ftgmac100_start_hw(priv, 10);

	ftgmac100_start_hw(priv, priv->use_ncsi ? 100 : 10);



	if (netdev->phydev)

		phy_start(netdev->phydev);

		phy_start(netdev->phydev);

	else if (priv->use_ncsi)

		netif_carrier_on(netdev);





	napi_enable(&priv->napi);

	napi_enable(&priv->napi);

	netif_start_queue(netdev);

	netif_start_queue(netdev);





	/* enable all interrupts */

	/* enable all interrupts */

	iowrite32(INT_MASK_ALL_ENABLED, priv->base + FTGMAC100_OFFSET_IER);

	iowrite32(INT_MASK_ALL_ENABLED, priv->base + FTGMAC100_OFFSET_IER);



	/* Start the NCSI device */

	if (priv->use_ncsi) {

		err = ncsi_start_dev(priv->ndev);

		if (err)

			goto err_ncsi;

	}



	priv->enabled = true;



	return 0;

	return 0;





err_ncsi:

	napi_disable(&priv->napi);

	netif_stop_queue(netdev);

	iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);

err_hw:

err_hw:

	free_irq(priv->irq, netdev);

	free_irq(priv->irq, netdev);

err_irq:

err_irq:
@@ -1146,11 +1169,16 @@ static int ftgmac100_stop(struct net_device *netdev) 
{

{

	struct ftgmac100 *priv = netdev_priv(netdev);

	struct ftgmac100 *priv = netdev_priv(netdev);





	if (!priv->enabled)

		return 0;



	/* disable all interrupts */

	/* disable all interrupts */

	priv->enabled = false;

	iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);

	iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);





	netif_stop_queue(netdev);

	netif_stop_queue(netdev);

	napi_disable(&priv->napi);

	napi_disable(&priv->napi);

	if (netdev->phydev)

		phy_stop(netdev->phydev);

		phy_stop(netdev->phydev);





	ftgmac100_stop_hw(priv);

	ftgmac100_stop_hw(priv);
@@ -1192,6 +1220,9 @@ static int ftgmac100_hard_start_xmit(struct sk_buff *skb, 
/* optional */

/* optional */

static int ftgmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)

static int ftgmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)

{

{

	if (!netdev->phydev)

		return -ENXIO;



	return phy_mii_ioctl(netdev->phydev, ifr, cmd);

	return phy_mii_ioctl(netdev->phydev, ifr, cmd);

}

}
@@ -1258,6 +1289,15 @@ static void ftgmac100_destroy_mdio(struct net_device *netdev) 
	mdiobus_free(priv->mii_bus);

	mdiobus_free(priv->mii_bus);

}

}





static void ftgmac100_ncsi_handler(struct ncsi_dev *nd)

{

	if (unlikely(nd->state != ncsi_dev_state_functional))

		return;



	netdev_info(nd->dev, "NCSI interface %s\n",

		    nd->link_up ? "up" : "down");

}



/******************************************************************************

/******************************************************************************

 * struct platform_driver functions

 * struct platform_driver functions

 *****************************************************************************/

 *****************************************************************************/
@@ -1267,7 +1307,7 @@ static int ftgmac100_probe(struct platform_device *pdev) 
	int irq;

	int irq;

	struct net_device *netdev;

	struct net_device *netdev;

	struct ftgmac100 *priv;

	struct ftgmac100 *priv;

	int err;

	int err = 0;





	if (!pdev)

	if (!pdev)

		return -ENODEV;

		return -ENODEV;
@@ -1291,7 +1331,6 @@ static int ftgmac100_probe(struct platform_device *pdev) 




	netdev->ethtool_ops = &ftgmac100_ethtool_ops;

	netdev->ethtool_ops = &ftgmac100_ethtool_ops;

	netdev->netdev_ops = &ftgmac100_netdev_ops;

	netdev->netdev_ops = &ftgmac100_netdev_ops;

	netdev->features = NETIF_F_IP_CSUM | NETIF_F_GRO;





	platform_set_drvdata(pdev, netdev);

	platform_set_drvdata(pdev, netdev);
@@ -1326,9 +1365,34 @@ static int ftgmac100_probe(struct platform_device *pdev) 
	/* MAC address from chip or random one */

	/* MAC address from chip or random one */

	ftgmac100_setup_mac(priv);

	ftgmac100_setup_mac(priv);





	if (pdev->dev.of_node &&

	    of_get_property(pdev->dev.of_node, "use-ncsi", NULL)) {

		if (!IS_ENABLED(CONFIG_NET_NCSI)) {

			dev_err(&pdev->dev, "NCSI stack not enabled\n");

			goto err_ncsi_dev;

		}



		dev_info(&pdev->dev, "Using NCSI interface\n");

		priv->use_ncsi = true;

		priv->ndev = ncsi_register_dev(netdev, ftgmac100_ncsi_handler);

		if (!priv->ndev)

			goto err_ncsi_dev;

	} else {

		priv->use_ncsi = false;

		err = ftgmac100_setup_mdio(netdev);

		err = ftgmac100_setup_mdio(netdev);

		if (err)

		if (err)

			goto err_setup_mdio;

			goto err_setup_mdio;

	}



	/* We have to disable on-chip IP checksum functionality

	 * when NCSI is enabled on the interface. It doesn't work

	 * in that case.

	 */

	netdev->features = NETIF_F_IP_CSUM | NETIF_F_GRO;

	if (priv->use_ncsi &&

	    of_get_property(pdev->dev.of_node, "no-hw-checksum", NULL))

		netdev->features &= ~NETIF_F_IP_CSUM;







	/* register network device */

	/* register network device */

	err = register_netdev(netdev);

	err = register_netdev(netdev);
@@ -1341,6 +1405,7 @@ static int ftgmac100_probe(struct platform_device *pdev) 




	return 0;

	return 0;





err_ncsi_dev:

err_register_netdev:

err_register_netdev:

	ftgmac100_destroy_mdio(netdev);

	ftgmac100_destroy_mdio(netdev);

err_setup_mdio:

err_setup_mdio: