Merge pull request #456 from rizlik/backport_debug0

qemu x86 fsp: fix support for DEBUG=0 build; fix conditional OTP compilation in Makefile

Author: dgarske

Makefile

@@ -137,6 +137,7 @@ BOOTLOADER_PARTITION_SIZE?=$$(( $(WOLFBOOT_PARTITION_BOOT_ADDRESS) - $(ARCH_FLAS
 all: $(MAIN_TARGET)
 
 stage1: stage1/loader_stage1.bin
+stage1/loader_stage1.bin: wolfboot.elf
 stage1/loader_stage1.bin: FORCE
 	@echo "\t[BIN] $@"
 	$(Q)$(MAKE) -C $(dir $@) $(notdir $@)

arch.mk

@@ -671,7 +671,10 @@ endif
 ifeq ($(filter $(TARGET),x86_fsp_qemu kontron_vx3060_s2),$(TARGET))
   FSP=1
   CFLAGS+=-DWOLFBOOT_FSP=1
-  CFLAGS+=-ffunction-sections -fdata-sections
+  CFLAGS+=-ffunction-sections -fdata-sections -ffreestanding -nostdlib -static
+  # some std libc have headers that bring in extra symbols used in
+  # FORTIFY_SOURCE realated checks. Use -U_FORTIFY_SOURCE to avoid that.
+  CFLAGS+=-U_FORTIFY_SOURCE
   ifeq ($(TARGET), kontron_vx3060_s2)
     FSP_TGL=1
     CFLAGS+=-DWOLFBOOT_TGL=1
@@ -840,9 +843,7 @@ CFLAGS+=-DWOLFBOOT_ORIGIN=$(WOLFBOOT_ORIGIN)
 CFLAGS+=-DBOOTLOADER_PARTITION_SIZE=$(BOOTLOADER_PARTITION_SIZE)
 
 ## Debug
-ifeq ($(DEBUG),1)
-  WOLFCRYPT_OBJS+=./lib/wolfssl/wolfcrypt/src/logging.o
-endif
+WOLFCRYPT_OBJS+=./lib/wolfssl/wolfcrypt/src/logging.o
 
 # Debug UART
 ifeq ($(DEBUG_UART),1)

config/examples/kontron_vx3060_s2.config

@@ -3,7 +3,7 @@ TARGET=kontron_vx3060_s2
 WOLFBOOT_SMALL_STACK=0
 SIGN=ECC384
 HASH=SHA256
-DEBUG=1
+DEBUG=0
 SPMATH=1
 ENCRYPTION=0
 WOLFBOOT_NO_PARTITIONS=1
@@ -63,4 +63,5 @@ DISK_LOCK=0
 WOLFTPM=1
 WOLFBOOT_TPM_SEAL=1
 WOLFBOOT_TPM_SEAL_KEY_ID=1
-WOLFBOOT_UNIVERSAL_KEYSTORE=1
+WOLFBOOT_UNIVERSAL_KEYSTORE=1
+DEBUG_SYMBOLS=1

config/examples/x86_fsp_qemu_seal.config

@@ -3,7 +3,7 @@ TARGET=x86_fsp_qemu
 WOLFBOOT_SMALL_STACK=0
 SIGN=ECC384
 HASH=SHA256
-DEBUG=1
+DEBUG=0
 SPMATH=1
 FORCE_32BIT=1
 ENCRYPTION=0
@@ -45,4 +45,5 @@ MEASURED_PCR_A=0
 WOLFBOOT_TPM_SEAL=1
 WOLFBOOT_TPM_SEAL_KEY_ID=1
 DISK_LOCK=1
-WOLFBOOT_UNIVERSAL_KEYSTORE=1
+WOLFBOOT_UNIVERSAL_KEYSTORE=1
+DEBUG_SYMBOLS=1

hal/x86_uart.c

@@ -142,7 +142,7 @@ int uart_init(uint32_t bitrate, uint8_t data, char parity, uint8_t stop)
 
     mode = 0;
     mode |= data;
-    mode |= (stop << 2);
+    mode |= (stops << 2);
     mode |= (parity_bits << 3);
     write_reg(X86_UART_LCR, mode);
 

include/user_settings.h

@@ -40,8 +40,12 @@
 #define SIZEOF_LONG_LONG 8
 
 #define CTYPE_USER /* don't let wolfCrypt types.h include ctype.h */
+#ifndef toupper
 extern int toupper(int c);
+#endif
+#ifndef tolower
 extern int tolower(int c);
+#endif
 #define XTOUPPER(c)     toupper((c))
 #define XTOLOWER(c)     tolower((c))
 

src/boot_x86_fsp.c

@@ -88,6 +88,15 @@ const uint8_t __attribute__((section(".sig_wolfboot_raw")))
 #define PCI_DEVICE_CONTROLLER_TO_PEX 0x6
 #define PCIE_TRAINING_TIMEOUT_MS (100)
 
+/* compile time alignment checks */
+#define ALIGN_CHECK(value, alignment) ((value) & ((alignment)-1)) == 0
+#if !ALIGN_CHECK(FSP_S_LOAD_BASE - IMAGE_HEADER_SIZE, 16)
+#error "FSP_S_LOAD_BASE must be aligned on a 16 bytes boundary"
+#endif
+#if !ALIGN_CHECK(WOLFBOOT_LOAD_BASE - IMAGE_HEADER_SIZE, 16)
+#error "WOLFBOOT_LOAD_BASE must be aligned on a 16 bytes boundary"
+#endif
+
 typedef uint32_t (*memory_init_cb)(void *udp, struct efi_hob **HobList);
 typedef uint32_t (*temp_ram_exit_cb)(void *udp);
 typedef uint32_t (*silicon_init_cb)(void *udp);
@@ -492,6 +501,8 @@ static int fsp_silicon_init(struct fsp_info_header *fsp_info, uint8_t *fsp_s_bas
     memcpy(silicon_init_parameter, fsp_s_base + fsp_info->CfgRegionOffset,
             FSP_S_PARAM_SIZE);
     status = fsp_machine_update_s_parameters(silicon_init_parameter);
+    if (status != 0)
+        panic();
     SiliconInit = (silicon_init_cb)(fsp_s_base + fsp_info->FspSiliconInitEntryOffset);
 
 #if defined(WOLFBOOT_DUMP_FSP_UPD)
@@ -744,7 +755,7 @@ void start(uint32_t stack_base, uint32_t stack_top, uint64_t timestamp,
     uint8_t *fsp_m_base, done = 0;
     struct efi_hob *hobList, *it;
     memory_init_cb MemoryInit;
-    uint64_t top_address;
+    uint64_t top_address = MEMORY_4GB;
     uint32_t new_stack;
     uint32_t status;
     uint16_t type;
@@ -836,7 +847,7 @@ void start(uint32_t stack_base, uint32_t stack_top, uint64_t timestamp,
     hob_dump_memory_map(hobList);
 #endif /* DEBUG */
 
-    if (top_address > MEMORY_4GB) {
+    if (top_address >= MEMORY_4GB) {
         panic();
     }
 

src/elf.c

@@ -88,6 +88,7 @@ int elf_load_image_mmu(uint8_t *image, uintptr_t *entry, elf_mmu_map_cb mmu_cb)
     /* Load class and endianess */
     is_elf32 = (h32->ident[4] == ELF_CLASS_32);
     is_le = (h32->ident[5] == ELF_ENDIAN_LITTLE);
+    (void)is_le;
 
     /* Verify this is an executable */
     if (GET_H16(type) != ELF_HET_EXEC) {

src/update_disk.c

@@ -79,9 +79,9 @@ extern uint8_t _end_wb[];
  */
 void RAMFUNCTION wolfBoot_start(void)
 {
+    uint8_t p_hdr[IMAGE_HEADER_SIZE] __attribute__((aligned(16)));
     struct stage2_parameter *stage2_params;
     struct wolfBoot_image os_image;
-    uint8_t p_hdr[IMAGE_HEADER_SIZE];
     int pA_ver = 0, pB_ver = 0;
     uint32_t cur_part = 0;
     int ret = -1;
@@ -135,8 +135,8 @@ void RAMFUNCTION wolfBoot_start(void)
         selected = 0;
 
     stage2_params = stage2_get_parameters();
-    /* load the image just after wolfboot */
-    load_address = (uint32_t *)(_end_wb);
+    /* load the image just after wolfboot, 16 bytes aligned */
+    load_address = (uint32_t *)((((uintptr_t)_end_wb) + 0xf) & ~0xf);
     wolfBoot_printf("Load address 0x%x\r\n", load_address);
     do {
         failures++;

src/x86/ahci.c

@@ -171,7 +171,6 @@ int init_sata_controller(uint32_t bus, uint32_t dev, uint32_t fun)
 uint32_t ahci_enable(uint32_t bus, uint32_t dev, uint32_t fun)
 {
     uint16_t reg16;
-    uint32_t iobar;
     uint32_t reg;
     uint32_t bar;
 
@@ -180,8 +179,6 @@ uint32_t ahci_enable(uint32_t bus, uint32_t dev, uint32_t fun)
 
     bar = pci_config_read32(bus, dev, fun, AHCI_ABAR_OFFSET);
     AHCI_DEBUG_PRINTF("PCI BAR: %08x\r\n", bar);
-    iobar = pci_config_read32(bus, dev, fun, AHCI_AIDPBA_OFFSET);
-    AHCI_DEBUG_PRINTF("PCI I/O space: %08x\r\n", iobar);
 
     reg |= PCI_COMMAND_BUS_MASTER;
     reg |= PCI_COMMAND_MEM_SPACE;
@@ -197,29 +194,6 @@ uint32_t ahci_enable(uint32_t bus, uint32_t dev, uint32_t fun)
     return bar;
 }
 
-/**
- * @brief Dumps the status of the specified AHCI port.
- *
- * This function dumps the status of the AHCI port with the given index.
- * It prints the status of various port registers for debugging purposes.
- *
- * @param base The AHCI Base Address Register (ABAR) for accessing AHCI registers.
- * @param i The index of the AHCI port to dump status for.
- */
-void ahci_dump_port(uint32_t base, int i)
-{
-    uint32_t cmd, ci, is, tfd, serr, ssst;
-
-    cmd = mmio_read32(AHCI_PxCMD(base, i));
-    ci = mmio_read32(AHCI_PxCI(base, i));
-    is = mmio_read32(AHCI_PxIS(base, i));
-    tfd = mmio_read32(AHCI_PxTFD(base, i));
-    serr = mmio_read32(AHCI_PxSERR(base, i));
-    ssst = mmio_read32(AHCI_PxSSTS(base, i));
-    AHCI_DEBUG_PRINTF("%d: cmd:0x%x ci:0x%x is: 0x%x tfd: 0x%x serr: 0x%x ssst: 0x%x\r\n",
-                    i, cmd, ci, is, tfd, serr, ssst);
-}
-
 #ifdef WOLFBOOT_ATA_DISK_LOCK
 #ifdef WOLFBOOT_ATA_DISK_LOCK_PASSWORD
 static int sata_get_unlock_secret(uint8_t *secret, int *secret_size)
@@ -362,7 +336,7 @@ static int sata_get_unlock_secret(uint8_t *secret, int *secret_size)
 #error "implement get_tpm_policy "
 #endif
 
-    if (policy_size > TPM_MAX_POLICY_SIZE)
+    if (policy_size > TPM_MAX_POLICY_SIZE || ret != 0)
         return -1;
 
     memcpy(policy, pol, policy_size);
@@ -464,15 +438,21 @@ int sata_unlock_disk(int drv, int freeze)
         }
         r = ata_identify_device(drv);
         AHCI_DEBUG_PRINTF("ATA identify: returned %d\r\n", r);
+        if (r != 0)
+            return -1;
         ata_st = ata_security_get_state(drv);
         wolfBoot_printf("ATA: State SEC%d\r\n", ata_st);
     }
     else if (ata_st == ATA_SEC4) {
         AHCI_DEBUG_PRINTF("ATA identify: calling device unlock\r\n", r);
         r = ata_security_unlock_device(drv, (char*)secret, 0);
         AHCI_DEBUG_PRINTF("ATA device unlock: returned %d\r\n", r);
+        if (r != 0)
+            return -1;
         r = ata_identify_device(drv);
         AHCI_DEBUG_PRINTF("ATA identify: returned %d\r\n", r);
+        if (r != 0)
+            return -1;
         ata_st = ata_security_get_state(drv);
         if (ata_st == ATA_SEC5) {
             if (freeze) {
@@ -487,6 +467,8 @@ int sata_unlock_disk(int drv, int freeze)
             }
             r = ata_identify_device(drv);
             AHCI_DEBUG_PRINTF("ATA identify: returned %d\r\n", r);
+            if (r != 0)
+                return -1;
         }
     }
     ata_st = ata_security_get_state(drv);
@@ -583,6 +565,7 @@ void sata_enable(uint32_t base)
 
     cap = mmio_read32(AHCI_HBA_CAP(base));
     n_ports = (cap & 0x1F) + 1;
+    (void)n_ports;
     sata_only = (cap & AHCI_CAP_SAM);
     cap_sud = (cap & AHCI_CAP_SSS);
 
@@ -601,8 +584,8 @@ void sata_enable(uint32_t base)
         if ((ports_impl & (1 << i)) != 0) {
             uint32_t reg;
             uint32_t ssts = mmio_read32(AHCI_PxSSTS(base, i));
-            uint8_t ipm = (ssts >> 8) & 0xFF;
             uint8_t det = ssts & 0x0F;
+            uint8_t ipm;
             volatile struct hba_cmd_header *hdr;
 
 
@@ -736,6 +719,7 @@ void sata_enable(uint32_t base)
                         AHCI_DEBUG_PRINTF("ATA%d associated to AHCI port %d\r\n",
                                 drv, i);
                         r = ata_identify_device(drv);
+                        (void)r;
                         AHCI_DEBUG_PRINTF("ATA identify: returned %d\r\n", r);
                     }
                 } else {