net: implement NC-SI network support
Subsystems (3)
RFC PATCH 1/1 net: implement NC-SI network support
This introduces support for the NC-SI protocol to u-boot, something which so far has only been available in vendor trees.
NC-SI (Network Controller Sideband Interface) is a protocol to manage a sideband connection to a proper network interface, for example a BMC (Baseboard Management Controller) sharing the NIC of the host system. Probing and configuration occurs by communicating with the "remote" NIC via NC-SI control frames (Ethernet header 0x88f8).
This implementation is roughly based on the upstream Linux implementation[0], with a reduced feature set and an emphasis on getting a link up as fast as possible rather than probing the full possible topology of the bus.
At the moment the NC-SI functionality is implemented as a phy driver, with the ftgmac100 driver including support for using it instead of the mdio phy (also similar to in linux). Since NC-SI configuration must be done before any other network operation, but in it's current implementation depends on the net_loop() infrastructure, the NC-SI configuration is performed at the start of a call to net_loop(). There is probably a better way of fitting this in but for the moment it makes sure that the configuration occurs at the right time. Configuration can also be done by calling 'ncsi' directly.
There are some supporting patches related to this for full support on the AST2x00 platforms we're targeting this for but I'm sending this up to see if I'm on the right track for integrating this with the network infrastructure or if there's a more elegant method. Comments and advice very welcome!
An example of NC-SI setup before a normal network command:
=> dhcpnet_loop: configuring NCSI first
ethernet at 1e660000: link up, 100 Mbps full-duplex mac:f6:55:52:d0:4b:40
NCSI: probing channels
NCSI: configuring channel 0
NCSI: configuration done!
BOOTP broadcast 1
BOOTP broadcast 2
BOOTP broadcast 3
DHCP client bound to address 10.61.254.32 (1024 ms)
*** Warning: no boot file name; using '0A3DFE20.img'
Using ethernet at 1e660000 device
TFTP from server 10.61.2.7; our IP address is 10.61.254.32 Filename '0A3DFE20.img'.
Load address: 0x83000000
Loading: *
TFTP error: 'File not found' (1)
Not retrying...
[0] https://github.com/torvalds/linux/tree/master/net/ncsi
--- cmd/Kconfig | 6 + cmd/net.c | 18 + drivers/net/ftgmac100.c | 36 +- drivers/net/phy/Kconfig | 4 + drivers/net/phy/Makefile | 1 + drivers/net/phy/ncsi.c | 867 +++++++++++++++++++++++++++++++++++++++ drivers/net/phy/phy.c | 7 + include/net.h | 3 +- include/net/ncsi-pkt.h | 415 +++++++++++++++++++ include/net/ncsi.h | 7 + include/phy.h | 12 + include/phy_interface.h | 2 + net/net.c | 28 +- 13 files changed, 1394 insertions(+), 12 deletions(-) create mode 100644 drivers/net/phy/ncsi.c create mode 100644 include/net/ncsi-pkt.h create mode 100644 include/net/ncsi.h
cmd/Kconfig +6 -0
@@ -1332,6 +1332,12 @@ config CMD_LINK_LOCAL help Acquire a network IP address using the link-local protocol +config CMD_NCSI + bool "ncsi" + depends on PHY_NCSI + help + Configure the attached NIC via NC-SI + endif config CMD_ETHSW
cmd/net.c +18 -0
@@ -457,3 +457,21 @@ U_BOOT_CMD( );#endif /* CONFIG_CMD_LINK_LOCAL */ + +#if defined(CONFIG_CMD_NCSI ) +static int do_ncsi (cmd_tbl_t *cmdtp,int flag,int argc, +char *const argv[]) +{ +if (net_loop (NCSI ) <0 ) +return CMD_RET_FAILURE ; + +return CMD_RET_SUCCESS ; +} + +U_BOOT_CMD ( + ncsi,1 ,1 , do_ncsi, +"Configure attached NIC via NC-SI" , +"" +); + +#endif /* CONFIG_CMD_NCSI */
drivers/net/ftgmac100.c +26 -10
@@ -18,6 +18,7 @@#include <wait_bit.h> #include <linux/io.h> #include <linux/iopoll.h> +#include <net/ncsi.h> #include "ftgmac100.h"
@@ -81,6 +82,7 @@ struct ftgmac100_data {struct mii_dev *bus;u32 phy_mode;u32 max_speed; +bool ncsi_mode;struct clk_bulk clks;
@@ -181,7 +183,7 @@ static int ftgmac100_phy_adjust_link(struct ftgmac100_data *priv)struct phy_device *phydev = priv->phydev;u32 maccr; -if (!phydev->link) { +if (!phydev->link && !priv->ncsi_mode) {dev_err (phydev->dev,"No link\n" );return -EREMOTEIO ; }
@@ -217,7 +219,8 @@ static int ftgmac100_phy_init(struct udevice *dev)if (!phydev)return -ENODEV ; - phydev->supported &=PHY_GBIT_FEATURES ; +if (!priv->ncsi_mode) + phydev->supported &=PHY_GBIT_FEATURES ;if (priv->max_speed) { ret =phy_set_supported (phydev, priv->max_speed);if (ret)
@@ -275,7 +278,8 @@ static void ftgmac100_stop(struct udevice *dev)writel (0 , &ftgmac100->maccr); -phy_shutdown (priv->phydev); +if (!priv->ncsi_mode) +phy_shutdown (priv->phydev); }static int ftgmac100_start (struct udevice *dev)
@@ -513,6 +517,7 @@ static int ftgmac100_ofdata_to_platdata(struct udevice *dev) pdata->iobase =devfdt_get_addr (dev); pdata->phy_interface =-1 ; phy_mode =dev_read_string (dev,"phy-mode" ); +if (phy_mode) pdata->phy_interface =phy_get_interface_by_name (phy_mode);if (pdata->phy_interface ==-1 ) {
@@ -539,6 +544,8 @@ static int ftgmac100_probe(struct udevice *dev)struct ftgmac100_data *priv =dev_get_priv (dev);int ret; + priv->ncsi_mode =dev_read_bool (dev,"use-ncsi" ); + priv->iobase = (struct ftgmac100 *)pdata->iobase; priv->phy_mode = pdata->phy_interface; priv->max_speed = pdata->max_speed;
@@ -548,10 +555,15 @@ static int ftgmac100_probe(struct udevice *dev)if (ret) goto out; - ret =ftgmac100_mdio_init (dev); -if (ret) { -dev_err (dev,"Failed to initialize mdiobus: %d\n" , ret); - goto out; +if (priv->ncsi_mode) { +printf ("%s - NCSI detected\n" , __func__); + }else { + ret =ftgmac100_mdio_init (dev); +if (ret) { +dev_err (dev,"Failed to initialize mdiobus: %d\n" , ret); + goto out; + } + } ret =ftgmac100_phy_init (dev);
@@ -571,9 +583,13 @@ static int ftgmac100_remove(struct udevice *dev) {struct ftgmac100_data *priv =dev_get_priv (dev); -free (priv->phydev); -mdio_unregister (priv->bus); -mdio_free (priv->bus); +if (!priv->ncsi_mode) { +free (priv->phydev); +mdio_unregister (priv->bus); +mdio_free (priv->bus); + }else { +free (priv->phydev); + }clk_release_bulk (&priv->clks);return 0 ;
drivers/net/phy/Kconfig +4 -0
@@ -238,4 +238,8 @@ config PHY_FIXED on, the link is always up with fixed speed and fixed duplex-setting. More information: doc/device-tree-bindings/net/fixed-link.txt +config PHY_NCSI + bool "NC-SI based PHY" + depends on DM_ETH + endif #PHYLIB
drivers/net/phy/Makefile +1 -0
@@ -30,3 +30,4 @@ obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o obj-$(CONFIG_PHY_VITESSE) += vitesse.o obj-$(CONFIG_PHY_MSCC) += mscc.o obj-$(CONFIG_PHY_FIXED) += fixed.o +obj-$(CONFIG_PHY_NCSI) += ncsi.o
drivers/net/phy/ncsi.c new file +867 -0
867 lines not on this page · raw message
drivers/net/phy/phy.c +7 -0
@@ -539,6 +539,9 @@ int phy_init(void)#endif #ifdef CONFIG_PHY_FIXED phy_fixed_init (); +#endif +#ifdef CONFIG_PHY_NCSI +phy_ncsi_init ();#endif return 0 ; }
@@ -947,6 +950,10 @@ struct phy_device *phy_connect(struct mii_dev *bus, int addr, phydev =phy_connect_fixed (bus, dev, interface);#endif +#ifdef CONFIG_PHY_NCSI + phydev =phy_device_create (bus,0 ,PHY_NCSI_ID , false, interface); +#endif +if (!phydev) phydev =phy_find_by_mask (bus, mask, interface);
include/net.h +2 -1
@@ -343,6 +343,7 @@ struct vlan_ethernet_hdr {#define PROT_VLAN 0x8100/* IEEE 802.1q protocol */ #define PROT_IPV6 0x86dd/* IPv6 over bluebook */ #define PROT_PPP_SES 0x8864/* PPPoE session messages */ +#define PROT_NCSI 0x88f8/* NC-SI control packets */ #define IPPROTO_ICMP 1/* Internet Control Message Protocol */ #define IPPROTO_UDP 17/* User Datagram Protocol */
@@ -530,7 +531,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 +TFTPSRV ,TFTPPUT ,LINKLOCAL ,FASTBOOT ,WOL ,NCSI };extern char net_boot_file_name[1024 ];/* Boot File name */
include/net/ncsi-pkt.h new file +415 -0
415 lines not on this page · raw message
include/net/ncsi.h new file +7 -0
@@ -0,0 +1,7 @@ +#include <common.h> +#include <phy.h> + +void ncsi_receive (struct ethernet_hdr *et,struct ip_udp_hdr *ip, +unsigned int len); +void ncsi_probe_packages (void ); +int ncsi_probe (struct phy_device *phydev);
include/phy.h +12 -0
@@ -17,6 +17,7 @@#include <phy_interface.h> #define PHY_FIXED_ID 0xa5a55a5a +#define PHY_NCSI_ID 0xbeefcafe#define PHY_MAX_ADDR 32
@@ -162,6 +163,11 @@ static inline int phy_read(struct phy_device *phydev, int devad, int regnum) {struct mii_dev *bus = phydev->bus; +if (!bus || !bus->read) { +debug ("%s: No bus configured\n" , __func__); +return 0 ; + } +return bus->read (bus, phydev->addr, devad, regnum); }
@@ -170,6 +176,11 @@ static inline int phy_write(struct phy_device *phydev, int devad, int regnum, {struct mii_dev *bus = phydev->bus; +if (!bus || !bus->read) { +debug ("%s: No bus configured\n" , __func__); +return 0 ; + } +return bus->write (bus, phydev->addr, devad, regnum, val); }
@@ -311,6 +322,7 @@ int phy_vitesse_init(void);int phy_xilinx_init (void );int phy_mscc_init (void );int phy_fixed_init (void ); +int phy_ncsi_init (void );int board_phy_config (struct phy_device *phydev);int get_phy_id (struct mii_dev *bus,int addr,int devad,u32 *phy_id);
include/phy_interface.h +2 -0
@@ -31,6 +31,7 @@ typedef enum {PHY_INTERFACE_MODE_XLAUI ,PHY_INTERFACE_MODE_CAUI2 ,PHY_INTERFACE_MODE_CAUI4 , +PHY_INTERFACE_MODE_NCSI ,PHY_INTERFACE_MODE_NONE ,/* Must be last */ PHY_INTERFACE_MODE_COUNT,
@@ -58,6 +59,7 @@ static const char * const phy_interface_strings[] = { [PHY_INTERFACE_MODE_XLAUI] = "xlaui4", [PHY_INTERFACE_MODE_CAUI2] = "caui2", [PHY_INTERFACE_MODE_CAUI4] = "caui4", + [PHY_INTERFACE_MODE_NCSI] = "NC-SI", [PHY_INTERFACE_MODE_NONE] = "", };
net/net.c +27 -1
@@ -95,6 +95,7 @@#include <net.h> #include <net/fastboot.h> #include <net/tftp.h> +#include <net/ncsi.h> #if defined(CONFIG_LED_STATUS )#include <miiphy.h> #include <status_led.h>
@@ -407,6 +408,17 @@ int net_loop(enum proto_t protocol) net_try_count =1 ;debug_cond (DEBUG_INT_STATE ,"--- net_loop Entry\n" ); +#ifdef CONFIG_PHY_NCSI +// TODO Only call if not configured already +if (protocol !=NCSI ) { +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 () || protocol !=NETCONS ) {
@@ -420,6 +432,7 @@ int net_loop(enum proto_t protocol) }else {eth_init_state_only (); } + restart: #ifdef CONFIG_USB_KEYBOARD net_busy_flag =0 ;
@@ -526,6 +539,11 @@ restart:case WOL :wol_start ();break ; +#endif +#if defined(CONFIG_CMD_NCSI ) +case NCSI : +ncsi_probe_packages (); +break ;#endif default :break ;
@@ -637,7 +655,7 @@ restart:env_set_hex ("filesize" , net_boot_file_size);env_set_hex ("fileaddr" , load_addr); } -if (protocol !=NETCONS ) +if (protocol !=NETCONS && protocol !=NCSI )eth_halt ();else eth_halt_state_only ();
@@ -1318,6 +1336,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 } }
@@ -1379,6 +1402,9 @@ common:#ifdef CONFIG_CMD_RARP case RARP : +#endif +#ifdef CONFIG_CMD_NCSI +case NCSI :#endif case BOOTP :case CDP :
Signature · 1 line
2.21.0