imx: hab: Check if CSF contains deprecated commands

[people/ms/u-boot.git] / lib / efi_loader / efi_net.c

diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index b16463ba1a1dfec7ed8dd78a2bf1bec48245617e..8c5d5b492cab03df847ea6a443c3919cbe592a5b 100644 (file)
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -150,12 +150,13 @@ static efi_status_t EFIAPI efi_net_get_status(struct efi_simple_network *this,
 }
 
 static efi_status_t EFIAPI efi_net_transmit(struct efi_simple_network *this,
-               ulong header_size, ulong buffer_size, void *buffer,
+               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_ENTRY("%p, %lx, %lx, %p, %p, %p, %p", this, header_size,
-                 buffer_size, buffer, src_addr, dest_addr, protocol);
+       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();
 
@@ -183,11 +184,30 @@ static void efi_net_push(void *pkt, int len)
        wait_for_packet->is_signaled = true;
 }
 
+/*
+ * 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
+ */
 static efi_status_t EFIAPI efi_net_receive(struct efi_simple_network *this,
-               ulong *header_size, ulong *buffer_size, void *buffer,
+               size_t *header_size, size_t *buffer_size, void *buffer,
                struct efi_mac_address *src_addr,
                struct efi_mac_address *dest_addr, u16 *protocol)
 {
+       struct ethernet_hdr *eth_hdr;
+       size_t hdr_size = sizeof(struct ethernet_hdr);
+       u16 protlen;
+
        EFI_ENTRY("%p, %p, %p, %p, %p, %p, %p", this, header_size,
                  buffer_size, buffer, src_addr, dest_addr, protocol);
 
@@ -195,13 +215,32 @@ static efi_status_t EFIAPI efi_net_receive(struct efi_simple_network *this,
 
        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);
+       }
+       /* Fill export parameters */
+       eth_hdr = (struct ethernet_hdr *)net_rx_packet;
+       protlen = ntohs(eth_hdr->et_protlen);
+       if (protlen == 0x8100) {
+               hdr_size += 4;
+               protlen = ntohs(*(u16 *)&net_rx_packet[hdr_size - 2]);
+       }
+       if (header_size)
+               *header_size = hdr_size;
+       if (dest_addr)
+               memcpy(dest_addr, eth_hdr->et_dest, ARP_HLEN);
+       if (src_addr)
+               memcpy(src_addr, eth_hdr->et_src, ARP_HLEN);
+       if (protocol)
+               *protocol = protlen;
        if (*buffer_size < net_rx_packet_len) {
                /* Packet doesn't fit, try again with bigger buf */
                *buffer_size = net_rx_packet_len;
                return EFI_EXIT(EFI_BUFFER_TOO_SMALL);
        }
-
+       /* Copy packet */
        memcpy(buffer, net_rx_packet, net_rx_packet_len);
        *buffer_size = net_rx_packet_len;
        new_rx_packet = false;
@@ -253,16 +292,25 @@ int efi_net_register(void)
 
        /* We only expose the "active" eth device, so one is enough */
        netobj = calloc(1, sizeof(*netobj));
+       if (!netobj)
+               goto out_of_memory;
+
+       /* Hook net up to the device list */
+       efi_add_handle(&netobj->parent);
 
        /* Fill in object data */
-       netobj->parent.protocols[0].guid = &efi_net_guid;
-       netobj->parent.protocols[0].protocol_interface = &netobj->net;
-       netobj->parent.protocols[1].guid = &efi_guid_device_path;
-       netobj->parent.protocols[1].protocol_interface =
-               efi_dp_from_eth();
-       netobj->parent.protocols[2].guid = &efi_pxe_guid;
-       netobj->parent.protocols[2].protocol_interface = &netobj->pxe;
-       netobj->parent.handle = &netobj->net;
+       r = efi_add_protocol(netobj->parent.handle, &efi_net_guid,
+                            &netobj->net);
+       if (r != EFI_SUCCESS)
+               goto out_of_memory;
+       r = efi_add_protocol(netobj->parent.handle, &efi_guid_device_path,
+                            efi_dp_from_eth());
+       if (r != EFI_SUCCESS)
+               goto out_of_memory;
+       r = efi_add_protocol(netobj->parent.handle, &efi_pxe_guid,
+                            &netobj->pxe);
+       if (r != EFI_SUCCESS)
+               goto out_of_memory;
        netobj->net.revision = EFI_SIMPLE_NETWORK_PROTOCOL_REVISION;
        netobj->net.start = efi_net_start;
        netobj->net.stop = efi_net_stop;
@@ -287,9 +335,6 @@ int efi_net_register(void)
        if (dhcp_ack)
                netobj->pxe_mode.dhcp_ack = *dhcp_ack;
 
-       /* Hook net up to the device list */
-       list_add_tail(&netobj->parent.link, &efi_obj_list);
-
        /*
         * Create WaitForPacket event.
         */
@@ -322,4 +367,7 @@ int efi_net_register(void)
        }
 
        return 0;
+out_of_memory:
+       printf("ERROR: Out of memory\n");
+       return 1;
 }