Skip to contentSkip to conversation

igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support.

PATCH Superseded Sasha Neftin 4 participants 5 messages Jun 24, 2018 – Jul 10, 2018

Subsystems (2)

v3 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/11 igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support.

This patch adds the beginning framework onto which I am going to add the igc driver which supports the Intel(R) I225-LM/I225-V 2.5G Ethernet Controller.

Sasha Neftin (v2):
update module author, copyright and licence header cosmetic changes

Sasha Neftin (v3):
Removed unused header files

---
 drivers/net/ethernet/intel/Kconfig        |  15 +++
 drivers/net/ethernet/intel/Makefile       |   1 +
 drivers/net/ethernet/intel/igc/Makefile   |  10 ++
 drivers/net/ethernet/intel/igc/e1000_hw.h |  10 ++
 drivers/net/ethernet/intel/igc/igc.h      |  29 ++++++
 drivers/net/ethernet/intel/igc/igc_main.c | 146 ++++++++++++++++++++++++++++++
 6 files changed, 211 insertions(+)
 create mode 100644 drivers/net/ethernet/intel/igc/Makefile
 create mode 100644 drivers/net/ethernet/intel/igc/e1000_hw.h
 create mode 100644 drivers/net/ethernet/intel/igc/igc.h
 create mode 100644 drivers/net/ethernet/intel/igc/igc_main.c
drivers/net/ethernet/intel/Kconfig +15 -0
index 14d287bed33c..0e425b5bc733 100644
@@ -280,4 +280,19 @@ config FM10K
 	  To compile this driver as a module, choose M here. The module
 	  will be called fm10k.  MSI-X interrupt support is required
 
+config IGC
+	tristate "Intel(R) I225-LM/I225-V 2.5G Ethernet Controller support"
+	default n
+	depends on PCI
+	---help---
+	  This driver supports Intel(R) I225-LM/I225-V 2.5G Ethernet
+	  Controller family of adapters.
+	  For more information on how to identify your adapter, go
+	  to the Adapter & Driver ID Guide that can be located at:
+
+	  <http://support.intel.com>
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called igc.
+
 endif # NET_VENDOR_INTEL
drivers/net/ethernet/intel/Makefile +1 -0
index 807a4f8c7e4e..18f4aac68bc0 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_E1000) += e1000/
 obj-$(CONFIG_E1000E) += e1000e/
 obj-$(CONFIG_IGB) += igb/
+obj-$(CONFIG_IGC) += igc/
 obj-$(CONFIG_IGBVF) += igbvf/
 obj-$(CONFIG_IXGBE) += ixgbe/
 obj-$(CONFIG_IXGBEVF) += ixgbevf/
drivers/net/ethernet/intel/igc/Makefile new file +10 -0
new file mode 100644
index 000000000000..3d13b015d401
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c)  2018 Intel Corporation
+
+#
+# Intel(R) I225-LM/I225-V 2.5G Ethernet Controller
+#
+
+obj-$(CONFIG_IGC) += igc.o
+
+igc-objs := igc_main.o
drivers/net/ethernet/intel/igc/e1000_hw.h new file +10 -0
new file mode 100644
index 000000000000..677f40c2c0a4
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c)  2018 Intel Corporation */
+
+#ifndef _E1000_HW_H_
+#define _E1000_HW_H_
+
+#define E1000_DEV_ID_I225_LM			0x15F2
+#define E1000_DEV_ID_I225_V			0x15F3
+
+#endif /* _E1000_HW_H_ */
drivers/net/ethernet/intel/igc/igc.h new file +29 -0
new file mode 100644
index 000000000000..afe595cfcf63
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c)  2018 Intel Corporation */
+
+#ifndef _IGC_H_
+#define _IGC_H_
+
+#include <linux/kobject.h>
+
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/vmalloc.h>
+
+#include <linux/ethtool.h>
+
+#include <linux/sctp.h>
+
+#define IGC_ERR(args...) pr_err("igc: " args)
+
+#define PFX "igc: "
+
+#include <linux/timecounter.h>
+#include <linux/net_tstamp.h>
+#include <linux/ptp_clock_kernel.h>
+
+/* main */
+extern char igc_driver_name[];
+extern char igc_driver_version[];
+
+#endif /* _IGC_H_ */
drivers/net/ethernet/intel/igc/igc_main.c new file +146 -0

146 lines not on this page · raw message

Signature · 1 line
2.11.0
#1 lore raw

PATCH v3 1/11 igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support.

Dear Sasha,

Thank you for the change. Some nitpics below.

Am 24.06.2018 um 10:44 schrieb Sasha Neftin:

Quoted 10 lines

This patch adds the beginning framework onto which I am going to add the igc driver which supports the Intel(R) I225-LM/I225-V 2.5G Ethernet Controller.

Sasha Neftin (v2):
update module author, copyright and licence header cosmetic changes

Sasha Neftin (v3):
Removed unused header files

Above you use imperative mood, so s/Removed/Remove/ for consistency.

Quoted 19 lines
---
  drivers/net/ethernet/intel/Kconfig        |  15 +++
  drivers/net/ethernet/intel/Makefile       |   1 +
  drivers/net/ethernet/intel/igc/Makefile   |  10 ++
  drivers/net/ethernet/intel/igc/e1000_hw.h |  10 ++
  drivers/net/ethernet/intel/igc/igc.h      |  29 ++++++
  drivers/net/ethernet/intel/igc/igc_main.c | 146 ++++++++++++++++++++++++++++++
  6 files changed, 211 insertions(+)

create mode 100644 drivers/net/ethernet/intel/igc/Makefile create mode 100644 drivers/net/ethernet/intel/igc/e1000_hw.h create mode 100644 drivers/net/ethernet/intel/igc/igc.h create mode 100644 drivers/net/ethernet/intel/igc/igc_main.c

drivers/net/ethernet/intel/Kconfig +0 -0
index 14d287bed33c..0e425b5bc733 100644

drivers/net/ethernet/intel/Kconfig config FM10K · line 289

Quoted 10 lines
drivers/net/ethernet/intel/Kconfig +7 -0
@@ -280,4 +280,19 @@ config FM10K
  	  To compile this driver as a module, choose M here. The module
  	  will be called fm10k.  MSI-X interrupt support is required
 
+config IGC
+	tristate "Intel(R) I225-LM/I225-V 2.5G Ethernet Controller support"
+	default n
+	depends on PCI
+	---help---
+	  This driver supports Intel(R) I225-LM/I225-V 2.5G Ethernet
+	  Controller family of adapters.

Please add a blank line below.

drivers/net/ethernet/intel/Kconfig config FM10K · line 293

Quoted 4 lines
drivers/net/ethernet/intel/Kconfig +4 -0
+	  For more information on how to identify your adapter, go
+	  to the Adapter & Driver ID Guide that can be located at:
+
+	  <http://support.intel.com>

Is that available more securely over HTTPS?

Quoted 116 lines
drivers/net/ethernet/intel/Kconfig +4 -0
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called igc.
+
  endif # NET_VENDOR_INTEL
drivers/net/ethernet/intel/Makefile +1 -0
index 807a4f8c7e4e..18f4aac68bc0 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_E100) += e100.o
  obj-$(CONFIG_E1000) += e1000/
  obj-$(CONFIG_E1000E) += e1000e/
  obj-$(CONFIG_IGB) += igb/
+obj-$(CONFIG_IGC) += igc/
  obj-$(CONFIG_IGBVF) += igbvf/
  obj-$(CONFIG_IXGBE) += ixgbe/
  obj-$(CONFIG_IXGBEVF) += ixgbevf/
drivers/net/ethernet/intel/igc/Makefile new file +10 -0
new file mode 100644
index 000000000000..3d13b015d401
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c)  2018 Intel Corporation
+
+#
+# Intel(R) I225-LM/I225-V 2.5G Ethernet Controller
+#
+
+obj-$(CONFIG_IGC) += igc.o
+
+igc-objs := igc_main.o
drivers/net/ethernet/intel/igc/e1000_hw.h new file +10 -0
new file mode 100644
index 000000000000..677f40c2c0a4
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c)  2018 Intel Corporation */
+
+#ifndef _E1000_HW_H_
+#define _E1000_HW_H_
+
+#define E1000_DEV_ID_I225_LM			0x15F2
+#define E1000_DEV_ID_I225_V			0x15F3
+
+#endif /* _E1000_HW_H_ */
drivers/net/ethernet/intel/igc/igc.h new file +29 -0
new file mode 100644
index 000000000000..afe595cfcf63
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c)  2018 Intel Corporation */
+
+#ifndef _IGC_H_
+#define _IGC_H_
+
+#include <linux/kobject.h>
+
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/vmalloc.h>
+
+#include <linux/ethtool.h>
+
+#include <linux/sctp.h>
+
+#define IGC_ERR(args...) pr_err("igc: " args)
+
+#define PFX "igc: "
+
+#include <linux/timecounter.h>
+#include <linux/net_tstamp.h>
+#include <linux/ptp_clock_kernel.h>
+
+/* main */
+extern char igc_driver_name[];
+extern char igc_driver_version[];
+
+#endif /* _IGC_H_ */
drivers/net/ethernet/intel/igc/igc_main.c new file +26 -0
new file mode 100644
index 000000000000..3e10d27752d5
@@ -0,0 +1,146 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c)  2018 Intel Corporation */
+
+#include <linux/module.h>
+#include <linux/types.h>
+
+#include "igc.h"
+#include "e1000_hw.h"
+
+#define DRV_VERSION	"0.0.1-k"
+#define DRV_SUMMARY	"Intel(R) 2.5G Ethernet Linux Driver"
+
+char igc_driver_name[] = "igc";
+char igc_driver_version[] = DRV_VERSION;
+static const char igc_driver_string[] = DRV_SUMMARY;
+static const char igc_copyright[] =
+	"Copyright(c) 2018 Intel Corporation.";
+
+static const struct pci_device_id igc_pci_tbl[] = {
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I225_LM) },
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I225_V) },
+	/* required last entry */
+	{0, }
+};
+
+MODULE_DEVICE_TABLE(pci, igc_pci_tbl);

drivers/net/ethernet/intel/igc/igc_main.c line 36

Quoted 10 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +10 -0
+
+/**
+ *  igc_probe - Device Initialization Routine
+ *  @pdev: PCI device information struct
+ *  @ent: entry in igc_pci_tbl
+ *
+ *  Returns 0 on success, negative on failure
+ *
+ *  igc_probe initializes an adapter identified by a pci_dev structure.
+ *  The OS initialization, configuring of the adapter private structure,

I?d use *the adapter private structure configuration*.

Quoted 43 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +43 -0
+ *  and a hardware reset occur.
+ **/
+static int igc_probe(struct pci_dev *pdev,
+		     const struct pci_device_id *ent)
+{
+	int err, pci_using_dac;
+
+	err = pci_enable_device_mem(pdev);
+	if (err)
+		return err;
+
+	pci_using_dac = 0;
+	err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+	if (!err) {
+		err = dma_set_coherent_mask(&pdev->dev,
+					    DMA_BIT_MASK(64));
+		if (!err)
+			pci_using_dac = 1;
+	} else {
+		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+		if (err) {
+			err = dma_set_coherent_mask(&pdev->dev,
+						    DMA_BIT_MASK(32));
+			if (err) {
+				IGC_ERR("Wrong DMA configuration, aborting\n");
+				goto err_dma;
+			}
+		}
+	}
+
+	err = pci_request_selected_regions(pdev,
+					   pci_select_bars(pdev,
+							   IORESOURCE_MEM),
+					   igc_driver_name);
+	if (err)
+		goto err_pci_reg;
+
+	pci_set_master(pdev);
+	pci_save_state(pdev);
+	return 0;
+
+err_pci_reg:
+err_dma:

drivers/net/ethernet/intel/igc/igc_main.c line 89

Quoted 10 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +10 -0
+	pci_disable_device(pdev);
+	return err;
+}
+
+/**
+ *  igc_remove - Device Removal Routine
+ *  @pdev: PCI device information struct
+ *
+ *  igc_remove is called by the PCI subsystem to alert the driver
+ *  that it should release a PCI device.  The could be caused by a

s/The/This/?

Quoted 43 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +43 -0
+ *  Hot-Plug event, or because the driver is going to be removed from
+ *  memory.
+ **/
+static void igc_remove(struct pci_dev *pdev)
+{
+	pci_release_selected_regions(pdev,
+				     pci_select_bars(pdev, IORESOURCE_MEM));
+
+	pci_disable_device(pdev);
+}
+
+static struct pci_driver igc_driver = {
+	.name     = igc_driver_name,
+	.id_table = igc_pci_tbl,
+	.probe    = igc_probe,
+	.remove   = igc_remove,
+};
+
+/**
+ *  igc_init_module - Driver Registration Routine
+ *
+ *  igc_init_module is the first routine called when the driver is
+ *  loaded. All it does is register with the PCI subsystem.
+ **/
+static int __init igc_init_module(void)
+{
+	int ret;
+
+	pr_info("%s - version %s\n",
+		igc_driver_string, igc_driver_version);
+
+	pr_info("%s\n", igc_copyright);
+
+	ret = pci_register_driver(&igc_driver);
+	return ret;
+}
+
+module_init(igc_init_module);
+
+/**
+ *  igc_exit_module - Driver Exit Cleanup Routine
+ *
+ *  igc_exit_module is called just before the driver is removed

drivers/net/ethernet/intel/igc/igc_main.c line 142

Quoted 10 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +10 -0
+ *  from memory.
+ **/
+static void __exit igc_exit_module(void)
+{
+	pci_unregister_driver(&igc_driver);
+}
+
+module_exit(igc_exit_module);
+
+MODULE_AUTHOR("Intel Corporation, <[email protected]>");

That address doesn?t show up in MAINTAINERS.

drivers/net/ethernet/intel/igc/igc_main.c line 146

Quoted 4 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +4 -0
+MODULE_DESCRIPTION(DRV_SUMMARY);
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+/* igc_main.c */

Kind regards,

Paul

#2 lore raw

PATCH v3 1/11 igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support.

Quoted 10 lines · Paul Menzel

Dear Sasha,

Thank you for the change. Some nitpics below.

Am 24.06.2018 um 10:44 schrieb Sasha Neftin:

Quoted 4 lines

This patch adds the beginning framework onto which I am going to add the igc driver which supports the Intel(R) I225-LM/I225-V 2.5G Ethernet Controller.

Quoted 9 lines
Quoted 6 lines

Sasha Neftin (v2):
update module author, copyright and licence header cosmetic changes

Sasha Neftin (v3):
Removed unused header files

Above you use imperative mood, so s/Removed/Remove/ for consistency.

Good. Will be fixed in next version (v4).

Quoted 24 lines
Quoted 24 lines

---

? drivers/net/ethernet/intel/Kconfig??????? |? 15 +++
? drivers/net/ethernet/intel/Makefile?????? |?? 1 +
? drivers/net/ethernet/intel/igc/Makefile?? |? 10 ++
? drivers/net/ethernet/intel/igc/e1000_hw.h |? 10 ++
? drivers/net/ethernet/intel/igc/igc.h????? |? 29 ++++++
? drivers/net/ethernet/intel/igc/igc_main.c | 146 

++++++++++++++++++++++++++++++
? 6 files changed, 211 insertions(+)
? create mode 100644 drivers/net/ethernet/intel/igc/Makefile ? create mode 100644 drivers/net/ethernet/intel/igc/e1000_hw.h ? create mode 100644 drivers/net/ethernet/intel/igc/igc.h ? create mode 100644 drivers/net/ethernet/intel/igc/igc_main.c

drivers/net/ethernet/intel/Kconfig +0 -0
index 14d287bed33c..0e425b5bc733 100644
@@ -280,4 +280,19 @@ config FM10K

??????? To compile this driver as a module, choose M here. The module ??????? will be called fm10k.? MSI-X interrupt support is required +config IGC

Quoted 8 lines
Quoted 6 lines

+??? tristate "Intel(R) I225-LM/I225-V 2.5G Ethernet Controller support" +??? default n
+??? depends on PCI
+??? ---help---
+????? This driver supports Intel(R) I225-LM/I225-V 2.5G Ethernet +????? Controller family of adapters.

Please add a blank line below. >

Good. Will be fixed in next version (v4).

Quoted 7 lines
Quoted 4 lines

+????? For more information on how to identify your adapter, go +????? to the Adapter & Driver ID Guide that can be located at:
+
+????? <http://support.intel.com>

Is that available more securely over HTTPS?

I will check. Currently I do it same as for other ours drivers.

Quoted 125 lines
Quoted 125 lines
drivers/net/ethernet/intel/Kconfig +4 -0
+
+????? To compile this driver as a module, choose M here. The module
+????? will be called igc.
+

? endif # NET_VENDOR_INTEL

drivers/net/ethernet/intel/Makefile +0 -0
index 807a4f8c7e4e..18f4aac68bc0 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_E100) += e100.o

? obj-$(CONFIG_E1000) += e1000/
? obj-$(CONFIG_E1000E) += e1000e/
? obj-$(CONFIG_IGB) += igb/
+obj-$(CONFIG_IGC) += igc/
? obj-$(CONFIG_IGBVF) += igbvf/
? obj-$(CONFIG_IXGBE) += ixgbe/
? obj-$(CONFIG_IXGBEVF) += ixgbevf/

drivers/net/ethernet/intel/igc/Makefile new file +10 -0
new file mode 100644
index 000000000000..3d13b015d401
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c)? 2018 Intel Corporation
+
+#
+# Intel(R) I225-LM/I225-V 2.5G Ethernet Controller
+#
+
+obj-$(CONFIG_IGC) += igc.o
+
+igc-objs := igc_main.o
drivers/net/ethernet/intel/igc/e1000_hw.h new file +10 -0
new file mode 100644
index 000000000000..677f40c2c0a4
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c)? 2018 Intel Corporation */
+
+#ifndef _E1000_HW_H_
+#define _E1000_HW_H_
+
+#define E1000_DEV_ID_I225_LM??????????? 0x15F2
+#define E1000_DEV_ID_I225_V??????????? 0x15F3
+
+#endif /* _E1000_HW_H_ */
drivers/net/ethernet/intel/igc/igc.h new file +29 -0
new file mode 100644
index 000000000000..afe595cfcf63
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c)? 2018 Intel Corporation */
+
+#ifndef _IGC_H_
+#define _IGC_H_
+
+#include <linux/kobject.h>
+
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/vmalloc.h>
+
+#include <linux/ethtool.h>
+
+#include <linux/sctp.h>
+
+#define IGC_ERR(args...) pr_err("igc: " args)
+
+#define PFX "igc: "
+
+#include <linux/timecounter.h>
+#include <linux/net_tstamp.h>
+#include <linux/ptp_clock_kernel.h>
+
+/* main */
+extern char igc_driver_name[];
+extern char igc_driver_version[];
+
+#endif /* _IGC_H_ */
drivers/net/ethernet/intel/igc/igc_main.c new file +30 -0
new file mode 100644
index 000000000000..3e10d27752d5
@@ -0,0 +1,146 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c)? 2018 Intel Corporation */
+
+#include <linux/module.h>
+#include <linux/types.h>
+
+#include "igc.h"
+#include "e1000_hw.h"
+
+#define DRV_VERSION??? "0.0.1-k"
+#define DRV_SUMMARY??? "Intel(R) 2.5G Ethernet Linux Driver"
+
+char igc_driver_name[] = "igc";
+char igc_driver_version[] = DRV_VERSION;
+static const char igc_driver_string[] = DRV_SUMMARY;
+static const char igc_copyright[] =
+??? "Copyright(c) 2018 Intel Corporation.";
+
+static const struct pci_device_id igc_pci_tbl[] = {
+??? { PCI_VDEVICE(INTEL, E1000_DEV_ID_I225_LM) },
+??? { PCI_VDEVICE(INTEL, E1000_DEV_ID_I225_V) },
+??? /* required last entry */
+??? {0, }
+};
+
+MODULE_DEVICE_TABLE(pci, igc_pci_tbl);
+
+/**
+ *? igc_probe - Device Initialization Routine
+ *? @pdev: PCI device information struct
Quoted 9 lines

drivers/net/ethernet/intel/igc/igc_main.c line 36

Quoted 6 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +6 -0
+ *? @ent: entry in igc_pci_tbl
+ *
+ *? Returns 0 on success, negative on failure
+ *
+ *? igc_probe initializes an adapter identified by a pci_dev structure.
+ *? The OS initialization, configuring of the adapter private structure,

I?d use *the adapter private structure configuration*.

Good point. Will be fix in v4.

Quoted 47 lines
Quoted 47 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +47 -0
+ *? and a hardware reset occur.
+ **/
+static int igc_probe(struct pci_dev *pdev,
+???????????? const struct pci_device_id *ent)
+{
+??? int err, pci_using_dac;
+
+??? err = pci_enable_device_mem(pdev);
+??? if (err)
+??????? return err;
+
+??? pci_using_dac = 0;
+??? err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+??? if (!err) {
+??????? err = dma_set_coherent_mask(&pdev->dev,
+??????????????????????? DMA_BIT_MASK(64));
+??????? if (!err)
+??????????? pci_using_dac = 1;
+??? } else {
+??????? err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+??????? if (err) {
+??????????? err = dma_set_coherent_mask(&pdev->dev,
+??????????????????????????? DMA_BIT_MASK(32));
+??????????? if (err) {
+??????????????? IGC_ERR("Wrong DMA configuration, aborting\n");
+??????????????? goto err_dma;
+??????????? }
+??????? }
+??? }
+
+??? err = pci_request_selected_regions(pdev,
+?????????????????????? pci_select_bars(pdev,
+?????????????????????????????? IORESOURCE_MEM),
+?????????????????????? igc_driver_name);
+??? if (err)
+??????? goto err_pci_reg;
+
+??? pci_set_master(pdev);
+??? pci_save_state(pdev);
+??? return 0;
+
+err_pci_reg:
+err_dma:
+??? pci_disable_device(pdev);
+??? return err;
+}
+
Quoted 9 lines

drivers/net/ethernet/intel/igc/igc_main.c line 89

Quoted 6 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +6 -0
+/**
+ *? igc_remove - Device Removal Routine
+ *? @pdev: PCI device information struct
+ *
+ *? igc_remove is called by the PCI subsystem to alert the driver
+ *? that it should release a PCI device.? The could be caused by a

s/The/This/?

Good. Will be fix in v4.

Quoted 47 lines
Quoted 47 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +47 -0
+ *? Hot-Plug event, or because the driver is going to be removed from
+ *? memory.
+ **/
+static void igc_remove(struct pci_dev *pdev)
+{
+??? pci_release_selected_regions(pdev,
+???????????????????? pci_select_bars(pdev, IORESOURCE_MEM));
+
+??? pci_disable_device(pdev);
+}
+
+static struct pci_driver igc_driver = {
+??? .name???? = igc_driver_name,
+??? .id_table = igc_pci_tbl,
+??? .probe??? = igc_probe,
+??? .remove?? = igc_remove,
+};
+
+/**
+ *? igc_init_module - Driver Registration Routine
+ *
+ *? igc_init_module is the first routine called when the driver is
+ *? loaded. All it does is register with the PCI subsystem.
+ **/
+static int __init igc_init_module(void)
+{
+??? int ret;
+
+??? pr_info("%s - version %s\n",
+??????? igc_driver_string, igc_driver_version);
+
+??? pr_info("%s\n", igc_copyright);
+
+??? ret = pci_register_driver(&igc_driver);
+??? return ret;
+}
+
+module_init(igc_init_module);
+
+/**
+ *? igc_exit_module - Driver Exit Cleanup Routine
+ *
+ *? igc_exit_module is called just before the driver is removed
+ *? from memory.
+ **/
+static void __exit igc_exit_module(void)
+{
Quoted 9 lines

drivers/net/ethernet/intel/igc/igc_main.c line 142

Quoted 6 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +6 -0
+??? pci_unregister_driver(&igc_driver);
+}
+
+module_exit(igc_exit_module);
+
+MODULE_AUTHOR("Intel Corporation, <[email protected]>");

That address doesn?t show up in MAINTAINERS.

Probably I need check it.

Quoted 9 lines

drivers/net/ethernet/intel/igc/igc_main.c line 146

Quoted 4 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +4 -0
+MODULE_DESCRIPTION(DRV_SUMMARY);
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+/* igc_main.c */

Kind regards,

Paul

Hello Paul,
Thanks for your inputs.

#3 lore raw

PATCH v3 1/11 igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support.

In reply to Sasha Neftin
Quoted 20 lines · Sasha Neftin

This patch adds the beginning framework onto which I am going to add the igc driver which supports the Intel(R) I225-LM/I225-V 2.5G Ethernet Controller.

Sasha Neftin (v2):
update module author, copyright and licence header cosmetic changes

Sasha Neftin (v3):
Removed unused header files

---
  drivers/net/ethernet/intel/Kconfig        |  15 +++
  drivers/net/ethernet/intel/Makefile       |   1 +
  drivers/net/ethernet/intel/igc/Makefile   |  10 ++
  drivers/net/ethernet/intel/igc/e1000_hw.h |  10 ++
  drivers/net/ethernet/intel/igc/igc.h      |  29 ++++++
  drivers/net/ethernet/intel/igc/igc_main.c | 146 ++++++++++++++++++++++++++++++
  6 files changed, 211 insertions(+)
Quoted 2 lines

create mode 100644 drivers/net/ethernet/intel/igc/Makefile create mode 100644 drivers/net/ethernet/intel/igc/e1000_hw.h

Can we please get rid of the e1000 stuff this time? Why isn't this called igc_hw.h?

Quoted 61 lines

create mode 100644 drivers/net/ethernet/intel/igc/igc.h create mode 100644 drivers/net/ethernet/intel/igc/igc_main.c

drivers/net/ethernet/intel/Kconfig +15 -0
index 14d287bed33c..0e425b5bc733 100644
@@ -280,4 +280,19 @@ config FM10K
  	  To compile this driver as a module, choose M here. The module
  	  will be called fm10k.  MSI-X interrupt support is required
 
+config IGC
+	tristate "Intel(R) I225-LM/I225-V 2.5G Ethernet Controller support"
+	default n
+	depends on PCI
+	---help---
+	  This driver supports Intel(R) I225-LM/I225-V 2.5G Ethernet
+	  Controller family of adapters.
+	  For more information on how to identify your adapter, go
+	  to the Adapter & Driver ID Guide that can be located at:
+
+	  <http://support.intel.com>
+
+	  To compile this driver as a module, choose M here. The module
+	  will be called igc.
+
  endif # NET_VENDOR_INTEL
drivers/net/ethernet/intel/Makefile +1 -0
index 807a4f8c7e4e..18f4aac68bc0 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_E100) += e100.o
  obj-$(CONFIG_E1000) += e1000/
  obj-$(CONFIG_E1000E) += e1000e/
  obj-$(CONFIG_IGB) += igb/
+obj-$(CONFIG_IGC) += igc/
  obj-$(CONFIG_IGBVF) += igbvf/
  obj-$(CONFIG_IXGBE) += ixgbe/
  obj-$(CONFIG_IXGBEVF) += ixgbevf/
drivers/net/ethernet/intel/igc/Makefile new file +10 -0
new file mode 100644
index 000000000000..3d13b015d401
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c)  2018 Intel Corporation
+
+#
+# Intel(R) I225-LM/I225-V 2.5G Ethernet Controller
+#
+
+obj-$(CONFIG_IGC) += igc.o
+
+igc-objs := igc_main.o
drivers/net/ethernet/intel/igc/e1000_hw.h new file +0 -0
new file mode 100644
index 000000000000..677f40c2c0a4

drivers/net/ethernet/intel/igc/e1000_hw.h line 8

Quoted 8 lines
drivers/net/ethernet/intel/igc/e1000_hw.h new file +8 -0
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c)  2018 Intel Corporation */
+
+#ifndef _E1000_HW_H_
+#define _E1000_HW_H_
+
+#define E1000_DEV_ID_I225_LM			0x15F2
+#define E1000_DEV_ID_I225_V			0x15F3

Please, please, please don't continue the e1000 stuff. It is already confusing enough with three other drivers using E1000 as a filename and macro prefix. Use IGC_ here.

Quoted 190 lines
drivers/net/ethernet/intel/igc/e1000_hw.h new file +2 -0
+
+#endif /* _E1000_HW_H_ */
drivers/net/ethernet/intel/igc/igc.h new file +29 -0
new file mode 100644
index 000000000000..afe595cfcf63
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c)  2018 Intel Corporation */
+
+#ifndef _IGC_H_
+#define _IGC_H_
+
+#include <linux/kobject.h>
+
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/vmalloc.h>
+
+#include <linux/ethtool.h>
+
+#include <linux/sctp.h>
+
+#define IGC_ERR(args...) pr_err("igc: " args)
+
+#define PFX "igc: "
+
+#include <linux/timecounter.h>
+#include <linux/net_tstamp.h>
+#include <linux/ptp_clock_kernel.h>
+
+/* main */
+extern char igc_driver_name[];
+extern char igc_driver_version[];
+
+#endif /* _IGC_H_ */
drivers/net/ethernet/intel/igc/igc_main.c new file +146 -0
new file mode 100644
index 000000000000..3e10d27752d5
@@ -0,0 +1,146 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c)  2018 Intel Corporation */
+
+#include <linux/module.h>
+#include <linux/types.h>
+
+#include "igc.h"
+#include "e1000_hw.h"
+
+#define DRV_VERSION	"0.0.1-k"
+#define DRV_SUMMARY	"Intel(R) 2.5G Ethernet Linux Driver"
+
+char igc_driver_name[] = "igc";
+char igc_driver_version[] = DRV_VERSION;
+static const char igc_driver_string[] = DRV_SUMMARY;
+static const char igc_copyright[] =
+	"Copyright(c) 2018 Intel Corporation.";
+
+static const struct pci_device_id igc_pci_tbl[] = {
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I225_LM) },
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I225_V) },
+	/* required last entry */
+	{0, }
+};
+
+MODULE_DEVICE_TABLE(pci, igc_pci_tbl);
+
+/**
+ *  igc_probe - Device Initialization Routine
+ *  @pdev: PCI device information struct
+ *  @ent: entry in igc_pci_tbl
+ *
+ *  Returns 0 on success, negative on failure
+ *
+ *  igc_probe initializes an adapter identified by a pci_dev structure.
+ *  The OS initialization, configuring of the adapter private structure,
+ *  and a hardware reset occur.
+ **/
+static int igc_probe(struct pci_dev *pdev,
+		     const struct pci_device_id *ent)
+{
+	int err, pci_using_dac;
+
+	err = pci_enable_device_mem(pdev);
+	if (err)
+		return err;
+
+	pci_using_dac = 0;
+	err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+	if (!err) {
+		err = dma_set_coherent_mask(&pdev->dev,
+					    DMA_BIT_MASK(64));
+		if (!err)
+			pci_using_dac = 1;
+	} else {
+		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+		if (err) {
+			err = dma_set_coherent_mask(&pdev->dev,
+						    DMA_BIT_MASK(32));
+			if (err) {
+				IGC_ERR("Wrong DMA configuration, aborting\n");
+				goto err_dma;
+			}
+		}
+	}
+
+	err = pci_request_selected_regions(pdev,
+					   pci_select_bars(pdev,
+							   IORESOURCE_MEM),
+					   igc_driver_name);
+	if (err)
+		goto err_pci_reg;
+
+	pci_set_master(pdev);
+	pci_save_state(pdev);
+	return 0;
+
+err_pci_reg:
+err_dma:
+	pci_disable_device(pdev);
+	return err;
+}
+
+/**
+ *  igc_remove - Device Removal Routine
+ *  @pdev: PCI device information struct
+ *
+ *  igc_remove is called by the PCI subsystem to alert the driver
+ *  that it should release a PCI device.  The could be caused by a
+ *  Hot-Plug event, or because the driver is going to be removed from
+ *  memory.
+ **/
+static void igc_remove(struct pci_dev *pdev)
+{
+	pci_release_selected_regions(pdev,
+				     pci_select_bars(pdev, IORESOURCE_MEM));
+
+	pci_disable_device(pdev);
+}
+
+static struct pci_driver igc_driver = {
+	.name     = igc_driver_name,
+	.id_table = igc_pci_tbl,
+	.probe    = igc_probe,
+	.remove   = igc_remove,
+};
+
+/**
+ *  igc_init_module - Driver Registration Routine
+ *
+ *  igc_init_module is the first routine called when the driver is
+ *  loaded. All it does is register with the PCI subsystem.
+ **/
+static int __init igc_init_module(void)
+{
+	int ret;
+
+	pr_info("%s - version %s\n",
+		igc_driver_string, igc_driver_version);
+
+	pr_info("%s\n", igc_copyright);
+
+	ret = pci_register_driver(&igc_driver);
+	return ret;
+}
+
+module_init(igc_init_module);
+
+/**
+ *  igc_exit_module - Driver Exit Cleanup Routine
+ *
+ *  igc_exit_module is called just before the driver is removed
+ *  from memory.
+ **/
+static void __exit igc_exit_module(void)
+{
+	pci_unregister_driver(&igc_driver);
+}
+
+module_exit(igc_exit_module);
+
+MODULE_AUTHOR("Intel Corporation, <[email protected]>");
+MODULE_DESCRIPTION(DRV_SUMMARY);
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+/* igc_main.c */
#4 lore raw

PATCH v3 1/11 igc: Add skeletal frame for Intel(R) 2.5G Ethernet Controller support.

Quoted 25 lines · Shannon Nelson
Quoted 19 lines · Sasha Neftin

This patch adds the beginning framework onto which I am going to add the igc driver which supports the Intel(R) I225-LM/I225-V 2.5G Ethernet Controller.

Sasha Neftin (v2):
update module author, copyright and licence header cosmetic changes

Sasha Neftin (v3):
Removed unused header files

---

? drivers/net/ethernet/intel/Kconfig??????? |? 15 +++
? drivers/net/ethernet/intel/Makefile?????? |?? 1 +
? drivers/net/ethernet/intel/igc/Makefile?? |? 10 ++
? drivers/net/ethernet/intel/igc/e1000_hw.h |? 10 ++
? drivers/net/ethernet/intel/igc/igc.h????? |? 29 ++++++
? drivers/net/ethernet/intel/igc/igc_main.c | 146 
Quoted 4 lines

++++++++++++++++++++++++++++++
? 6 files changed, 211 insertions(+)
? create mode 100644 drivers/net/ethernet/intel/igc/Makefile ? create mode 100644 drivers/net/ethernet/intel/igc/e1000_hw.h

Quoted 3 lines

Can we please get rid of the e1000 stuff this time?? Why isn't this called igc_hw.h?

yes. I've been looking in our other drivers and agree. I will rework all code and file names. igc_ prefix will be applied in v4.

Quoted 68 lines
Quoted 68 lines

? create mode 100644 drivers/net/ethernet/intel/igc/igc.h ? create mode 100644 drivers/net/ethernet/intel/igc/igc_main.c

drivers/net/ethernet/intel/Kconfig +0 -0
index 14d287bed33c..0e425b5bc733 100644
@@ -280,4 +280,19 @@ config FM10K

??????? To compile this driver as a module, choose M here. The module ??????? will be called fm10k.? MSI-X interrupt support is required

drivers/net/ethernet/intel/Kconfig +15 -0
+config IGC
+??? tristate "Intel(R) I225-LM/I225-V 2.5G Ethernet Controller support"
+??? default n
+??? depends on PCI
+??? ---help---
+????? This driver supports Intel(R) I225-LM/I225-V 2.5G Ethernet
+????? Controller family of adapters.
+????? For more information on how to identify your adapter, go
+????? to the Adapter & Driver ID Guide that can be located at:
+
+????? <http://support.intel.com>
+
+????? To compile this driver as a module, choose M here. The module
+????? will be called igc.
+

? endif # NET_VENDOR_INTEL

drivers/net/ethernet/intel/Makefile +0 -0
index 807a4f8c7e4e..18f4aac68bc0 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_E100) += e100.o

? obj-$(CONFIG_E1000) += e1000/
? obj-$(CONFIG_E1000E) += e1000e/
? obj-$(CONFIG_IGB) += igb/
+obj-$(CONFIG_IGC) += igc/
? obj-$(CONFIG_IGBVF) += igbvf/
? obj-$(CONFIG_IXGBE) += ixgbe/
? obj-$(CONFIG_IXGBEVF) += ixgbevf/

drivers/net/ethernet/intel/igc/Makefile new file +10 -0
new file mode 100644
index 000000000000..3d13b015d401
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c)? 2018 Intel Corporation
+
+#
+# Intel(R) I225-LM/I225-V 2.5G Ethernet Controller
+#
+
+obj-$(CONFIG_IGC) += igc.o
+
+igc-objs := igc_main.o
drivers/net/ethernet/intel/igc/e1000_hw.h new file +4 -0
new file mode 100644
index 000000000000..677f40c2c0a4
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c)? 2018 Intel Corporation */
+
+#ifndef _E1000_HW_H_
Quoted 10 lines

drivers/net/ethernet/intel/igc/e1000_hw.h

Quoted 4 lines
drivers/net/ethernet/intel/igc/e1000_hw.h new file +4 -0
+#define _E1000_HW_H_
+
+#define E1000_DEV_ID_I225_LM??????????? 0x15F2
+#define E1000_DEV_ID_I225_V??????????? 0x15F3

Please, please, please don't continue the e1000 stuff.? It is already confusing enough with three other drivers using E1000 as a filename and macro prefix.? Use IGC_ here.

igc_ prefix will be applied in v4.

Quoted 184 lines
Quoted 184 lines
drivers/net/ethernet/intel/igc/e1000_hw.h new file +2 -0
+
+#endif /* _E1000_HW_H_ */
drivers/net/ethernet/intel/igc/igc.h new file +29 -0
new file mode 100644
index 000000000000..afe595cfcf63
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c)? 2018 Intel Corporation */
+
+#ifndef _IGC_H_
+#define _IGC_H_
+
+#include <linux/kobject.h>
+
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/vmalloc.h>
+
+#include <linux/ethtool.h>
+
+#include <linux/sctp.h>
+
+#define IGC_ERR(args...) pr_err("igc: " args)
+
+#define PFX "igc: "
+
+#include <linux/timecounter.h>
+#include <linux/net_tstamp.h>
+#include <linux/ptp_clock_kernel.h>
+
+/* main */
+extern char igc_driver_name[];
+extern char igc_driver_version[];
+
+#endif /* _IGC_H_ */
drivers/net/ethernet/intel/igc/igc_main.c new file +139 -0
new file mode 100644
index 000000000000..3e10d27752d5
@@ -0,0 +1,146 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c)? 2018 Intel Corporation */
+
+#include <linux/module.h>
+#include <linux/types.h>
+
+#include "igc.h"
+#include "e1000_hw.h"
+
+#define DRV_VERSION??? "0.0.1-k"
+#define DRV_SUMMARY??? "Intel(R) 2.5G Ethernet Linux Driver"
+
+char igc_driver_name[] = "igc";
+char igc_driver_version[] = DRV_VERSION;
+static const char igc_driver_string[] = DRV_SUMMARY;
+static const char igc_copyright[] =
+??? "Copyright(c) 2018 Intel Corporation.";
+
+static const struct pci_device_id igc_pci_tbl[] = {
+??? { PCI_VDEVICE(INTEL, E1000_DEV_ID_I225_LM) },
+??? { PCI_VDEVICE(INTEL, E1000_DEV_ID_I225_V) },
+??? /* required last entry */
+??? {0, }
+};
+
+MODULE_DEVICE_TABLE(pci, igc_pci_tbl);
+
+/**
+ *? igc_probe - Device Initialization Routine
+ *? @pdev: PCI device information struct
+ *? @ent: entry in igc_pci_tbl
+ *
+ *? Returns 0 on success, negative on failure
+ *
+ *? igc_probe initializes an adapter identified by a pci_dev structure.
+ *? The OS initialization, configuring of the adapter private structure,
+ *? and a hardware reset occur.
+ **/
+static int igc_probe(struct pci_dev *pdev,
+???????????? const struct pci_device_id *ent)
+{
+??? int err, pci_using_dac;
+
+??? err = pci_enable_device_mem(pdev);
+??? if (err)
+??????? return err;
+
+??? pci_using_dac = 0;
+??? err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+??? if (!err) {
+??????? err = dma_set_coherent_mask(&pdev->dev,
+??????????????????????? DMA_BIT_MASK(64));
+??????? if (!err)
+??????????? pci_using_dac = 1;
+??? } else {
+??????? err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+??????? if (err) {
+??????????? err = dma_set_coherent_mask(&pdev->dev,
+??????????????????????????? DMA_BIT_MASK(32));
+??????????? if (err) {
+??????????????? IGC_ERR("Wrong DMA configuration, aborting\n");
+??????????????? goto err_dma;
+??????????? }
+??????? }
+??? }
+
+??? err = pci_request_selected_regions(pdev,
+?????????????????????? pci_select_bars(pdev,
+?????????????????????????????? IORESOURCE_MEM),
+?????????????????????? igc_driver_name);
+??? if (err)
+??????? goto err_pci_reg;
+
+??? pci_set_master(pdev);
+??? pci_save_state(pdev);
+??? return 0;
+
+err_pci_reg:
+err_dma:
+??? pci_disable_device(pdev);
+??? return err;
+}
+
+/**
+ *? igc_remove - Device Removal Routine
+ *? @pdev: PCI device information struct
+ *
+ *? igc_remove is called by the PCI subsystem to alert the driver
+ *? that it should release a PCI device.? The could be caused by a
+ *? Hot-Plug event, or because the driver is going to be removed from
+ *? memory.
+ **/
+static void igc_remove(struct pci_dev *pdev)
+{
+??? pci_release_selected_regions(pdev,
+???????????????????? pci_select_bars(pdev, IORESOURCE_MEM));
+
+??? pci_disable_device(pdev);
+}
+
+static struct pci_driver igc_driver = {
+??? .name???? = igc_driver_name,
+??? .id_table = igc_pci_tbl,
+??? .probe??? = igc_probe,
+??? .remove?? = igc_remove,
+};
+
+/**
+ *? igc_init_module - Driver Registration Routine
+ *
+ *? igc_init_module is the first routine called when the driver is
+ *? loaded. All it does is register with the PCI subsystem.
+ **/
+static int __init igc_init_module(void)
+{
+??? int ret;
+
+??? pr_info("%s - version %s\n",
+??????? igc_driver_string, igc_driver_version);
+
+??? pr_info("%s\n", igc_copyright);
+
+??? ret = pci_register_driver(&igc_driver);
+??? return ret;
+}
+
+module_init(igc_init_module);
+
+/**
+ *? igc_exit_module - Driver Exit Cleanup Routine
+ *
+ *? igc_exit_module is called just before the driver is removed
+ *? from memory.
+ **/
+static void __exit igc_exit_module(void)
+{
+??? pci_unregister_driver(&igc_driver);
+}
+
Quoted 8 lines

drivers/net/ethernet/intel/igc/igc_main.c line 146

Quoted 8 lines
drivers/net/ethernet/intel/igc/igc_main.c new file +7 -0
+module_exit(igc_exit_module);
+
+MODULE_AUTHOR("Intel Corporation, <[email protected]>");
+MODULE_DESCRIPTION(DRV_SUMMARY);
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
+/* igc_main.c */

Thank you very much for your comments. igc_ prefix will be applied in v4.