[coreboot-gerrit] New patch to review for coreboot: 4c62f30 usbdebug: Move ehci_debug_info into CAR_GLOBAL
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Sun Jun 16 08:45:09 CEST 2013
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3475
-gerrit
commit 4c62f30c9e79a7a69ef0936d4245062f1c7372ff
Author: Aaron Durbin <adurbin at chromium.org>
Date: Fri Jun 14 00:41:19 2013 +0300
usbdebug: Move ehci_debug_info into CAR_GLOBAL
Store EHCI Debug Port runtime variables in CAR_GLOBAL.
For platforms without CAR_MIGRATION, logging on EHCI Debug Port is
temporarily lost when CAR is torn down at end of romstage.
On model_2065x and model_206ax ehci_debug_info was overlapping the MRC
variable region and additionally migration used incorrect size for
the structure.
Change-Id: I5e6c613b8a4b1dda43d5b69bd437753108760fca
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/cpu/intel/car/cache_as_ram_ht.inc | 5 -----
src/cpu/intel/haswell/cache_as_ram.inc | 9 ---------
src/cpu/intel/model_2065x/cache_as_ram.inc | 9 ---------
src/cpu/intel/model_206ax/cache_as_ram.inc | 9 ---------
src/cpu/intel/model_6ex/cache_as_ram.inc | 5 -----
src/include/cbmem.h | 1 +
src/lib/usbdebug.c | 32 ++++++++++++++++++++++++------
7 files changed, 27 insertions(+), 43 deletions(-)
diff --git a/src/cpu/intel/car/cache_as_ram_ht.inc b/src/cpu/intel/car/cache_as_ram_ht.inc
index 8a845e9..fe1e29a 100644
--- a/src/cpu/intel/car/cache_as_ram_ht.inc
+++ b/src/cpu/intel/car/cache_as_ram_ht.inc
@@ -334,12 +334,7 @@ no_msr_11e:
post_code(0x2e)
/* Set up the stack pointer. */
-#if CONFIG_USBDEBUG
- /* Leave some space for the struct ehci_debug_info. */
- movl $(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %esp
-#else
movl $(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4), %esp
-#endif
/* Restore the BIST result. */
movl %ebp, %eax
diff --git a/src/cpu/intel/haswell/cache_as_ram.inc b/src/cpu/intel/haswell/cache_as_ram.inc
index 8601f46..2d1e86f 100644
--- a/src/cpu/intel/haswell/cache_as_ram.inc
+++ b/src/cpu/intel/haswell/cache_as_ram.inc
@@ -190,15 +190,6 @@ before_romstage:
post_code(0x2f)
- /* Copy global variable space (for USBDEBUG) to memory */
-#if CONFIG_USBDEBUG
- cld
- movl $(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - 24), %esi
- movl $(CONFIG_RAMTOP - 24), %edi
- movl $24, %ecx
- rep movsb
-#endif
-
post_code(0x30)
/* Disable cache. */
diff --git a/src/cpu/intel/model_2065x/cache_as_ram.inc b/src/cpu/intel/model_2065x/cache_as_ram.inc
index db0eaae..ec7335e 100644
--- a/src/cpu/intel/model_2065x/cache_as_ram.inc
+++ b/src/cpu/intel/model_2065x/cache_as_ram.inc
@@ -182,15 +182,6 @@ before_romstage:
post_code(0x2f)
- /* Copy global variable space (for USBDEBUG) to memory */
-#if CONFIG_USBDEBUG
- cld
- movl $(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - 24), %esi
- movl $(CONFIG_RAMTOP - 24), %edi
- movl $24, %ecx
- rep movsb
-#endif
-
post_code(0x30)
/* Disable cache. */
diff --git a/src/cpu/intel/model_206ax/cache_as_ram.inc b/src/cpu/intel/model_206ax/cache_as_ram.inc
index 2652cb7..b4119cc 100644
--- a/src/cpu/intel/model_206ax/cache_as_ram.inc
+++ b/src/cpu/intel/model_206ax/cache_as_ram.inc
@@ -182,15 +182,6 @@ before_romstage:
post_code(0x2f)
- /* Copy global variable space (for USBDEBUG) to memory */
-#if CONFIG_USBDEBUG
- cld
- movl $(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - 24), %esi
- movl $(CONFIG_RAMTOP - 24), %edi
- movl $24, %ecx
- rep movsb
-#endif
-
post_code(0x30)
/* Disable cache. */
diff --git a/src/cpu/intel/model_6ex/cache_as_ram.inc b/src/cpu/intel/model_6ex/cache_as_ram.inc
index 50fab35..ac3c66b 100644
--- a/src/cpu/intel/model_6ex/cache_as_ram.inc
+++ b/src/cpu/intel/model_6ex/cache_as_ram.inc
@@ -126,12 +126,7 @@ clear_mtrrs:
movl %eax, %cr0
/* Set up the stack pointer. */
-#if CONFIG_USBDEBUG
- /* Leave some space for the struct ehci_debug_info. */
- movl $(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax
-#else
movl $(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4), %eax
-#endif
movl %eax, %esp
/* Restore the BIST result. */
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index baec780..1daa60f 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -70,6 +70,7 @@
#define CBMEM_ID_ROOT 0xff4007ff
#define CBMEM_ID_VBOOT_HANDOFF 0x780074f0
#define CBMEM_ID_CAR_GLOBALS 0xcac4e6a3
+#define CBMEM_ID_EHCI_DEBUG 0xe4c1deb9
#define CBMEM_ID_NONE 0x00000000
#ifndef __ASSEMBLER__
diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c
index 200121f..0fdf221 100644
--- a/src/lib/usbdebug.c
+++ b/src/lib/usbdebug.c
@@ -22,6 +22,9 @@
#include <console/console.h>
#include <arch/io.h>
#include <arch/byteorder.h>
+#include <cpu/x86/car.h>
+#include <cbmem.h>
+#include <string.h>
#include <usb_ch9.h>
#include <ehci.h>
@@ -86,6 +89,8 @@
#define DBGP_MAX_PACKET 8
#define DBGP_LOOPS 1000
+static struct ehci_debug_info glob_dbg_info CAR_GLOBAL;
+
static int dbgp_wait_until_complete(struct ehci_dbg_port *ehci_debug)
{
u32 ctrl;
@@ -574,8 +579,7 @@ next_debug_port:
int early_usbdebug_init(void)
{
- struct ehci_debug_info *dbg_info = (struct ehci_debug_info *)
- (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - sizeof(struct ehci_debug_info));
+ struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
return usbdebug_init(CONFIG_EHCI_BAR, CONFIG_EHCI_DEBUG_OFFSET, dbg_info);
}
@@ -585,8 +589,7 @@ void usbdebug_tx_byte(struct ehci_debug_info *dbg_info, unsigned char data)
#if DBGP_DEBUG == 0
if (!dbg_info) {
/* "Find" dbg_info structure in Cache */
- dbg_info = (struct ehci_debug_info *)
- (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - sizeof(struct ehci_debug_info));
+ dbg_info = car_get_var_ptr(&glob_dbg_info);
}
if (dbg_info->ehci_debug) {
@@ -604,8 +607,7 @@ void usbdebug_tx_flush(struct ehci_debug_info *dbg_info)
#if DBGP_DEBUG == 0
if (!dbg_info) {
/* "Find" dbg_info structure in Cache */
- dbg_info = (struct ehci_debug_info *)
- (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - sizeof(struct ehci_debug_info));
+ dbg_info = car_get_var_ptr(&glob_dbg_info);
}
if (dbg_info->ehci_debug && dbg_info->bufidx > 0) {
@@ -614,3 +616,21 @@ void usbdebug_tx_flush(struct ehci_debug_info *dbg_info)
}
#endif
}
+
+#if CONFIG_CAR_MIGRATION && defined(__PRE_RAM__)
+static void migrate_ehci_debug(void)
+{
+ struct ehci_debug_info *dbg_info;
+ struct ehci_debug_info *dbg_info_cbmem;
+
+ dbg_info = car_get_var_ptr(&glob_dbg_info);
+
+ dbg_info_cbmem = cbmem_add(CBMEM_ID_EHCI_DEBUG, sizeof(*dbg_info));
+
+ if (dbg_info_cbmem == NULL)
+ return;
+
+ memcpy(dbg_info_cbmem, dbg_info, sizeof(*dbg_info));
+}
+CAR_MIGRATE(migrate_ehci_debug);
+#endif
More information about the coreboot-gerrit
mailing list