[PATCH v4 1/4] net: NC-SI setup and handling

[Cédric Le Goater]

On 8/8/22 14:16, Joel Stanley wrote:
> From: Samuel Mendoza-Jonas <sam at mendozajonas.com>
> 
> 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 at mendozajonas.com>
> Signed-off-by: Joel Stanley <joel at jms.id.au>

Reviewed-by: Cédric Le Goater <clg at kaod.org>

> ---
> v4: split out cmd addition into a separate patch
> v3:
>   - Fix compilation. There were no configs that enabled the NCSI phy code
>     so it had bitrotted
>   - Use NCSI_PHY instead of CMD_NCSI so NCSI can work without the command
>   - Add phy_interface_is_ncsi() helper, thanks Cédric for this suggestion
>   - Only create NCSI phy device when driver is configured for it
> 
>   include/net.h          |  2 +-
>   include/phy.h          |  2 ++
>   drivers/net/phy/ncsi.c |  1 +
>   drivers/net/phy/phy.c  |  9 ++++++++-
>   net/net.c              | 26 +++++++++++++++++++++++++-
>   5 files changed, 37 insertions(+), 3 deletions(-)
> 
> diff --git a/include/net.h b/include/net.h
> index e3889a0bc85e..0681b8246323 100644
> --- a/include/net.h
> +++ b/include/net.h
> @@ -558,7 +558,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 b32959571069..1e0f8856f629 100644
> --- a/include/phy.h
> +++ b/include/phy.h
> @@ -583,6 +583,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/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
> index bf1e832be9f1..bb7ecebed382 100644
> --- 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 1121b99abff5..d04538838852 100644
> --- 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
>   
> @@ -1101,3 +1101,10 @@ int phy_modify(struct phy_device *phydev, int devad, int regnum, u16 mask,
>   
>   	return phy_write(phydev, devad, regnum, (ret & ~mask) | set);
>   }
> +
> +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/net/net.c b/net/net.c
> index 81905f631592..f0faf33d0d77 100644
> --- 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: