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

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

Merge branch 'hns3-ethernet-driver' 



Salil Mehta says:

====================
Hisilicon Network Subsystem 3 Ethernet Driver

This patch-set contains the support of the HNS3 (Hisilicon Network Subsystem 3)
Ethernet driver for hip08 family of SoCs and future upcoming SoCs.

Hisilicon's new hip08 SoCs have integrated ethernet based on PCI Express and
hence there was a need of new driver over the previous HNS driver which is
already part of the Linux mainline. This new driver is NOT backward
compatible with HNS.

This current driver is meant to control the Physical Function and there would
soon be a support of a separate driver for Virtual Function once this base PF
driver has been accepted. Also, this driver is the ongoing development work and
HNS3 Ethernet driver would be incrementally enhanced with more new features.

High Level Architecture:

        [ Ethtool ]
	   ^  |
           |  |
     [Ethernet Client]  [ODP/UIO Client] . . . [ RoCE Client ]
                         |                            |
                   [ HNAE Device ]                    |
                         |                            |
    ---------------------------------------------     |
                         |                            |
     [ HNAE3 Framework (Register/unregister) ]        |
                         |                            |
    ---------------------------------------------     |
                         |                            |
                   [ HCLGE Layer]                     |
         ________________|_________________           |
        |                |                 |          |
    [ MDIO ]    [ Scheduler/Shaper ]  [ Debugfs* ]    |
        |                |                 |          |
        |________________|_________________|          |
                         |                            |
             [ IMP command Interface ]                |
    ---------------------------------------------     |
              HIP08  H A R D W A R E                  *

Current patch-set broadly adds the support of the following PF functionality:
 1. Basic Rx and Tx functionality
 2. TSO support
 3. Ethtool support
 4. * Debugfs support -> this patch for now has been taken off.
 5. HNAE framework and hardware compatability layer
 6. Scheduler and Shaper support in transmit function
 7. MDIO support

Change Log:
V5->V6: Addressed below comments:
        * Andrew Lunn: Comments on MDIO and ethtool link mode
        * Leon Romanvosky: Some comments on HNAE layer tidy-up
        * Internal comments on redundant code removal, fixing error types etc.
V4->V5: Addressed below concerns:
        * Florian Fanelli: Miscellaneous comments on ethtool & enet layer
        * Stephen Hemminger: comment of Netdev stats in ethool layer
        * Leon Romanvosky: Comments on Driver Version String, naming & Kconfig
        * Rochard Cochran: Redundant function prototype
V3->V4: Addressed below comments:
        * Andrew Lunn: Various comments on MDIO, ethtool, ENET driver etc,
        * Stephen Hemminger: change access and updation to 64 but statistics
        * Bo You: some spelling mistakes and checkpatch.pl errors.
V2->V3: Addressed comments
        * Yuval Mintz: Removal of redundant userprio-to-tc code
        * Stephen Hemminger: Ethtool & interuupt enable
        * Andrew Lunn: On C45/C22 PHy support, HNAE, ethtool
        * Florian Fainelli: C45/C22 and phy_connect/attach
        * Intel kbuild errors
V1->V2: Addressed some comments by kbuild, Yuval MIntz, Andrew Lunn &
        Florian Fainelli in the following patches:
        * Add support of HNS3 Ethernet Driver for hip08 SoC
        * Add MDIO support to HNS3 Ethernet driver for hip08 SoC
        * Add support of debugfs interface to HNS3 driver
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5477f7f3 15e8e5ff

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -6148,6 +6148,14 @@ S: Maintained 
F:	drivers/net/ethernet/hisilicon/

F:	Documentation/devicetree/bindings/net/hisilicon*.txt



HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)

M:	Yisen Zhuang <yisen.zhuang@huawei.com>

M:	Salil Mehta <salil.mehta@huawei.com>

L:	netdev@vger.kernel.org

W:	http://www.hisilicon.com

S:	Maintained

F:	drivers/net/ethernet/hisilicon/hns3/



HISILICON ROCE DRIVER

M:	Lijun Ou <oulijun@huawei.com>

M:	Wei Hu(Xavier) <xavier.huwei@huawei.com>

drivers/net/ethernet/hisilicon/Kconfig

+27 −0
Original line number Diff line number Diff line
@@ -76,4 +76,31 @@ config HNS_ENET 
	  This selects the general ethernet driver for HNS.  This module make

	  use of any HNS AE driver, such as HNS_DSAF



config HNS3

	tristate "Hisilicon Network Subsystem Support HNS3 (Framework)"

    depends on PCI

	---help---

	  This selects the framework support for Hisilicon Network Subsystem 3.

	  This layer facilitates clients like ENET, RoCE and user-space ethernet

	  drivers(like ODP)to register with HNAE devices and their associated

	  operations.



config HNS3_HCLGE

	tristate "Hisilicon HNS3 HCLGE Acceleration Engine & Compatibility Layer Support"

    depends on PCI_MSI

	depends on HNS3

	---help---

	  This selects the HNS3_HCLGE network acceleration engine & its hardware

	  compatibility layer. The engine would be used in Hisilicon hip08 family of

	  SoCs and further upcoming SoCs.



config HNS3_ENET

	tristate "Hisilicon HNS3 Ethernet Device Support"

    depends on 64BIT && PCI

	depends on HNS3 && HNS3_HCLGE

	---help---

	  This selects the Ethernet Driver for Hisilicon Network Subsystem 3 for hip08

	  family of SoCs. This module depends upon HNAE3 driver to access the HNAE3

	  devices and their associated operations.



endif # NET_VENDOR_HISILICON

drivers/net/ethernet/hisilicon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,4 +6,5 @@ obj-$(CONFIG_HIX5HD2_GMAC) += hix5hd2_gmac.o 
obj-$(CONFIG_HIP04_ETH) += hip04_eth.o

obj-$(CONFIG_HNS_MDIO) += hns_mdio.o

obj-$(CONFIG_HNS) += hns/

obj-$(CONFIG_HNS3) += hns3/

obj-$(CONFIG_HISI_FEMAC) += hisi_femac.o

drivers/net/ethernet/hisilicon/hns3/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#

# Makefile for the HISILICON network device drivers.

#



obj-$(CONFIG_HNS3) += hns3pf/



obj-$(CONFIG_HNS3) += hnae3.o

drivers/net/ethernet/hisilicon/hns3/hnae3.c

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

 * Copyright (c) 2016-2017 Hisilicon Limited.

 *

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

 */



#include <linux/list.h>

#include <linux/slab.h>

#include <linux/spinlock.h>



#include "hnae3.h"



static LIST_HEAD(hnae3_ae_algo_list);

static LIST_HEAD(hnae3_client_list);

static LIST_HEAD(hnae3_ae_dev_list);



/* we are keeping things simple and using single lock for all the

 * list. This is a non-critical code so other updations, if happen

 * in parallel, can wait.

 */

static DEFINE_MUTEX(hnae3_common_lock);



static bool hnae3_client_match(enum hnae3_client_type client_type,

			       enum hnae3_dev_type dev_type)

{

	if ((dev_type == HNAE3_DEV_KNIC) && (client_type == HNAE3_CLIENT_KNIC ||

					     client_type == HNAE3_CLIENT_ROCE))

		return true;



	if (dev_type == HNAE3_DEV_UNIC && client_type == HNAE3_CLIENT_UNIC)

		return true;



	return false;

}



static int hnae3_match_n_instantiate(struct hnae3_client *client,

				     struct hnae3_ae_dev *ae_dev,

				     bool is_reg, bool *matched)

{

	int ret;



	*matched = false;



	/* check if this client matches the type of ae_dev */

	if (!(hnae3_client_match(client->type, ae_dev->dev_type) &&

	      hnae_get_bit(ae_dev->flag, HNAE3_DEV_INITED_B))) {

		return 0;

	}

	/* there is a match of client and dev */

	*matched = true;



	/* now, (un-)instantiate client by calling lower layer */

	if (is_reg) {

		ret = ae_dev->ops->init_client_instance(client, ae_dev);

		if (ret)

			dev_err(&ae_dev->pdev->dev,

				"fail to instantiate client\n");

		return ret;

	}



	ae_dev->ops->uninit_client_instance(client, ae_dev);

	return 0;

}



int hnae3_register_client(struct hnae3_client *client)

{

	struct hnae3_client *client_tmp;

	struct hnae3_ae_dev *ae_dev;

	bool matched;

	int ret = 0;



	mutex_lock(&hnae3_common_lock);

	/* one system should only have one client for every type */

	list_for_each_entry(client_tmp, &hnae3_client_list, node) {

		if (client_tmp->type == client->type)

			goto exit;

	}



	list_add_tail(&client->node, &hnae3_client_list);



	/* initialize the client on every matched port */

	list_for_each_entry(ae_dev, &hnae3_ae_dev_list, node) {

		/* if the client could not be initialized on current port, for

		 * any error reasons, move on to next available port

		 */

		ret = hnae3_match_n_instantiate(client, ae_dev, true, &matched);

		if (ret)

			dev_err(&ae_dev->pdev->dev,

				"match and instantiation failed for port\n");

	}



exit:

	mutex_unlock(&hnae3_common_lock);



	return ret;

}

EXPORT_SYMBOL(hnae3_register_client);



void hnae3_unregister_client(struct hnae3_client *client)

{

	struct hnae3_ae_dev *ae_dev;

	bool matched;



	mutex_lock(&hnae3_common_lock);

	/* un-initialize the client on every matched port */

	list_for_each_entry(ae_dev, &hnae3_ae_dev_list, node) {

		hnae3_match_n_instantiate(client, ae_dev, false, &matched);

	}



	list_del(&client->node);

	mutex_unlock(&hnae3_common_lock);

}

EXPORT_SYMBOL(hnae3_unregister_client);



/* hnae3_register_ae_algo - register a AE algorithm to hnae3 framework

 * @ae_algo: AE algorithm

 * NOTE: the duplicated name will not be checked

 */

int hnae3_register_ae_algo(struct hnae3_ae_algo *ae_algo)

{

	const struct pci_device_id *id;

	struct hnae3_ae_dev *ae_dev;

	struct hnae3_client *client;

	bool matched;

	int ret = 0;



	mutex_lock(&hnae3_common_lock);



	list_add_tail(&ae_algo->node, &hnae3_ae_algo_list);



	/* Check if this algo/ops matches the list of ae_devs */

	list_for_each_entry(ae_dev, &hnae3_ae_dev_list, node) {

		id = pci_match_id(ae_algo->pdev_id_table, ae_dev->pdev);

		if (!id)

			continue;



		/* ae_dev init should set flag */

		ae_dev->ops = ae_algo->ops;

		ret = ae_algo->ops->init_ae_dev(ae_dev);

		if (ret) {

			dev_err(&ae_dev->pdev->dev, "init ae_dev error.\n");

			continue;

		}



		hnae_set_bit(ae_dev->flag, HNAE3_DEV_INITED_B, 1);



		/* check the client list for the match with this ae_dev type and

		 * initialize the figure out client instance

		 */

		list_for_each_entry(client, &hnae3_client_list, node) {

			ret = hnae3_match_n_instantiate(client, ae_dev, true,

							&matched);

			if (ret)

				dev_err(&ae_dev->pdev->dev,

					"match and instantiation failed\n");

			if (matched)

				break;

		}

	}



	mutex_unlock(&hnae3_common_lock);



	return ret;

}

EXPORT_SYMBOL(hnae3_register_ae_algo);



/* hnae3_unregister_ae_algo - unregisters a AE algorithm

 * @ae_algo: the AE algorithm to unregister

 */

void hnae3_unregister_ae_algo(struct hnae3_ae_algo *ae_algo)

{

	const struct pci_device_id *id;

	struct hnae3_ae_dev *ae_dev;

	struct hnae3_client *client;

	bool matched;



	mutex_lock(&hnae3_common_lock);

	/* Check if there are matched ae_dev */

	list_for_each_entry(ae_dev, &hnae3_ae_dev_list, node) {

		id = pci_match_id(ae_algo->pdev_id_table, ae_dev->pdev);

		if (!id)

			continue;



		/* check the client list for the match with this ae_dev type and

		 * un-initialize the figure out client instance

		 */

		list_for_each_entry(client, &hnae3_client_list, node) {

			hnae3_match_n_instantiate(client, ae_dev, false,

						  &matched);

			if (matched)

				break;

		}



		ae_algo->ops->uninit_ae_dev(ae_dev);

		hnae_set_bit(ae_dev->flag, HNAE3_DEV_INITED_B, 0);

	}



	list_del(&ae_algo->node);

	mutex_unlock(&hnae3_common_lock);

}

EXPORT_SYMBOL(hnae3_unregister_ae_algo);



/* hnae3_register_ae_dev - registers a AE device to hnae3 framework

 * @ae_dev: the AE device

 * NOTE: the duplicated name will not be checked

 */

int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev)

{

	const struct pci_device_id *id;

	struct hnae3_ae_algo *ae_algo;

	struct hnae3_client *client;

	bool matched;

	int ret = 0;



	mutex_lock(&hnae3_common_lock);

	list_add_tail(&ae_dev->node, &hnae3_ae_dev_list);



	/* Check if there are matched ae_algo */

	list_for_each_entry(ae_algo, &hnae3_ae_algo_list, node) {

		id = pci_match_id(ae_algo->pdev_id_table, ae_dev->pdev);

		if (!id)

			continue;



		ae_dev->ops = ae_algo->ops;



		if (!ae_dev->ops) {

			dev_err(&ae_dev->pdev->dev, "ae_dev ops are null\n");

			goto out_err;

		}



		/* ae_dev init should set flag */

		ret = ae_dev->ops->init_ae_dev(ae_dev);

		if (ret) {

			dev_err(&ae_dev->pdev->dev, "init ae_dev error\n");

			goto out_err;

		}



		hnae_set_bit(ae_dev->flag, HNAE3_DEV_INITED_B, 1);

		break;

	}



	/* check the client list for the match with this ae_dev type and

	 * initialize the figure out client instance

	 */

	list_for_each_entry(client, &hnae3_client_list, node) {

		ret = hnae3_match_n_instantiate(client, ae_dev, true,

						&matched);

		if (ret)

			dev_err(&ae_dev->pdev->dev,

				"match and instantiation failed\n");

		if (matched)

			break;

	}



out_err:

	mutex_unlock(&hnae3_common_lock);



	return ret;

}

EXPORT_SYMBOL(hnae3_register_ae_dev);



/* hnae3_unregister_ae_dev - unregisters a AE device

 * @ae_dev: the AE device to unregister

 */

void hnae3_unregister_ae_dev(struct hnae3_ae_dev *ae_dev)

{

	const struct pci_device_id *id;

	struct hnae3_ae_algo *ae_algo;

	struct hnae3_client *client;

	bool matched;



	mutex_lock(&hnae3_common_lock);

	/* Check if there are matched ae_algo */

	list_for_each_entry(ae_algo, &hnae3_ae_algo_list, node) {

		id = pci_match_id(ae_algo->pdev_id_table, ae_dev->pdev);

		if (!id)

			continue;



		list_for_each_entry(client, &hnae3_client_list, node) {

			hnae3_match_n_instantiate(client, ae_dev, false,

						  &matched);

			if (matched)

				break;

		}



		ae_algo->ops->uninit_ae_dev(ae_dev);

		hnae_set_bit(ae_dev->flag, HNAE3_DEV_INITED_B, 0);

	}



	list_del(&ae_dev->node);

	mutex_unlock(&hnae3_common_lock);

}

EXPORT_SYMBOL(hnae3_unregister_ae_dev);



MODULE_AUTHOR("Huawei Tech. Co., Ltd.");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("HNAE3(Hisilicon Network Acceleration Engine) Framework");