Merge tag 'ti-v2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
[oweals/u-boot.git] / lib / efi_loader / efi_net.c
index 4e8b2d597dfd6040dc79f0a69a6d3df6e43bcf72..22f0123eca4790753d62af98ca67a2667488375f 100644 (file)
@@ -1,19 +1,33 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- *  EFI application network access support
+ * Simple network protocol
+ * PXE base code protocol
  *
- *  Copyright (c) 2016 Alexander Graf
+ * Copyright (c) 2016 Alexander Graf
+ *
+ * The simple network protocol has the following statuses and services
+ * to move between them:
+ *
+ * Start():     EfiSimpleNetworkStopped     -> EfiSimpleNetworkStarted
+ * Initialize(): EfiSimpleNetworkStarted     -> EfiSimpleNetworkInitialized
+ * Shutdown():  EfiSimpleNetworkInitialized -> EfiSimpleNetworkStarted
+ * Stop():      EfiSimpleNetworkStarted     -> EfiSimpleNetworkStopped
+ * Reset():     EfiSimpleNetworkInitialized -> EfiSimpleNetworkInitialized
  */
 
 #include <common.h>
 #include <efi_loader.h>
 #include <malloc.h>
+#include <net.h>
 
-static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_GUID;
-static const efi_guid_t efi_pxe_guid = EFI_PXE_GUID;
+static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
+static const efi_guid_t efi_pxe_base_code_protocol_guid =
+                                       EFI_PXE_BASE_CODE_PROTOCOL_GUID;
 static struct efi_pxe_packet *dhcp_ack;
 static bool new_rx_packet;
 static void *new_tx_packet;
+static void *transmit_buffer;
+
 /*
  * The notification function of this event is called in every timer cycle
  * to check if a new network packet has been received.
@@ -24,33 +38,91 @@ static struct efi_event *network_timer_event;
  */
 static struct efi_event *wait_for_packet;
 
+/**
+ * struct efi_net_obj - EFI object representing a network interface
+ *
+ * @header:    EFI object header
+ * @net:       simple network protocol interface
+ * @net_mode:  status of the network interface
+ * @pxe:       PXE base code protocol interface
+ * @pxe_mode:  status of the PXE base code protocol
+ */
 struct efi_net_obj {
-       /* Generic EFI object parent class data */
-       struct efi_object parent;
-       /* EFI Interface callback struct for network */
+       struct efi_object header;
        struct efi_simple_network net;
        struct efi_simple_network_mode net_mode;
-       /* PXE struct to transmit dhcp data */
-       struct efi_pxe pxe;
+       struct efi_pxe_base_code_protocol pxe;
        struct efi_pxe_mode pxe_mode;
 };
 
+/*
+ * efi_net_start() - start the network interface
+ *
+ * This function implements the Start service of the
+ * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface
+ * (UEFI) specification for details.
+ *
+ * @this:      pointer to the protocol instance
+ * Return:     status code
+ */
 static efi_status_t EFIAPI efi_net_start(struct efi_simple_network *this)
 {
+       efi_status_t ret = EFI_SUCCESS;
+
        EFI_ENTRY("%p", this);
 
-       return EFI_EXIT(EFI_SUCCESS);
+       /* Check parameters */
+       if (!this) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       if (this->mode->state != EFI_NETWORK_STOPPED) {
+               ret = EFI_ALREADY_STARTED;
+       } else {
+               this->int_status = 0;
+               wait_for_packet->is_signaled = false;
+               this->mode->state = EFI_NETWORK_STARTED;
+       }
+out:
+       return EFI_EXIT(ret);
 }
 
+/*
+ * efi_net_stop() - stop the network interface
+ *
+ * This function implements the Stop service of the
+ * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface
+ * (UEFI) specification for details.
+ *
+ * @this:      pointer to the protocol instance
+ * Return:     status code
+ */
 static efi_status_t EFIAPI efi_net_stop(struct efi_simple_network *this)
 {
+       efi_status_t ret = EFI_SUCCESS;
+
        EFI_ENTRY("%p", this);
 
-       return EFI_EXIT(EFI_SUCCESS);
+       /* Check parameters */
+       if (!this) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       if (this->mode->state == EFI_NETWORK_STOPPED) {
+               ret = EFI_NOT_STARTED;
+       } else {
+               /* Disable hardware and put it into the reset state */
+               eth_halt();
+               this->mode->state = EFI_NETWORK_STOPPED;
+       }
+out:
+       return EFI_EXIT(ret);
 }
 
 /*
- * Initialize network adapter and allocate transmit and receive buffers.
+ * efi_net_initialize() - initialize the network interface
  *
  * This function implements the Initialize service of the
  * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface
@@ -59,7 +131,7 @@ static efi_status_t EFIAPI efi_net_stop(struct efi_simple_network *this)
  * @this:      pointer to the protocol instance
  * @extra_rx:  extra receive buffer to be allocated
  * @extra_tx:  extra transmit buffer to be allocated
- * @return:    status code
+ * Return:     status code
  */
 static efi_status_t EFIAPI efi_net_initialize(struct efi_simple_network *this,
                                              ulong extra_rx, ulong extra_tx)
@@ -69,9 +141,19 @@ static efi_status_t EFIAPI efi_net_initialize(struct efi_simple_network *this,
 
        EFI_ENTRY("%p, %lx, %lx", this, extra_rx, extra_tx);
 
+       /* Check parameters */
        if (!this) {
                r = EFI_INVALID_PARAMETER;
-               goto error;
+               goto out;
+       }
+
+       switch (this->mode->state) {
+       case EFI_NETWORK_INITIALIZED:
+       case EFI_NETWORK_STARTED:
+               break;
+       default:
+               r = EFI_NOT_STARTED;
+               goto out;
        }
 
        /* Setup packet buffers */
@@ -84,32 +166,120 @@ static efi_status_t EFIAPI efi_net_initialize(struct efi_simple_network *this,
        ret = eth_init();
        if (ret < 0) {
                eth_halt();
+               this->mode->state = EFI_NETWORK_STOPPED;
                r = EFI_DEVICE_ERROR;
+               goto out;
+       } else {
+               this->int_status = 0;
+               wait_for_packet->is_signaled = false;
+               this->mode->state = EFI_NETWORK_INITIALIZED;
        }
-
-error:
+out:
        return EFI_EXIT(r);
 }
 
+/*
+ * efi_net_reset() - reinitialize the network interface
+ *
+ * This function implements the Reset service of the
+ * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface
+ * (UEFI) specification for details.
+ *
+ * @this:                      pointer to the protocol instance
+ * @extended_verification:     execute exhaustive verification
+ * Return:                     status code
+ */
 static efi_status_t EFIAPI efi_net_reset(struct efi_simple_network *this,
                                         int extended_verification)
 {
+       efi_status_t ret;
+
        EFI_ENTRY("%p, %x", this, extended_verification);
 
-       return EFI_EXIT(EFI_SUCCESS);
+       /* Check parameters */
+       if (!this) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       switch (this->mode->state) {
+       case EFI_NETWORK_INITIALIZED:
+               break;
+       case EFI_NETWORK_STOPPED:
+               ret = EFI_NOT_STARTED;
+               goto out;
+       default:
+               ret = EFI_DEVICE_ERROR;
+               goto out;
+       }
+
+       this->mode->state = EFI_NETWORK_STARTED;
+       ret = EFI_CALL(efi_net_initialize(this, 0, 0));
+out:
+       return EFI_EXIT(ret);
 }
 
+/*
+ * efi_net_shutdown() - shut down the network interface
+ *
+ * This function implements the Shutdown service of the
+ * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface
+ * (UEFI) specification for details.
+ *
+ * @this:      pointer to the protocol instance
+ * Return:     status code
+ */
 static efi_status_t EFIAPI efi_net_shutdown(struct efi_simple_network *this)
 {
+       efi_status_t ret = EFI_SUCCESS;
+
        EFI_ENTRY("%p", this);
 
-       return EFI_EXIT(EFI_SUCCESS);
+       /* Check parameters */
+       if (!this) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       switch (this->mode->state) {
+       case EFI_NETWORK_INITIALIZED:
+               break;
+       case EFI_NETWORK_STOPPED:
+               ret = EFI_NOT_STARTED;
+               goto out;
+       default:
+               ret = EFI_DEVICE_ERROR;
+               goto out;
+       }
+
+       eth_halt();
+       this->int_status = 0;
+       wait_for_packet->is_signaled = false;
+       this->mode->state = EFI_NETWORK_STARTED;
+
+out:
+       return EFI_EXIT(ret);
 }
 
-static efi_status_t EFIAPI efi_net_receive_filters(
-               struct efi_simple_network *this, u32 enable, u32 disable,
-               int reset_mcast_filter, ulong mcast_filter_count,
-               struct efi_mac_address *mcast_filter)
+/*
+ * efi_net_receive_filters() - mange multicast receive filters
+ *
+ * This function implements the ReceiveFilters service of the
+ * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface
+ * (UEFI) specification for details.
+ *
+ * @this:              pointer to the protocol instance
+ * @enable:            bit mask of receive filters to enable
+ * @disable:           bit mask of receive filters to disable
+ * @reset_mcast_filter:        true resets contents of the filters
+ * @mcast_filter_count:        number of hardware MAC addresses in the new filters list
+ * @mcast_filter:      list of new filters
+ * Return:             status code
+ */
+static efi_status_t EFIAPI efi_net_receive_filters
+               (struct efi_simple_network *this, u32 enable, u32 disable,
+                int reset_mcast_filter, ulong mcast_filter_count,
+                struct efi_mac_address *mcast_filter)
 {
        EFI_ENTRY("%p, %x, %x, %x, %lx, %p", this, enable, disable,
                  reset_mcast_filter, mcast_filter_count, mcast_filter);
@@ -117,15 +287,40 @@ static efi_status_t EFIAPI efi_net_receive_filters(
        return EFI_EXIT(EFI_UNSUPPORTED);
 }
 
-static efi_status_t EFIAPI efi_net_station_address(
-               struct efi_simple_network *this, int reset,
-               struct efi_mac_address *new_mac)
+/*
+ * efi_net_station_address() - set the hardware MAC address
+ *
+ * This function implements the StationAddress service of the
+ * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface
+ * (UEFI) specification for details.
+ *
+ * @this:      pointer to the protocol instance
+ * @reset:     if true reset the address to default
+ * @new_mac:   new MAC address
+ * Return:     status code
+ */
+static efi_status_t EFIAPI efi_net_station_address
+               (struct efi_simple_network *this, int reset,
+                struct efi_mac_address *new_mac)
 {
        EFI_ENTRY("%p, %x, %p", this, reset, new_mac);
 
        return EFI_EXIT(EFI_UNSUPPORTED);
 }
 
+/*
+ * efi_net_statistics() - reset or collect statistics of the network interface
+ *
+ * This function implements the Statistics service of the
+ * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface
+ * (UEFI) specification for details.
+ *
+ * @this:      pointer to the protocol instance
+ * @reset:     if true, the statistics are reset
+ * @stat_size: size of the statistics table
+ * @stat_table:        table to receive the statistics
+ * Return:     status code
+ */
 static efi_status_t EFIAPI efi_net_statistics(struct efi_simple_network *this,
                                              int reset, ulong *stat_size,
                                              void *stat_table)
@@ -135,16 +330,82 @@ static efi_status_t EFIAPI efi_net_statistics(struct efi_simple_network *this,
        return EFI_EXIT(EFI_UNSUPPORTED);
 }
 
+/*
+ * efi_net_mcastiptomac() - translate multicast IP address to MAC address
+ *
+ * This function implements the MCastIPtoMAC service of the
+ * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface
+ * (UEFI) specification for details.
+ *
+ * @this:      pointer to the protocol instance
+ * @ipv6:      true if the IP address is an IPv6 address
+ * @ip:                IP address
+ * @mac:       MAC address
+ * Return:     status code
+ */
 static efi_status_t EFIAPI efi_net_mcastiptomac(struct efi_simple_network *this,
                                                int ipv6,
                                                struct efi_ip_address *ip,
                                                struct efi_mac_address *mac)
 {
+       efi_status_t ret = EFI_SUCCESS;
+
        EFI_ENTRY("%p, %x, %p, %p", this, ipv6, ip, mac);
 
-       return EFI_EXIT(EFI_INVALID_PARAMETER);
+       if (!this || !ip || !mac) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       if (ipv6) {
+               ret = EFI_UNSUPPORTED;
+               goto out;
+       }
+
+       /* Multi-cast addresses are in the range 224.0.0.0 - 239.255.255.255 */
+       if ((ip->ip_addr[0] & 0xf0) != 0xe0) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       };
+
+       switch (this->mode->state) {
+       case EFI_NETWORK_INITIALIZED:
+       case EFI_NETWORK_STARTED:
+               break;
+       default:
+               ret = EFI_NOT_STARTED;
+               goto out;
+       }
+
+       memset(mac, 0, sizeof(struct efi_mac_address));
+
+       /*
+        * Copy lower 23 bits of IPv4 multi-cast address
+        * RFC 1112, RFC 7042 2.1.1.
+        */
+       mac->mac_addr[0] = 0x01;
+       mac->mac_addr[1] = 0x00;
+       mac->mac_addr[2] = 0x5E;
+       mac->mac_addr[3] = ip->ip_addr[1] & 0x7F;
+       mac->mac_addr[4] = ip->ip_addr[2];
+       mac->mac_addr[5] = ip->ip_addr[3];
+out:
+       return EFI_EXIT(ret);
 }
 
+/**
+ * efi_net_nvdata() - read or write NVRAM
+ *
+ * This function implements the GetStatus service of the Simple Network
+ * Protocol. See the UEFI spec for details.
+ *
+ * @this:              the instance of the Simple Network Protocol
+ * @read_write:                true for read, false for write
+ * @offset:            offset in NVRAM
+ * @buffer_size:       size of buffer
+ * @buffer:            buffer
+ * Return:             status code
+ */
 static efi_status_t EFIAPI efi_net_nvdata(struct efi_simple_network *this,
                                          int read_write, ulong offset,
                                          ulong buffer_size, char *buffer)
@@ -155,82 +416,165 @@ static efi_status_t EFIAPI efi_net_nvdata(struct efi_simple_network *this,
        return EFI_EXIT(EFI_UNSUPPORTED);
 }
 
+/**
+ * efi_net_get_status() - get interrupt status
+ *
+ * This function implements the GetStatus service of the Simple Network
+ * Protocol. See the UEFI spec for details.
+ *
+ * @this:              the instance of the Simple Network Protocol
+ * @int_status:                interface status
+ * @txbuf:             transmission buffer
+ */
 static efi_status_t EFIAPI efi_net_get_status(struct efi_simple_network *this,
                                              u32 *int_status, void **txbuf)
 {
+       efi_status_t ret = EFI_SUCCESS;
+
        EFI_ENTRY("%p, %p, %p", this, int_status, txbuf);
 
        efi_timer_check();
 
+       /* Check parameters */
+       if (!this) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       switch (this->mode->state) {
+       case EFI_NETWORK_STOPPED:
+               ret = EFI_NOT_STARTED;
+               goto out;
+       case EFI_NETWORK_STARTED:
+               ret = EFI_DEVICE_ERROR;
+               goto out;
+       default:
+               break;
+       }
+
        if (int_status) {
-               /* We send packets synchronously, so nothing is outstanding */
-               *int_status = EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT;
-               if (new_rx_packet)
-                       *int_status |= EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT;
+               *int_status = this->int_status;
+               this->int_status = 0;
        }
        if (txbuf)
                *txbuf = new_tx_packet;
 
        new_tx_packet = NULL;
-
-       return EFI_EXIT(EFI_SUCCESS);
+out:
+       return EFI_EXIT(ret);
 }
 
-static efi_status_t EFIAPI efi_net_transmit(struct efi_simple_network *this,
-               size_t header_size, size_t buffer_size, void *buffer,
-               struct efi_mac_address *src_addr,
-               struct efi_mac_address *dest_addr, u16 *protocol)
+/**
+ * efi_net_transmit() - transmit a packet
+ *
+ * This function implements the Transmit service of the Simple Network Protocol.
+ * See the UEFI spec for details.
+ *
+ * @this:              the instance of the Simple Network Protocol
+ * @header_size:       size of the media header
+ * @buffer_size:       size of the buffer to receive the packet
+ * @buffer:            buffer to receive the packet
+ * @src_addr:          source hardware MAC address
+ * @dest_addr:         destination hardware MAC address
+ * @protocol:          type of header to build
+ * Return:             status code
+ */
+static efi_status_t EFIAPI efi_net_transmit
+               (struct efi_simple_network *this, size_t header_size,
+                size_t buffer_size, void *buffer,
+                struct efi_mac_address *src_addr,
+                struct efi_mac_address *dest_addr, u16 *protocol)
 {
+       efi_status_t ret = EFI_SUCCESS;
+
        EFI_ENTRY("%p, %lu, %lu, %p, %p, %p, %p", this,
                  (unsigned long)header_size, (unsigned long)buffer_size,
                  buffer, src_addr, dest_addr, protocol);
 
        efi_timer_check();
 
+       /* Check parameters */
+       if (!this || !buffer) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       /* We do not support jumbo packets */
+       if (buffer_size > PKTSIZE_ALIGN) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       /* At least the IP header has to fit into the buffer */
+       if (buffer_size < this->mode->media_header_size) {
+               ret = EFI_BUFFER_TOO_SMALL;
+               goto out;
+       }
+
+       /*
+        * TODO:
+        * Support VLANs. Use net_set_ether() for copying the header. Use a
+        * U_BOOT_ENV_CALLBACK to update the media header size.
+        */
        if (header_size) {
-               /* We would need to create the header if header_size != 0 */
-               return EFI_EXIT(EFI_INVALID_PARAMETER);
+               struct ethernet_hdr *header = buffer;
+
+               if (!dest_addr || !protocol ||
+                   header_size != this->mode->media_header_size) {
+                       ret = EFI_INVALID_PARAMETER;
+                       goto out;
+               }
+               if (!src_addr)
+                       src_addr = &this->mode->current_address;
+
+               memcpy(header->et_dest, dest_addr, ARP_HLEN);
+               memcpy(header->et_src, src_addr, ARP_HLEN);
+               header->et_protlen = htons(*protocol);
+       }
+
+       switch (this->mode->state) {
+       case EFI_NETWORK_STOPPED:
+               ret = EFI_NOT_STARTED;
+               goto out;
+       case EFI_NETWORK_STARTED:
+               ret = EFI_DEVICE_ERROR;
+               goto out;
+       default:
+               break;
        }
 
-#ifdef CONFIG_EFI_LOADER_BOUNCE_BUFFER
        /* Ethernet packets always fit, just bounce */
-       memcpy(efi_bounce_buffer, buffer, buffer_size);
-       net_send_packet(efi_bounce_buffer, buffer_size);
-#else
-       net_send_packet(buffer, buffer_size);
-#endif
+       memcpy(transmit_buffer, buffer, buffer_size);
+       net_send_packet(transmit_buffer, buffer_size);
 
        new_tx_packet = buffer;
-
-       return EFI_EXIT(EFI_SUCCESS);
-}
-
-static void efi_net_push(void *pkt, int len)
-{
-       new_rx_packet = true;
-       wait_for_packet->is_signaled = true;
+       this->int_status |= EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT;
+out:
+       return EFI_EXIT(ret);
 }
 
-/*
- * Receive a packet from a network interface.
+/**
+ * efi_net_receive() - receive a packet from a network interface
  *
  * This function implements the Receive service of the Simple Network Protocol.
  * See the UEFI spec for details.
  *
- * @this       the instance of the Simple Network Protocol
- * @header_size        size of the media header
- * @buffer_size        size of the buffer to receive the packet
- * @buffer     buffer to receive the packet
- * @src_addr   source MAC address
- * @dest_addr  destination MAC address
- * @protocol   protocol
- * @return     status code
+ * @this:              the instance of the Simple Network Protocol
+ * @header_size:       size of the media header
+ * @buffer_size:       size of the buffer to receive the packet
+ * @buffer:            buffer to receive the packet
+ * @src_addr:          source MAC address
+ * @dest_addr:         destination MAC address
+ * @protocol:          protocol
+ * Return:             status code
  */
-static efi_status_t EFIAPI efi_net_receive(struct efi_simple_network *this,
-               size_t *header_size, size_t *buffer_size, void *buffer,
-               struct efi_mac_address *src_addr,
-               struct efi_mac_address *dest_addr, u16 *protocol)
+static efi_status_t EFIAPI efi_net_receive
+               (struct efi_simple_network *this, size_t *header_size,
+                size_t *buffer_size, void *buffer,
+                struct efi_mac_address *src_addr,
+                struct efi_mac_address *dest_addr, u16 *protocol)
 {
+       efi_status_t ret = EFI_SUCCESS;
        struct ethernet_hdr *eth_hdr;
        size_t hdr_size = sizeof(struct ethernet_hdr);
        u16 protlen;
@@ -238,14 +582,29 @@ static efi_status_t EFIAPI efi_net_receive(struct efi_simple_network *this,
        EFI_ENTRY("%p, %p, %p, %p, %p, %p, %p", this, header_size,
                  buffer_size, buffer, src_addr, dest_addr, protocol);
 
+       /* Execute events */
        efi_timer_check();
 
-       if (!new_rx_packet)
-               return EFI_EXIT(EFI_NOT_READY);
-       /* Check that we at least received an Ethernet header */
-       if (net_rx_packet_len < sizeof(struct ethernet_hdr)) {
-               new_rx_packet = false;
-               return EFI_EXIT(EFI_NOT_READY);
+       /* Check parameters */
+       if (!this || !buffer || !buffer_size) {
+               ret = EFI_INVALID_PARAMETER;
+               goto out;
+       }
+
+       switch (this->mode->state) {
+       case EFI_NETWORK_STOPPED:
+               ret = EFI_NOT_STARTED;
+               goto out;
+       case EFI_NETWORK_STARTED:
+               ret = EFI_DEVICE_ERROR;
+               goto out;
+       default:
+               break;
+       }
+
+       if (!new_rx_packet) {
+               ret = EFI_NOT_READY;
+               goto out;
        }
        /* Fill export parameters */
        eth_hdr = (struct ethernet_hdr *)net_rx_packet;
@@ -263,18 +622,28 @@ static efi_status_t EFIAPI efi_net_receive(struct efi_simple_network *this,
        if (protocol)
                *protocol = protlen;
        if (*buffer_size < net_rx_packet_len) {
-               /* Packet doesn't fit, try again with bigger buf */
+               /* Packet doesn't fit, try again with bigger buffer */
                *buffer_size = net_rx_packet_len;
-               return EFI_EXIT(EFI_BUFFER_TOO_SMALL);
+               ret = EFI_BUFFER_TOO_SMALL;
+               goto out;
        }
        /* Copy packet */
        memcpy(buffer, net_rx_packet, net_rx_packet_len);
        *buffer_size = net_rx_packet_len;
-       new_rx_packet = false;
-
-       return EFI_EXIT(EFI_SUCCESS);
+       new_rx_packet = 0;
+       this->int_status &= ~EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT;
+out:
+       return EFI_EXIT(ret);
 }
 
+/**
+ * efi_net_set_dhcp_ack() - take note of a selected DHCP IP address
+ *
+ * This function is called by dhcp_handler().
+ *
+ * @pkt:       packet received by dhcp_handler()
+ * @len:       length of the packet received
+ */
 void efi_net_set_dhcp_ack(void *pkt, int len)
 {
        int maxsize = sizeof(*dhcp_ack);
@@ -285,58 +654,212 @@ void efi_net_set_dhcp_ack(void *pkt, int len)
        memcpy(dhcp_ack, pkt, min(len, maxsize));
 }
 
-/*
- * Check if a new network packet has been received.
+/**
+ * efi_net_push() - callback for received network packet
+ *
+ * This function is called when a network packet is received by eth_rx().
+ *
+ * @pkt:       network packet
+ * @len:       length
+ */
+static void efi_net_push(void *pkt, int len)
+{
+       new_rx_packet = true;
+}
+
+/**
+ * efi_network_timer_notify() - check if a new network packet has been received
  *
  * This notification function is called in every timer cycle.
  *
- * @event      the event for which this notification function is registered
- * @context    event context - not used in this function
+ * @event:     the event for which this notification function is registered
+ * @context:   event context - not used in this function
  */
 static void EFIAPI efi_network_timer_notify(struct efi_event *event,
                                            void *context)
 {
+       struct efi_simple_network *this = (struct efi_simple_network *)context;
+
        EFI_ENTRY("%p, %p", event, context);
 
+       /*
+        * Some network drivers do not support calling eth_rx() before
+        * initialization.
+        */
+       if (!this || this->mode->state != EFI_NETWORK_INITIALIZED)
+               goto out;
+
        if (!new_rx_packet) {
                push_packet = efi_net_push;
                eth_rx();
                push_packet = NULL;
+               if (new_rx_packet) {
+                       /* Check that we at least received an Ethernet header */
+                       if (net_rx_packet_len >=
+                           sizeof(struct ethernet_hdr)) {
+                               this->int_status |=
+                                       EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT;
+                               wait_for_packet->is_signaled = true;
+                       } else {
+                               new_rx_packet = 0;
+                       }
+               }
        }
+out:
        EFI_EXIT(EFI_SUCCESS);
 }
 
-/* This gets called from do_bootefi_exec(). */
+static efi_status_t EFIAPI efi_pxe_base_code_start(
+                               struct efi_pxe_base_code_protocol *this,
+                               u8 use_ipv6)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_stop(
+                               struct efi_pxe_base_code_protocol *this)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_dhcp(
+                               struct efi_pxe_base_code_protocol *this,
+                               u8 sort_offers)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_discover(
+                               struct efi_pxe_base_code_protocol *this,
+                               u16 type, u16 *layer, u8 bis,
+                               struct efi_pxe_base_code_discover_info *info)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_mtftp(
+                               struct efi_pxe_base_code_protocol *this,
+                               u32 operation, void *buffer_ptr,
+                               u8 overwrite, efi_uintn_t *buffer_size,
+                               struct efi_ip_address server_ip, char *filename,
+                               struct efi_pxe_base_code_mtftp_info *info,
+                               u8 dont_use_buffer)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_udp_write(
+                               struct efi_pxe_base_code_protocol *this,
+                               u16 op_flags, struct efi_ip_address *dest_ip,
+                               u16 *dest_port,
+                               struct efi_ip_address *gateway_ip,
+                               struct efi_ip_address *src_ip, u16 *src_port,
+                               efi_uintn_t *header_size, void *header_ptr,
+                               efi_uintn_t *buffer_size, void *buffer_ptr)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_udp_read(
+                               struct efi_pxe_base_code_protocol *this,
+                               u16 op_flags, struct efi_ip_address *dest_ip,
+                               u16 *dest_port, struct efi_ip_address *src_ip,
+                               u16 *src_port, efi_uintn_t *header_size,
+                               void *header_ptr, efi_uintn_t *buffer_size,
+                               void *buffer_ptr)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_set_ip_filter(
+                               struct efi_pxe_base_code_protocol *this,
+                               struct efi_pxe_base_code_filter *new_filter)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_arp(
+                               struct efi_pxe_base_code_protocol *this,
+                               struct efi_ip_address *ip_addr,
+                               struct efi_mac_address *mac_addr)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_set_parameters(
+                               struct efi_pxe_base_code_protocol *this,
+                               u8 *new_auto_arp, u8 *new_send_guid,
+                               u8 *new_ttl, u8 *new_tos,
+                               u8 *new_make_callback)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_set_station_ip(
+                               struct efi_pxe_base_code_protocol *this,
+                               struct efi_ip_address *new_station_ip,
+                               struct efi_ip_address *new_subnet_mask)
+{
+       return EFI_UNSUPPORTED;
+}
+
+static efi_status_t EFIAPI efi_pxe_base_code_set_packets(
+                               struct efi_pxe_base_code_protocol *this,
+                               u8 *new_dhcp_discover_valid,
+                               u8 *new_dhcp_ack_received,
+                               u8 *new_proxy_offer_received,
+                               u8 *new_pxe_discover_valid,
+                               u8 *new_pxe_reply_received,
+                               u8 *new_pxe_bis_reply_received,
+                               EFI_PXE_BASE_CODE_PACKET *new_dchp_discover,
+                               EFI_PXE_BASE_CODE_PACKET *new_dhcp_acc,
+                               EFI_PXE_BASE_CODE_PACKET *new_proxy_offer,
+                               EFI_PXE_BASE_CODE_PACKET *new_pxe_discover,
+                               EFI_PXE_BASE_CODE_PACKET *new_pxe_reply,
+                               EFI_PXE_BASE_CODE_PACKET *new_pxe_bis_reply)
+{
+       return EFI_UNSUPPORTED;
+}
+
+/**
+ * efi_net_register() - register the simple network protocol
+ *
+ * This gets called from do_bootefi_exec().
+ */
 efi_status_t efi_net_register(void)
 {
-       struct efi_net_obj *netobj;
+       struct efi_net_obj *netobj = NULL;
        efi_status_t r;
 
        if (!eth_get_dev()) {
-               /* No eth device active, don't expose any */
+               /* No network device active, don't expose any */
                return EFI_SUCCESS;
        }
 
-       /* We only expose the "active" eth device, so one is enough */
+       /* We only expose the "active" network device, so one is enough */
        netobj = calloc(1, sizeof(*netobj));
-       if (!netobj) {
-               printf("ERROR: Out of memory\n");
-               return EFI_OUT_OF_RESOURCES;
-       }
+       if (!netobj)
+               goto out_of_resources;
+
+       /* Allocate an aligned transmit buffer */
+       transmit_buffer = calloc(1, PKTSIZE_ALIGN + PKTALIGN);
+       if (!transmit_buffer)
+               goto out_of_resources;
+       transmit_buffer = (void *)ALIGN((uintptr_t)transmit_buffer, PKTALIGN);
 
        /* Hook net up to the device list */
-       efi_add_handle(&netobj->parent);
+       efi_add_handle(&netobj->header);
 
        /* Fill in object data */
-       r = efi_add_protocol(netobj->parent.handle, &efi_net_guid,
+       r = efi_add_protocol(&netobj->header, &efi_net_guid,
                             &netobj->net);
        if (r != EFI_SUCCESS)
                goto failure_to_add_protocol;
-       r = efi_add_protocol(netobj->parent.handle, &efi_guid_device_path,
+       r = efi_add_protocol(&netobj->header, &efi_guid_device_path,
                             efi_dp_from_eth());
        if (r != EFI_SUCCESS)
                goto failure_to_add_protocol;
-       r = efi_add_protocol(netobj->parent.handle, &efi_pxe_guid,
+       r = efi_add_protocol(&netobj->header, &efi_pxe_base_code_protocol_guid,
                             &netobj->pxe);
        if (r != EFI_SUCCESS)
                goto failure_to_add_protocol;
@@ -355,12 +878,26 @@ efi_status_t efi_net_register(void)
        netobj->net.transmit = efi_net_transmit;
        netobj->net.receive = efi_net_receive;
        netobj->net.mode = &netobj->net_mode;
-       netobj->net_mode.state = EFI_NETWORK_STARTED;
+       netobj->net_mode.state = EFI_NETWORK_STOPPED;
        memcpy(netobj->net_mode.current_address.mac_addr, eth_get_ethaddr(), 6);
        netobj->net_mode.hwaddr_size = ARP_HLEN;
+       netobj->net_mode.media_header_size = ETHER_HDR_SIZE;
        netobj->net_mode.max_packet_size = PKTSIZE;
        netobj->net_mode.if_type = ARP_ETHER;
 
+       netobj->pxe.revision = EFI_PXE_BASE_CODE_PROTOCOL_REVISION;
+       netobj->pxe.start = efi_pxe_base_code_start;
+       netobj->pxe.stop = efi_pxe_base_code_stop;
+       netobj->pxe.dhcp = efi_pxe_base_code_dhcp;
+       netobj->pxe.discover = efi_pxe_base_code_discover;
+       netobj->pxe.mtftp = efi_pxe_base_code_mtftp;
+       netobj->pxe.udp_write = efi_pxe_base_code_udp_write;
+       netobj->pxe.udp_read = efi_pxe_base_code_udp_read;
+       netobj->pxe.set_ip_filter = efi_pxe_base_code_set_ip_filter;
+       netobj->pxe.arp = efi_pxe_base_code_arp;
+       netobj->pxe.set_parameters = efi_pxe_base_code_set_parameters;
+       netobj->pxe.set_station_ip = efi_pxe_base_code_set_station_ip;
+       netobj->pxe.set_packets = efi_pxe_base_code_set_packets;
        netobj->pxe.mode = &netobj->pxe_mode;
        if (dhcp_ack)
                netobj->pxe_mode.dhcp_ack = *dhcp_ack;
@@ -385,13 +922,13 @@ efi_status_t efi_net_register(void)
         * iPXE is running at TPL_CALLBACK most of the time. Use a higher TPL.
         */
        r = efi_create_event(EVT_TIMER | EVT_NOTIFY_SIGNAL, TPL_NOTIFY,
-                            efi_network_timer_notify, NULL, NULL,
+                            efi_network_timer_notify, &netobj->net, NULL,
                             &network_timer_event);
        if (r != EFI_SUCCESS) {
                printf("ERROR: Failed to register network event\n");
                return r;
        }
-       /* Network is time critical, create event in every timer cyle */
+       /* Network is time critical, create event in every timer cycle */
        r = efi_set_timer(network_timer_event, EFI_TIMER_PERIODIC, 0);
        if (r != EFI_SUCCESS) {
                printf("ERROR: Failed to set network timer\n");
@@ -402,4 +939,9 @@ efi_status_t efi_net_register(void)
 failure_to_add_protocol:
        printf("ERROR: Failure to add protocol\n");
        return r;
+out_of_resources:
+       free(netobj);
+       /* free(transmit_buffer) not needed yet */
+       printf("ERROR: Out of memory\n");
+       return EFI_OUT_OF_RESOURCES;
 }