net: NC-SI setup and handling

Add the handling of NC-SI ethernet frames, and add a check at the start
of net_loop() to configure NC-SI before starting other network commands.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>

diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index bf1e832be9f1566df4894983a6110302b7b92c7e..bb7ecebed382a1ad6ad4ee84a07c30d5515fd3ff 100644 (file)
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <phy.h>
+#include <net.h>
 #include <net/ncsi.h>
 #include <net/ncsi-pkt.h>
 #include <asm/unaligned.h>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 0350afdd1b68bf28c67ed262aa37c07cb316b157..90876630533e61acf7f2ee7bac75d23e88cbf511 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -1026,7 +1026,7 @@ struct phy_device *phy_connect(struct mii_dev *bus, int addr,
 #endif
 
 #ifdef CONFIG_PHY_NCSI
-       if (!phydev)
+       if (!phydev && interface == PHY_INTERFACE_MODE_NCSI)
                phydev = phy_device_create(bus, 0, PHY_NCSI_ID, false);
 #endif
 
@@ -1275,3 +1275,10 @@ int phy_clear_bits_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val
 
        return 0;
 }
+
+bool phy_interface_is_ncsi(void)
+{
+       struct eth_pdata *pdata = dev_get_plat(eth_get_dev());
+
+       return pdata->phy_interface == PHY_INTERFACE_MODE_NCSI;
+}

diff --git a/include/net.h b/include/net.h
index c06b577808b9f198195fdde2b9d81955d4fd91df..32364ed0ced9ee9e05580b0e09dd6cdca7622b98 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -560,7 +560,7 @@ extern int          net_restart_wrap;       /* Tried all network devices */
 
 enum proto_t {
        BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP,
-       TFTPSRV, TFTPPUT, LINKLOCAL, FASTBOOT, WOL, UDP
+       TFTPSRV, TFTPPUT, LINKLOCAL, FASTBOOT, WOL, UDP, NCSI
 };
 
 extern char    net_boot_file_name[1024];/* Boot File name */

diff --git a/include/phy.h b/include/phy.h
index ad2096ca84f1f5bcee709e21a78f8cef4388eb13..0737c4e8f9ae406b068f0bc6788e7031007a9e42 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -412,6 +412,8 @@ static inline bool phy_interface_is_sgmii(struct phy_device *phydev)
                phydev->interface <= PHY_INTERFACE_MODE_QSGMII;
 }
 
+bool phy_interface_is_ncsi(void);
+
 /* PHY UIDs for various PHYs that are referenced in external code */
 #define PHY_UID_CS4340         0x13e51002
 #define PHY_UID_CS4223         0x03e57003

diff --git a/net/net.c b/net/net.c
index f9d11c08d2e96701cceb66d4e6214b1af5c7e677..6987a3817b9f24b84344e689939f18577201d795 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -93,6 +93,7 @@
 #include <net.h>
 #include <net/fastboot.h>
 #include <net/tftp.h>
+#include <net/ncsi.h>
 #if defined(CONFIG_CMD_PCAP)
 #include <net/pcap.h>
 #endif
@@ -410,6 +411,16 @@ int net_loop(enum proto_t protocol)
        net_try_count = 1;
        debug_cond(DEBUG_INT_STATE, "--- net_loop Entry\n");
 
+#ifdef CONFIG_PHY_NCSI
+       if (phy_interface_is_ncsi() && protocol != NCSI && !ncsi_active()) {
+               printf("%s: configuring NCSI first\n", __func__);
+               if (net_loop(NCSI) < 0)
+                       return ret;
+               eth_init_state_only();
+               goto restart;
+       }
+#endif
+
        bootstage_mark_name(BOOTSTAGE_ID_ETH_START, "eth_start");
        net_init();
        if (eth_is_on_demand_init()) {
@@ -526,6 +537,11 @@ restart:
                case WOL:
                        wol_start();
                        break;
+#endif
+#if defined(CONFIG_PHY_NCSI)
+               case NCSI:
+                       ncsi_probe_packages();
+                       break;
 #endif
                default:
                        break;
@@ -637,7 +653,7 @@ restart:
                                env_set_hex("filesize", net_boot_file_size);
                                env_set_hex("fileaddr", image_load_addr);
                        }
-                       if (protocol != NETCONS)
+                       if (protocol != NETCONS && protocol != NCSI)
                                eth_halt();
                        else
                                eth_halt_state_only();
@@ -1321,6 +1337,11 @@ void net_process_received_packet(uchar *in_packet, int len)
        case PROT_WOL:
                wol_receive(ip, len);
                break;
+#endif
+#ifdef CONFIG_PHY_NCSI
+       case PROT_NCSI:
+               ncsi_receive(et, ip, len);
+               break;
 #endif
        }
 }
@@ -1381,6 +1402,9 @@ common:
 
 #ifdef CONFIG_CMD_RARP
        case RARP:
+#endif
+#ifdef CONFIG_PHY_NCSI
+       case NCSI:
 #endif
        case BOOTP:
        case CDP: