update zircon

.gitignore

@@ -28,3 +28,5 @@ compile_commands.json
 /prebuilt/config.mk
 /prebuilt/config.mk.bak
 /AnalysisResult/
+/public/lib/
+/public/sysroot/

.travis.yml

@@ -2,11 +2,11 @@ language: c
 script: ./scripts/travis-builds.sh
 env:
     # full zircon kernel + user space builds
-    - PROJECT=zircon-pc-x86-64
-    - PROJECT=zircon-qemu-arm64
-    - PROJECT=zircon-rpi3-arm64
-    - PROJECT=zircon-hikey960-arm64
-    - PROJECT=zircon-odroidc2-arm64
+    - PROJECT=x86
+    - PROJECT=arm64
+    - PROJECT=hikey960
+    - PROJECT=gauss
+    - PROJECT=odroidc2
 
 sudo: required
 dist: trusty

README.md

@@ -29,13 +29,18 @@ This page is a non-comprehensive index of the zircon documentation.
 
 + [Getting Started](docs/getting_started.md)
 + [Contributing Patches](docs/contributing.md)
-+ [Testing](docs/testing.md)
-+ [Hacking notes](docs/hacking.md)
-+ [Memory usage analysis tools](docs/memory.md)
-+ [Relationship with LK](docs/zx_and_lk.md)
+
++ [Concepts Overview](docs/concepts.md)
 + [Kernel Objects](docs/objects.md)
 + [Process Objects](docs/objects/process.md)
 + [Thread Objects](docs/objects/thread.md)
 + [Handles](docs/handles.md)
 + [System Calls](docs/syscalls.md)
+
++ [Driver Development Kit](docs/ddk/overview.md)
+
++ [Testing](docs/testing.md)
++ [Hacking notes](docs/hacking.md)
++ [Memory usage analysis tools](docs/memory.md)
++ [Relationship with LK](docs/zx_and_lk.md)
 + [Micro-benchmarks](docs/benchmarks/microbenchmarks.md)

bootloader/build.mk

@@ -6,40 +6,29 @@
 
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
-EFI_LIBDIRS	:= system/ulib/tftp
+EFI_LIBDIRS := system/ulib/tftp
 
-ifeq ($(call TOBOOL,$(USE_CLANG)),true)
-EFI_CC		:= $(CLANG_TOOLCHAIN_PREFIX)clang
-EFI_LD		:= $(CLANG_TOOLCHAIN_PREFIX)lld-link
-else
-EFI_CC		:= $(TOOLCHAIN_PREFIX)gcc
-EFI_LD		:= $(TOOLCHAIN_PREFIX)ld
-endif
+EFI_CFLAGS += -nostdinc -I$(LOCAL_DIR)/include -I$(LOCAL_DIR)/src
+EFI_CFLAGS += -Isystem/public -Isystem/private
+EFI_CFLAGS += $(foreach LIBDIR,$(EFI_LIBDIRS),-I$(LIBDIR)/include)
 
-EFI_CFLAGS	:= -O2
-EFI_CFLAGS	+= -fshort-wchar -fno-stack-protector -mno-red-zone
-EFI_CFLAGS	+= -Wall -std=c99
-EFI_CFLAGS	+= -ffreestanding -nostdinc -I$(LOCAL_DIR)/include -I$(LOCAL_DIR)/src
-EFI_CFLAGS	+= -Isystem/public -Isystem/private
-EFI_CFLAGS	+= $(foreach LIBDIR,$(EFI_LIBDIRS),-I$(LIBDIR)/include)
 ifeq ($(call TOBOOL,$(USE_CLANG)),true)
-EFI_CFLAGS	+= --target=x86_64-windows-msvc
+EFI_LDFLAGS := /subsystem:efi_application /entry:efi_main /libpath:out
 else
-EFI_CFLAGS	+= -fPIE
+EFI_LINKSCRIPT := $(LOCAL_DIR)/build/efi-x86-64.lds
+EFI_LDFLAGS := -nostdlib -T $(EFI_LINKSCRIPT) -pie -Lout
 endif
 
-ifeq ($(call TOBOOL,$(USE_CLANG)),true)
-EFI_LDFLAGS	:= /subsystem:efi_application /entry:efi_main /libpath:out
-else
-EFI_LINKSCRIPT	:= $(LOCAL_DIR)/build/efi-x86-64.lds
-EFI_LDFLAGS	:= -nostdlib -T $(EFI_LINKSCRIPT) -pie -Lout
-endif
-
-EFI_SECTIONS	:= .text .data .reloc
-EFI_SECTIONS	:= $(patsubst %,-j %,$(EFI_SECTIONS))
+EFI_SECTIONS := .text .data .reloc
+EFI_SECTIONS := $(patsubst %,-j %,$(EFI_SECTIONS))
 
+ifeq ($(EFI_ARCH),x86_64)
 EFI_SO          := $(BUILDDIR)/bootloader/bootx64.so
 EFI_BOOTLOADER  := $(BUILDDIR)/bootloader/bootx64.efi
+else ifeq ($(EFI_ARCH),aarch64)
+EFI_SO          := $(BUILDDIR)/bootloader/bootaa64.so
+EFI_BOOTLOADER  := $(BUILDDIR)/bootloader/bootaa64.efi
+endif
 
 # Bootloader sources
 EFI_SOURCES := \
@@ -74,8 +63,8 @@ EFI_LIBS := $(foreach LIBDIR,$(EFI_LIBDIRS), \
 
 $(BUILDDIR)/bootloader/%.o : $(LOCAL_DIR)/%.c
 	@$(MKDIR)
-	$(call BUILDECHO,compiling $@)
-	$(NOECHO)$(EFI_CC) -MMD -MP -o $@ -c $(EFI_CFLAGS) $<
+	$(call BUILDECHO,compiling $<)
+	$(NOECHO)$(EFI_CC) -MMD -MP -o $@ -c $(EFI_OPTFLAGS) $(EFI_COMPILEFLAGS) $(EFI_CFLAGS) $<
 
 ifeq ($(call TOBOOL,$(USE_CLANG)),true)
 
@@ -107,9 +96,16 @@ $(EFI_BOOTLOADER): $(EFI_SO)
 endif
 
 GENERATED += $(EFI_BOOTLOADER)
-EXTRA_BUILDDEPS += $(EFI_BOOTLOADER)
 
 .PHONY: gigaboot
 gigaboot: $(EFI_BOOTLOADER)
 
+ifeq ($(call TOBOOL,$(ENABLE_ULIB_ONLY)),false)
+# x86 only by default for now
+ifeq ($(ARCH),x86)
+bootloader: gigaboot
+all:: bootloader
+endif
+endif
+
 -include $(EFI_DEPS)

bootloader/include/printf.h

@@ -37,6 +37,9 @@ typedef int (*_printf_engine_output_func)(const char *str, size_t len, void *sta
 
 int _printf_engine(_printf_engine_output_func out, void *state, const char *fmt, va_list ap);
 
+// Print a wide string to console
+int puts16(char16_t *str);
+
 __END_CDECLS
 
 #endif

bootloader/lib/console-printf.c

@@ -49,3 +49,7 @@ int _printf(const char* fmt, ...) {
     }
     return r;
 }
+
+int puts16(char16_t* str) {
+    return gConOut->OutputString(gConOut, str) == EFI_SUCCESS ? 0 : EFI_END_OF_FILE;
+}

bootloader/lib/efi/guids.c

@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <efi/protocol/block-io.h>
 #include <efi/protocol/device-path.h>
 #include <efi/protocol/device-path-to-text.h>
+#include <efi/protocol/disk-io.h>
 #include <efi/protocol/driver-binding.h>
 #include <efi/protocol/file.h>
 #include <efi/protocol/graphics-output.h>
@@ -16,8 +18,10 @@
 #include <efi/protocol/simple-text-output.h>
 #include <efi/protocol/usb-io.h>
 
+efi_guid BlockIoProtocol = EFI_BLOCK_IO_PROTOCOL_GUID;
 efi_guid DevicePathProtocol = EFI_DEVICE_PATH_PROTOCOL_GUID;
 efi_guid DevicePathToTextProtocol = EFI_DEVICE_PATH_TO_TEXT_PROTOCOL_GUID;
+efi_guid DiskIoProtocol = EFI_DISK_IO_PROTOCOL_GUID;
 efi_guid DriverBindingProtocol = EFI_DRIVER_BINDING_PROTOCOL_GUID;
 efi_guid FileInfoGuid = EFI_FILE_INFO_GUID;
 efi_guid FileSystemInfoGuid = EFI_FILE_SYSTEM_INFO_GUID;

bootloader/lib/loadfile.c

@@ -26,9 +26,9 @@ efi_file_protocol* xefi_open_file(char16_t* filename) {
     }
 
 #if 0
-	printf("Img DeviceHandle='%s'\n", HandleToString(loaded->DeviceHandle));
-	printf("Img FilePath='%s'\n", DevicePathToStr(loaded->FilePath));
-	printf("Img Base=%lx Size=%lx\n", loaded->ImageBase, loaded->ImageSize);
+    printf("Img DeviceHandle='%s'\n", HandleToString(loaded->DeviceHandle));
+    printf("Img FilePath='%s'\n", DevicePathToStr(loaded->FilePath));
+    printf("Img Base=%lx Size=%lx\n", loaded->ImageBase, loaded->ImageSize);
 #endif
 
     efi_simple_file_system_protocol* sfs;

bootloader/scripts/bootzircon

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-make && mcopy -o -i out/disk.img@@1024K ../build-zircon-pc-x86-64/zircon.bin ::zircon.bin && make qemu
+make && mcopy -o -i out/disk.img@@1024K ../build-x86/zircon.bin ::zircon.bin && make qemu

bootloader/src/eff_short_wordlist_1.h

@@ -415,7 +415,7 @@ const char dictionary[1296][6] = {
     "fence",
     "fend",
     "ferry",
-    "fetal",
+    "feta",
     "fetch",
     "fever",
     "fiber",
@@ -1144,7 +1144,7 @@ const char dictionary[1296][6] = {
     "thigh",
     "thing",
     "think",
-    "thong",
+    "third",
     "thorn",
     "those",
     "throb",

bootloader/src/framebuffer.c

@@ -211,7 +211,7 @@ void draw_text(const char* text, size_t length, fb_font* font, int x, int y) {
     size_t offset = 0;
     size_t scale = 1;
     for (size_t i = 0; i < length; ++i) {
-        char c = text[i];
+        unsigned char c = text[i];
         if (c > 127)
             continue;
         putchar(gop, font, c, x + offset, y, scale, scale, fg_color, &font_black);

bootloader/src/misc.c

@@ -12,15 +12,19 @@
 
 static efi_guid AcpiTableGUID = ACPI_TABLE_GUID;
 static efi_guid Acpi2TableGUID = ACPI_20_TABLE_GUID;
+static efi_guid SmbiosTableGUID = SMBIOS_TABLE_GUID;
+static efi_guid Smbios3TableGUID = SMBIOS3_TABLE_GUID;
 static uint8_t ACPI_RSD_PTR[8] = "RSD PTR ";
+static uint8_t SmbiosAnchor[4] = "_SM_";
+static uint8_t Smbios3Anchor[5] = "_SM3_";
 
 uint64_t find_acpi_root(efi_handle img, efi_system_table* sys) {
     efi_configuration_table* cfgtab = sys->ConfigurationTable;
     int i;
 
     for (i = 0; i < sys->NumberOfTableEntries; i++) {
-        if (!xefi_cmp_guid(&cfgtab[i].VendorGuid, &AcpiTableGUID) &&
-            !xefi_cmp_guid(&cfgtab[i].VendorGuid, &Acpi2TableGUID)) {
+        if (xefi_cmp_guid(&cfgtab[i].VendorGuid, &AcpiTableGUID) &&
+            xefi_cmp_guid(&cfgtab[i].VendorGuid, &Acpi2TableGUID)) {
             // not an ACPI table
             continue;
         }
@@ -33,6 +37,24 @@ uint64_t find_acpi_root(efi_handle img, efi_system_table* sys) {
     return 0;
 }
 
+uint64_t find_smbios(efi_handle img, efi_system_table* sys) {
+    efi_configuration_table* cfgtab = sys->ConfigurationTable;
+    int i;
+
+    for (i = 0; i < sys->NumberOfTableEntries; i++) {
+        if (!xefi_cmp_guid(&cfgtab[i].VendorGuid, &SmbiosTableGUID)) {
+            if (!memcmp(cfgtab[i].VendorTable, SmbiosAnchor, sizeof(SmbiosAnchor))) {
+                return (uint64_t)cfgtab[i].VendorTable;
+            }
+        } else if (!xefi_cmp_guid(&cfgtab[i].VendorGuid, &Smbios3TableGUID)) {
+            if (!memcmp(cfgtab[i].VendorTable, Smbios3Anchor, sizeof(Smbios3Anchor))) {
+                return (uint64_t)cfgtab[i].VendorTable;
+            }
+        }
+    }
+    return 0;
+}
+
 static void get_bit_range(uint32_t mask, int* high, int* low) {
     *high = -1;
     *low = -1;

bootloader/src/netboot.c

@@ -229,11 +229,11 @@ static void buffer_close(void* cookie) {
     printf("Done\n");
 }
 
-static int udp_send(void* data, size_t len, void* cookie) {
+static tftp_status udp_send(void* data, size_t len, void* cookie) {
     transport_info_t* transport_info = cookie;
     int bytes_sent = udp6_send(data, len, &transport_info->dest_addr, transport_info->dest_port,
                                NB_TFTP_OUTGOING_PORT);
-    return bytes_sent < 0 ? TFTP_ERR_IO : bytes_sent;
+    return bytes_sent < 0 ? TFTP_ERR_IO : TFTP_NO_ERROR;
 }
 
 static int udp_timeout_set(uint32_t timeout_ms, void* cookie) {

bootloader/src/netifc.c

@@ -10,8 +10,9 @@
 
 #include <xefi.h>
 
-#include <inet6.h>
-#include <netifc.h>
+#include "inet6.h"
+#include "netifc.h"
+#include "osboot.h"
 
 static efi_simple_network_protocol* snp;
 
@@ -79,14 +80,22 @@ void* eth_get_buffer(size_t sz) {
 }
 
 void eth_put_buffer(void* data) {
-    eth_buffer* buf = (void*)(((uint64_t)data) & (~2047));
+    efi_physical_addr buf_paddr = (efi_physical_addr)data;
+    if ((buf_paddr < eth_buffers_base)
+        || (buf_paddr >= (eth_buffers_base + (NUM_BUFFER_PAGES * PAGE_SIZE)))) {
+        printf("fatal: attempt to use buffer outside of allocated range\n");
+        for (;;)
+            ;
+    }
 
+    eth_buffer* buf = (void*)(buf_paddr & (~2047));
     if (buf->magic != ETH_BUFFER_MAGIC) {
         printf("fatal: eth buffer %p (from %p) bad magic %" PRIx64 "\n",
                buf, data, buf->magic);
         for (;;)
             ;
     }
+
     buf->next = eth_buffers;
     eth_buffers_avail++;
     eth_buffers = buf;
@@ -197,7 +206,8 @@ efi_simple_network_protocol* netifc_find_available(void) {
             }
         }
 
-        printf("%ls: ", paths[i]);
+        puts16(paths[i]);
+        printf(": ");
         ret = bs->HandleProtocol(handles[i], &SimpleNetworkProtocol, (void**)&cur_snp);
         if (ret) {
             printf("Failed to open (%s)\n", xefi_strerror(ret));
@@ -346,7 +356,12 @@ void netifc_poll(void) {
             return;
         }
         if (txdone) {
-            eth_put_buffer(txdone);
+            // Check to make sure this is one of our buffers (see ZX-1516)
+            efi_physical_addr buf_paddr = (efi_physical_addr)txdone;
+            if ((buf_paddr >= eth_buffers_base)
+                && (buf_paddr < (eth_buffers_base + (NUM_BUFFER_PAGES * PAGE_SIZE)))) {
+                eth_put_buffer(txdone);
+            }
         }
     }