Merge tag 'u-boot-socfpga-next-20250124' of https://source.denx.de/u-boot/custodians/u-boot-socfpga

1.  Bug fixed for doorbell in secure device manager mailbox driver
2.  Enhancement on SoCFPGA dwc_eth_xgmac driver
3.  Enhancement on DW MAC driver
4.  Improved the error message and status for SoC64 device FPGA
    configuration driver
5.  Updated existing watchdog in system manager to support new SM device

3 files changed, 81 insertions, 31 deletions

diff --git a/drivers/net/dwc_eth_xgmac.c b/drivers/net/dwc_eth_xgmac.c
index d3e5f9255f5..cf8227b1b4d 100644
--- a/drivers/net/dwc_eth_xgmac.c
+++ b/drivers/net/dwc_eth_xgmac.c
@@ -152,7 +152,9 @@ static int xgmac_mdio_read(struct mii_dev *bus, int mdio_addr, int mdio_devad,
 
 	ret = xgmac_mdio_wait_idle(xgmac);
 	if (ret) {
-		pr_err("MDIO not idle at entry: %d\n", ret);
+		pr_err("%s MDIO not idle at entry: %d\n",
+		       xgmac->dev->name, ret);
+
 		return ret;
 	}
 
@@ -172,7 +174,9 @@ static int xgmac_mdio_read(struct mii_dev *bus, int mdio_addr, int mdio_devad,
 
 	ret = xgmac_mdio_wait_idle(xgmac);
 	if (ret) {
-		pr_err("MDIO not idle at entry: %d\n", ret);
+		pr_err("%s MDIO not idle at entry: %d\n",
+		       xgmac->dev->name, ret);
+
 		return ret;
 	}
 
@@ -181,7 +185,9 @@ static int xgmac_mdio_read(struct mii_dev *bus, int mdio_addr, int mdio_devad,
 
 	ret = xgmac_mdio_wait_idle(xgmac);
 	if (ret) {
-		pr_err("MDIO read didn't complete: %d\n", ret);
+		pr_err("%s MDIO read didn't complete: %d\n",
+		       xgmac->dev->name, ret);
+
 		return ret;
 	}
 
@@ -206,7 +212,9 @@ static int xgmac_mdio_write(struct mii_dev *bus, int mdio_addr, int mdio_devad,
 
 	ret = xgmac_mdio_wait_idle(xgmac);
 	if (ret) {
-		pr_err("MDIO not idle at entry: %d\n", ret);
+		pr_err("%s MDIO not idle at entry: %d\n",
+		       xgmac->dev->name, ret);
+
 		return ret;
 	}
 
@@ -229,7 +237,9 @@ static int xgmac_mdio_write(struct mii_dev *bus, int mdio_addr, int mdio_devad,
 
 	ret = xgmac_mdio_wait_idle(xgmac);
 	if (ret) {
-		pr_err("MDIO not idle at entry: %d\n", ret);
+		pr_err("%s MDIO not idle at entry: %d\n",
+		       xgmac->dev->name, ret);
+
 		return ret;
 	}
 
@@ -238,7 +248,9 @@ static int xgmac_mdio_write(struct mii_dev *bus, int mdio_addr, int mdio_devad,
 
 	ret = xgmac_mdio_wait_idle(xgmac);
 	if (ret) {
-		pr_err("MDIO write didn't complete: %d\n", ret);
+		pr_err("%s MDIO write didn't complete: %d\n",
+		       xgmac->dev->name, ret);
+
 		return ret;
 	}
 
@@ -323,7 +335,7 @@ static int xgmac_adjust_link(struct udevice *dev)
 	else
 		ret = xgmac_set_half_duplex(dev);
 	if (ret < 0) {
-		pr_err("xgmac_set_*_duplex() failed: %d\n", ret);
+		pr_err("%s xgmac_set_*_duplex() failed: %d\n", dev->name, ret);
 		return ret;
 	}
 
@@ -341,26 +353,28 @@ static int xgmac_adjust_link(struct udevice *dev)
 		ret = xgmac_set_mii_speed_10(dev);
 		break;
 	default:
-		pr_err("invalid speed %d\n", xgmac->phy->speed);
+		pr_err("%s invalid speed %d\n", dev->name, xgmac->phy->speed);
 		return -EINVAL;
 	}
 	if (ret < 0) {
-		pr_err("xgmac_set_*mii_speed*() failed: %d\n", ret);
+		pr_err("%s xgmac_set_*mii_speed*() failed: %d\n", dev->name, ret);
 		return ret;
 	}
 
 	if (en_calibration) {
 		ret = xgmac->config->ops->xgmac_calibrate_pads(dev);
 		if (ret < 0) {
-			pr_err("xgmac_calibrate_pads() failed: %d\n",
-			       ret);
+			pr_err("%s xgmac_calibrate_pads() failed: %d\n",
+			       dev->name, ret);
+
 			return ret;
 		}
 	} else {
 		ret = xgmac->config->ops->xgmac_disable_calibration(dev);
 		if (ret < 0) {
-			pr_err("xgmac_disable_calibration() failed: %d\n",
-			       ret);
+			pr_err("%s xgmac_disable_calibration() failed: %d\n",
+			       dev->name, ret);
+
 			return ret;
 		}
 	}
@@ -456,7 +470,7 @@ static int xgmac_start(struct udevice *dev)
 
 	ret = xgmac->config->ops->xgmac_start_resets(dev);
 	if (ret < 0) {
-		pr_err("xgmac_start_resets() failed: %d\n", ret);
+		pr_err("%s xgmac_start_resets() failed: %d\n", dev->name, ret);
 		goto err;
 	}
 
@@ -466,13 +480,13 @@ static int xgmac_start(struct udevice *dev)
 				XGMAC_DMA_MODE_SWR, false,
 				xgmac->config->swr_wait, false);
 	if (ret) {
-		pr_err("XGMAC_DMA_MODE_SWR stuck: %d\n", ret);
+		pr_err("%s XGMAC_DMA_MODE_SWR stuck: %d\n", dev->name, ret);
 		goto err_stop_resets;
 	}
 
 	ret = xgmac->config->ops->xgmac_calibrate_pads(dev);
 	if (ret < 0) {
-		pr_err("xgmac_calibrate_pads() failed: %d\n", ret);
+		pr_err("%s xgmac_calibrate_pads() failed: %d\n", dev->name, ret);
 		goto err_stop_resets;
 	}
 
@@ -485,14 +499,16 @@ static int xgmac_start(struct udevice *dev)
 		xgmac->phy = phy_connect(xgmac->mii, addr, dev,
 					 xgmac->config->interface(dev));
 		if (!xgmac->phy) {
-			pr_err("phy_connect() failed\n");
+			pr_err("%s phy_connect() failed\n", dev->name);
 			goto err_stop_resets;
 		}
 
 		if (xgmac->max_speed) {
 			ret = phy_set_supported(xgmac->phy, xgmac->max_speed);
 			if (ret) {
-				pr_err("phy_set_supported() failed: %d\n", ret);
+				pr_err("%s phy_set_supported() failed: %d\n",
+				       dev->name, ret);
+
 				goto err_shutdown_phy;
 			}
 		}
@@ -500,25 +516,25 @@ static int xgmac_start(struct udevice *dev)
 		xgmac->phy->node = xgmac->phy_of_node;
 		ret = phy_config(xgmac->phy);
 		if (ret < 0) {
-			pr_err("phy_config() failed: %d\n", ret);
+			pr_err("%s phy_config() failed: %d\n", dev->name, ret);
 			goto err_shutdown_phy;
 		}
 	}
 
 	ret = phy_startup(xgmac->phy);
 	if (ret < 0) {
-		pr_err("phy_startup() failed: %d\n", ret);
+		pr_err("%s phy_startup() failed: %d\n", dev->name, ret);
 		goto err_shutdown_phy;
 	}
 
 	if (!xgmac->phy->link) {
-		pr_err("No link\n");
+		pr_err("%s No link\n", dev->name);
 		goto err_shutdown_phy;
 	}
 
 	ret = xgmac_adjust_link(dev);
 	if (ret < 0) {
-		pr_err("xgmac_adjust_link() failed: %d\n", ret);
+		pr_err("%s xgmac_adjust_link() failed: %d\n", dev->name, ret);
 		goto err_shutdown_phy;
 	}
 
@@ -611,7 +627,7 @@ static int xgmac_start(struct udevice *dev)
 
 	ret = xgmac_write_hwaddr(dev);
 	if (ret < 0) {
-		pr_err("xgmac_write_hwaddr() failed: %d\n", ret);
+		pr_err("%s xgmac_write_hwaddr() failed: %d\n", dev->name, ret);
 		goto err;
 	}
 
@@ -738,7 +754,7 @@ err_shutdown_phy:
 err_stop_resets:
 	xgmac->config->ops->xgmac_stop_resets(dev);
 err:
-	pr_err("FAILED: %d\n", ret);
+	pr_err("%s FAILED: %d\n", dev->name, ret);
 	return ret;
 }
 
@@ -1047,7 +1063,7 @@ static int xgmac_probe(struct udevice *dev)
 
 	xgmac->regs = dev_read_addr(dev);
 	if (xgmac->regs == FDT_ADDR_T_NONE) {
-		pr_err("dev_read_addr() failed\n");
+		pr_err("%s dev_read_addr() failed\n", dev->name);
 		return -ENODEV;
 	}
 	xgmac->mac_regs = (void *)(xgmac->regs + XGMAC_MAC_REGS_BASE);
@@ -1058,19 +1074,23 @@ static int xgmac_probe(struct udevice *dev)
 
 	ret = xgmac_probe_resources_core(dev);
 	if (ret < 0) {
-		pr_err("xgmac_probe_resources_core() failed: %d\n", ret);
+		pr_err("%s xgmac_probe_resources_core() failed: %d\n",
+		       dev->name, ret);
+
 		return ret;
 	}
 
 	ret = xgmac->config->ops->xgmac_probe_resources(dev);
 	if (ret < 0) {
-		pr_err("xgmac_probe_resources() failed: %d\n", ret);
+		pr_err("%s xgmac_probe_resources() failed: %d\n",
+		       dev->name, ret);
+
 		goto err_remove_resources_core;
 	}
 
 	ret = xgmac->config->ops->xgmac_start_clks(dev);
 	if (ret < 0) {
-		pr_err("xgmac_start_clks() failed: %d\n", ret);
+		pr_err("%s xgmac_start_clks() failed: %d\n", dev->name, ret);
 		return ret;
 	}
 
@@ -1080,7 +1100,7 @@ static int xgmac_probe(struct udevice *dev)
 	if (!xgmac->mii) {
 		xgmac->mii = mdio_alloc();
 		if (!xgmac->mii) {
-			pr_err("mdio_alloc() failed\n");
+			pr_err("%s mdio_alloc() failed\n", dev->name);
 			ret = -ENOMEM;
 			goto err_stop_clks;
 		}
@@ -1091,7 +1111,9 @@ static int xgmac_probe(struct udevice *dev)
 
 		ret = mdio_register(xgmac->mii);
 		if (ret < 0) {
-			pr_err("mdio_register() failed: %d\n", ret);
+			pr_err("%s mdio_register() failed: %d\n",
+			       dev->name, ret);
+
 			goto err_free_mdio;
 		}
 	}
diff --git a/drivers/net/dwc_eth_xgmac_socfpga.c b/drivers/net/dwc_eth_xgmac_socfpga.c
index 87fb7e887e7..c89c8a188b7 100644
--- a/drivers/net/dwc_eth_xgmac_socfpga.c
+++ b/drivers/net/dwc_eth_xgmac_socfpga.c
@@ -29,6 +29,25 @@
 
 #define SOCFPGA_XGMAC_SYSCON_ARG_COUNT 2
 
+phy_interface_t dwxgmac_of_get_mac_mode(struct udevice *dev)
+{
+	const char *mac_mode;
+	int i;
+
+	debug("%s(dev=%p):\n", __func__, dev);
+	mac_mode = dev_read_string(dev, "mac-mode");
+	if (!mac_mode)
+		return PHY_INTERFACE_MODE_NA;
+
+	if (mac_mode) {
+		for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) {
+			if (!strcmp(mac_mode, phy_interface_strings[i]))
+				return i;
+		}
+	}
+	return PHY_INTERFACE_MODE_NA;
+}
+
 static int dwxgmac_socfpga_do_setphy(struct udevice *dev, u32 modereg)
 {
 	struct xgmac_priv *xgmac = dev_get_priv(dev);
@@ -66,12 +85,17 @@ static int xgmac_probe_resources_socfpga(struct udevice *dev)
 	struct ofnode_phandle_args args;
 	void *range;
 	phy_interface_t interface;
+	phy_interface_t mac_mode;
 	int ret;
 	u32 modereg;
 
 	interface = xgmac->config->interface(dev);
+	mac_mode = dwxgmac_of_get_mac_mode(dev);
+
+	if (mac_mode == PHY_INTERFACE_MODE_NA)
+		mac_mode = interface;
 
-	switch (interface) {
+	switch (mac_mode) {
 	case PHY_INTERFACE_MODE_MII:
 	case PHY_INTERFACE_MODE_GMII:
 		modereg = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII;
@@ -80,6 +104,7 @@ static int xgmac_probe_resources_socfpga(struct udevice *dev)
 		modereg = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RMII;
 		break;
 	case PHY_INTERFACE_MODE_RGMII:
+	case PHY_INTERFACE_MODE_RGMII_ID:
 		modereg = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII;
 		break;
 	default:
diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index a9e2d8c0972..a55f3e29f9f 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -106,6 +106,9 @@ static int dwmac_socfpga_probe(struct udevice *dev)
 		modereg = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RMII;
 		break;
 	case PHY_INTERFACE_MODE_RGMII:
+	case PHY_INTERFACE_MODE_RGMII_ID:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
+	case PHY_INTERFACE_MODE_RGMII_TXID:
 		modereg = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII;
 		break;
 	default: