X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fphy%2Faquantia.c;h=a0abb23299236ef1d29dbdc2a977ca46fc0d1521;hb=522e035441ca04d99de2fc13b614ad896691e9c9;hp=cbd70120d19f34ef9c4c1b1b9821b7dd780ff5b4;hpb=4506423ad23749a28ae48720bc64ad40caf089b2;p=oweals%2Fu-boot.git

diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index cbd70120d1..a0abb23299 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -8,7 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <phy.h>
-#include <crc.h>
+#include <u-boot/crc.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <fs.h>
@@ -236,18 +236,34 @@ done:
 #else
 static int aquantia_upload_firmware(struct phy_device *phydev)
 {
-	return 0;
+	printf("ERROR %s firmware loading disabled.\n", phydev->dev->name);
+	return -1;
 }
 #endif
 
 int aquantia_config(struct phy_device *phydev)
 {
-	u32 val;
-	int ret;
+	u32 val, id, rstatus, fault;
 
-	ret = aquantia_upload_firmware(phydev);
-	if (ret != 0)
-		return ret;
+	id = phy_read(phydev, MDIO_MMD_VEND1, GLOBAL_FIRMWARE_ID);
+	rstatus = phy_read(phydev, MDIO_MMD_VEND1, GLOBAL_RSTATUS_1);
+	fault = phy_read(phydev, MDIO_MMD_VEND1, GLOBAL_FAULT);
+
+	if (id != 0)
+		printf("%s running firmware version %X.%X.%X\n",
+		       phydev->dev->name, (id >> 8), id & 0xff,
+		       (rstatus >> 4) & 0xf);
+
+	if (fault != 0)
+		printf("%s fault 0x%04x detected\n", phydev->dev->name, fault);
+
+	if (id == 0 || fault != 0) {
+		int ret;
+
+		ret = aquantia_upload_firmware(phydev);
+		if (ret != 0)
+			return ret;
+	}
 
 	val = phy_read(phydev, MDIO_MMD_PMAPMD, MII_BMCR);