Leroy P Leahy (leroy.p.leahy@intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15132
-gerrit
commit f0077d39bed88fe891bc0a38a08061bc2635dcd4 Author: Lee Leahy leroy.p.leahy@intel.com Date: Sun Jun 5 18:48:31 2016 -0700
soc/intel/quark: Add C bootblock
Add a bootblock which builds with C_ENVIRONMENT_BOOTBLOCK selected.
TEST=Build and run on Galileo Gen2
Change-Id: I14d2af2adb6e75d4bff1ebfb863196df04d07daf Signed-off-by: Lee Leahy leroy.p.leahy@intel.com --- src/soc/intel/quark/Kconfig | 25 + src/soc/intel/quark/Makefile.inc | 7 + src/soc/intel/quark/bootblock/bootblock.c | 77 +++ .../intel/quark/bootblock/bootblock_save_bist.inc | 23 + .../quark/bootblock/bootblock_save_timestamp.inc | 36 ++ src/soc/intel/quark/bootblock/esram_init.S | 522 +++++++++++++++++++++ src/soc/intel/quark/include/soc/romstage.h | 1 + src/soc/intel/quark/romstage/Makefile.inc | 3 + src/soc/intel/quark/romstage/bootblock_in_c.S | 75 +++ src/soc/intel/quark/romstage/romstage.c | 27 ++ 10 files changed, 796 insertions(+)
diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig index 2c7ec64..3066c7b 100644 --- a/src/soc/intel/quark/Kconfig +++ b/src/soc/intel/quark/Kconfig @@ -261,4 +261,29 @@ config RMU_LOC The location in CBFS that the RMU is located. It must match the strap-determined base address.
+##### +# Bootblock +# The following options support the C_ENVIRONMENT_BOOTBLOCK. +##### + +config BOOTBLOCK_SAVE_BIST + string + default src/soc/intel/quark/bootblock/bootblock_save_bist.inc + +config BOOTBLOCK_SAVE_TIMESTAMP + string + default src/soc/intel/quark/bootblock/bootblock_save_timestamp.inc + +config DCACHE_BSP_STACK_SIZE + hex + default 0x4000 + +config C_ENV_BOOTBLOCK_SIZE + hex + default 0x8000 + +config ROMSTAGE_AFTER_CAR_STAGE_ENTRY + string + default "src/soc/intel/quark/romstage/bootblock_in_c.S + endif # SOC_INTEL_QUARK diff --git a/src/soc/intel/quark/Makefile.inc b/src/soc/intel/quark/Makefile.inc index d747079..b336fc7 100644 --- a/src/soc/intel/quark/Makefile.inc +++ b/src/soc/intel/quark/Makefile.inc @@ -18,6 +18,13 @@ ifeq ($(CONFIG_SOC_INTEL_QUARK),y) subdirs-y += romstage subdirs-y += ../../../cpu/x86/tsc
+bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += bootblock/esram_init.S +bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += bootblock/bootblock.c +bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += i2c.c +bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += reg_access.c +bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += tsc_freq.c +bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += uart_common.c + romstage-y += i2c.c romstage-y += memmap.c romstage-y += reg_access.c diff --git a/src/soc/intel/quark/bootblock/bootblock.c b/src/soc/intel/quark/bootblock/bootblock.c new file mode 100644 index 0000000..669cd47 --- /dev/null +++ b/src/soc/intel/quark/bootblock/bootblock.c @@ -0,0 +1,77 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2013 Google Inc. + * Copyright (C) 2015-2016 Intel Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include <bootblock_common.h> +#include <console/console.h> +#include <device/pci_def.h> +#include <program_loading.h> +#include <soc/iomap.h> +#include <soc/pci_devs.h> +#include <soc/reg_access.h> + +static const struct reg_script clear_smi_and_wake_events[] = { + /* Clear any SMI or wake events */ + REG_GPE0_READ(R_QNC_GPE0BLK_GPE0S), + REG_GPE0_READ(R_QNC_GPE0BLK_SMIS), + REG_GPE0_OR(R_QNC_GPE0BLK_GPE0S, B_QNC_GPE0BLK_GPE0S_ALL), + REG_GPE0_OR(R_QNC_GPE0BLK_SMIS, B_QNC_GPE0BLK_SMIS_ALL), + REG_SCRIPT_END +}; + +static const struct reg_script legacy_gpio_init[] = { + /* Temporarily enable the legacy GPIO controller */ + REG_PCI_WRITE32(R_QNC_LPC_GBA_BASE, IO_ADDRESS_VALID + | LEGACY_GPIO_BASE_ADDRESS), + /* Temporarily enable the GPE controller */ + REG_PCI_WRITE32(R_QNC_LPC_GPE0BLK, IO_ADDRESS_VALID + | GPE0_BASE_ADDRESS), + REG_PCI_OR8(PCI_COMMAND, PCI_COMMAND_IO), + REG_SCRIPT_END +}; + +static const struct reg_script i2c_gpio_controller_init[] = { + /* Temporarily enable the GPIO controller */ + REG_PCI_WRITE32(PCI_BASE_ADDRESS_0, I2C_BASE_ADDRESS), + REG_PCI_WRITE32(PCI_BASE_ADDRESS_1, GPIO_BASE_ADDRESS), + REG_PCI_OR8(PCI_COMMAND, PCI_COMMAND_MEMORY), + REG_SCRIPT_END +}; + +static const struct reg_script hsuart_init[] = { + /* Enable the HSUART */ + REG_PCI_WRITE32(PCI_BASE_ADDRESS_0, UART_BASE_ADDRESS), + REG_PCI_OR8(PCI_COMMAND, PCI_COMMAND_MEMORY), + REG_SCRIPT_END +}; + +void bootblock_soc_early_init(void) +{ + /* Initialize the controllers */ + reg_script_run_on_dev(I2CGPIO_BDF, i2c_gpio_controller_init); + reg_script_run_on_dev(LPC_BDF, legacy_gpio_init); + + /* Enable the HSUART */ + if (IS_ENABLED(CONFIG_ENABLE_BUILTIN_HSUART0)) + reg_script_run_on_dev(HSUART0_BDF, hsuart_init); + if (IS_ENABLED(CONFIG_ENABLE_BUILTIN_HSUART1)) + reg_script_run_on_dev(HSUART1_BDF, hsuart_init); +} + +void platform_prog_run(struct prog *prog) +{ + /* Display the program entry point */ + printk(BIOS_SPEW, "Calling %s, 0x%p(0x%p)\n", prog->name, + prog->entry, prog->arg); +} diff --git a/src/soc/intel/quark/bootblock/bootblock_save_bist.inc b/src/soc/intel/quark/bootblock/bootblock_save_bist.inc new file mode 100644 index 0000000..dc79028 --- /dev/null +++ b/src/soc/intel/quark/bootblock/bootblock_save_bist.inc @@ -0,0 +1,23 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2016, Intel Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Default BIST save routine. + */ + +.global save_bist + + /* No value to save since Quark does not generate a BIST value */ + +save_bist: diff --git a/src/soc/intel/quark/bootblock/bootblock_save_timestamp.inc b/src/soc/intel/quark/bootblock/bootblock_save_timestamp.inc new file mode 100644 index 0000000..7e9cde9 --- /dev/null +++ b/src/soc/intel/quark/bootblock/bootblock_save_timestamp.inc @@ -0,0 +1,36 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2016, Intel Corporation + + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Default timestamp save routine. + */ + +.global save_timestamp + + /* Get an early timestamp */ + rdtsc + + /* Save the timestamp value: + * eax: Low 32-bits of timestamp + * edx: High 32-bits of timestamp + */ + +save_timestamp: + movl %eax, %ebp + movl %edx, %edi + + /* Registers: + * ebp: Low 32-bits of timestamp + * edi: High 32-bits of timestamp + */ diff --git a/src/soc/intel/quark/bootblock/esram_init.S b/src/soc/intel/quark/bootblock/esram_init.S new file mode 100644 index 0000000..42ec9c0 --- /dev/null +++ b/src/soc/intel/quark/bootblock/esram_init.S @@ -0,0 +1,522 @@ +/** @file + * + * Copyright (C) 2015-2016, Intel Corporation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of Intel Corporation nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + * +**/ + +#include <cpu/x86/cr.h> +#include <cpu/x86/post_code.h> +#include <soc/QuarkNcSocId.h> + +.macro RET32 + jmp *%esp +.endm + +/* ROM/SPI/MEMORY Definitions */ +.equ QUARK_DDR3_MEM_BASE_ADDRESS, (0x000000000) /* Memory Base Address = 0 */ +.equ QUARK_MAX_DDR3_MEM_SIZE_BYTES, (0x80000000) /* DDR3 Memory Size = 2GB */ +.equ QUARK_ESRAM_MEM_BASE_ADDRESS, (QUARK_DDR3_MEM_BASE_ADDRESS \ + + QUARK_MAX_DDR3_MEM_SIZE_BYTES) /* eSRAM Memory above DDR3 */ +.equ QUARK_ESRAM_MEM_SIZE_BYTES, (0x00080000) /* eSRAM Memory Size = 512K */ +.equ QUARK_STACK_SIZE_BYTES, (0x008000) /* Quark stack size = 32K */ +.equ QUARK_STACK_BASE_ADDRESS, (QUARK_ESRAM_MEM_BASE_ADDRESS \ + + QUARK_ESRAM_MEM_SIZE_BYTES \ + - QUARK_STACK_SIZE_BYTES) /* Top of eSRAM - stack size */ +.equ QUARK_CMH_SIZE_BYTES, (0x0400) /* Quark Module Header size */ +.equ QUARK_ESRAM_STAGE1_BASE_ADDRESS, (QUARK_ESRAM_MEM_BASE_ADDRESS \ + + QUARK_CMH_SIZE_BYTES) /* Start of Stage1 code in eSRAM */ + +/* RTC/CMOS definitions */ +.equ RTC_INDEX, (0x70) +.equ NMI_DISABLE, (0x80) /* Bit7=1 disables NMI */ +.equ RTC_DATA, (0x71) + +/* PCI Configuration definitions (Datasheet 5.5.1) */ +.equ PCI_CFG, (0x80000000) /* PCI configuration access mechanism */ +.equ PCI_ADDRESS_PORT, (0xCF8) +.equ PCI_DATA_PORT, (0xCFC) + +/* Quark PCI devices */ +.equ HOST_BRIDGE_PFA, (0 << 11) /* B0:D0:F0 (Host Bridge) */ +.equ ILB_PFA, (0x1F << 11) /* B0:D31:F0 (Legacy Block) */ + +/* ILB PCI Config Registers */ +.equ BDE, (0x0D4) /* BIOS Decode Enable register */ +.equ DECODE_ALL_REGIONS_ENABLE, (0xFF000000) /* Decode all BIOS ranges */ + +/* iLB Reset Register */ +.equ ILB_RESET_REG, (0x0CF9) +.equ CF9_WARM_RESET, (0x02) +.equ CF9_COLD_RESET, (0x08) + +/* Memory Arbiter Config Registers */ +.equ AEC_CTRL_OFFSET, (0x00) + +/* Host Bridge Config Registers */ +.equ HMBOUND_OFFSET, (0x08) +.equ HMBOUND_ADDRESS, (QUARK_DDR3_MEM_BASE_ADDRESS \ + + QUARK_MAX_DDR3_MEM_SIZE_BYTES + QUARK_ESRAM_MEM_SIZE_BYTES) +.equ HECREG_OFFSET, (0x09) +.equ EC_BASE, (0xE0000000) +.equ EC_ENABLE, (0x01) + +/* Memory Manager Config Registers */ +.equ ESRAM_ADDRESS_2G, (0x10000080) +.equ BIMRVCTL_OFFSET, (0x19) +.equ ENABLE_IMR_INTERRUPT, (0x80000000) + +/* SOC UNIT Debug Registers */ +.equ CFGSTICKY_W1_OFFSET, (0x50) +.equ FORCE_COLD_RESET, (0x00000001) +.equ CFGSTICKY_RW_OFFSET, (0x51) +.equ RESET_FOR_ESRAM_LOCK, (0x00000020) +.equ RESET_FOR_HMBOUND_LOCK, (0x00000040) +.equ CFGNONSTICKY_W1_OFFSET, (0x52) +.equ FORCE_WARM_RESET, (0x00000001) + +.global bootblock_pre_c_entry +bootblock_pre_c_entry: + + /* Registers: + * ebp: Low 32-bits of timestamp + * edi: High 32-bits of timestamp + */ + +setup_esram: + /* Ensure cache is disabled. */ + movl %cr0, %eax + orl $(CR0_CD | CR0_NW), %eax + invd + movl %eax, %cr0 + + /* + * Disable NMI operation + * Good convention suggests you should read back RTC data port after + * accessing the RTC index port. + */ + movb $(NMI_DISABLE), %al + movw $(RTC_INDEX), %dx + outb %al, %dx + movw $(RTC_DATA), %dx + inb %dx, %al + + /* Disable SMI (Disables SMI wire, not SMI messages) */ + movl $((QUARK_OPCODE_READ << QNC_MCR_OP_OFFSET) \ + | (QUARK_NC_HOST_BRIDGE_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (QNC_MSG_FSBIC_REG_HMISC << QNC_MCR_REG_OFFSET)), %ecx + leal L1, %esp + jmp stackless_SideBand_Read +L1: + andl $(~SMI_EN), %eax + movl $((QUARK_OPCODE_WRITE << QNC_MCR_OP_OFFSET) \ + | (QUARK_NC_HOST_BRIDGE_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (QNC_MSG_FSBIC_REG_HMISC << QNC_MCR_REG_OFFSET)), %ecx + leal L2, %esp + jmp stackless_SideBand_Write +L2: + + /* + * Before we get going, check SOC Unit Registers to see if we are + * required to issue a warm/cold reset + */ + movl $((QUARK_ALT_OPCODE_READ << QNC_MCR_OP_OFFSET) \ + | (QUARK_SCSS_SOC_UNIT_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (CFGNONSTICKY_W1_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L3, %esp + jmp stackless_SideBand_Read +L3: + andl $(FORCE_WARM_RESET), %eax + jz TestForceColdReset /* No warm reset - branch */ + jmp IssueWarmReset + +TestForceColdReset: + movl $((QUARK_ALT_OPCODE_READ << QNC_MCR_OP_OFFSET) \ + | (QUARK_SCSS_SOC_UNIT_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (CFGNONSTICKY_W1_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L4, %esp + jmp stackless_SideBand_Read +L4: + andl $(FORCE_COLD_RESET), %eax + jz TestHmboundLock /* No cold reset - branch */ + jmp IssueColdReset + + /* Before setting HMBOUND, check it's not locked */ +TestHmboundLock: + movl $((QUARK_OPCODE_READ << QNC_MCR_OP_OFFSET) \ + | (QUARK_NC_HOST_BRIDGE_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (HMBOUND_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L5, %esp + jmp stackless_SideBand_Read +L5: + andl $(HMBOUND_LOCK), %eax + jz ConfigHmbound /* Good configuration - branch */ + + /* Failed to config - store sticky bit debug */ + movl $((QUARK_ALT_OPCODE_READ << QNC_MCR_OP_OFFSET) \ + | (QUARK_SCSS_SOC_UNIT_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (CFGSTICKY_RW_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L6, %esp + jmp stackless_SideBand_Read +L6: + orl $(RESET_FOR_HMBOUND_LOCK), %eax + movl $((QUARK_ALT_OPCODE_WRITE << QNC_MCR_OP_OFFSET) \ + | (QUARK_SCSS_SOC_UNIT_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (CFGSTICKY_RW_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L7, %esp + jmp stackless_SideBand_Write +L7: + jmp IssueWarmReset + + /* Set up the HMBOUND register */ +ConfigHmbound: + movl $(HMBOUND_ADDRESS), %eax /* Data (Set HMBOUND location) */ + movl $((QUARK_OPCODE_WRITE << QNC_MCR_OP_OFFSET) \ + | (QUARK_NC_HOST_BRIDGE_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (HMBOUND_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L8, %esp + jmp stackless_SideBand_Write +L8: + + /* + * Enable interrupts to Remote Management Unit when a IMR/SMM/HMBOUND + * violation occurs. + */ + movl $(ENABLE_IMR_INTERRUPT), %eax /* Set interrupt enable mask */ + movl $((QUARK_OPCODE_WRITE << QNC_MCR_OP_OFFSET) \ + | (QUARK_NC_MEMORY_MANAGER_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (BIMRVCTL_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L9, %esp + jmp stackless_SideBand_Write +L9: + + /* Move eSRAM memory to 2GB */ + movl $(ESRAM_ADDRESS_2G), %eax /* Data (Set eSRAM location) */ + movl $((QUARK_OPCODE_WRITE << QNC_MCR_OP_OFFSET) \ + | (QUARK_NC_MEMORY_MANAGER_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (QUARK_NC_MEMORY_MANAGER_ESRAMPGCTRL_BLOCK \ + << QNC_MCR_REG_OFFSET)), %ecx + leal L10, %esp + jmp stackless_SideBand_Write +L10: + + /* Check that we're not blocked from setting the config that we want. */ + movl $((QUARK_OPCODE_READ << QNC_MCR_OP_OFFSET) \ + | (QUARK_NC_MEMORY_MANAGER_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (QUARK_NC_MEMORY_MANAGER_ESRAMPGCTRL_BLOCK \ + << QNC_MCR_REG_OFFSET)), %ecx + leal L11, %esp + jmp stackless_SideBand_Read +L11: + andl $(BLOCK_ENABLE_PG), %eax + jnz ConfigPci /* Good configuration - branch */ + + /* Failed to config - store sticky bit debug */ + movl $((QUARK_ALT_OPCODE_READ << QNC_MCR_OP_OFFSET) \ + | (QUARK_SCSS_SOC_UNIT_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (CFGSTICKY_RW_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L12, %esp + jmp stackless_SideBand_Read +L12: + orl $(RESET_FOR_ESRAM_LOCK), %eax + movl $((QUARK_ALT_OPCODE_WRITE << QNC_MCR_OP_OFFSET) \ + | (QUARK_SCSS_SOC_UNIT_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (CFGSTICKY_RW_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L13, %esp + jmp stackless_SideBand_Write +L13: + jmp IssueWarmReset + + /* Enable PCIEXBAR */ +ConfigPci: + movl $(EC_BASE + EC_ENABLE), %eax /* Data */ + movl $((QUARK_OPCODE_WRITE << QNC_MCR_OP_OFFSET) \ + | (QUARK_NC_MEMORY_ARBITER_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (AEC_CTRL_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L14, %esp + jmp stackless_SideBand_Write +L14: + + movl $(EC_BASE + EC_ENABLE), %eax /* Data */ + movl $((QUARK_OPCODE_WRITE << QNC_MCR_OP_OFFSET) \ + | (QUARK_NC_HOST_BRIDGE_SB_PORT_ID << QNC_MCR_PORT_OFFSET) \ + | (HECREG_OFFSET << QNC_MCR_REG_OFFSET)), %ecx + leal L15, %esp + jmp stackless_SideBand_Write +L15: + + /* Open up full 8MB SPI decode */ + movl $(PCI_CFG | ILB_PFA | BDE), %ebx /* PCI config address */ + movl $(DECODE_ALL_REGIONS_ENABLE), %eax + leal L16, %esp + jmp stackless_PCIConfig_Write +L16: + + jmp esram_init_done + +IssueWarmReset: + /* Issue Warm Reset request to Remote Management Unit via iLB */ + movw $(CF9_WARM_RESET), %ax + movw $(ILB_RESET_REG), %dx + outw %ax, %dx + jmp . /* Stay here until we are reset. */ + +IssueColdReset: + /* Issue Cold Reset request to Remote Management Unit via iLB */ + movw $(CF9_COLD_RESET), %ax + movw $(ILB_RESET_REG), %dx + outw %ax, %dx + jmp . /* Stay here until we are reset. */ + +/* + *---------------------------------------------------------------------------- + * + * Procedure: stackless_SideBand_Read + * + * Input: esp - return address + * ecx[15:8] - Register offset + * ecx[23:16] - Port ID + * ecx[31:24] - Opcode + * + * Output: eax - Data read + * + * Destroys: eax + * ebx + * cl + * esi + * + * Description: + * Perform requested sideband read + *---------------------------------------------------------------------------- + */ + +stackless_SideBand_Read: + + movl %esp, %esi /* Save the return address */ + + /* Load the SideBand Packet Register to generate the transaction */ + movl $(PCI_CFG | HOST_BRIDGE_PFA | QNC_ACCESS_PORT_MCR), %ebx + movb $QNC_MCR_BYTE_ENABLES, %cl /* Set all Byte Enable bits */ + xchgl %ecx, %eax + leal L17, %esp + jmp stackless_PCIConfig_Write +L17: + xchgl %ecx, %eax + + /* Read the SideBand Data Register */ + movl $(PCI_CFG | HOST_BRIDGE_PFA | (QNC_ACCESS_PORT_MDR)), %ebx + leal L18, %esp + jmp stackless_PCIConfig_Read +L18: + + movl %esi, %esp /* Restore the return address */ + RET32 + +/* + *---------------------------------------------------------------------------- + * + * Procedure: stackless_SideBand_Write + * + * Input: esp - return address + * eax - Data + * ecx[15:8] - Register offset + * ecx[23:16] - Port ID + * ecx[31:24] - Opcode + * + * Output: None + * + * Destroys: ebx + * cl + * esi + * + * Description: + * Perform requested sideband write + * + *---------------------------------------------------------------------------- + */ + +stackless_SideBand_Write: + + movl %esp, %esi /* Save the return address */ + + /* Load the SideBand Data Register with the data */ + movl $(PCI_CFG | HOST_BRIDGE_PFA | QNC_ACCESS_PORT_MDR), %ebx + leal L19, %esp + jmp stackless_PCIConfig_Write +L19: + + /* Load the SideBand Packet Register to generate the transaction */ + movl $(PCI_CFG | HOST_BRIDGE_PFA | QNC_ACCESS_PORT_MCR), %ebx + movb $QNC_MCR_BYTE_ENABLES, %cl /* Set all Byte Enable bits */ + xchgl %ecx, %eax + leal L20, %esp + jmp stackless_PCIConfig_Write +L20: + xchgl %ecx, %eax + + movl %esi, %esp /* Restore the return address */ + RET32 + +/* + *---------------------------------------------------------------------------- + * + * Procedure: stackless_PCIConfig_Write + * + * Input: esp - return address + * eax - Data to write + * ebx - PCI Config Address + * + * Output: None + * + * Destroys: dx + * + * Description: + * Perform a DWORD PCI Configuration write + * + *---------------------------------------------------------------------------- + */ + +stackless_PCIConfig_Write: + + /* Write the PCI Config Address to the address port */ + xchgl %ebx, %eax + movw $(PCI_ADDRESS_PORT), %dx + outl %eax, %dx + xchgl %ebx, %eax + + /* Write the PCI DWORD Data to the data port */ + movw $(PCI_DATA_PORT), %dx + outl %eax, %dx + + RET32 + +/* + *---------------------------------------------------------------------------- + * + * Procedure: stackless_PCIConfig_Read + * + * Input: esp - return address + * ebx - PCI Config Address + * + * Output: eax - Data read + * + * Destroys: eax + * dx + * + * Description: + * Perform a DWORD PCI Configuration read + * + *---------------------------------------------------------------------------- + */ + +stackless_PCIConfig_Read: + + /* Write the PCI Config Address to the address port */ + xchgl %ebx, %eax + movw $(PCI_ADDRESS_PORT), %dx + outl %eax, %dx + xchgl %ebx, %eax + + /* Read the PCI DWORD Data from the data port */ + movw $(PCI_DATA_PORT), %dx + inl %dx, %eax + + RET32 + +/*----------------------------------------------------------------------------*/ + +esram_init_done: + +#if IS_ENABLED(CONFIG_ENABLE_DEBUG_LED) +sd_led: + +.equ SD_PFA, (0x14 << 11) /* B0:D20:F0 - SDIO controller */ +.equ SD_CFG_BASE, (PCI_CFG | SD_PFA) /* SD cntrl base in PCI config space */ +.equ SD_CFG_CMD, (SD_CFG_BASE+0x04) /* Command reg in PCI config space */ +.equ SD_CFG_ADDR, (SD_CFG_BASE+0x10) /* Base address in PCI config space */ +.equ SD_BASE_ADDR, (0xA0018000) /* SD controller's base address */ +.equ SD_HOST_CTRL, (SD_BASE_ADDR+0x28) /* HOST_CTRL register */ + + /* Set the SDIO controller's base address */ + movl $(SD_BASE_ADDR), %eax + movl $(SD_CFG_ADDR), %ebx + leal L40, %esp + jmp stackless_PCIConfig_Write + +L40: + movl $(SD_CFG_ADDR), %ebx + leal L41, %esp + jmp stackless_PCIConfig_Read + +L41: + /* Enable the SDIO controller */ + movl $(SD_CFG_CMD), %ebx + leal L42, %esp + jmp stackless_PCIConfig_Read + +L42: + orl $2, %eax + movl $(SD_CFG_CMD), %ebx + leal L43, %esp + jmp stackless_PCIConfig_Write + +L43: + movl $(SD_CFG_CMD), %ebx + leal L44, %esp + jmp stackless_PCIConfig_Read + +L44: +#if IS_ENABLED(CONFIG_ENABLE_DEBUG_LED_ESRAM) + /* Turn on SD LED to indicate ESRAM successfully initialized */ + movl $SD_HOST_CTRL, %ebx + movb 0(%ebx), %al + orb $1, %al + movb %al, 0(%ebx) + + /* Loop forever */ + jmp . +#endif /* CONFIG_ENABLE_DEBUG_LED_ESRAM */ +#endif /* CONFIG_ENABLE_DEBUG_LED */ + + /* Registers: + * ebp: Low 32-bits of timestamp + * edi: High 32-bits of timestamp + */ + + /* Setup bootblock stack */ + movl $_car_stack_end, %esp + +before_carstage: + post_code(0x2b) + + /* Restore the timestamp from bootblock_crt0.S (mm2:mm1) */ + push %ebp + push %edi + + /* We can call into C functions now */ + call bootblock_main_with_timestamp + + /* Never reached */ diff --git a/src/soc/intel/quark/include/soc/romstage.h b/src/soc/intel/quark/include/soc/romstage.h index 3a9e7a8..47545ac 100644 --- a/src/soc/intel/quark/include/soc/romstage.h +++ b/src/soc/intel/quark/include/soc/romstage.h @@ -25,6 +25,7 @@ #include <fsp/romstage.h> #include <soc/reg_access.h>
+asmlinkage void *car_state_c_entry(void); uint32_t port_reg_read(uint8_t port, uint32_t offset); void port_reg_write(uint8_t port, uint32_t offset, uint32_t value); void report_platform_info(void); diff --git a/src/soc/intel/quark/romstage/Makefile.inc b/src/soc/intel/quark/romstage/Makefile.inc index 6c92ac4..63836b1 100644 --- a/src/soc/intel/quark/romstage/Makefile.inc +++ b/src/soc/intel/quark/romstage/Makefile.inc @@ -13,8 +13,11 @@ # GNU General Public License for more details. #
+ifeq ($(CONFIG_C_ENVIRONMENT_BOOTBLOCK),y) +else cpu_incs-y += $(src)/soc/intel/quark/romstage/esram_init.inc cpu_incs-y += $(src)/soc/intel/quark/romstage/cache_as_ram.inc +endif
romstage-y += mtrr.c romstage-y += pcie.c diff --git a/src/soc/intel/quark/romstage/bootblock_in_c.S b/src/soc/intel/quark/romstage/bootblock_in_c.S new file mode 100644 index 0000000..35b0639 --- /dev/null +++ b/src/soc/intel/quark/romstage/bootblock_in_c.S @@ -0,0 +1,75 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2000,2007 Ronald G. Minnich rminnich@gmail.com + * Copyright (C) 2007-2008 coresystems GmbH + * Copyright (C) 2013-2014 Sage Electronic Engineering, LLC. + * Copyright (C) 2015-2016 Intel Corporation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Replacement for cache_as_ram.inc when using the C environment boot block. + */ + +#include <rules.h> + + .global car_stage_entry + +car_stage_entry: + + /* Call cache_as_ram_main(struct cache_as_ram_params *) */ + call car_state_c_entry + +/* One will never return from cache_as_ram_main() in verstage so there's + * no such thing as after ram init. */ +#if !ENV_VERSTAGE +#include "src/drivers/intel/fsp1_1/after_raminit.S" +#endif + + movb $0x69, %ah + jmp .Lhlt + +#---------------------------------------------------------------------------- +# +# Procedure: .Lhlt +# +# Input: ah - Upper 8-bits of POST code +# al - Lower 8-bits of POST code +# +# Description: +# Infinite loop displaying alternating POST code values +# +#---------------------------------------------------------------------------- + +#define FLASH_DELAY 0x1000 /* I/O delay between post codes on failure */ +#define POST_DELAY 0x50 + +.Lhlt: + xchg %al, %ah + mov $POST_DELAY, %dh +#if IS_ENABLED(CONFIG_POST_IO) + outb %al, $CONFIG_POST_IO_PORT +#else + post_code(POST_DEAD_CODE) +#endif +.flash_setup: + movl $FLASH_DELAY, %ecx +.flash_delay: + outb %al, $0xED + loop .flash_delay +#if IS_ENABLED(CONFIG_ENABLE_DEBUG_LED) + movl $SD_HOST_CTRL, %ebx + movb 0(%ebx), %dl + xorb $1, %dl + movb %dl, 0(%ebx) +#endif /* CONFIG_ENABLE_DEBUG_LED */ + decb %dh + jnz .flash_setup + jmp .Lhlt diff --git a/src/soc/intel/quark/romstage/romstage.c b/src/soc/intel/quark/romstage/romstage.c index e27aa68..66853de 100644 --- a/src/soc/intel/quark/romstage/romstage.c +++ b/src/soc/intel/quark/romstage/romstage.c @@ -29,6 +29,7 @@ #include <soc/pm.h> #include <soc/romstage.h> #include <soc/reg_access.h> +#include <string.h>
static const struct reg_script clear_smi_and_wake_events[] = { /* Clear any SMI or wake events */ @@ -65,6 +66,32 @@ static const struct reg_script hsuart_init[] = { REG_SCRIPT_END };
+asmlinkage void *car_state_c_entry(void) +{ + post_code(0x20); + if (IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1)) { + FSP_INFO_HEADER *fih; + struct cache_as_ram_params car_params; + void *top_of_stack; + + memcpy((void *)CONFIG_FSP_ESRAM_LOC, (void *)CONFIG_FSP_LOC, + 0x00040000); + + fih = find_fsp(CONFIG_FSP_ESRAM_LOC); + + car_params.tsc = 0; + car_params.bist = 0; + car_params.fih = fih; + car_params.bootloader_car_start = 0; + car_params.bootloader_car_end = 0; + post_code(0x2A); + top_of_stack = cache_as_ram_main(&car_params); + return top_of_stack; + } + + return NULL; +} + void car_soc_pre_console_init(void) { /* Initialize the controllers */
-
Leroy P Leahy