1 files changed, 35 insertions, 0 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 73cd0fefad44..18ddffbb7e3f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -42,6 +42,7 @@
 #include <linux/slab.h>
 #include <net/checksum.h>
 #include <net/ip6_checksum.h>
+#include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/if.h>
 #include <linux/if_vlan.h>
@@ -50,6 +51,15 @@
 #include <linux/prefetch.h>
 #include <scsi/fc/fc_fcoe.h>
 
+#ifdef CONFIG_OF
+#include <linux/of_net.h>
+#endif
+
+#ifdef CONFIG_SPARC
+#include <asm/idprom.h>
+#include <asm/prom.h>
+#endif
+
 #include "ixgbe.h"
 #include "ixgbe_common.h"
 #include "ixgbe_dcb_82599.h"
@@ -8021,6 +8031,29 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,
 }
 
 /**
+ * ixgbe_get_platform_mac_addr - Look up MAC address in Open Firmware / IDPROM
+ * @adapter: Pointer to adapter struct
+ */
+static void ixgbe_get_platform_mac_addr(struct ixgbe_adapter *adapter)
+{
+#ifdef CONFIG_OF
+        struct device_node *dp = pci_device_to_OF_node(adapter->pdev);
+        struct ixgbe_hw *hw = &adapter->hw;
+        const unsigned char *addr;
+
+        addr = of_get_mac_address(dp);
+        if (addr) {
+                ether_addr_copy(hw->mac.perm_addr, addr);
+                return;
+        }
+#endif /* CONFIG_OF */
+
+#ifdef CONFIG_SPARC
+        ether_addr_copy(hw->mac.perm_addr, idprom->id_ethaddr);
+#endif /* CONFIG_SPARC */
+}
+
+/**
  * ixgbe_probe - Device Initialization Routine
  * @pdev: PCI device information struct
  * @ent: entry in ixgbe_pci_tbl
@@ -8289,6 +8322,8 @@ skip_sriov:
                 goto err_sw_init;
         }
 
+        ixgbe_get_platform_mac_addr(adapter);
+
         memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len);
 
         if (!is_valid_ether_addr(netdev->dev_addr)) {