From patchwork Sat Jun 17 17:24:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salil Mehta X-Patchwork-Id: 105781 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp173152qgd; Sat, 17 Jun 2017 10:26:31 -0700 (PDT) X-Received: by 10.84.217.25 with SMTP id o25mr15907041pli.299.1497720391230; Sat, 17 Jun 2017 10:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497720391; cv=none; d=google.com; s=arc-20160816; b=cYqeSkyIVtY5bBfkJO5ofLU1cbgKvUq3RIK3bP3HV5kQMRqqg6uxvnthuP1vyD0vL8 3Aln3DcQ/izPrWxfUVYbu73+3Kmxl+sRHy51Q/KXrAbw0/hLcQ2vgnQPMSvQaddNbIyU NYYItVOdXTivrRMZqWyDnv50PX6CmvTmLTNUcG9yHezXn1Y9HN4uctYjTb9urf68hkiJ geeOLl8evF6ZaTw9aoz5V4173bs6YCMWjGznYU+wusRVzN0HECf26VjpUvsOzEFTRmyo kg/aySHOkOM/YWO77m6X4NdURmr3OFxGuGnaxqIdaBWs9JiexbPIVlB7m6iffDChXZ4R H7mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=6D7/rJSAcrv2mN4qcqDjVAdEOfEYBxtY44ej7pjX3vc=; b=iCW/Q/8MELigwKc9B2P96q2VA0X/NADK+V1qHZ1gJ2p1kVtHNsiJ1D1ujdCvKA2PLx YG0CFbdCm9E9N20jCjDvjFPKJrnMtnQu+Y63ZbN4uPvtBvpqyqjtNiTVNJNIjKSikdEq ++nL5/0/YMJltonkO7yJlbbKKklR68HJvHtBzzIabY9nNJccOR/LgEdwy9umL3oN9dwn Pq7+54GvJrnVYlvEDde6obfUa+GpIz+UW9LQlGoK8nlXCvainAYybnJW66XInazGhvr7 5SkP6TQNbw0yQci3O0pDAKId0RagQO5hHTl1yTY4wZxXiFjTJdHdEym2odY0aQGBY2pK EfUA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r14si5182180plj.556.2017.06.17.10.26.30; Sat, 17 Jun 2017 10:26:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752857AbdFQRZ7 (ORCPT + 25 others); Sat, 17 Jun 2017 13:25:59 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:8748 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752759AbdFQRZt (ORCPT ); Sat, 17 Jun 2017 13:25:49 -0400 Received: from 172.30.72.56 (EHLO DGGEML402-HUB.china.huawei.com) ([172.30.72.56]) by dggrg01-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AQL99677; Sun, 18 Jun 2017 01:25:47 +0800 (CST) Received: from S00293818-DELL1.china.huawei.com (10.203.181.160) by DGGEML402-HUB.china.huawei.com (10.3.17.38) with Microsoft SMTP Server id 14.3.301.0; Sun, 18 Jun 2017 01:25:36 +0800 From: Salil Mehta To: CC: , , , , , , , Subject: [PATCH V3 net-next 8/8] net: hns3: Add HNS3 driver to kernel build framework & MAINTAINERS Date: Sat, 17 Jun 2017 18:24:31 +0100 Message-ID: <20170617172431.177044-9-salil.mehta@huawei.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20170617172431.177044-1-salil.mehta@huawei.com> References: <20170617172431.177044-1-salil.mehta@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.203.181.160] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A0B0206.5945661B.0072, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: c9b3e63afdd35182aa679be4183d18e5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch updates the MAINTAINERS file with HNS3 Ethernet driver maintainers names and other details. This also introduces the new Makefiles required to build the HNS3 Ethernet driver and updates the existing Kconfig file in the hisilicon folder. Signed-off-by: Salil Mehta --- Patch V3: Addressed below errors: 1. Intel kbuild: https://lkml.org/lkml/2017/6/14/313 2. Intel Kbuild: https://lkml.org/lkml/2017/6/14/636 Patch V2: No change Patch V1: Initial Submit --- MAINTAINERS | 8 +++++++ drivers/net/ethernet/hisilicon/Kconfig | 27 ++++++++++++++++++++++ drivers/net/ethernet/hisilicon/Makefile | 1 + drivers/net/ethernet/hisilicon/hns3/Makefile | 7 ++++++ .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 11 +++++++++ 5 files changed, 54 insertions(+) create mode 100644 drivers/net/ethernet/hisilicon/hns3/Makefile create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile -- 2.7.4 diff --git a/MAINTAINERS b/MAINTAINERS index 8b8249b..cda0e80 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6070,6 +6070,14 @@ S: Maintained F: drivers/net/ethernet/hisilicon/ F: Documentation/devicetree/bindings/net/hisilicon*.txt +HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3) +M: Yisen Zhuang +M: Salil Mehta +L: netdev@vger.kernel.org +W: http://www.hisilicon.com +S: Maintained +F: drivers/net/ethernet/hisilicon/hns3/ + HISILICON ROCE DRIVER M: Lijun Ou M: Wei Hu(Xavier) diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig index d11287e..9f8ea28 100644 --- a/drivers/net/ethernet/hisilicon/Kconfig +++ b/drivers/net/ethernet/hisilicon/Kconfig @@ -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 + select 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 + select HNS3 + ---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 diff --git a/drivers/net/ethernet/hisilicon/Makefile b/drivers/net/ethernet/hisilicon/Makefile index 8661695..3828c43 100644 --- a/drivers/net/ethernet/hisilicon/Makefile +++ b/drivers/net/ethernet/hisilicon/Makefile @@ -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 diff --git a/drivers/net/ethernet/hisilicon/hns3/Makefile b/drivers/net/ethernet/hisilicon/hns3/Makefile new file mode 100644 index 0000000..5e53735 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hns3/Makefile @@ -0,0 +1,7 @@ +# +# Makefile for the HISILICON network device drivers. +# + +obj-$(CONFIG_HNS3) += hns3pf/ + +obj-$(CONFIG_HNS3) +=hnae3.o diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile b/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile new file mode 100644 index 0000000..c0a92b5 --- /dev/null +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile @@ -0,0 +1,11 @@ +# +# Makefile for the HISILICON network device drivers. +# + +ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3 + +obj-$(CONFIG_HNS3_HCLGE) += hclge.o +hclge-objs =hclge_main.o hclge_cmd.o hclge_mdio.o hclge_tm.o + +obj-$(CONFIG_HNS3_ENET) += hns3.o +hns3-objs = hns3_enet.o hns3_ethtool.o