[coreboot-gerrit] New patch to review for coreboot: soc/intel/quark: Switch to using C bootblock

Leroy P Leahy (leroy.p.leahy@intel.com) gerrit at coreboot.org
Thu Jun 9 02:26:16 CEST 2016


Leroy P Leahy (leroy.p.leahy at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15134

-gerrit

commit 7ca875a5766c30929c6944db33cb2f220075de7c
Author: Lee Leahy <leroy.p.leahy at intel.com>
Date:   Wed Jun 8 14:07:05 2016 -0700

    soc/intel/quark: Switch to using C bootblock
    
    Use the C_ENVIRONMENT_BOOTBLOCK and remove the junk.
    
    TEST=Build and run on Galileo Gen2
    
    Change-Id: Ibcdf771bf63dd9c425a2b73b0b6104581158cfaf
    Signed-off-by: Lee Leahy <Leroy.P.Leahy at intel.com>
---
 src/soc/intel/quark/Kconfig                   |   1 +
 src/soc/intel/quark/romstage/Makefile.inc     |   6 -
 src/soc/intel/quark/romstage/cache_as_ram.inc | 252 -------------
 src/soc/intel/quark/romstage/esram_init.inc   | 516 --------------------------
 4 files changed, 1 insertion(+), 774 deletions(-)

diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig
index 3066c7b..dc33fec 100644
--- a/src/soc/intel/quark/Kconfig
+++ b/src/soc/intel/quark/Kconfig
@@ -26,6 +26,7 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_RAMSTAGE_X86_32
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_VERSTAGE_X86_32
+	select C_ENVIRONMENT_BOOTBLOCK
 	select REG_SCRIPT
 	select SOC_INTEL_COMMON
 	select SOC_SETS_MTRRS
diff --git a/src/soc/intel/quark/romstage/Makefile.inc b/src/soc/intel/quark/romstage/Makefile.inc
index 63836b1..391cda4 100644
--- a/src/soc/intel/quark/romstage/Makefile.inc
+++ b/src/soc/intel/quark/romstage/Makefile.inc
@@ -13,12 +13,6 @@
 # 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
 romstage-y += report_platform.c
diff --git a/src/soc/intel/quark/romstage/cache_as_ram.inc b/src/soc/intel/quark/romstage/cache_as_ram.inc
deleted file mode 100644
index a935bdf..0000000
--- a/src/soc/intel/quark/romstage/cache_as_ram.inc
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2000,2007 Ronald G. Minnich <rminnich at 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 FSP binary.  This code
- * locates the FSP binary, initializes the cache as RAM and performs the
- * first stage of initialization.  Next this code switches the stack from
- * the cache to RAM and then disables the cache as RAM.  Finally this code
- * performs the final stage of initialization.
- */
-
-#include <rules.h>
-
-	/*
-	 * eax:  BIST value
-	 */
-
-	movl	%eax, %edi
-
-cache_as_ram:
-	post_code(0x20)
-
-	/*
-	 * edi:  BIST value
-	 */
-
-	/*
-	 * Find the FSP binary in cbfs.
-	 * Make a fake stack that has the return value back to this code.
-	 */
-	lea	fake_fsp_stack, %esp
-	jmp	find_fsp
-
-find_fsp_ret:
-	/* Save the FSP location */
-	mov	%eax, %ebp
-
-	/*
-	 * Only when a valid FSP binary is found at CONFIG_FSP_LOC is
-	 * the returned FSP_INFO_HEADER structure address above the base
-	 * address of FSP binary specified by the CONFIG_FSP_LOC value.
-	 * All of the error values are in the 0x8xxxxxxx range which are
-	 * below the CONFIG_FSP_LOC value.
-	 */
-	cmp	$CONFIG_FSP_ESRAM_LOC, %eax
-	jbe	halt1
-
-	post_code(POST_FSP_TEMP_RAM_INIT)
-
-#if IS_ENABLED(CONFIG_ENABLE_DEBUG_LED_FINDFSP)
-	movl	$SD_HOST_CTRL, %ebx
-	movb	0(%ebx), %al
-	orb	$1, %al
-	movb	%al, 0(%ebx)
-	jmp	.
-#endif /* CONFIG_ENABLE_DEBUG_LED_FINDFSP */
-
-	/* Calculate entry into FSP */
-	mov	0x30(%ebp), %eax	/* Load TempRamInitEntry */
-	add	0x1c(%ebp), %eax	/* add in the offset for FSP */
-
-	/*
-	 * Pass early init variables on a fake stack (no memory yet)
-	 * as well as the return location
-	 */
-	lea	CAR_init_stack, %esp
-
-	/*
-	 *       BIST value is zero
-	 * eax:  TempRamInitApi address
-	 * ebp:  FSP_INFO_HEADER address
-	 * edi:  BIST value
-	 * esi:  Not used
-	 */
-
-	/* call FSP binary to setup temporary stack */
-	jmp	*%eax
-
-CAR_init_done:
-	addl	$4, %esp
-
-	/*
-	 * ebp:  FSP_INFO_HEADER address
-	 * ecx:  Temp RAM base
-	 * edx:  Temp RAM top
-	 * edi:  BIST value
-	 */
-
-	cmp	$0, %eax
-	jne	halt2
-
-#if IS_ENABLED(CONFIG_ENABLE_DEBUG_LED_TEMPRAMINIT)
-	movl	%edx, %esi
-	movl	$SD_HOST_CTRL, %ebx
-	movb	0(%ebx), %al
-	orb	$1, %al
-	movb	%al, 0(%ebx)
-	movl	%esi, %edx
-	jmp	.
-#endif /* CONFIG_ENABLE_DEBUG_LED_TEMPRAMINIT */
-
-	/* Set up bootloader stack */
-	movl	%edx, %esp
-
-	/*
-	 * eax:  0
-	 * ebp:  FSP_INFO_HEADER address
-	 * ecx:  Temp RAM base
-	 * edx:  Temp RAM top
-	 * edi:  BIST value
-	 * esp:  Top of stack in temp RAM
-	 */
-
-	/* Create cache_as_ram_params on stack */
-	pushl	%edx	/* bootloader CAR end */
-	pushl	%ecx	/* bootloader CAR begin */
-	pushl	%ebp	/* FSP_INFO_HEADER */
-	pushl	$0	/* BIST - esram_init.inc catches non-zero BIST values */
-	/* TODO: Locate 64-bits of storage for initial TSC value */
-	pushl	$0	/* tsc[63:32] */
-	pushl	$0 	/* tsc[31:0] */
-	pushl	%esp	/* pointer to cache_as_ram_params */
-
-	/* Save FSP_INFO_HEADER location in ebx */
-	mov	%ebp, %ebx
-
-	/* Coreboot assumes stack/heap region will be zero */
-	cld
-	movl	%ecx, %edi
-	neg	%ecx
-	/* Only clear up to current stack value. */
-	add	%esp, %ecx
-	shrl	$2, %ecx
-	xorl	%eax, %eax
-	rep	stosl
-
-before_romstage:
-	post_code(0x2A)
-
-	/* Call cache_as_ram_main(struct cache_as_ram_params *) */
-	call	cache_as_ram_main
-
-/* 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
-
-halt1:
-	/*
-	 * Failures for postcode 0xBA - failed in fsp_fih_early_find()
-	 *
-	 * Values are:
-	 * 0x01 - FV signature, "_FVH" not present
-	 * 0x02 - FFS GUID not present
-	 * 0x03 - FSP INFO Header not found
-	 * 0x04 - ImageBase does not equal CONFIG_FSP_LOC - Is the FSP rebased to
-	 *        a different location, or does it need to be?
-	 * 0x05 - FSP INFO Header signature "FSPH" not found
-	 * 0x06 - FSP Image ID is not the expected ID.
-	 */
-	movb	$0xBA, %ah
-	jmp	.Lhlt
-
-halt2:
-	/*
-	 * Failures for postcode 0xBB - failed in the FSP:
-	 *
-	 * 0x00 - FSP_SUCCESS: Temp RAM was initialized successfully.
-	 * 0x02 - FSP_INVALID_PARAMETER: Input parameters are invalid.
-	 * 0x03 - FSP_UNSUPPORTED: The FSP calling conditions were not met.
-	 * 0x07 - FSP_DEVICE_ERROR: Temp RAM initialization failed
-	 * 0x0E - FSP_NOT_FOUND: No valid microcode was found in the microcode region.
-	 * 0x14 - FSP_ALREADY_STARTED: Temp RAM initialization has been invoked
-	 */
-	movb	$0xBB, %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_FINDFSP)
-	movl	$SD_HOST_CTRL, %ebx
-	movb	0(%ebx), %dl
-	xorb	$1, %dl
-	movb	%dl, 0(%ebx)
-#endif /* CONFIG_ENABLE_DEBUG_LED_FINDFSP */
-	decb	%dh
-	jnz	.flash_setup
-	jmp	.Lhlt
-
-/*
- * esp is set to this location so that the call into and return from the FSP
- * in find_fsp will work.
- */
-	.align 4
-fake_fsp_stack:
-	.long	find_fsp_ret
-	.long	CONFIG_FSP_ESRAM_LOC	/* FSP base address */
-
-CAR_init_params:
-	.long	CONFIG_CPU_MICROCODE_CBFS_LOC		/* Microcode Location */
-	.long	CONFIG_CPU_MICROCODE_CBFS_LEN		/* Microcode Length */
-	.long	0xFFFFFFFF - CONFIG_ROM_SIZE + 1	/* Firmware Location */
-	.long	CONFIG_ROM_SIZE				/* Total Firmware Length */
-
-CAR_init_stack:
-	.long	CAR_init_done
-	.long	CAR_init_params
diff --git a/src/soc/intel/quark/romstage/esram_init.inc b/src/soc/intel/quark/romstage/esram_init.inc
deleted file mode 100644
index b899741..0000000
--- a/src/soc/intel/quark/romstage/esram_init.inc
+++ /dev/null
@@ -1,516 +0,0 @@
-/** @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 <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)
-
-verify_bist:
-	cmp	$0, %eax
-	je	setup_esram
-	mov	$POST_DEAD_CODE, %eax
-#if IS_ENABLED(CONFIG_POST_IO)
-	outb	%al, $CONFIG_POST_IO_PORT
-#else
-	post_code(POST_DEAD_CODE)
-#endif
-	jmp	.
-
-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_PLATFORM_USES_FSP1_1)
-
-	/* Copy FSP image to eSRAM and call it. */
-	/* TODO: FSP location/size could be got in a routine. */
-	cld
-	movl	$(0x00040000), %ecx               /* 256K DWORDs = 64K */
-	shrl	$2, %ecx
-	movl	$CONFIG_FSP_LOC, %esi   /* The source address. */
-	movl	$CONFIG_FSP_ESRAM_LOC, %edi   /* FSP destination in ESRAM */
-	rep	movsl
-#endif /* CONFIG_PLATFORM_USES_FSP1_1 */
-
-#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 */



More information about the coreboot-gerrit mailing list