public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed
From: John Holland <jotihojr@gmail•com>
To: intel-wired-lan@lists•osuosl.org, netdev@vger•kernel.org
Cc: jeffrey.t.kirsher@intel•com
Subject: [Intel-wired-lan] [next] igb: allow setting MAC address on i211 using a device tree blob V4
Date: Thu, 18 Feb 2016 00:49:17 +0100	[thread overview]
Message-ID: <56C506FD.5040408@gmail.com> (raw)

Hello,

The Intel i211 LOM pcie ethernet controllers' iNVM operates as an OTP
and has no externel EEPROM interface [1]. The following allows the
driver to pickup the MAC address from a device tree blob when CONFIG_OF
has been enabled.

[1]http://www.intel.com/content/www/us/en/embedded/products/networking/i211-ethernet-controller-datasheet.html

Changes V2
- Restrict searching for compatible devices to current pci device.

Changes V3
- Add device tree binding documentation.

Changes V4
- Rebase patch.

Signed-off-by: John Holland<jotihojr@gmail•com>
---

  Documentation/devicetree/bindings/net/intel,i210.txt         | 36 
++++++++++++++++++++++
  drivers/net/ethernet/intel/igb/igb_main.c                    | 31 
+++++++++++++++++++
  2 files changed, 67 insertions(+)

diff --git a/Documentation/devicetree/bindings/net/intel,i210.txt 
b/Documentation/devicetree/bindings/net/intel,i210.txt
new file mode 100644
index 0000000..d6ac8d3
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/intel,i210.txt
@@ -0,0 +1,36 @@
+* Intel I210, I211 PCIe bus controller
+
+Required properties:
+- compatible: must be "intel,i210" as described in
+  Documentation/devicetree/bindings/net/phy.txt;
+
+Optional properties:
+- local-mac-address: as described in
+  Documentation/devicetree/bindings/net/ethernet.txt;
+- mac-address: as described in
+  Documentation/devicetree/bindings/net/ethernet.txt;
+
+Child nodes of this PCIe bus controller node are a subset
+of the standard Ethernet PHY device nodes.
+
+Example:
+
+/*
+ * Set a valid MAC address from the u-boot environment variable eth1addr.
+ * The resulting value may be viewed under
+ * <sysfs>/firmware/devicetree/base/soc/pcie@0x01000000/i211@bus1/
+ */
+
+#include "imx6q.dtsi";
+
+/ {
+	aliases {
+		ethernet1 = &eth1;
+	};
+};
+
+&pcie {
+	eth1: i211@bus1 {
+		compatible = "intel,i210";
+	};
+};
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c 
b/drivers/net/ethernet/intel/igb/igb_main.c
index a98f418..a3203ec 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -57,6 +57,11 @@
  #include "igb.h"
  #include "igb_cdev.h"

+#ifdef CONFIG_OF
+#include <linux/of_net.h>
+#include <linux/etherdevice.h>
+#endif
+
  #define MAJ 5
  #define MIN 3
  #define BUILD 0
@@ -2299,6 +2304,27 @@ static s32 igb_init_i2c(struct igb_adapter *adapter)
  	return status;
  }

+#ifdef CONFIG_OF
+/**
+ *  igb_read_mac_addr_dts - Read mac address from the device tree blob
+ *  @dev: pointer to device structure
+ *  @mac_addr: pointer to found mac address
+ **/
+static void igb_read_mac_addr_dts(const struct device *dev, u8 *mac_addr)
+{
+	const u8 *mac;
+	struct device_node *dn;
+
+	dn = of_find_compatible_node(dev->of_node, NULL, "intel,i210");
+	if (dn) {
+		mac = of_get_mac_address(dn);
+		if (mac)
+			ether_addr_copy(mac_addr, mac);
+	}
+}
+#endif
+
+
  /**
   *  igb_probe - Device Initialization Routine
   *  @pdev: PCI device information struct
@@ -2511,6 +2537,11 @@ static int igb_probe(struct pci_dev *pdev, const 
struct pci_device_id *ent)
  	if (hw->mac.ops.read_mac_addr(hw))
  		dev_err(&pdev->dev, "NVM Read Error\n");

+#ifdef CONFIG_OF
+	if (!is_valid_ether_addr(hw->mac.addr))
+		igb_read_mac_addr_dts(&pdev->dev, hw->mac.addr);
+#endif
+
  	memcpy(netdev->dev_addr, hw->mac.addr, netdev->addr_len);

  	if (!is_valid_ether_addr(netdev->dev_addr)) {

             reply	other threads:[~2016-02-17 23:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-17 23:49 John Holland [this message]
2016-02-18  2:29 ` [Intel-wired-lan] [next] igb: allow setting MAC address on i211 using a device tree blob V4 David Miller
2016-02-18  7:53   ` John Holland
2016-02-18  9:15     ` Jeff Kirsher
2016-02-18 15:22     ` David Miller
2016-02-18 15:47       ` John Holland

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56C506FD.5040408@gmail.com \
    --to=jotihojr@gmail$(echo .)com \
    --cc=intel-wired-lan@lists$(echo .)osuosl.org \
    --cc=jeffrey.t.kirsher@intel$(echo .)com \
    --cc=netdev@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox