From 316e15b4cc17d077e423dd6e7ce8bf0046b27f2f Mon Sep 17 00:00:00 2001
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Thu, 31 Mar 2016 13:13:38 +0000
Subject: [PATCH] Fix MAC address configuration for VNIC

The FDT description is as follows:
- phy-handle, reg, qlm-mode, mac-address are under nodes in bgx0/1 node
- phy nodes (pointed by phy-handle) are under MDIO even though they may
  not be connected through to MDIO. In those nodes they do not contain
  MAC address or etc.

This commit changes parsing of the FDT nodes for BGX so that it can
obtain correct MAC address for a given PHY.

Reviewed by:   wma
Obtained from: Semihalf
Sponsored by:  Cavium
Differential Revision: https://reviews.freebsd.org/D5781
---
 sys/dev/vnic/thunder_bgx_fdt.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/sys/dev/vnic/thunder_bgx_fdt.c b/sys/dev/vnic/thunder_bgx_fdt.c
index ec6e68f6485..b4d77cfc4c1 100644
--- a/sys/dev/vnic/thunder_bgx_fdt.c
+++ b/sys/dev/vnic/thunder_bgx_fdt.c
@@ -285,18 +285,9 @@ bgx_fdt_init_phy(struct bgx *bgx)
 			continue;
 		}
 
-		if (OF_getencprop(child, "phy-handle", &phy,
-		    sizeof(phy)) <= 0) {
-			if (bootverbose) {
-				device_printf(bgx->dev,
-				    "No phy-handle in PHY node. Skipping...\n");
-			}
-			continue;
-		}
 
 		/* Acquire PHY address */
-		phy = OF_node_from_xref(phy);
-		if (OF_getencprop(phy, "reg", &bgx->lmac[lmac].phyaddr,
+		if (OF_getencprop(child, "reg", &bgx->lmac[lmac].phyaddr,
 		    sizeof(bgx->lmac[lmac].phyaddr)) <= 0) {
 			if (bootverbose) {
 				device_printf(bgx->dev,
@@ -305,6 +296,15 @@ bgx_fdt_init_phy(struct bgx *bgx)
 			bgx->lmac[lmac].phyaddr = MII_PHY_ANY;
 		}
 
+		if (OF_getencprop(child, "phy-handle", &phy,
+		    sizeof(phy)) <= 0) {
+			if (bootverbose) {
+				device_printf(bgx->dev,
+				    "No phy-handle in PHY node. Skipping...\n");
+			}
+			continue;
+		}
+		phy = OF_instance_to_package(phy);
 		/*
 		 * Get PHY interface (MDIO bus) device.
 		 * Driver must be already attached.
@@ -321,7 +321,7 @@ bgx_fdt_init_phy(struct bgx *bgx)
 		}
 
 		/* Get mac address from FDT */
-		bgx_fdt_get_macaddr(phy, bgx->lmac[lmac].mac);
+		bgx_fdt_get_macaddr(child, bgx->lmac[lmac].mac);
 
 		bgx->lmac[lmac].lmacid = lmac;
 		lmac++;