[v2, 10/16] net: designware: socfpga: Add ATF support for MAC driver

[Siew Chin Lim]

From: Chee Hong Ang <chee.hong.ang at intel.com>

In non-secure mode (EL2), MAC driver calls the SMC/PSCI services
provided by ATF to setup the PHY interface.

Signed-off-by: Chee Hong Ang <chee.hong.ang at intel.com>
Signed-off-by: Siew Chin Lim <elly.siew.chin.lim at intel.com>

---
v2:
- Code clean up without functionality change:
  - Changed dwmac_socfpga_fw_setphy() to dwmac_socfpga_do_setphy().
    This function will be called in both legacy and ATF boot flow.
  - Use phy_intf value from phandle in dwmac_socfpga_do_setphy().
  - Move #ifdef .. #endif switch into dwmac_socfpga_do_setphy(),
    and directly call it in dwmac_socfpga_probe().
---
 drivers/net/dwmac_socfpga.c | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index e93561dffa..2528577b34 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -17,7 +17,9 @@
 #include <dm/device_compat.h>
 #include <linux/err.h>
 
+#include <asm/arch/smc_api.h>
 #include <asm/arch/system_manager.h>
+#include <linux/intel-smc.h>
 
 struct dwmac_socfpga_platdata {
 	struct dw_eth_pdata	dw_eth_pdata;
@@ -64,6 +66,28 @@ static int dwmac_socfpga_ofdata_to_platdata(struct udevice *dev)
 	return designware_eth_ofdata_to_platdata(dev);
 }
 
+static int dwmac_socfpga_do_setphy(struct udevice *dev, u32 modereg)
+{
+	struct dwmac_socfpga_platdata *pdata = dev_get_platdata(dev);
+
+#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ATF)
+	u64 args[2];
+	int ret;
+
+	args[0] = ((u64)pdata->phy_intf - socfpga_get_sysmgr_addr() -
+		   SYSMGR_SOC64_EMAC0) >> 2;
+	args[1] = modereg;
+
+	if (invoke_smc(INTEL_SIP_SMC_HPS_SET_PHYINTF, args, 2, NULL, 0))
+		return -EIO;
+#else
+	clrsetbits_le32(pdata->phy_intf, SYSMGR_EMACGRP_CTRL_PHYSEL_MASK <<
+			pdata->reg_shift, modereg << pdata->reg_shift);
+#endif
+
+	return 0;
+}
+
 static int dwmac_socfpga_probe(struct udevice *dev)
 {
 	struct dwmac_socfpga_platdata *pdata = dev_get_platdata(dev);
@@ -71,7 +95,6 @@ static int dwmac_socfpga_probe(struct udevice *dev)
 	struct reset_ctl_bulk reset_bulk;
 	int ret;
 	u32 modereg;
-	u32 modemask;
 
 	switch (edata->phy_interface) {
 	case PHY_INTERFACE_MODE_MII:
@@ -97,9 +120,9 @@ static int dwmac_socfpga_probe(struct udevice *dev)
 
 	reset_assert_bulk(&reset_bulk);
 
-	modemask = SYSMGR_EMACGRP_CTRL_PHYSEL_MASK << pdata->reg_shift;
-	clrsetbits_le32(pdata->phy_intf, modemask,
-			modereg << pdata->reg_shift);
+	ret = dwmac_socfpga_do_setphy(dev, modereg);
+	if (ret)
+		return ret;
 
 	reset_release_bulk(&reset_bulk);
 
-- 
2.13.0