Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: NC-SI setup and handling

Browse source 
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>
This commit is contained in:
Samuel Mendoza-Jonas 2022-08-08 21:46:03 +09:30 • committed by Tom Rini
parent 7723828c97
commit 09bd3d0b0a
5 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/phy/ncsi.c
View file

@ -9,6 +9,7 @@
#include <log.h> #include <log.h>
#include <malloc.h> #include <malloc.h>
#include <phy.h> #include <phy.h>
#include <net.h>
#include <net/ncsi.h> #include <net/ncsi.h>
#include <net/ncsi-pkt.h> #include <net/ncsi-pkt.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>

9
drivers/net/phy/phy.c
View file

@ -1026,7 +1026,7 @@ struct phy_device *phy_connect(struct mii_dev *bus, int addr,
#endif #endif
#ifdef CONFIG_PHY_NCSI #ifdef CONFIG_PHY_NCSI
if (!phydev) if (!phydev && interface == PHY_INTERFACE_MODE_NCSI)
phydev = phy_device_create(bus, 0, PHY_NCSI_ID, false); phydev = phy_device_create(bus, 0, PHY_NCSI_ID, false);
#endif #endif
@ -1275,3 +1275,10 @@ int phy_clear_bits_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val
return 0; 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;
}

2
include/net.h
View file

@ -560,7 +560,7 @@ extern int net_restart_wrap; /* Tried all network devices */
enum proto_t { enum proto_t {
BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP, 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 */ extern char net_boot_file_name[1024];/* Boot File name */

2
include/phy.h
View file

@ -412,6 +412,8 @@ static inline bool phy_interface_is_sgmii(struct phy_device *phydev)
phydev->interface <= PHY_INTERFACE_MODE_QSGMII; phydev->interface <= PHY_INTERFACE_MODE_QSGMII;
} }
bool phy_interface_is_ncsi(void);
/* PHY UIDs for various PHYs that are referenced in external code */ /* PHY UIDs for various PHYs that are referenced in external code */
#define PHY_UID_CS4340 0x13e51002 #define PHY_UID_CS4340 0x13e51002
#define PHY_UID_CS4223 0x03e57003 #define PHY_UID_CS4223 0x03e57003

26
net/net.c
View file

@ -93,6 +93,7 @@
#include <net.h> #include <net.h>
#include <net/fastboot.h> #include <net/fastboot.h>
#include <net/tftp.h> #include <net/tftp.h>
#include <net/ncsi.h>
#if defined(CONFIG_CMD_PCAP) #if defined(CONFIG_CMD_PCAP)
#include <net/pcap.h> #include <net/pcap.h>
#endif #endif
@ -410,6 +411,16 @@ int net_loop(enum proto_t protocol)
net_try_count = 1; net_try_count = 1;
debug_cond(DEBUG_INT_STATE, "--- net_loop Entry\n"); 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"); bootstage_mark_name(BOOTSTAGE_ID_ETH_START, "eth_start");
net_init(); net_init();
if (eth_is_on_demand_init()) { if (eth_is_on_demand_init()) {
@ -526,6 +537,11 @@ restart:
case WOL: case WOL:
wol_start(); wol_start();
break; break;
#endif
#if defined(CONFIG_PHY_NCSI)
case NCSI:
ncsi_probe_packages();
break;
#endif #endif
default: default:
break; break;
@ -637,7 +653,7 @@ restart:
env_set_hex("filesize", net_boot_file_size); env_set_hex("filesize", net_boot_file_size);
env_set_hex("fileaddr", image_load_addr); env_set_hex("fileaddr", image_load_addr);
} }
if (protocol != NETCONS) if (protocol != NETCONS && protocol != NCSI)
eth_halt(); eth_halt();
else else
eth_halt_state_only(); eth_halt_state_only();
@ -1321,6 +1337,11 @@ void net_process_received_packet(uchar *in_packet, int len)
case PROT_WOL: case PROT_WOL:
wol_receive(ip, len); wol_receive(ip, len);
break; break;
#endif
#ifdef CONFIG_PHY_NCSI
case PROT_NCSI:
ncsi_receive(et, ip, len);
break;
#endif #endif
} }
} }
@ -1381,6 +1402,9 @@ common:
#ifdef CONFIG_CMD_RARP #ifdef CONFIG_CMD_RARP
case RARP: case RARP:
#endif
#ifdef CONFIG_PHY_NCSI
case NCSI:
#endif #endif
case BOOTP: case BOOTP:
case CDP: case CDP: