[U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

* [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage
@ 2013-04-18  2:13 Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 01/19] x86: Remove unused bios/pci code Simon Glass
                   ` (19 more replies)
  0 siblings, 20 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

This series removes unused x86 code based on advice from Graeme Russ. THis
code was used for real mode which is no longer needed in U-Boot.

A new more accurate timer is added, and this permits bootstage to be
enabled and produce useful results on x86.


Doug Anderson (2):
  bootstage: Copy bootstage strings post-relocation
  Call bootstage_relocate() after malloc is initted

Simon Glass (17):
  x86: Remove unused bios/pci code
  x86: Remove unused portion of link script
  x86: Remove legacy board init code
  x86: Declare global_data pointer when it is used
  x86: Implement panic output for coreboot
  x86: Rationalise kernel booting logic and bootstage
  x86: Add TSC timer
  x86: Remove old broken timer implementation
  x86: Remove ISR timer
  x86: Re-enable PCAT timer 2 for beeping
  bootstage: Add stubs for new bootstage functions
  x86: Enable bootstage for coreboot
  bootstage: Allow marking a particular line of code
  x86: Fix warning in cmd_ximg.c when CONFIG_GZIP is not defined
  x86: config: Enable LZO for coreboot, remove zlib, gzip
  x86: Support adding coreboot timestanps to bootstage
  x86: Add coreboot timestamps

 arch/x86/cpu/Makefile                          |   2 +-
 arch/x86/cpu/coreboot/coreboot.c               |  13 ++
 arch/x86/cpu/coreboot/timestamp.c              |  42 +++-
 arch/x86/cpu/cpu.c                             |   5 +
 arch/x86/cpu/interrupts.c                      |   2 +
 arch/x86/cpu/timer.c                           |  17 --
 arch/x86/cpu/u-boot.lds                        |  12 --
 arch/x86/include/asm/arch-coreboot/timestamp.h |   7 +
 arch/x86/include/asm/init_helpers.h            |   9 -
 arch/x86/include/asm/init_wrappers.h           |  42 ----
 arch/x86/include/asm/pci.h                     |   4 -
 arch/x86/include/asm/u-boot-x86.h              |   4 +
 arch/x86/include/asm/u-boot.h                  |  32 ---
 arch/x86/lib/Makefile                          |  10 +-
 arch/x86/lib/bios.h                            | 170 ---------------
 arch/x86/lib/board.c                           | 273 -------------------------
 arch/x86/lib/bootm.c                           |   8 -
 arch/x86/lib/cmd_boot.c                        |   2 +
 arch/x86/lib/init_helpers.c                    |  98 ---------
 arch/x86/lib/init_wrappers.c                   | 164 ---------------
 arch/x86/lib/pcat_timer.c                      |  69 +------
 arch/x86/lib/pci.c                             | 188 -----------------
 arch/x86/lib/physmem.c                         |   2 +
 arch/x86/lib/relocate.c                        |   2 +
 arch/x86/lib/timer.c                           | 116 -----------
 arch/x86/lib/tsc_timer.c                       | 107 ++++++++++
 arch/x86/lib/zimage.c                          |  11 +-
 common/board_r.c                               |   1 +
 common/bootstage.c                             |  44 ++++
 common/cmd_ximg.c                              |   2 +
 include/bootstage.h                            |  54 +++++
 include/configs/coreboot.h                     |  18 +-
 32 files changed, 314 insertions(+), 1216 deletions(-)
 delete mode 100644 arch/x86/cpu/timer.c
 delete mode 100644 arch/x86/include/asm/init_wrappers.h
 delete mode 100644 arch/x86/lib/bios.h
 delete mode 100644 arch/x86/lib/board.c
 delete mode 100644 arch/x86/lib/init_wrappers.c
 delete mode 100644 arch/x86/lib/pci.c
 delete mode 100644 arch/x86/lib/timer.c
 create mode 100644 arch/x86/lib/tsc_timer.c

-- 
1.8.2.1

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 01/19] x86: Remove unused bios/pci code
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:50   ` Graeme Russ
  2013-04-18  2:13 ` [U-Boot] [PATCH 02/19] x86: Remove unused portion of link script Simon Glass
                   ` (18 subsequent siblings)
  19 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

Graeme Russ pointed out that this code is no longer used. Remove it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/x86/include/asm/pci.h |   4 -
 arch/x86/lib/Makefile      |   1 -
 arch/x86/lib/bios.h        | 170 ----------------------------------------
 arch/x86/lib/pci.c         | 188 ---------------------------------------------
 4 files changed, 363 deletions(-)
 delete mode 100644 arch/x86/lib/bios.h
 delete mode 100644 arch/x86/lib/pci.c

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 6d68ab6..9cc2034 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -30,8 +30,4 @@
 	const struct pci_device_id _table[]
 
 void pci_setup_type1(struct pci_controller *hose);
-int pci_enable_legacy_video_ports(struct pci_controller* hose);
-int pci_shadow_rom(pci_dev_t dev, unsigned char *dest);
-void pci_remove_rom_window(struct pci_controller* hose, u32 addr);
-u32 pci_get_rom_window(struct pci_controller* hose, int size);
 #endif
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index ee89354..9c6b621 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -37,7 +37,6 @@ COBJS-y	+= init_wrappers.o
 COBJS-y	+= interrupts.o
 COBJS-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o
 COBJS-$(CONFIG_SYS_GENERIC_TIMER) += pcat_timer.o
-COBJS-$(CONFIG_PCI) += pci.o
 COBJS-$(CONFIG_PCI) += pci_type1.o
 COBJS-y	+= relocate.o
 COBJS-y += physmem.o
diff --git a/arch/x86/lib/bios.h b/arch/x86/lib/bios.h
deleted file mode 100644
index 96509b0..0000000
--- a/arch/x86/lib/bios.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * (C) Copyright 2002
- * Daniel Engstr?m, Omicron Ceti AB, <daniel@omicron.se>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef _BIOS_H_
-#define _BIOS_H_
-
-#define OFFS_ES		0	/* 16bit */
-#define OFFS_GS		2	/* 16bit */
-#define OFFS_DS		4	/* 16bit */
-#define OFFS_EDI	6	/* 32bit */
-#define OFFS_DI		6	/* low 16 bits of EDI */
-#define OFFS_ESI	10	/* 32bit */
-#define OFFS_SI		10	/* low 16 bits of ESI */
-#define OFFS_EBP	14	/* 32bit */
-#define OFFS_BP		14	/* low 16 bits of EBP */
-#define OFFS_ESP	18	/* 32bit */
-#define OFFS_SP		18	/* low 16 bits of ESP */
-#define OFFS_EBX	22	/* 32bit */
-#define OFFS_BX		22	/* low 16 bits of EBX */
-#define OFFS_BL		22	/* low  8 bits of BX */
-#define OFFS_BH		23	/* high 8 bits of BX */
-#define OFFS_EDX	26	/* 32bit */
-#define OFFS_DX		26	/* low 16 bits of EBX */
-#define OFFS_DL		26	/* low  8 bits of BX */
-#define OFFS_DH		27	/* high 8 bits of BX */
-#define OFFS_ECX	30	/* 32bit */
-#define OFFS_CX		30	/* low 16 bits of EBX */
-#define OFFS_CL		30	/* low  8 bits of BX */
-#define OFFS_CH		31	/* high 8 bits of BX */
-#define OFFS_EAX	34	/* 32bit */
-#define OFFS_AX		34	/* low 16 bits of EBX */
-#define OFFS_AL		34	/* low  8 bits of BX */
-#define OFFS_AH		35	/* high 8 bits of BX */
-#define OFFS_VECTOR	38	/* 16bit */
-#define OFFS_IP		40	/* 16bit */
-#define OFFS_CS		42	/* 16bit */
-#define OFFS_FLAGS	44	/* 16bit */
-
-/* stack at 0x40:0x800 -> 0x800 */
-#define SEGMENT		0x40
-#define STACK		0x800
-
-/*
- * save general registers
- * save some segments
- * save callers stack segment
- * setup BIOS segments
- * setup BIOS stackpointer
- */
-#define MAKE_BIOS_STACK		\
-	pushal;			\
-	pushw	%ds;		\
-	pushw	%gs;		\
-	pushw	%es;		\
-	pushw	%ss;		\
-	popw	%gs;		\
-	movw	$SEGMENT, %ax;	\
-	movw	%ax, %ds;	\
-	movw	%ax, %es;	\
-	movw	%ax, %ss;	\
-	movw	%sp, %bp;	\
-	movw	$STACK, %sp
-
-/*
- * restore callers stack segment
- * restore some segments
- * restore general registers
- */
-#define RESTORE_CALLERS_STACK	\
-	pushw	%gs;		\
-	popw	%ss;		\
-	movw	%bp, %sp;	\
-	popw	%es;		\
-	popw	%gs;		\
-	popw	%ds;		\
-	popal
-
-#ifndef __ASSEMBLY__
-#define BIOS_DATA	((char *)0x400)
-#define BIOS_DATA_SIZE	256
-#define BIOS_BASE	((char *)0xf0000)
-#define BIOS_CS		0xf000
-
-extern ulong __bios_start;
-extern ulong __bios_size;
-
-/* these are defined in a 16bit segment and needs
- * to be accessed with the RELOC_16_xxxx() macros below
- */
-extern u16 ram_in_64kb_chunks;
-extern u16 bios_equipment;
-extern u8  pci_last_bus;
-
-extern void *rm_int00;
-extern void *rm_int01;
-extern void *rm_int02;
-extern void *rm_int03;
-extern void *rm_int04;
-extern void *rm_int05;
-extern void *rm_int06;
-extern void *rm_int07;
-extern void *rm_int08;
-extern void *rm_int09;
-extern void *rm_int0a;
-extern void *rm_int0b;
-extern void *rm_int0c;
-extern void *rm_int0d;
-extern void *rm_int0e;
-extern void *rm_int0f;
-extern void *rm_int10;
-extern void *rm_int11;
-extern void *rm_int12;
-extern void *rm_int13;
-extern void *rm_int14;
-extern void *rm_int15;
-extern void *rm_int16;
-extern void *rm_int17;
-extern void *rm_int18;
-extern void *rm_int19;
-extern void *rm_int1a;
-extern void *rm_int1b;
-extern void *rm_int1c;
-extern void *rm_int1d;
-extern void *rm_int1e;
-extern void *rm_int1f;
-extern void *rm_def_int;
-
-#define RELOC_16_LONG(seg, off) (*(u32 *)(seg << 4 | (u32)&off))
-#define RELOC_16_WORD(seg, off) (*(u16 *)(seg << 4 | (u32)&off))
-#define RELOC_16_BYTE(seg, off) (*(u8 *)(seg << 4 | (u32)&off))
-
-#ifdef PCI_BIOS_DEBUG
-extern u32 num_pci_bios_present;
-extern u32 num_pci_bios_find_device;
-extern u32 num_pci_bios_find_class;
-extern u32 num_pci_bios_generate_special_cycle;
-extern u32 num_pci_bios_read_cfg_byte;
-extern u32 num_pci_bios_read_cfg_word;
-extern u32 num_pci_bios_read_cfg_dword;
-extern u32 num_pci_bios_write_cfg_byte;
-extern u32 num_pci_bios_write_cfg_word;
-extern u32 num_pci_bios_write_cfg_dword;
-extern u32 num_pci_bios_get_irq_routing;
-extern u32 num_pci_bios_set_irq;
-extern u32 num_pci_bios_unknown_function;
-#endif
-
-#endif
-
-#endif
diff --git a/arch/x86/lib/pci.c b/arch/x86/lib/pci.c
deleted file mode 100644
index 71878dd..0000000
--- a/arch/x86/lib/pci.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * (C) Copyright 2002
- * Daniel Engstr?m, Omicron Ceti AB, <daniel@omicron.se>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <pci.h>
-#include <asm/io.h>
-#include <asm/pci.h>
-
-#undef PCI_ROM_SCAN_VERBOSE
-
-int pci_shadow_rom(pci_dev_t dev, unsigned char *dest)
-{
-	struct pci_controller *hose;
-	int res = -1;
-	int i;
-
-	u32 rom_addr;
-	u32 addr_reg;
-	u32 size;
-
-	u16 vendor;
-	u16 device;
-	u32 class_code;
-
-	u32 pci_data;
-
-	hose = pci_bus_to_hose(PCI_BUS(dev));
-
-	debug("pci_shadow_rom() asked to shadow device %x to %x\n",
-	       dev, (u32)dest);
-
-	pci_read_config_word(dev, PCI_VENDOR_ID, &vendor);
-	pci_read_config_word(dev, PCI_DEVICE_ID, &device);
-	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_code);
-
-	class_code &= 0xffffff00;
-	class_code >>= 8;
-
-	debug("PCI Header Vendor %04x device %04x class %06x\n",
-	       vendor, device, class_code);
-
-	/* Enable the rom addess decoder */
-	pci_write_config_dword(dev, PCI_ROM_ADDRESS, (u32)PCI_ROM_ADDRESS_MASK);
-	pci_read_config_dword(dev, PCI_ROM_ADDRESS, &addr_reg);
-
-	if (!addr_reg) {
-		/* register unimplemented */
-		printf("pci_chadow_rom: device do not seem to have a rom\n");
-		return -1;
-	}
-
-	size = (~(addr_reg&PCI_ROM_ADDRESS_MASK)) + 1;
-
-	debug("ROM is %d bytes\n", size);
-
-	rom_addr = pci_get_rom_window(hose, size);
-
-	debug("ROM mapped at %x\n", rom_addr);
-
-	pci_write_config_dword(dev, PCI_ROM_ADDRESS,
-			       pci_phys_to_mem(dev, rom_addr)
-			       |PCI_ROM_ADDRESS_ENABLE);
-
-
-	for (i = rom_addr; i < rom_addr + size; i += 512) {
-		if (readw(i) == 0xaa55) {
-#ifdef PCI_ROM_SCAN_VERBOSE
-			printf("ROM signature found\n");
-#endif
-			pci_data = readw(0x18 + i);
-			pci_data += i;
-
-			if (0 == memcmp((void *)pci_data, "PCIR", 4)) {
-#ifdef PCI_ROM_SCAN_VERBOSE
-				printf("Fount PCI rom image@offset %d\n",
-				       i - rom_addr);
-				printf("Vendor %04x device %04x class %06x\n",
-				       readw(pci_data + 4), readw(pci_data + 6),
-				       readl(pci_data + 0x0d) & 0xffffff);
-				printf("%s\n",
-				       (readw(pci_data + 0x15) & 0x80) ?
-				       "Last image" : "More images follow");
-				switch	(readb(pci_data + 0x14)) {
-				case 0:
-					printf("X86 code\n");
-					break;
-				case 1:
-					printf("Openfirmware code\n");
-					break;
-				case 2:
-					printf("PARISC code\n");
-					break;
-				}
-				printf("Image size %d\n",
-				       readw(pci_data + 0x10) * 512);
-#endif
-				/*
-				 * FixMe: I think we should compare the class
-				 * code bytes as well but I have no reference
-				 * on the exact order of these bytes in the PCI
-				 * ROM header
-				 */
-				if (readw(pci_data + 4) == vendor &&
-				    readw(pci_data + 6) == device &&
-				    readb(pci_data + 0x14) == 0) {
-#ifdef PCI_ROM_SCAN_VERBOSE
-					printf("Suitable ROM image found\n");
-#endif
-					memmove(dest, (void *)rom_addr,
-						readw(pci_data + 0x10) * 512);
-					res = 0;
-					break;
-
-				}
-
-				if (readw(pci_data + 0x15) & 0x80)
-					break;
-			}
-		}
-
-	}
-
-#ifdef PCI_ROM_SCAN_VERBOSE
-	if (res)
-		printf("No suitable image found\n");
-#endif
-	/* disable PAR register and PCI device ROM address devocer */
-	pci_remove_rom_window(hose, rom_addr);
-
-	pci_write_config_dword(dev, PCI_ROM_ADDRESS, 0);
-
-	return res;
-}
-
-#ifdef PCI_BIOS_DEBUG
-
-void print_bios_bios_stat(void)
-{
-	printf("16 bit functions:\n");
-	printf("pci_bios_present:                %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_present));
-	printf("pci_bios_find_device:            %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_find_device));
-	printf("pci_bios_find_class:             %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_find_class));
-	printf("pci_bios_generate_special_cycle: %d\n",
-			RELOC_16_LONG(0xf000,
-				      num_pci_bios_generate_special_cycle));
-	printf("pci_bios_read_cfg_byte:          %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_read_cfg_byte));
-	printf("pci_bios_read_cfg_word:          %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_read_cfg_word));
-	printf("pci_bios_read_cfg_dword:         %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_read_cfg_dword));
-	printf("pci_bios_write_cfg_byte:         %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_write_cfg_byte));
-	printf("pci_bios_write_cfg_word:         %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_write_cfg_word));
-	printf("pci_bios_write_cfg_dword:        %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_write_cfg_dword));
-	printf("pci_bios_get_irq_routing:        %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_get_irq_routing));
-	printf("pci_bios_set_irq:                %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_set_irq));
-	printf("pci_bios_unknown_function:       %d\n",
-			RELOC_16_LONG(0xf000, num_pci_bios_unknown_function));
-}
-#endif
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 01/19] x86: Remove unused bios/pci code
  2013-04-18  2:13 ` [U-Boot] [PATCH 01/19] x86: Remove unused bios/pci code Simon Glass
@ 2013-04-18  2:50   ` Graeme Russ
  0 siblings, 0 replies; 35+ messages in thread
From: Graeme Russ @ 2013-04-18  2:50 UTC (permalink / raw)
  To: u-boot

Hi Simon,

On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>
> Graeme Russ pointed out that this code is no longer used. Remove it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>  arch/x86/include/asm/pci.h |   4 -
>  arch/x86/lib/Makefile      |   1 -
>  arch/x86/lib/bios.h        | 170 ----------------------------------------
>  arch/x86/lib/pci.c         | 188
---------------------------------------------
>  4 files changed, 363 deletions(-)
>  delete mode 100644 arch/x86/lib/bios.h
>  delete mode 100644 arch/x86/lib/pci.c
>

[snip]

Acked-by: Graeme Russ <graeme.russ@gmail.com>

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 02/19] x86: Remove unused portion of link script
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 01/19] x86: Remove unused bios/pci code Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:50   ` Graeme Russ
  2013-04-18  2:13 ` [U-Boot] [PATCH 03/19] x86: Remove legacy board init code Simon Glass
                   ` (17 subsequent siblings)
  19 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

Since we don't have real-mode code now, we can remove this chunk of the link
script.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/x86/cpu/u-boot.lds | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds
index 2d6911a..b4ecd4b 100644
--- a/arch/x86/cpu/u-boot.lds
+++ b/arch/x86/cpu/u-boot.lds
@@ -79,18 +79,6 @@ SECTIONS
 	/DISCARD/ : { *(.interp*) }
 	/DISCARD/ : { *(.gnu*) }
 
-	/* 16bit realmode trampoline code */
-	.realmode REALMODE_BASE : AT ( LOADADDR(.rel.dyn) + SIZEOF(.rel.dyn) ) { KEEP(*(.realmode)) }
-
-	__realmode_start = LOADADDR(.realmode);
-	__realmode_size = SIZEOF(.realmode);
-
-	/* 16bit BIOS emulation code (just enough to boot Linux) */
-	.bios 0 : AT ( LOADADDR(.realmode) + SIZEOF(.realmode) ) { KEEP(*(.bios)) }
-
-	__bios_start = LOADADDR(.bios);
-	__bios_size = SIZEOF(.bios);
-
 #ifdef CONFIG_X86_RESET_VECTOR
 
 	/*
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 02/19] x86: Remove unused portion of link script
  2013-04-18  2:13 ` [U-Boot] [PATCH 02/19] x86: Remove unused portion of link script Simon Glass
@ 2013-04-18  2:50   ` Graeme Russ
  0 siblings, 0 replies; 35+ messages in thread
From: Graeme Russ @ 2013-04-18  2:50 UTC (permalink / raw)
  To: u-boot

Hi Simon,


On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>
> Since we don't have real-mode code now, we can remove this chunk of the
link
> script.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>  arch/x86/cpu/u-boot.lds | 12 ------------
>  1 file changed, 12 deletions(-)
>
> diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds
> index 2d6911a..b4ecd4b 100644
> --- a/arch/x86/cpu/u-boot.lds
> +++ b/arch/x86/cpu/u-boot.lds
> @@ -79,18 +79,6 @@ SECTIONS
>         /DISCARD/ : { *(.interp*) }
>         /DISCARD/ : { *(.gnu*) }
>
> -       /* 16bit realmode trampoline code */
> -       .realmode REALMODE_BASE : AT ( LOADADDR(.rel.dyn) +
SIZEOF(.rel.dyn) ) { KEEP(*(.realmode)) }
> -
> -       __realmode_start = LOADADDR(.realmode);
> -       __realmode_size = SIZEOF(.realmode);
> -
> -       /* 16bit BIOS emulation code (just enough to boot Linux) */
> -       .bios 0 : AT ( LOADADDR(.realmode) + SIZEOF(.realmode) ) {
KEEP(*(.bios)) }
> -
> -       __bios_start = LOADADDR(.bios);
> -       __bios_size = SIZEOF(.bios);
> -
>  #ifdef CONFIG_X86_RESET_VECTOR
>
>         /*
> --
> 1.8.2.1
>

Acked-by: Graeme Russ <graeme.russ@gmail.com>

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 03/19] x86: Remove legacy board init code
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 01/19] x86: Remove unused bios/pci code Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 02/19] x86: Remove unused portion of link script Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  3:04   ` Graeme Russ
  2013-04-18  2:13 ` [U-Boot] [PATCH 04/19] x86: Declare global_data pointer when it is used Simon Glass
                   ` (16 subsequent siblings)
  19 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

Since we use CONFIG_SYS_GENERIC_BOARD on x86, we don't need this anymore.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/x86/include/asm/init_helpers.h  |   9 --
 arch/x86/include/asm/init_wrappers.h |  42 ------
 arch/x86/include/asm/u-boot.h        |  32 ----
 arch/x86/lib/Makefile                |   5 -
 arch/x86/lib/board.c                 | 273 -----------------------------------
 arch/x86/lib/init_helpers.c          |  98 -------------
 arch/x86/lib/init_wrappers.c         | 164 ---------------------
 7 files changed, 623 deletions(-)
 delete mode 100644 arch/x86/include/asm/init_wrappers.h
 delete mode 100644 arch/x86/lib/board.c
 delete mode 100644 arch/x86/lib/init_wrappers.c

diff --git a/arch/x86/include/asm/init_helpers.h b/arch/x86/include/asm/init_helpers.h
index d018b29..0a6a675 100644
--- a/arch/x86/include/asm/init_helpers.h
+++ b/arch/x86/include/asm/init_helpers.h
@@ -24,19 +24,10 @@
 #ifndef _INIT_HELPERS_H_
 #define _INIT_HELPERS_H_
 
-int display_banner(void);
-int display_dram_config(void);
-int init_baudrate_f(void);
 int calculate_relocation_address(void);
 
 int init_cache_f_r(void);
-
-int set_reloc_flag_r(void);
-int mem_malloc_init_r(void);
 int init_bd_struct_r(void);
-int flash_init_r(void);
-int status_led_set_r(void);
-int set_load_addr_r(void);
 int init_func_spi(void);
 int find_fdt(void);
 int prepare_fdt(void);
diff --git a/arch/x86/include/asm/init_wrappers.h b/arch/x86/include/asm/init_wrappers.h
deleted file mode 100644
index 899ffb1..0000000
--- a/arch/x86/include/asm/init_wrappers.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * (C) Copyright 2011
- * Graeme Russ, <graeme.russ@gmail.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef _INIT_WRAPPERS_H_
-#define _INIT_WRAPPERS_H_
-
-int serial_initialize_r(void);
-int env_relocate_r(void);
-int pci_init_r(void);
-int jumptable_init_r(void);
-int pcmcia_init_r(void);
-int kgdb_init_r(void);
-int enable_interrupts_r(void);
-int eth_initialize_r(void);
-int reset_phy_r(void);
-int ide_init_r(void);
-int scsi_init_r(void);
-int doc_init_r(void);
-int bb_miiphy_init_r(void);
-int post_run_r(void);
-
-#endif	/* !_INIT_WRAPPERS_H_ */
diff --git a/arch/x86/include/asm/u-boot.h b/arch/x86/include/asm/u-boot.h
index df759fa..006232b 100644
--- a/arch/x86/include/asm/u-boot.h
+++ b/arch/x86/include/asm/u-boot.h
@@ -36,40 +36,8 @@
 #ifndef _U_BOOT_H_
 #define _U_BOOT_H_	1
 
-#include <config.h>
-#include <compiler.h>
-
-#ifdef CONFIG_SYS_GENERIC_BOARD
 /* Use the generic board which requires a unified bd_info */
 #include <asm-generic/u-boot.h>
-#else
-
-#ifndef __ASSEMBLY__
-
-typedef struct bd_info {
-	unsigned long	bi_memstart;	/* start of DRAM memory */
-	phys_size_t	bi_memsize;	/* size	 of DRAM memory in bytes */
-	unsigned long	bi_flashstart;	/* start of FLASH memory */
-	unsigned long	bi_flashsize;	/* size	 of FLASH memory */
-	unsigned long	bi_flashoffset; /* reserved area for startup monitor */
-	unsigned long	bi_sramstart;	/* start of SRAM memory */
-	unsigned long	bi_sramsize;	/* size	 of SRAM memory */
-	unsigned long	bi_bootflags;	/* boot / reboot flag (for LynxOS) */
-	unsigned short	bi_ethspeed;	/* Ethernet speed in Mbps */
-	unsigned long	bi_intfreq;	/* Internal Freq, in MHz */
-	unsigned long	bi_busfreq;	/* Bus Freq, in MHz */
-	unsigned int	bi_baudrate;	/* Console Baudrate */
-	unsigned long   bi_boot_params;	/* where this board expects params */
-	struct				/* RAM configuration */
-	{
-		ulong start;
-		ulong size;
-	}bi_dram[CONFIG_NR_DRAM_BANKS];
-} bd_t;
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* !CONFIG_SYS_GENERIC_BOARD */
 
 /* For image.h:image_check_target_arch() */
 #define IH_ARCH_DEFAULT IH_ARCH_I386
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 9c6b621..962593d 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -25,15 +25,10 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(ARCH).o
 
-ifeq ($(CONFIG_SYS_GENERIC_BOARD),)
-COBJS-y	+= board.o
-endif
-
 COBJS-y	+= bootm.o
 COBJS-y	+= cmd_boot.o
 COBJS-y	+= gcc.o
 COBJS-y	+= init_helpers.o
-COBJS-y	+= init_wrappers.o
 COBJS-y	+= interrupts.o
 COBJS-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o
 COBJS-$(CONFIG_SYS_GENERIC_TIMER) += pcat_timer.o
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
deleted file mode 100644
index f372898..0000000
--- a/arch/x86/lib/board.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * (C) Copyright 2008-2011
- * Graeme Russ, <graeme.russ@gmail.com>
- *
- * (C) Copyright 2002
- * Daniel Engstr?m, Omicron Ceti AB, <daniel@omicron.se>
- *
- * (C) Copyright 2002
- * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <fdtdec.h>
-#include <watchdog.h>
-#include <stdio_dev.h>
-#include <asm/u-boot-x86.h>
-#include <asm/relocate.h>
-#include <asm/processor.h>
-#include <asm/sections.h>
-
-#include <asm/init_helpers.h>
-#include <asm/init_wrappers.h>
-
-/*
- * Breath some life into the board...
- *
- * Getting the board up and running is a three-stage process:
- *  1) Execute from Flash, SDRAM Uninitialised
- *     At this point, there is a limited amount of non-SDRAM memory
- *     (typically the CPU cache, but can also be SRAM or even a buffer of
- *     of some peripheral). This limited memory is used to hold:
- *      - The initial copy of the Global Data Structure
- *      - A temporary stack
- *      - A temporary x86 Global Descriptor Table
- *      - The pre-console buffer (if enabled)
- *
- *     The following is performed during this phase of execution:
- *      - Core low-level CPU initialisation
- *      - Console initialisation
- *      - SDRAM initialisation
- *
- *  2) Execute from Flash, SDRAM Initialised
- *     At this point we copy Global Data from the initial non-SDRAM
- *     memory and set up the permanent stack in SDRAM. The CPU cache is no
- *     longer being used as temporary memory, so we can now fully enable
- *     it.
- *
- *     The following is performed during this phase of execution:
- *      - Create final stack in SDRAM
- *      - Copy Global Data from temporary memory to SDRAM
- *      - Enabling of CPU cache(s),
- *      - Copying of U-Boot code and data from Flash to RAM
- *      - Clearing of the BSS
- *      - ELF relocation adjustments
- *
- *  3) Execute from SDRAM
- *     The following is performed during this phase of execution:
- *      - All remaining initialisation
- */
-
-/*
- * The requirements for any new initalization function is simple: it is
- * a function with no parameters which returns an integer return code,
- * where 0 means "continue" and != 0 means "fatal error, hang the system"
- */
-typedef int (init_fnc_t) (void);
-
-/*
- * init_sequence_f is the list of init functions which are run when U-Boot
- * is executing from Flash with a limited 'C' environment. The following
- * limitations must be considered when implementing an '_f' function:
- *  - 'static' variables are read-only
- *  - Global Data (gd->xxx) is read/write
- *  - Stack space is limited
- *
- * The '_f' sequence must, as a minimum, initialise SDRAM. It _should_
- * also initialise the console (to provide early debug output)
- */
-init_fnc_t *init_sequence_f[] = {
-	cpu_init_f,
-	board_early_init_f,
-#ifdef CONFIG_OF_CONTROL
-	find_fdt,
-	fdtdec_check_fdt,
-#endif
-	env_init,
-	init_baudrate_f,
-	serial_init,
-	console_init_f,
-#ifdef CONFIG_OF_CONTROL
-	prepare_fdt,
-#endif
-	dram_init_f,
-	calculate_relocation_address,
-
-	NULL,
-};
-
-/*
- * init_sequence_f_r is the list of init functions which are run when
- * U-Boot is executing from Flash with a semi-limited 'C' environment.
- * The following limitations must be considered when implementing an
- * '_f_r' function:
- *  - 'static' variables are read-only
- *  - Global Data (gd->xxx) is read/write
- *
- * The '_f_r' sequence must, as a minimum, copy U-Boot to RAM (if
- * supported).  It _should_, if possible, copy global data to RAM and
- * initialise the CPU caches (to speed up the relocation process)
- */
-init_fnc_t *init_sequence_f_r[] = {
-	init_cache_f_r,
-	copy_uboot_to_ram,
-	copy_fdt_to_ram,
-	clear_bss,
-	do_elf_reloc_fixups,
-
-	NULL,
-};
-
-/*
- * init_sequence_r is the list of init functions which are run when U-Boot
- * is executing from RAM with a full 'C' environment. There are no longer
- * any limitations which must be considered when implementing an '_r'
- * function, (i.e.'static' variables are read/write)
- *
- * If not already done, the '_r' sequence must copy global data to RAM and
- * (should) initialise the CPU caches.
- */
-init_fnc_t *init_sequence_r[] = {
-	set_reloc_flag_r,
-	init_bd_struct_r,
-	mem_malloc_init_r,
-	cpu_init_r,
-	board_early_init_r,
-	dram_init,
-	interrupt_init,
-	timer_init,
-	display_banner,
-	display_dram_config,
-	serial_initialize_r,
-#ifndef CONFIG_SYS_NO_FLASH
-	flash_init_r,
-#endif
-#ifdef CONFIG_PCI
-	pci_init_r,
-#endif
-#ifdef CONFIG_SPI
-	init_func_spi,
-#endif
-	env_relocate_r,
-	stdio_init,
-	jumptable_init_r,
-	console_init_r,
-#ifdef CONFIG_MISC_INIT_R
-	misc_init_r,
-#endif
-#if defined(CONFIG_CMD_KGDB)
-	kgdb_init_r,
-#endif
-	enable_interrupts_r,
-#ifdef CONFIG_STATUS_LED
-	status_led_set_r,
-#endif
-	set_load_addr_r,
-#if defined(CONFIG_CMD_IDE)
-	ide_init_r,
-#endif
-#if defined(CONFIG_CMD_SCSI)
-	scsi_init_r,
-#endif
-#if defined(CONFIG_CMD_DOC)
-	doc_init_r,
-#endif
-#ifdef CONFIG_BITBANGMII
-	bb_miiphy_init_r,
-#endif
-#if defined(CONFIG_CMD_NET)
-	eth_initialize_r,
-#ifdef CONFIG_RESET_PHY_R
-	reset_phy_r,
-#endif
-#endif
-#ifdef CONFIG_LAST_STAGE_INIT
-	last_stage_init,
-#endif
-	NULL,
-};
-
-static void do_init_loop(init_fnc_t **init_fnc_ptr)
-{
-	for (; *init_fnc_ptr; ++init_fnc_ptr) {
-		WATCHDOG_RESET();
-		if ((*init_fnc_ptr)() != 0)
-			hang();
-	}
-}
-
-void board_init_f(ulong boot_flags)
-{
-	gd->fdt_blob = gd->new_fdt = NULL;
-	gd->flags = boot_flags;
-
-	do_init_loop(init_sequence_f);
-
-	/*
-	 * SDRAM and console are now initialised. The final stack can now
-	 * be setup in SDRAM. Code execution will continue in Flash, but
-	 * with the stack in SDRAM and Global Data in temporary memory
-	 * (CPU cache)
-	 */
-	board_init_f_r_trampoline(gd->start_addr_sp);
-
-	/* NOTREACHED - board_init_f_r_trampoline() does not return */
-	while (1)
-		;
-}
-
-void board_init_f_r(void)
-{
-	do_init_loop(init_sequence_f_r);
-
-	/*
-	 * U-Boot has been copied into SDRAM, the BSS has been cleared etc.
-	 * Transfer execution from Flash to RAM by calculating the address
-	 * of the in-RAM copy of board_init_r() and calling it
-	 */
-	(board_init_r + gd->reloc_off)(gd, gd->relocaddr);
-
-	/* NOTREACHED - board_init_r() does not return */
-	while (1)
-		;
-}
-
-void board_init_r(gd_t *id, ulong dest_addr)
-{
-	do_init_loop(init_sequence_r);
-
-	/* main_loop() can return to retry autoboot, if so just run it again. */
-	for (;;)
-		main_loop();
-
-	/* NOTREACHED - no way out of command loop except booting */
-}
-
-void hang(void)
-{
-	puts("### ERROR ### Please RESET the board ###\n");
-	for (;;)
-		;
-}
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c
index af9dbc1..a57a0eb 100644
--- a/arch/x86/lib/init_helpers.c
+++ b/arch/x86/lib/init_helpers.c
@@ -21,60 +21,12 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
-#include <command.h>
 #include <fdtdec.h>
-#include <stdio_dev.h>
-#include <version.h>
-#include <malloc.h>
-#include <net.h>
-#include <ide.h>
-#include <serial.h>
 #include <spi.h>
-#include <status_led.h>
-#include <asm/processor.h>
 #include <asm/sections.h>
-#include <asm/u-boot-x86.h>
-#include <linux/compiler.h>
-
-#include <asm/init_helpers.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/************************************************************************
- * Init Utilities							*
- ************************************************************************
- * Some of this code should be moved into the core functions,
- * or dropped completely,
- * but let's get it working (again) first...
- */
-
-int display_banner(void)
-{
-	printf("\n\n%s\n\n", version_string);
-
-	return 0;
-}
-
-int display_dram_config(void)
-{
-	int i;
-
-	puts("DRAM Configuration:\n");
-
-	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
-		printf("Bank #%d: %08lx ", i, gd->bd->bi_dram[i].start);
-		print_size(gd->bd->bi_dram[i].size, "\n");
-	}
-
-	return 0;
-}
-
-int init_baudrate_f(void)
-{
-	gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE);
-	return 0;
-}
-
 /* Get the top of usable RAM */
 __weak ulong board_get_usable_ram_top(ulong total_size)
 {
@@ -134,21 +86,6 @@ int init_cache_f_r(void)
 	return init_cache();
 }
 
-int set_reloc_flag_r(void)
-{
-	gd->flags = GD_FLG_RELOC;
-
-	return 0;
-}
-
-int mem_malloc_init_r(void)
-{
-	mem_malloc_init(((gd->relocaddr - CONFIG_SYS_MALLOC_LEN)+3)&~3,
-			CONFIG_SYS_MALLOC_LEN);
-
-	return 0;
-}
-
 bd_t bd_data;
 
 int init_bd_struct_r(void)
@@ -159,39 +96,6 @@ int init_bd_struct_r(void)
 	return 0;
 }
 
-#ifndef CONFIG_SYS_NO_FLASH
-int flash_init_r(void)
-{
-	ulong size;
-
-	puts("Flash: ");
-
-	/* configure available FLASH banks */
-	size = flash_init();
-
-	print_size(size, "\n");
-
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_STATUS_LED
-int status_led_set_r(void)
-{
-	status_led_set(STATUS_LED_BOOT, STATUS_LED_BLINKING);
-
-	return 0;
-}
-#endif
-
-int set_load_addr_r(void)
-{
-	/* Initialize from environment */
-	load_addr = getenv_ulong("loadaddr", 16, load_addr);
-
-	return 0;
-}
-
 int init_func_spi(void)
 {
 	puts("SPI:   ");
@@ -200,7 +104,6 @@ int init_func_spi(void)
 	return 0;
 }
 
-#ifdef CONFIG_OF_CONTROL
 int find_fdt(void)
 {
 #ifdef CONFIG_OF_EMBED
@@ -227,4 +130,3 @@ int prepare_fdt(void)
 
 	return 0;
 }
-#endif
diff --git a/arch/x86/lib/init_wrappers.c b/arch/x86/lib/init_wrappers.c
deleted file mode 100644
index 19af875..0000000
--- a/arch/x86/lib/init_wrappers.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * (C) Copyright 2011
- * Graeme Russ, <graeme.russ@gmail.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-#include <common.h>
-#include <environment.h>
-#include <fdtdec.h>
-#include <serial.h>
-#include <kgdb.h>
-#include <scsi.h>
-#include <post.h>
-#include <miiphy.h>
-
-#include <asm/init_wrappers.h>
-
-int serial_initialize_r(void)
-{
-	serial_initialize();
-
-	return 0;
-}
-
-/*
- * Tell if it's OK to load the environment early in boot.
- *
- * If CONFIG_OF_CONFIG is defined, we'll check with the FDT to see
- * if this is OK (defaulting to saying it's not OK).
- *
- * NOTE: Loading the environment early can be a bad idea if security is
- *       important, since no verification is done on the environment.
- *
- * @return 0 if environment should not be loaded, !=0 if it is ok to load
- */
-static int should_load_env(void)
-{
-#ifdef CONFIG_OF_CONTROL
-	return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0);
-#elif defined CONFIG_DELAY_ENVIRONMENT
-	return 0;
-#else
-	return 1;
-#endif
-}
-
-int env_relocate_r(void)
-{
-	/* initialize environment */
-	if (should_load_env())
-		env_relocate();
-	else
-		set_default_env(NULL);
-
-	return 0;
-}
-
-
-int pci_init_r(void)
-{
-	/* Do pci configuration */
-	pci_init();
-
-	return 0;
-}
-
-int jumptable_init_r(void)
-{
-	jumptable_init();
-
-	return 0;
-}
-
-int pcmcia_init_r(void)
-{
-	puts("PCMCIA:");
-	pcmcia_init();
-
-	return 0;
-}
-
-int kgdb_init_r(void)
-{
-	puts("KGDB:  ");
-	kgdb_init();
-
-	return 0;
-}
-
-int enable_interrupts_r(void)
-{
-	/* enable exceptions */
-	enable_interrupts();
-
-	return 0;
-}
-
-int eth_initialize_r(void)
-{
-	puts("Net:   ");
-	eth_initialize(gd->bd);
-
-	return 0;
-}
-
-int reset_phy_r(void)
-{
-#ifdef DEBUG
-	puts("Reset Ethernet PHY\n");
-#endif
-	reset_phy();
-
-	return 0;
-}
-
-int ide_init_r(void)
-{
-	puts("IDE:   ");
-	ide_init();
-
-	return 0;
-}
-
-int scsi_init_r(void)
-{
-	puts("SCSI:  ");
-	scsi_init();
-
-	return 0;
-}
-
-#ifdef CONFIG_BITBANGMII
-int bb_miiphy_init_r(void)
-{
-	bb_miiphy_init();
-
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_POST
-int post_run_r(void)
-{
-	post_run(NULL, POST_RAM | post_bootmode_get(0));
-
-	return 0;
-}
-#endif
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 03/19] x86: Remove legacy board init code
  2013-04-18  2:13 ` [U-Boot] [PATCH 03/19] x86: Remove legacy board init code Simon Glass
@ 2013-04-18  3:04   ` Graeme Russ
  0 siblings, 0 replies; 35+ messages in thread
From: Graeme Russ @ 2013-04-18  3:04 UTC (permalink / raw)
  To: u-boot

Hi Simon


On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>
> Since we use CONFIG_SYS_GENERIC_BOARD on x86, we don't need this anymore.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>  arch/x86/include/asm/init_helpers.h  |   9 --
>  arch/x86/include/asm/init_wrappers.h |  42 ------
>  arch/x86/include/asm/u-boot.h        |  32 ----
>  arch/x86/lib/Makefile                |   5 -
>  arch/x86/lib/board.c                 | 273
-----------------------------------
>  arch/x86/lib/init_helpers.c          |  98 -------------
>  arch/x86/lib/init_wrappers.c         | 164 ---------------------
>  7 files changed, 623 deletions(-)
>  delete mode 100644 arch/x86/include/asm/init_wrappers.h
>  delete mode 100644 arch/x86/lib/board.c
>  delete mode 100644 arch/x86/lib/init_wrappers.c

Acked-by: Graeme Russ <graeme.russ@gmail.com>

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 04/19] x86: Declare global_data pointer when it is used
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (2 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 03/19] x86: Remove legacy board init code Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 05/19] x86: Implement panic output for coreboot Simon Glass
                   ` (15 subsequent siblings)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

Several files use the global_data pointer without declaring it. This works
because the declaration is currently a NOP. But still it is better to
fix this so that x86 lines up with other archs.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/x86/cpu/interrupts.c | 2 ++
 arch/x86/lib/cmd_boot.c   | 2 ++
 arch/x86/lib/physmem.c    | 2 ++
 arch/x86/lib/relocate.c   | 2 ++
 arch/x86/lib/timer.c      | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/arch/x86/cpu/interrupts.c b/arch/x86/cpu/interrupts.c
index 6dc74e3..e733bcb 100644
--- a/arch/x86/cpu/interrupts.c
+++ b/arch/x86/cpu/interrupts.c
@@ -37,6 +37,8 @@
 #include <asm/msr.h>
 #include <asm/u-boot-x86.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define DECLARE_INTERRUPT(x) \
 	".globl irq_"#x"\n" \
 	".hidden irq_"#x"\n" \
diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c
index a81a9a3..315be5a 100644
--- a/arch/x86/lib/cmd_boot.c
+++ b/arch/x86/lib/cmd_boot.c
@@ -36,6 +36,8 @@
 #include <malloc.h>
 #include <asm/u-boot-x86.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 unsigned long do_go_exec(ulong (*entry)(int, char * const []),
 			 int argc, char * const argv[])
 {
diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c
index 18f0e62..59b3fe9 100644
--- a/arch/x86/lib/physmem.c
+++ b/arch/x86/lib/physmem.c
@@ -12,6 +12,8 @@
 #include <physmem.h>
 #include <linux/compiler.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* Large pages are 2MB. */
 #define LARGE_PAGE_SIZE ((1 << 20) * 2)
 
diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c
index f178db9..21982db 100644
--- a/arch/x86/lib/relocate.c
+++ b/arch/x86/lib/relocate.c
@@ -39,6 +39,8 @@
 #include <asm/sections.h>
 #include <elf.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int copy_uboot_to_ram(void)
 {
 	size_t len = (size_t)&__data_end - (size_t)&__text_start;
diff --git a/arch/x86/lib/timer.c b/arch/x86/lib/timer.c
index 1f8ce60..fb11bfe 100644
--- a/arch/x86/lib/timer.c
+++ b/arch/x86/lib/timer.c
@@ -30,6 +30,8 @@
 #include <asm/i8254.h>
 #include <asm/ibmpc.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 struct timer_isr_function {
 	struct timer_isr_function *next;
 	timer_fnc_t *isr_func;
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 05/19] x86: Implement panic output for coreboot
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (3 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 04/19] x86: Declare global_data pointer when it is used Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 06/19] x86: Rationalise kernel booting logic and bootstage Simon Glass
                   ` (14 subsequent siblings)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

panic_puts() can be called in early boot to display a message. It might
help with early debugging.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
---
 arch/x86/cpu/coreboot/coreboot.c  | 10 ++++++++++
 arch/x86/include/asm/u-boot-x86.h |  1 +
 2 files changed, 11 insertions(+)

diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index f8e28f0..4a7dae49 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -26,6 +26,7 @@
 #include <asm/u-boot-x86.h>
 #include <flash.h>
 #include <netdev.h>
+#include <ns16550.h>
 #include <asm/msr.h>
 #include <asm/cache.h>
 #include <asm/io.h>
@@ -135,3 +136,12 @@ int board_final_cleanup(void)
 
 	return 0;
 }
+
+void panic_puts(const char *str)
+{
+	NS16550_t port = (NS16550_t)0x3f8;
+
+	NS16550_init(port, 1);
+	while (*str)
+		NS16550_putc(port, *str++);
+}
diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index ae0c388..5a59db6 100644
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -33,6 +33,7 @@ void init_gd(gd_t *id, u64 *gdt_addr);
 void setup_gdt(gd_t *id, u64 *gdt_addr);
 int init_cache(void);
 int cleanup_before_linux(void);
+void panic_puts(const char *str);
 
 /* cpu/.../timer.c */
 void timer_isr(void *);
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 06/19] x86: Rationalise kernel booting logic and bootstage
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (4 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 05/19] x86: Implement panic output for coreboot Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  3:05   ` Graeme Russ
  2013-04-18  2:13 ` [U-Boot] [PATCH 07/19] x86: Add TSC timer Simon Glass
                   ` (13 subsequent siblings)
  19 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

The 'Starting linux' message appears twice in the code, but both call
through the same place. Unify these and add calls to bootstage to
mark the occasion.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Michael Spang <spang@chromium.org>
---
 arch/x86/cpu/cpu.c    |  5 +++++
 arch/x86/lib/bootm.c  |  8 --------
 arch/x86/lib/zimage.c | 11 +++++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 1a2f85c..7a914a5 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -120,6 +120,11 @@ void setup_gdt(gd_t *id, u64 *gdt_addr)
 
 int __weak x86_cleanup_before_linux(void)
 {
+#ifdef CONFIG_BOOTSTAGE_STASH
+	bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH,
+			CONFIG_BOOTSTAGE_STASH_SIZE);
+#endif
+
 	return 0;
 }
 
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 83caf6b..2520228 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -93,14 +93,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
 		goto error;
 	}
 
-#ifdef DEBUG
-	printf("## Transferring control to Linux (at address %08x) ...\n",
-		(u32)base_ptr);
-#endif
-
-	/* we assume that the kernel is in place */
-	printf("\nStarting kernel ...\n\n");
-
 	boot_zimage(base_ptr, load_address);
 	/* does not return */
 
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 4e9e1f7..b54cf12 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -283,6 +283,13 @@ __weak void board_final_cleanup(void)
 
 void boot_zimage(void *setup_base, void *load_address)
 {
+	debug("## Transferring control to Linux (at address %08x) ...\n",
+	      (u32)setup_base);
+
+	bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
+#ifdef CONFIG_BOOTSTAGE_REPORT
+	bootstage_report();
+#endif
 	board_final_cleanup();
 
 	printf("\nStarting kernel ...\n\n");
@@ -363,10 +370,6 @@ int do_zboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 		return -1;
 	}
 
-	printf("## Transferring control to Linux "
-	       "(at address %08x) ...\n",
-	       (u32)base_ptr);
-
 	/* we assume that the kernel is in place */
 	boot_zimage(base_ptr, load_address);
 	/* does not return */
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 06/19] x86: Rationalise kernel booting logic and bootstage
  2013-04-18  2:13 ` [U-Boot] [PATCH 06/19] x86: Rationalise kernel booting logic and bootstage Simon Glass
@ 2013-04-18  3:05   ` Graeme Russ
  0 siblings, 0 replies; 35+ messages in thread
From: Graeme Russ @ 2013-04-18  3:05 UTC (permalink / raw)
  To: u-boot

Hi Simon,

On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>
> The 'Starting linux' message appears twice in the code, but both call
> through the same place. Unify these and add calls to bootstage to
> mark the occasion.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Michael Spang <spang@chromium.org>
> ---
>  arch/x86/cpu/cpu.c    |  5 +++++
>  arch/x86/lib/bootm.c  |  8 --------
>  arch/x86/lib/zimage.c | 11 +++++++----
>  3 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
> index 1a2f85c..7a914a5 100644
> --- a/arch/x86/cpu/cpu.c
> +++ b/arch/x86/cpu/cpu.c
> @@ -120,6 +120,11 @@ void setup_gdt(gd_t *id, u64 *gdt_addr)
>
>  int __weak x86_cleanup_before_linux(void)
>  {
> +#ifdef CONFIG_BOOTSTAGE_STASH
> +       bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH,
> +                       CONFIG_BOOTSTAGE_STASH_SIZE);
> +#endif
> +
>         return 0;
>  }
>
> diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
> index 83caf6b..2520228 100644
> --- a/arch/x86/lib/bootm.c
> +++ b/arch/x86/lib/bootm.c
> @@ -93,14 +93,6 @@ int do_bootm_linux(int flag, int argc, char * const
argv[],
>                 goto error;
>         }
>
> -#ifdef DEBUG
> -       printf("## Transferring control to Linux (at address %08x) ...\n",
> -               (u32)base_ptr);
> -#endif
> -
> -       /* we assume that the kernel is in place */
> -       printf("\nStarting kernel ...\n\n");
> -
>         boot_zimage(base_ptr, load_address);
>         /* does not return */
>
> diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
> index 4e9e1f7..b54cf12 100644
> --- a/arch/x86/lib/zimage.c
> +++ b/arch/x86/lib/zimage.c
> @@ -283,6 +283,13 @@ __weak void board_final_cleanup(void)
>
>  void boot_zimage(void *setup_base, void *load_address)
>  {
> +       debug("## Transferring control to Linux (at address %08x) ...\n",
> +             (u32)setup_base);
> +
> +       bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
> +#ifdef CONFIG_BOOTSTAGE_REPORT
> +       bootstage_report();
> +#endif
>         board_final_cleanup();
>
>         printf("\nStarting kernel ...\n\n");
> @@ -363,10 +370,6 @@ int do_zboot(cmd_tbl_t *cmdtp, int flag, int argc,
char *const argv[])
>                 return -1;
>         }
>
> -       printf("## Transferring control to Linux "
> -              "(at address %08x) ...\n",
> -              (u32)base_ptr);
> -
>         /* we assume that the kernel is in place */
>         boot_zimage(base_ptr, load_address);
>         /* does not return */
> --
> 1.8.2.1
>

Acked-by: Graeme Russ <graeme.russ@gmail.com>

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 07/19] x86: Add TSC timer
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (5 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 06/19] x86: Rationalise kernel booting logic and bootstage Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  3:03   ` Graeme Russ
  2013-04-18  2:13 ` [U-Boot] [PATCH 08/19] x86: Remove old broken timer implementation Simon Glass
                   ` (12 subsequent siblings)
  19 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

This timer runs at a rate that can be calculated, well over 100MHz. It is
ideal for accurate timing and does not need interrupt servicing.

Tidy up some old broken and unneeded implementations at the same time.

To provide a consistent view of boot time, we use the same time
base as coreboot. Use the base timestamp supplied by coreboot
as U-Boot's base time.

Signed-off-by: Simon Glass <sjg@chromium.org>base
Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/x86/cpu/coreboot/timestamp.c |   4 +-
 arch/x86/cpu/timer.c              |   3 ++
 arch/x86/include/asm/u-boot-x86.h |   2 +
 arch/x86/lib/Makefile             |   1 +
 arch/x86/lib/tsc_timer.c          | 103 ++++++++++++++++++++++++++++++++++++++
 include/configs/coreboot.h        |   4 +-
 6 files changed, 113 insertions(+), 4 deletions(-)
 create mode 100644 arch/x86/lib/tsc_timer.c

diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
index 2ca7a57..d26718e 100644
--- a/arch/x86/cpu/coreboot/timestamp.c
+++ b/arch/x86/cpu/coreboot/timestamp.c
@@ -39,7 +39,9 @@ static struct timestamp_table *ts_table  __attribute__((section(".data")));
 void timestamp_init(void)
 {
 	ts_table = lib_sysinfo.tstamp_table;
-	timer_set_tsc_base(ts_table->base_time);
+#ifdef CONFIG_SYS_X86_TSC_TIMER
+	timer_set_base(ts_table->base_time);
+#endif
 	timestamp_add_now(TS_U_BOOT_INITTED);
 }
 
diff --git a/arch/x86/cpu/timer.c b/arch/x86/cpu/timer.c
index 149109d..f95fce5 100644
--- a/arch/x86/cpu/timer.c
+++ b/arch/x86/cpu/timer.c
@@ -10,8 +10,11 @@
 
 #include <common.h>
 
+/* Temporary patch to maintain bisectability, removed in next commit */
+#ifndef CONFIG_SYS_X86_TSC_TIMER
 unsigned long timer_get_us(void)
 {
 	printf("timer_get_us used but not implemented.\n");
 	return 0;
 }
+#endif
diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index 5a59db6..bec583f 100644
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -39,6 +39,8 @@ void panic_puts(const char *str);
 void timer_isr(void *);
 typedef void (timer_fnc_t) (void);
 int register_timer_isr (timer_fnc_t *isr_func);
+unsigned long get_tbclk_mhz(void);
+void timer_set_base(uint64_t base);
 
 /* Architecture specific - can be in arch/x86/cpu/, arch/x86/lib/, or $(BOARD)/ */
 int dram_init_f(void);
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 962593d..0bc8c2f 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -37,6 +37,7 @@ COBJS-y	+= relocate.o
 COBJS-y += physmem.o
 COBJS-y	+= string.o
 COBJS-$(CONFIG_SYS_X86_ISR_TIMER)	+= timer.o
+COBJS-$(CONFIG_SYS_X86_TSC_TIMER)	+= tsc_timer.o
 COBJS-$(CONFIG_VIDEO_VGA)	+= video.o
 COBJS-$(CONFIG_CMD_ZBOOT)	+= zimage.o
 
diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
new file mode 100644
index 0000000..d931e5f
--- /dev/null
+++ b/arch/x86/lib/tsc_timer.c
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2012 The Chromium OS Authors.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <malloc.h>
+#include <asm/io.h>
+#include <asm/i8254.h>
+#include <asm/ibmpc.h>
+#include <asm/msr.h>
+#include <asm/u-boot-x86.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void timer_set_base(u64 base)
+{
+	gd->arch.tsc_base = base;
+}
+
+/*
+ * Get the number of CPU time counter ticks since it was read first time after
+ * restart. This yields a free running counter guaranteed to take almost 6
+ * years to wrap around even at 100GHz clock rate.
+ */
+u64 get_ticks(void)
+{
+	u64 now_tick = rdtsc();
+
+	/* We assume that 0 means the base hasn't been set yet */
+	if (!gd->arch.tsc_base)
+		panic("No tick base available");
+	return now_tick - gd->arch.tsc_base;
+}
+
+#define PLATFORM_INFO_MSR 0xce
+
+/* Get the speed of the TSC timer in MHz */
+unsigned long get_tbclk_mhz(void)
+{
+	u32 ratio;
+	u64 platform_info = native_read_msr(PLATFORM_INFO_MSR);
+
+	/* 100MHz times Max Non Turbo ratio */
+	ratio = (platform_info >> 8) & 0xff;
+	return 100 * ratio;
+}
+
+unsigned long get_tbclk(void)
+{
+	return get_tbclk_mhz() * 1000 * 1000;
+}
+
+static ulong get_ms_timer(void)
+{
+	return (get_ticks() * 1000) / get_tbclk();
+}
+
+ulong get_timer(ulong base)
+{
+	return get_ms_timer() - base;
+}
+
+ulong timer_get_us(void)
+{
+	return get_ticks() / get_tbclk_mhz();
+}
+
+ulong timer_get_boot_us(void)
+{
+	return timer_get_us();
+}
+
+void __udelay(unsigned long usec)
+{
+	u64 now = get_ticks();
+	u64 stop;
+
+	stop = now + usec * get_tbclk_mhz();
+
+	while ((int64_t)(stop - get_ticks()) > 0)
+		;
+}
+
+int timer_init(void)
+{
+	/* Nothing to do here - the timer needs no init */
+	return 0;
+}
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 5bacc77..99408dc 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -38,7 +38,6 @@
 #define CONFIG_SHOW_BOOT_PROGRESS
 #define CONFIG_LAST_STAGE_INIT
 #define CONFIG_SYS_VSNPRINTF
-#define CONFIG_INTEL_CORE_ARCH	/* Sandy bridge and ivy bridge chipsets. */
 #define CONFIG_ZBOOT_32
 #define CONFIG_PHYSMEM
 #define CONFIG_SYS_EARLY_PCI_INIT
@@ -218,7 +217,6 @@
 #define CONFIG_SYS_MEMTEST_END			0x01000000
 #define CONFIG_SYS_LOAD_ADDR			0x100000
 #define CONFIG_SYS_HZ				1000
-#define CONFIG_SYS_X86_ISR_TIMER
 
 /*-----------------------------------------------------------------------
  * SDRAM Configuration
@@ -235,7 +233,7 @@
  * CPU Features
  */
 
-#define CONFIG_SYS_GENERIC_TIMER
+#define CONFIG_SYS_X86_TSC_TIMER
 #define CONFIG_SYS_PCAT_INTERRUPTS
 #define CONFIG_SYS_NUM_IRQS			16
 
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 07/19] x86: Add TSC timer
  2013-04-18  2:13 ` [U-Boot] [PATCH 07/19] x86: Add TSC timer Simon Glass
@ 2013-04-18  3:03   ` Graeme Russ
  2013-04-26 13:41     ` Simon Glass
  0 siblings, 1 reply; 35+ messages in thread
From: Graeme Russ @ 2013-04-18  3:03 UTC (permalink / raw)
  To: u-boot

Hi Simon,


On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>
> This timer runs at a rate that can be calculated, well over 100MHz. It is
> ideal for accurate timing and does not need interrupt servicing.
>
> Tidy up some old broken and unneeded implementations at the same time.
>
> To provide a consistent view of boot time, we use the same time
> base as coreboot. Use the base timestamp supplied by coreboot
> as U-Boot's base time.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>base
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>  arch/x86/cpu/coreboot/timestamp.c |   4 +-
>  arch/x86/cpu/timer.c              |   3 ++
>  arch/x86/include/asm/u-boot-x86.h |   2 +
>  arch/x86/lib/Makefile             |   1 +
>  arch/x86/lib/tsc_timer.c          | 103
++++++++++++++++++++++++++++++++++++++
>  include/configs/coreboot.h        |   4 +-
>  6 files changed, 113 insertions(+), 4 deletions(-)
>  create mode 100644 arch/x86/lib/tsc_timer.c
>
> diff --git a/arch/x86/cpu/coreboot/timestamp.c
b/arch/x86/cpu/coreboot/timestamp.c
> index 2ca7a57..d26718e 100644
> --- a/arch/x86/cpu/coreboot/timestamp.c
> +++ b/arch/x86/cpu/coreboot/timestamp.c
> @@ -39,7 +39,9 @@ static struct timestamp_table *ts_table
 __attribute__((section(".data")));
>  void timestamp_init(void)
>  {
>         ts_table = lib_sysinfo.tstamp_table;
> -       timer_set_tsc_base(ts_table->base_time);
> +#ifdef CONFIG_SYS_X86_TSC_TIMER
> +       timer_set_base(ts_table->base_time);
> +#endif
>         timestamp_add_now(TS_U_BOOT_INITTED);
>  }
>
> diff --git a/arch/x86/cpu/timer.c b/arch/x86/cpu/timer.c
> index 149109d..f95fce5 100644
> --- a/arch/x86/cpu/timer.c
> +++ b/arch/x86/cpu/timer.c
> @@ -10,8 +10,11 @@
>
>  #include <common.h>
>
> +/* Temporary patch to maintain bisectability, removed in next commit */
> +#ifndef CONFIG_SYS_X86_TSC_TIMER
>  unsigned long timer_get_us(void)
>  {
>         printf("timer_get_us used but not implemented.\n");
>         return 0;
>  }
> +#endif

Why bother? Why not just one commit 'Replace timer implementation with TSC
Timer'?

> diff --git a/arch/x86/include/asm/u-boot-x86.h
b/arch/x86/include/asm/u-boot-x86.h
> index 5a59db6..bec583f 100644
> --- a/arch/x86/include/asm/u-boot-x86.h
> +++ b/arch/x86/include/asm/u-boot-x86.h
> @@ -39,6 +39,8 @@ void panic_puts(const char *str);
>  void timer_isr(void *);
>  typedef void (timer_fnc_t) (void);
>  int register_timer_isr (timer_fnc_t *isr_func);
> +unsigned long get_tbclk_mhz(void);
> +void timer_set_base(uint64_t base);
>
>  /* Architecture specific - can be in arch/x86/cpu/, arch/x86/lib/, or
$(BOARD)/ */
>  int dram_init_f(void);
> diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
> index 962593d..0bc8c2f 100644
> --- a/arch/x86/lib/Makefile
> +++ b/arch/x86/lib/Makefile
> @@ -37,6 +37,7 @@ COBJS-y       += relocate.o
>  COBJS-y += physmem.o
>  COBJS-y        += string.o
>  COBJS-$(CONFIG_SYS_X86_ISR_TIMER)      += timer.o
> +COBJS-$(CONFIG_SYS_X86_TSC_TIMER)      += tsc_timer.o
>  COBJS-$(CONFIG_VIDEO_VGA)      += video.o
>  COBJS-$(CONFIG_CMD_ZBOOT)      += zimage.o
>
> diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
> new file mode 100644
> index 0000000..d931e5f
> --- /dev/null
> +++ b/arch/x86/lib/tsc_timer.c
> @@ -0,0 +1,103 @@
> +/*
> + * Copyright (c) 2012 The Chromium OS Authors.
> + *
> + * 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.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#include <common.h>
> +#include <malloc.h>
> +#include <asm/io.h>
> +#include <asm/i8254.h>
> +#include <asm/ibmpc.h>
> +#include <asm/msr.h>
> +#include <asm/u-boot-x86.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +void timer_set_base(u64 base)
> +{
> +       gd->arch.tsc_base = base;
> +}
> +
> +/*
> + * Get the number of CPU time counter ticks since it was read first time
after
> + * restart. This yields a free running counter guaranteed to take almost
6
> + * years to wrap around even at 100GHz clock rate.
> + */
> +u64 get_ticks(void)
> +{
> +       u64 now_tick = rdtsc();
> +
> +       /* We assume that 0 means the base hasn't been set yet */
> +       if (!gd->arch.tsc_base)
> +               panic("No tick base available");
> +       return now_tick - gd->arch.tsc_base;
> +}
> +
> +#define PLATFORM_INFO_MSR 0xce
> +
> +/* Get the speed of the TSC timer in MHz */
> +unsigned long get_tbclk_mhz(void)
> +{
> +       u32 ratio;
> +       u64 platform_info = native_read_msr(PLATFORM_INFO_MSR);
> +
> +       /* 100MHz times Max Non Turbo ratio */
> +       ratio = (platform_info >> 8) & 0xff;
> +       return 100 * ratio;
> +}
> +
> +unsigned long get_tbclk(void)
> +{
> +       return get_tbclk_mhz() * 1000 * 1000;
> +}
> +
> +static ulong get_ms_timer(void)
> +{
> +       return (get_ticks() * 1000) / get_tbclk();
> +}
> +
> +ulong get_timer(ulong base)
> +{
> +       return get_ms_timer() - base;
> +}
> +
> +ulong timer_get_us(void)
> +{
> +       return get_ticks() / get_tbclk_mhz();
> +}
> +
> +ulong timer_get_boot_us(void)
> +{
> +       return timer_get_us();
> +}
> +
> +void __udelay(unsigned long usec)
> +{
> +       u64 now = get_ticks();
> +       u64 stop;
> +
> +       stop = now + usec * get_tbclk_mhz();
> +
> +       while ((int64_t)(stop - get_ticks()) > 0)
> +               ;
> +}
> +
> +int timer_init(void)
> +{
> +       /* Nothing to do here - the timer needs no init */
> +       return 0;
> +}
> diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
> index 5bacc77..99408dc 100644
> --- a/include/configs/coreboot.h
> +++ b/include/configs/coreboot.h
> @@ -38,7 +38,6 @@
>  #define CONFIG_SHOW_BOOT_PROGRESS
>  #define CONFIG_LAST_STAGE_INIT
>  #define CONFIG_SYS_VSNPRINTF
> -#define CONFIG_INTEL_CORE_ARCH /* Sandy bridge and ivy bridge chipsets.
*/

Why this?

>  #define CONFIG_ZBOOT_32
>  #define CONFIG_PHYSMEM
>  #define CONFIG_SYS_EARLY_PCI_INIT
> @@ -218,7 +217,6 @@
>  #define CONFIG_SYS_MEMTEST_END                 0x01000000
>  #define CONFIG_SYS_LOAD_ADDR                   0x100000
>  #define CONFIG_SYS_HZ                          1000
> -#define CONFIG_SYS_X86_ISR_TIMER
>
>  /*-----------------------------------------------------------------------
>   * SDRAM Configuration
> @@ -235,7 +233,7 @@
>   * CPU Features
>   */
>
> -#define CONFIG_SYS_GENERIC_TIMER
> +#define CONFIG_SYS_X86_TSC_TIMER
>  #define CONFIG_SYS_PCAT_INTERRUPTS
>  #define CONFIG_SYS_NUM_IRQS                    16
>
> --
> 1.8.2.1
>

Regards,

Graeme

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 07/19] x86: Add TSC timer
  2013-04-18  3:03   ` Graeme Russ
@ 2013-04-26 13:41     ` Simon Glass
  0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-26 13:41 UTC (permalink / raw)
  To: u-boot

Hi Graeme,

On Wed, Apr 17, 2013 at 8:03 PM, Graeme Russ <graeme.russ@gmail.com> wrote:
> Hi Simon,
>
>
>
> On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>>
>> This timer runs at a rate that can be calculated, well over 100MHz. It is
>> ideal for accurate timing and does not need interrupt servicing.
>>
>> Tidy up some old broken and unneeded implementations at the same time.
>>
>> To provide a consistent view of boot time, we use the same time
>> base as coreboot. Use the base timestamp supplied by coreboot
>> as U-Boot's base time.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>base
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>  arch/x86/cpu/coreboot/timestamp.c |   4 +-
>>  arch/x86/cpu/timer.c              |   3 ++
>>  arch/x86/include/asm/u-boot-x86.h |   2 +
>>  arch/x86/lib/Makefile             |   1 +
>>  arch/x86/lib/tsc_timer.c          | 103
>> ++++++++++++++++++++++++++++++++++++++
>>  include/configs/coreboot.h        |   4 +-
>>  6 files changed, 113 insertions(+), 4 deletions(-)
>>  create mode 100644 arch/x86/lib/tsc_timer.c
>>
>> diff --git a/arch/x86/cpu/coreboot/timestamp.c
>> b/arch/x86/cpu/coreboot/timestamp.c
>> index 2ca7a57..d26718e 100644
>> --- a/arch/x86/cpu/coreboot/timestamp.c
>> +++ b/arch/x86/cpu/coreboot/timestamp.c
>> @@ -39,7 +39,9 @@ static struct timestamp_table *ts_table
>> __attribute__((section(".data")));
>>  void timestamp_init(void)
>>  {
>>         ts_table = lib_sysinfo.tstamp_table;
>> -       timer_set_tsc_base(ts_table->base_time);
>> +#ifdef CONFIG_SYS_X86_TSC_TIMER
>> +       timer_set_base(ts_table->base_time);
>> +#endif
>>         timestamp_add_now(TS_U_BOOT_INITTED);
>>  }
>>
>> diff --git a/arch/x86/cpu/timer.c b/arch/x86/cpu/timer.c
>> index 149109d..f95fce5 100644
>> --- a/arch/x86/cpu/timer.c
>> +++ b/arch/x86/cpu/timer.c
>> @@ -10,8 +10,11 @@
>>
>>  #include <common.h>
>>
>> +/* Temporary patch to maintain bisectability, removed in next commit */
>> +#ifndef CONFIG_SYS_X86_TSC_TIMER
>>  unsigned long timer_get_us(void)
>>  {
>>         printf("timer_get_us used but not implemented.\n");
>>         return 0;
>>  }
>> +#endif
>
> Why bother? Why not just one commit 'Replace timer implementation with TSC
> Timer'?

OK will do.

>
>> diff --git a/arch/x86/include/asm/u-boot-x86.h
>> b/arch/x86/include/asm/u-boot-x86.h
>> index 5a59db6..bec583f 100644
>> --- a/arch/x86/include/asm/u-boot-x86.h
>> +++ b/arch/x86/include/asm/u-boot-x86.h
>> @@ -39,6 +39,8 @@ void panic_puts(const char *str);
>>  void timer_isr(void *);
>>  typedef void (timer_fnc_t) (void);
>>  int register_timer_isr (timer_fnc_t *isr_func);
>> +unsigned long get_tbclk_mhz(void);
>> +void timer_set_base(uint64_t base);
>>
>>  /* Architecture specific - can be in arch/x86/cpu/, arch/x86/lib/, or
>> $(BOARD)/ */
>>  int dram_init_f(void);
>> diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
>> index 962593d..0bc8c2f 100644
>> --- a/arch/x86/lib/Makefile
>> +++ b/arch/x86/lib/Makefile
>> @@ -37,6 +37,7 @@ COBJS-y       += relocate.o
>>  COBJS-y += physmem.o
>>  COBJS-y        += string.o
>>  COBJS-$(CONFIG_SYS_X86_ISR_TIMER)      += timer.o
>> +COBJS-$(CONFIG_SYS_X86_TSC_TIMER)      += tsc_timer.o
>>  COBJS-$(CONFIG_VIDEO_VGA)      += video.o
>>  COBJS-$(CONFIG_CMD_ZBOOT)      += zimage.o
>>
>> diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
>> new file mode 100644
>> index 0000000..d931e5f
>> --- /dev/null
>> +++ b/arch/x86/lib/tsc_timer.c
>> @@ -0,0 +1,103 @@
>> +/*
>> + * Copyright (c) 2012 The Chromium OS Authors.
>> + *
>> + * 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.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, write to the Free Software
>> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
>> + * MA 02111-1307 USA
>> + */
>> +
>> +#include <common.h>
>> +#include <malloc.h>
>> +#include <asm/io.h>
>> +#include <asm/i8254.h>
>> +#include <asm/ibmpc.h>
>> +#include <asm/msr.h>
>> +#include <asm/u-boot-x86.h>
>> +
>> +DECLARE_GLOBAL_DATA_PTR;
>> +
>> +void timer_set_base(u64 base)
>> +{
>> +       gd->arch.tsc_base = base;
>> +}
>> +
>> +/*
>> + * Get the number of CPU time counter ticks since it was read first time
>> after
>> + * restart. This yields a free running counter guaranteed to take almost
>> 6
>> + * years to wrap around even at 100GHz clock rate.
>> + */
>> +u64 get_ticks(void)
>> +{
>> +       u64 now_tick = rdtsc();
>> +
>> +       /* We assume that 0 means the base hasn't been set yet */
>> +       if (!gd->arch.tsc_base)
>> +               panic("No tick base available");
>> +       return now_tick - gd->arch.tsc_base;
>> +}
>> +
>> +#define PLATFORM_INFO_MSR 0xce
>> +
>> +/* Get the speed of the TSC timer in MHz */
>> +unsigned long get_tbclk_mhz(void)
>> +{
>> +       u32 ratio;
>> +       u64 platform_info = native_read_msr(PLATFORM_INFO_MSR);
>> +
>> +       /* 100MHz times Max Non Turbo ratio */
>> +       ratio = (platform_info >> 8) & 0xff;
>> +       return 100 * ratio;
>> +}
>> +
>> +unsigned long get_tbclk(void)
>> +{
>> +       return get_tbclk_mhz() * 1000 * 1000;
>> +}
>> +
>> +static ulong get_ms_timer(void)
>> +{
>> +       return (get_ticks() * 1000) / get_tbclk();
>> +}
>> +
>> +ulong get_timer(ulong base)
>> +{
>> +       return get_ms_timer() - base;
>> +}
>> +
>> +ulong timer_get_us(void)
>> +{
>> +       return get_ticks() / get_tbclk_mhz();
>> +}
>> +
>> +ulong timer_get_boot_us(void)
>> +{
>> +       return timer_get_us();
>> +}
>> +
>> +void __udelay(unsigned long usec)
>> +{
>> +       u64 now = get_ticks();
>> +       u64 stop;
>> +
>> +       stop = now + usec * get_tbclk_mhz();
>> +
>> +       while ((int64_t)(stop - get_ticks()) > 0)
>> +               ;
>> +}
>> +
>> +int timer_init(void)
>> +{
>> +       /* Nothing to do here - the timer needs no init */
>> +       return 0;
>> +}
>> diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
>> index 5bacc77..99408dc 100644
>> --- a/include/configs/coreboot.h
>> +++ b/include/configs/coreboot.h
>> @@ -38,7 +38,6 @@
>>  #define CONFIG_SHOW_BOOT_PROGRESS
>>  #define CONFIG_LAST_STAGE_INIT
>>  #define CONFIG_SYS_VSNPRINTF
>> -#define CONFIG_INTEL_CORE_ARCH /* Sandy bridge and ivy bridge chipsets.
>> */
>
> Why this?

We don't need the code that is enabled by this CONFIG, and we don't
need the CONFIG. I will squash this in also.

Regards,
Simon

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 08/19] x86: Remove old broken timer implementation
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (6 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 07/19] x86: Add TSC timer Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:51   ` Graeme Russ
  2013-04-18  2:13 ` [U-Boot] [PATCH 09/19] x86: Remove ISR timer Simon Glass
                   ` (11 subsequent siblings)
  19 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

Tidy up some old broken and unneeded implementations. These are not used
by coreboot or anything else now.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Gabe Black <gabeblack@chromium.org>
Reviewed-by: Michael Spang <spang@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
---
 arch/x86/cpu/Makefile |  2 +-
 arch/x86/cpu/timer.c  | 20 --------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 arch/x86/cpu/timer.c

diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
index 7b520f8..cddf0dd 100644
--- a/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
@@ -30,7 +30,7 @@ LIB	= $(obj)lib$(CPU).o
 
 START-y	= start.o
 START-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
-COBJS	= interrupts.o cpu.o timer.o
+COBJS	= interrupts.o cpu.o
 
 SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
diff --git a/arch/x86/cpu/timer.c b/arch/x86/cpu/timer.c
deleted file mode 100644
index f95fce5..0000000
--- a/arch/x86/cpu/timer.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- */
-
-#include <common.h>
-
-/* Temporary patch to maintain bisectability, removed in next commit */
-#ifndef CONFIG_SYS_X86_TSC_TIMER
-unsigned long timer_get_us(void)
-{
-	printf("timer_get_us used but not implemented.\n");
-	return 0;
-}
-#endif
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 08/19] x86: Remove old broken timer implementation
  2013-04-18  2:13 ` [U-Boot] [PATCH 08/19] x86: Remove old broken timer implementation Simon Glass
@ 2013-04-18  2:51   ` Graeme Russ
  0 siblings, 0 replies; 35+ messages in thread
From: Graeme Russ @ 2013-04-18  2:51 UTC (permalink / raw)
  To: u-boot

Hi Simon,

On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>
> Tidy up some old broken and unneeded implementations. These are not used
> by coreboot or anything else now.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Gabe Black <gabeblack@chromium.org>
> Reviewed-by: Michael Spang <spang@chromium.org>
> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
> ---
>  arch/x86/cpu/Makefile |  2 +-
>  arch/x86/cpu/timer.c  | 20 --------------------
>  2 files changed, 1 insertion(+), 21 deletions(-)
>  delete mode 100644 arch/x86/cpu/timer.c
>
> diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
> index 7b520f8..cddf0dd 100644
> --- a/arch/x86/cpu/Makefile
> +++ b/arch/x86/cpu/Makefile
> @@ -30,7 +30,7 @@ LIB   = $(obj)lib$(CPU).o
>
>  START-y        = start.o
>  START-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
> -COBJS  = interrupts.o cpu.o timer.o
> +COBJS  = interrupts.o cpu.o
>
>  SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
>  OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
> diff --git a/arch/x86/cpu/timer.c b/arch/x86/cpu/timer.c
> deleted file mode 100644
> index f95fce5..0000000
> --- a/arch/x86/cpu/timer.c
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -/*
> - * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
> - * Use of this source code is governed by a BSD-style license that can be
> - * found in the LICENSE file.
> - *
> - * Alternatively, this software may be distributed under the terms of the
> - * GNU General Public License ("GPL") version 2 as published by the Free
> - * Software Foundation.
> - */
> -
> -#include <common.h>
> -
> -/* Temporary patch to maintain bisectability, removed in next commit */
> -#ifndef CONFIG_SYS_X86_TSC_TIMER
> -unsigned long timer_get_us(void)
> -{
> -       printf("timer_get_us used but not implemented.\n");
> -       return 0;
> -}
> -#endif
> --
> 1.8.2.1
>

Acked-by: Graeme Russ <graeme.russ@gmail.com>

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 09/19] x86: Remove ISR timer
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (7 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 08/19] x86: Remove old broken timer implementation Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:45   ` Graeme Russ
  2013-04-18  2:13 ` [U-Boot] [PATCH 10/19] x86: Re-enable PCAT timer 2 for beeping Simon Glass
                   ` (10 subsequent siblings)
  19 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

This is no longer used since we prefer the more accurate TSC timer, so
remove the dead code.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/x86/lib/Makefile |   1 -
 arch/x86/lib/timer.c  | 118 --------------------------------------------------
 2 files changed, 119 deletions(-)
 delete mode 100644 arch/x86/lib/timer.c

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 0bc8c2f..c614479 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -36,7 +36,6 @@ COBJS-$(CONFIG_PCI) += pci_type1.o
 COBJS-y	+= relocate.o
 COBJS-y += physmem.o
 COBJS-y	+= string.o
-COBJS-$(CONFIG_SYS_X86_ISR_TIMER)	+= timer.o
 COBJS-$(CONFIG_SYS_X86_TSC_TIMER)	+= tsc_timer.o
 COBJS-$(CONFIG_VIDEO_VGA)	+= video.o
 COBJS-$(CONFIG_CMD_ZBOOT)	+= zimage.o
diff --git a/arch/x86/lib/timer.c b/arch/x86/lib/timer.c
deleted file mode 100644
index fb11bfe..0000000
--- a/arch/x86/lib/timer.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * (C) Copyright 2008,2009
- * Graeme Russ, <graeme.russ@gmail.com>
- *
- * (C) Copyright 2002
- * Daniel Engstr?m, Omicron Ceti AB, <daniel@omicron.se>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <malloc.h>
-#include <asm/io.h>
-#include <asm/i8254.h>
-#include <asm/ibmpc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-struct timer_isr_function {
-	struct timer_isr_function *next;
-	timer_fnc_t *isr_func;
-};
-
-static struct timer_isr_function *first_timer_isr;
-static unsigned long system_ticks;
-
-/*
- * register_timer_isr() allows multiple architecture and board specific
- * functions to be called every millisecond. Keep the execution time of
- * each function as low as possible
- */
-int register_timer_isr(timer_fnc_t *isr_func)
-{
-	struct timer_isr_function *new_func;
-	struct timer_isr_function *temp;
-	int flag;
-
-	new_func = malloc(sizeof(struct timer_isr_function));
-
-	if (new_func == NULL)
-		return 1;
-
-	new_func->isr_func = isr_func;
-	new_func->next = NULL;
-
-	/*
-	 *  Don't allow timer interrupts while the
-	 *  linked list is being modified
-	 */
-	flag = disable_interrupts();
-
-	if (first_timer_isr == NULL) {
-		first_timer_isr = new_func;
-	} else {
-		temp = first_timer_isr;
-		while (temp->next != NULL)
-			temp = temp->next;
-		temp->next = new_func;
-	}
-
-	if (flag)
-		enable_interrupts();
-
-	return 0;
-}
-
-/*
- * timer_isr() MUST be the registered interrupt handler for
- */
-void timer_isr(void *unused)
-{
-	struct timer_isr_function *temp = first_timer_isr;
-
-	system_ticks++;
-
-	/* Execute each registered function */
-	while (temp != NULL) {
-		temp->isr_func();
-		temp = temp->next;
-	}
-}
-
-ulong get_timer(ulong base)
-{
-	return system_ticks - base;
-}
-
-void timer_set_tsc_base(uint64_t new_base)
-{
-	gd->arch.tsc_base = new_base;
-}
-
-uint64_t timer_get_tsc(void)
-{
-	uint64_t time_now;
-
-	time_now = rdtsc();
-	if (!gd->arch.tsc_base)
-		gd->arch.tsc_base = time_now;
-
-	return time_now - gd->arch.tsc_base;
-}
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 09/19] x86: Remove ISR timer
  2013-04-18  2:13 ` [U-Boot] [PATCH 09/19] x86: Remove ISR timer Simon Glass
@ 2013-04-18  2:45   ` Graeme Russ
  0 siblings, 0 replies; 35+ messages in thread
From: Graeme Russ @ 2013-04-18  2:45 UTC (permalink / raw)
  To: u-boot

Hi Simon,

On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>
> This is no longer used since we prefer the more accurate TSC timer, so
> remove the dead code.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>  arch/x86/lib/Makefile |   1 -
>  arch/x86/lib/timer.c  | 118
--------------------------------------------------
>  2 files changed, 119 deletions(-)
>  delete mode 100644 arch/x86/lib/timer.c
>
> diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
> index 0bc8c2f..c614479 100644
> --- a/arch/x86/lib/Makefile
> +++ b/arch/x86/lib/Makefile
> @@ -36,7 +36,6 @@ COBJS-$(CONFIG_PCI) += pci_type1.o
>  COBJS-y        += relocate.o
>  COBJS-y += physmem.o
>  COBJS-y        += string.o
> -COBJS-$(CONFIG_SYS_X86_ISR_TIMER)      += timer.o
>  COBJS-$(CONFIG_SYS_X86_TSC_TIMER)      += tsc_timer.o
>  COBJS-$(CONFIG_VIDEO_VGA)      += video.o
>  COBJS-$(CONFIG_CMD_ZBOOT)      += zimage.o
> diff --git a/arch/x86/lib/timer.c b/arch/x86/lib/timer.c
> deleted file mode 100644
> index fb11bfe..0000000
> --- a/arch/x86/lib/timer.c
> +++ /dev/null
> @@ -1,118 +0,0 @@
> -/*
> - * (C) Copyright 2008,2009
> - * Graeme Russ, <graeme.russ@gmail.com>
> - *
> - * (C) Copyright 2002
> - * Daniel Engstr?m, Omicron Ceti AB, <daniel@omicron.se>
> - *
> - * See file CREDITS for list of people who contributed to this
> - * project.
> - *
> - * 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.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> - * MA 02111-1307 USA
> - */
> -
> -#include <common.h>
> -#include <malloc.h>
> -#include <asm/io.h>
> -#include <asm/i8254.h>
> -#include <asm/ibmpc.h>
> -
> -DECLARE_GLOBAL_DATA_PTR;
> -
> -struct timer_isr_function {
> -       struct timer_isr_function *next;
> -       timer_fnc_t *isr_func;
> -};
> -
> -static struct timer_isr_function *first_timer_isr;
> -static unsigned long system_ticks;
> -
> -/*
> - * register_timer_isr() allows multiple architecture and board specific
> - * functions to be called every millisecond. Keep the execution time of
> - * each function as low as possible
> - */
> -int register_timer_isr(timer_fnc_t *isr_func)
> -{
> -       struct timer_isr_function *new_func;
> -       struct timer_isr_function *temp;
> -       int flag;
> -
> -       new_func = malloc(sizeof(struct timer_isr_function));
> -
> -       if (new_func == NULL)
> -               return 1;
> -
> -       new_func->isr_func = isr_func;
> -       new_func->next = NULL;
> -
> -       /*
> -        *  Don't allow timer interrupts while the
> -        *  linked list is being modified
> -        */
> -       flag = disable_interrupts();
> -
> -       if (first_timer_isr == NULL) {
> -               first_timer_isr = new_func;
> -       } else {
> -               temp = first_timer_isr;
> -               while (temp->next != NULL)
> -                       temp = temp->next;
> -               temp->next = new_func;
> -       }
> -
> -       if (flag)
> -               enable_interrupts();
> -
> -       return 0;
> -}
> -
> -/*
> - * timer_isr() MUST be the registered interrupt handler for
> - */
> -void timer_isr(void *unused)
> -{
> -       struct timer_isr_function *temp = first_timer_isr;
> -
> -       system_ticks++;
> -
> -       /* Execute each registered function */
> -       while (temp != NULL) {
> -               temp->isr_func();
> -               temp = temp->next;
> -       }
> -}
> -
> -ulong get_timer(ulong base)
> -{
> -       return system_ticks - base;
> -}
> -
> -void timer_set_tsc_base(uint64_t new_base)
> -{
> -       gd->arch.tsc_base = new_base;
> -}
> -
> -uint64_t timer_get_tsc(void)
> -{
> -       uint64_t time_now;
> -
> -       time_now = rdtsc();
> -       if (!gd->arch.tsc_base)
> -               gd->arch.tsc_base = time_now;
> -
> -       return time_now - gd->arch.tsc_base;
> -}
> --
> 1.8.2.1
>

Acked-by: Graeme Russ <graeme.russ@gmail.com>

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 10/19] x86: Re-enable PCAT timer 2 for beeping
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (8 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 09/19] x86: Remove ISR timer Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:53   ` Graeme Russ
  2013-04-18  2:13 ` [U-Boot] [PATCH 11/19] bootstage: Add stubs for new bootstage functions Simon Glass
                   ` (9 subsequent siblings)
  19 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

While we don't want PCAT timers for timing, we want timer 2 so that we can
still make a beep. Re-purpose the PCAT driver for this, and enable it in
coreboot.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/x86/include/asm/u-boot-x86.h |  1 +
 arch/x86/lib/Makefile             |  2 +-
 arch/x86/lib/pcat_timer.c         | 69 ++-------------------------------------
 arch/x86/lib/tsc_timer.c          |  6 +++-
 include/configs/coreboot.h        |  1 +
 5 files changed, 11 insertions(+), 68 deletions(-)

diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index bec583f..22e0934 100644
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -41,6 +41,7 @@ typedef void (timer_fnc_t) (void);
 int register_timer_isr (timer_fnc_t *isr_func);
 unsigned long get_tbclk_mhz(void);
 void timer_set_base(uint64_t base);
+int pcat_timer_init(void);
 
 /* Architecture specific - can be in arch/x86/cpu/, arch/x86/lib/, or $(BOARD)/ */
 int dram_init_f(void);
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index c614479..f66ad30 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -31,7 +31,7 @@ COBJS-y	+= gcc.o
 COBJS-y	+= init_helpers.o
 COBJS-y	+= interrupts.o
 COBJS-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o
-COBJS-$(CONFIG_SYS_GENERIC_TIMER) += pcat_timer.o
+COBJS-$(CONFIG_SYS_PCAT_TIMER) += pcat_timer.o
 COBJS-$(CONFIG_PCI) += pci_type1.o
 COBJS-y	+= relocate.o
 COBJS-y += physmem.o
diff --git a/arch/x86/lib/pcat_timer.c b/arch/x86/lib/pcat_timer.c
index b0b6637..1ca3eb9 100644
--- a/arch/x86/lib/pcat_timer.c
+++ b/arch/x86/lib/pcat_timer.c
@@ -24,83 +24,20 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/i8254.h>
-#include <asm/ibmpc.h>
-#include <asm/interrupt.h>
 
-#define TIMER0_VALUE 0x04aa /* 1kHz 1.9318MHz / 1000 */
 #define TIMER2_VALUE 0x0a8e /* 440Hz */
 
-static int timer_init_done;
-
-int timer_init(void)
+int pcat_timer_init(void)
 {
-	/* initialize timer 0 and 2
-	 *
-	 * Timer 0 is used to increment system_tick 1000 times/sec
-	 * Timer 1 was used for DRAM refresh in early PC's
-	 * Timer 2 is used to drive the speaker
+	/*
+	 * initialize 2, used to drive the speaker
 	 * (to start a beep: write 3 to port 0x61,
 	 * to stop it again: write 0)
 	 */
-	outb(PIT_CMD_CTR0 | PIT_CMD_BOTH | PIT_CMD_MODE2,
-			PIT_BASE + PIT_COMMAND);
-	outb(TIMER0_VALUE & 0xff, PIT_BASE + PIT_T0);
-	outb(TIMER0_VALUE >> 8, PIT_BASE + PIT_T0);
-
 	outb(PIT_CMD_CTR2 | PIT_CMD_BOTH | PIT_CMD_MODE3,
 			PIT_BASE + PIT_COMMAND);
 	outb(TIMER2_VALUE & 0xff, PIT_BASE + PIT_T2);
 	outb(TIMER2_VALUE >> 8, PIT_BASE + PIT_T2);
 
-	irq_install_handler(0, timer_isr, NULL);
-	unmask_irq(0);
-
-	timer_init_done = 1;
-
 	return 0;
 }
-
-static u16 read_pit(void)
-{
-	u8 low;
-
-	outb(PIT_CMD_LATCH, PIT_BASE + PIT_COMMAND);
-	low = inb(PIT_BASE + PIT_T0);
-
-	return (inb(PIT_BASE + PIT_T0) << 8) | low;
-}
-
-/* this is not very exact */
-void __udelay(unsigned long usec)
-{
-	int counter;
-	int wraps;
-
-	if (timer_init_done) {
-		counter = read_pit();
-		wraps = usec / 1000;
-		usec = usec % 1000;
-
-		usec *= 1194;
-		usec /= 1000;
-		usec += counter;
-
-		while (usec > 1194) {
-			usec -= 1194;
-			wraps++;
-		}
-
-		while (1) {
-			int new_count = read_pit();
-
-			if (((new_count < usec) && !wraps) || wraps < 0)
-				break;
-
-			if (new_count > counter)
-				wraps--;
-
-			counter = new_count;
-		}
-	}
-
-}
diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
index d931e5f..c509801 100644
--- a/arch/x86/lib/tsc_timer.c
+++ b/arch/x86/lib/tsc_timer.c
@@ -98,6 +98,10 @@ void __udelay(unsigned long usec)
 
 int timer_init(void)
 {
-	/* Nothing to do here - the timer needs no init */
+#ifdef CONFIG_SYS_PCAT_TIMER
+	/* Set up the PCAT timer if required */
+	pcat_timer_init();
+#endif
+
 	return 0;
 }
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 99408dc..7953ec6 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -235,6 +235,7 @@
 
 #define CONFIG_SYS_X86_TSC_TIMER
 #define CONFIG_SYS_PCAT_INTERRUPTS
+#define CONFIG_SYS_PCAT_TIMER
 #define CONFIG_SYS_NUM_IRQS			16
 
 /*-----------------------------------------------------------------------
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 10/19] x86: Re-enable PCAT timer 2 for beeping
  2013-04-18  2:13 ` [U-Boot] [PATCH 10/19] x86: Re-enable PCAT timer 2 for beeping Simon Glass
@ 2013-04-18  2:53   ` Graeme Russ
  2013-04-26 13:43     ` Simon Glass
  0 siblings, 1 reply; 35+ messages in thread
From: Graeme Russ @ 2013-04-18  2:53 UTC (permalink / raw)
  To: u-boot

Hi Simon,

On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>
> While we don't want PCAT timers for timing, we want timer 2 so that we can
> still make a beep. Re-purpose the PCAT driver for this, and enable it in
> coreboot.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>  arch/x86/include/asm/u-boot-x86.h |  1 +
>  arch/x86/lib/Makefile             |  2 +-
>  arch/x86/lib/pcat_timer.c         | 69
++-------------------------------------
>  arch/x86/lib/tsc_timer.c          |  6 +++-
>  include/configs/coreboot.h        |  1 +
>  5 files changed, 11 insertions(+), 68 deletions(-)

[snip]

> -/* this is not very exact */
> -void __udelay(unsigned long usec)
> -{
> -       int counter;
> -       int wraps;
> -
> -       if (timer_init_done) {
> -               counter = read_pit();
> -               wraps = usec / 1000;
> -               usec = usec % 1000;
> -
> -               usec *= 1194;
> -               usec /= 1000;
> -               usec += counter;
> -
> -               while (usec > 1194) {
> -                       usec -= 1194;
> -                       wraps++;
> -               }
> -
> -               while (1) {
> -                       int new_count = read_pit();
> -
> -                       if (((new_count < usec) && !wraps) || wraps < 0)
> -                               break;
> -
> -                       if (new_count > counter)
> -                               wraps--;
> -
> -                       counter = new_count;
> -               }
> -       }
> -
> -}

This does not seem related...

Regards,

Graeme

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 10/19] x86: Re-enable PCAT timer 2 for beeping
  2013-04-18  2:53   ` Graeme Russ
@ 2013-04-26 13:43     ` Simon Glass
  0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-26 13:43 UTC (permalink / raw)
  To: u-boot

Hi Graeme,

On Wed, Apr 17, 2013 at 7:53 PM, Graeme Russ <graeme.russ@gmail.com> wrote:
> Hi Simon,
>
>
> On Thu, Apr 18, 2013 at 12:13 PM, Simon Glass <sjg@chromium.org> wrote:
>>
>> While we don't want PCAT timers for timing, we want timer 2 so that we can
>> still make a beep. Re-purpose the PCAT driver for this, and enable it in
>> coreboot.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>  arch/x86/include/asm/u-boot-x86.h |  1 +
>>  arch/x86/lib/Makefile             |  2 +-
>>  arch/x86/lib/pcat_timer.c         | 69
>> ++-------------------------------------
>>  arch/x86/lib/tsc_timer.c          |  6 +++-
>>  include/configs/coreboot.h        |  1 +
>>  5 files changed, 11 insertions(+), 68 deletions(-)
>
> [snip]
>
>> -/* this is not very exact */
>> -void __udelay(unsigned long usec)
>> -{
>> -       int counter;
>> -       int wraps;
>> -
>> -       if (timer_init_done) {
>> -               counter = read_pit();
>> -               wraps = usec / 1000;
>> -               usec = usec % 1000;
>> -
>> -               usec *= 1194;
>> -               usec /= 1000;
>> -               usec += counter;
>> -
>> -               while (usec > 1194) {
>> -                       usec -= 1194;
>> -                       wraps++;
>> -               }
>> -
>> -               while (1) {
>> -                       int new_count = read_pit();
>> -
>> -                       if (((new_count < usec) && !wraps) || wraps < 0)
>> -                               break;
>> -
>> -                       if (new_count > counter)
>> -                               wraps--;
>> -
>> -                       counter = new_count;
>> -               }
>> -       }
>> -
>> -}
>
> This does not seem related...

It really should be in a clean-up patch. But now that I am squashing
them, I will just add it to the squashed patch.

Regards,
Simon

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 11/19] bootstage: Add stubs for new bootstage functions
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (9 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 10/19] x86: Re-enable PCAT timer 2 for beeping Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 12/19] bootstage: Copy bootstage strings post-relocation Simon Glass
                   ` (8 subsequent siblings)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

Some functions don't have a stub for when CONFIG_BOOTSTAGE is not defined.
Add one to avoid #ifdefs in the code when this is used in U-Boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
---
 include/bootstage.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/include/bootstage.h b/include/bootstage.h
index 3b2216b..bdda768 100644
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -315,6 +315,12 @@ int bootstage_stash(void *base, int size);
 int bootstage_unstash(void *base, int size);
 
 #else
+static inline ulong bootstage_add_record(enum bootstage_id id,
+		const char *name, int flags, ulong mark)
+{
+	return 0;
+}
+
 /*
  * This is a dummy implementation which just calls show_boot_progress(),
  * and won't even do that unless CONFIG_SHOW_BOOT_PROGRESS is defined
@@ -337,6 +343,16 @@ static inline ulong bootstage_mark_name(enum bootstage_id id, const char *name)
 	return 0;
 }
 
+static inline uint32_t bootstage_start(enum bootstage_id id, const char *name)
+{
+	return 0;
+}
+
+static inline uint32_t bootstage_accum(enum bootstage_id id)
+{
+	return 0;
+}
+
 static inline int bootstage_stash(void *base, int size)
 {
 	return 0;	/* Pretend to succeed */
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 12/19] bootstage: Copy bootstage strings post-relocation
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (10 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 11/19] bootstage: Add stubs for new bootstage functions Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 13/19] Call bootstage_relocate() after malloc is initted Simon Glass
                   ` (7 subsequent siblings)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

From: Doug Anderson <dianders@chromium.org>

Any pointers to name strings that were passed to bootstage_mark_name()
pre-relocation should be copied post-relocation so that they don't get
trashed as the original location of U-Boot is re-used for other
purposes.

This change introduces a new API call that should be called from
board_init_r() after malloc has been initted on any board that uses
bootstage.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 common/bootstage.c  | 15 +++++++++++++++
 include/bootstage.h | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/common/bootstage.c b/common/bootstage.c
index a1e0939..15afa24 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -56,6 +56,21 @@ struct bootstage_hdr {
 	uint32_t magic;		/* Unused */
 };
 
+int bootstage_relocate(void)
+{
+	int i;
+
+	/*
+	 * Duplicate all strings.  They may point to an old location in the
+	 * program .text section that can eventually get trashed.
+	 */
+	for (i = 0; i < BOOTSTAGE_ID_COUNT; i++)
+		if (record[i].name)
+			record[i].name = strdup(record[i].name);
+
+	return 0;
+}
+
 ulong bootstage_add_record(enum bootstage_id id, const char *name,
 			   int flags, ulong mark)
 {
diff --git a/include/bootstage.h b/include/bootstage.h
index bdda768..c8235e8 100644
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -237,6 +237,16 @@ void show_boot_progress(int val);
 /* This is the full bootstage implementation */
 
 /**
+ * Relocate existing bootstage records
+ *
+ * Call this after relocation has happened and after malloc has been initted.
+ * We need to copy any pointers in bootstage records that were added pre-
+ * relocation, since memory can be overritten later.
+ * @return Always returns 0, to indicate success
+ */
+int bootstage_relocate(void);
+
+/**
  * Add a new bootstage record
  *
  * @param id	Bootstage ID to use (ignored if flags & BOOTSTAGEF_ALLOC)
@@ -326,6 +336,11 @@ static inline ulong bootstage_add_record(enum bootstage_id id,
  * and won't even do that unless CONFIG_SHOW_BOOT_PROGRESS is defined
  */
 
+static inline int bootstage_relocate(void)
+{
+	return 0;
+}
+
 static inline ulong bootstage_mark(enum bootstage_id id)
 {
 	show_boot_progress(id);
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 13/19] Call bootstage_relocate() after malloc is initted
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (11 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 12/19] bootstage: Copy bootstage strings post-relocation Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 14/19] x86: Enable bootstage for coreboot Simon Glass
                   ` (6 subsequent siblings)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

From: Doug Anderson <dianders@chromium.org>

In a previous CL we added the bootstage_relocate(), which should be
called after malloc is initted.  Now we call it on generic board.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 common/board_r.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/board_r.c b/common/board_r.c
index 2b17fa6..a364ef24 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -761,6 +761,7 @@ init_fnc_t init_sequence_r[] = {
 #endif
 	initr_barrier,
 	initr_malloc,
+	bootstage_relocate,
 #ifdef CONFIG_ARCH_EARLY_INIT_R
 	arch_early_init_r,
 #endif
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 14/19] x86: Enable bootstage for coreboot
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (12 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 13/19] Call bootstage_relocate() after malloc is initted Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 15/19] bootstage: Allow marking a particular line of code Simon Glass
                   ` (5 subsequent siblings)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

This is a convenient way of finding out where boottime is going. Enable
it for coreboot.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 include/configs/coreboot.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 7953ec6..743fb95 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -48,6 +48,15 @@
 #define CONFIG_OF_SEPARATE
 #define CONFIG_DEFAULT_DEVICE_TREE	link
 
+#define CONFIG_BOOTSTAGE
+#define CONFIG_BOOTSTAGE_REPORT
+#define CONFIG_BOOTSTAGE_FDT
+#define CONFIG_CMD_BOOTSTAGE
+/* Place to stash bootstage data from first-stage U-Boot */
+#define CONFIG_BOOTSTAGE_STASH		0x0110f000
+#define CONFIG_BOOTSTAGE_STASH_SIZE	0x7fc
+#define CONFIG_BOOTSTAGE_USER_COUNT	60
+
 /*-----------------------------------------------------------------------
  * Watchdog Configuration
  */
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 15/19] bootstage: Allow marking a particular line of code
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (13 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 14/19] x86: Enable bootstage for coreboot Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 16/19] x86: Fix warning in cmd_ximg.c when CONFIG_GZIP is not defined Simon Glass
                   ` (4 subsequent siblings)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

Add a function which allows a (file, function, line number) to be marked
in bootstage.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
---
 common/bootstage.c  | 29 +++++++++++++++++++++++++++++
 include/bootstage.h | 23 +++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/common/bootstage.c b/common/bootstage.c
index 15afa24..c5c6996 100644
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -30,6 +30,8 @@
 
 #include <common.h>
 #include <libfdt.h>
+#include <malloc.h>
+#include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -117,6 +119,33 @@ ulong bootstage_mark_name(enum bootstage_id id, const char *name)
 	return bootstage_add_record(id, name, flags, timer_get_boot_us());
 }
 
+ulong bootstage_mark_code(const char *file, const char *func, int linenum)
+{
+	char *str, *p;
+	__maybe_unused char *end;
+	int len = 0;
+
+	/* First work out the length we need to allocate */
+	if (linenum != -1)
+		len = 11;
+	if (func)
+		len += strlen(func);
+	if (file)
+		len += strlen(file);
+
+	str = malloc(len + 1);
+	p = str;
+	end = p + len;
+	if (file)
+		p += snprintf(p, end - p, "%s,", file);
+	if (linenum != -1)
+		p += snprintf(p, end - p, "%d", linenum);
+	if (func)
+		p += snprintf(p, end - p, ": %s", func);
+
+	return bootstage_mark_name(BOOTSTAGE_ID_ALLOC, str);
+}
+
 uint32_t bootstage_start(enum bootstage_id id, const char *name)
 {
 	struct bootstage_record *rec = &record[id];
diff --git a/include/bootstage.h b/include/bootstage.h
index c8235e8..0f44e71 100644
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -267,6 +267,19 @@ ulong bootstage_error(enum bootstage_id id);
 ulong bootstage_mark_name(enum bootstage_id id, const char *name);
 
 /**
+ * Mark a time stamp in the given function and line number
+ *
+ * See BOOTSTAGE_MARKER() for a convenient macro.
+ *
+ * @param file		Filename to record (NULL if none)
+ * @param func		Function name to record
+ * @param linenum	Line number to record
+ * @return recorded time stamp
+ */
+ulong bootstage_mark_code(const char *file, const char *func,
+			  int linenum);
+
+/**
  * Mark the start of a bootstage activity. The end will be marked later with
  * bootstage_accum() and at that point we accumulate the time taken. Calling
  * this function turns the given id into a accumulator rather than and
@@ -358,6 +371,12 @@ static inline ulong bootstage_mark_name(enum bootstage_id id, const char *name)
 	return 0;
 }
 
+static inline ulong bootstage_mark_code(const char *file, const char *func,
+					int linenum)
+{
+	return 0;
+}
+
 static inline uint32_t bootstage_start(enum bootstage_id id, const char *name)
 {
 	return 0;
@@ -379,4 +398,8 @@ static inline int bootstage_unstash(void *base, int size)
 }
 #endif /* CONFIG_BOOTSTAGE */
 
+/* Helper macro for adding a bootstage to a line of code */
+#define BOOTSTAGE_MARKER()	\
+		bootstage_mark_code(__FILE__, __func__, __LINE__)
+
 #endif
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 16/19] x86: Fix warning in cmd_ximg.c when CONFIG_GZIP is not defined
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (14 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 15/19] bootstage: Allow marking a particular line of code Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 17/19] x86: config: Enable LZO for coreboot, remove zlib, gzip Simon Glass
                   ` (3 subsequent siblings)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

This local variable is not used unless CONFIG_GZIP is defined. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 common/cmd_ximg.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c
index ea0a26e..02084b0 100644
--- a/common/cmd_ximg.c
+++ b/common/cmd_ximg.c
@@ -58,7 +58,9 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 	const void	*fit_data;
 	size_t		fit_len;
 #endif
+#ifdef CONFIG_GZIP
 	uint		unc_len = CONFIG_SYS_XIMG_LEN;
+#endif
 	uint8_t		comp;
 
 	verify = getenv_yesno("verify");
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 17/19] x86: config: Enable LZO for coreboot, remove zlib, gzip
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (15 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 16/19] x86: Fix warning in cmd_ximg.c when CONFIG_GZIP is not defined Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 18/19] x86: Support adding coreboot timestanps to bootstage Simon Glass
                   ` (2 subsequent siblings)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

We don't use zlib and gzip but do use lzo, so enable this.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 include/configs/coreboot.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 743fb95..be04a75 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -57,6 +57,10 @@
 #define CONFIG_BOOTSTAGE_STASH_SIZE	0x7fc
 #define CONFIG_BOOTSTAGE_USER_COUNT	60
 
+#define CONFIG_LZO
+#undef CONFIG_ZLIB
+#undef CONFIG_GZIP
+
 /*-----------------------------------------------------------------------
  * Watchdog Configuration
  */
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 18/19] x86: Support adding coreboot timestanps to bootstage
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (16 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 17/19] x86: config: Enable LZO for coreboot, remove zlib, gzip Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18  2:13 ` [U-Boot] [PATCH 19/19] x86: Add coreboot timestamps Simon Glass
  2013-04-18 15:50 ` [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Vadim Bendebury (вб)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

Coreboot provides a lot of useful timing information. Provide a facility
to add this to bootstage on start-up.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/x86/cpu/coreboot/timestamp.c              | 38 ++++++++++++++++++++++++++
 arch/x86/include/asm/arch-coreboot/timestamp.h |  7 +++++
 2 files changed, 45 insertions(+)

diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
index d26718e..bd3558a 100644
--- a/arch/x86/cpu/coreboot/timestamp.c
+++ b/arch/x86/cpu/coreboot/timestamp.c
@@ -61,3 +61,41 @@ void timestamp_add_now(enum timestamp_id id)
 {
 	timestamp_add(id, rdtsc());
 }
+
+int timestamp_add_to_bootstage(void)
+{
+	uint i;
+
+	if (!ts_table)
+		return -1;
+
+	for (i = 0; i < ts_table->num_entries; i++) {
+		struct timestamp_entry *tse = &ts_table->entries[i];
+		const char *name = NULL;
+
+		switch (tse->entry_id) {
+		case TS_START_ROMSTAGE:
+			name = "start-romstage";
+			break;
+		case TS_BEFORE_INITRAM:
+			name = "before-initram";
+			break;
+		case TS_DEVICE_INITIALIZE:
+			name = "device-initialize";
+			break;
+		case TS_DEVICE_DONE:
+			name = "device-done";
+			break;
+		case TS_SELFBOOT_JUMP:
+			name = "selfboot-jump";
+			break;
+		}
+		if (name) {
+			bootstage_add_record(0, name, BOOTSTAGEF_ALLOC,
+					     tse->entry_stamp /
+							get_tbclk_mhz());
+		}
+	}
+
+	return 0;
+}
diff --git a/arch/x86/include/asm/arch-coreboot/timestamp.h b/arch/x86/include/asm/arch-coreboot/timestamp.h
index d104912..fcfc1d5 100644
--- a/arch/x86/include/asm/arch-coreboot/timestamp.h
+++ b/arch/x86/include/asm/arch-coreboot/timestamp.h
@@ -49,4 +49,11 @@ void timestamp_init(void);
 void timestamp_add(enum timestamp_id id, uint64_t ts_time);
 void timestamp_add_now(enum timestamp_id id);
 
+/**
+ * timestamp_add_to_bootstage - Add important coreboot timestamps to bootstage
+ *
+ * @return 0 if ok, -1 if no timestamps were found
+ */
+int timestamp_add_to_bootstage(void);
+
 #endif
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 19/19] x86: Add coreboot timestamps
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (17 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 18/19] x86: Support adding coreboot timestanps to bootstage Simon Glass
@ 2013-04-18  2:13 ` Simon Glass
  2013-04-18 15:50 ` [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Vadim Bendebury (вб)
  19 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-04-18  2:13 UTC (permalink / raw)
  To: u-boot

Add selected coreboot timestamps into bootstage to get a unified view of
the boot timings.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/x86/cpu/coreboot/coreboot.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 4a7dae49..14cb699 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -91,6 +91,9 @@ void show_boot_progress(int val)
 
 int last_stage_init(void)
 {
+	if (gd->flags & GD_FLG_COLD_BOOT)
+		timestamp_add_to_bootstage();
+
 	return 0;
 }
 
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage
  2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
                   ` (18 preceding siblings ...)
  2013-04-18  2:13 ` [U-Boot] [PATCH 19/19] x86: Add coreboot timestamps Simon Glass
@ 2013-04-18 15:50 ` Vadim Bendebury (вб)
  2013-04-25 22:12   ` Simon Glass
  19 siblings, 1 reply; 35+ messages in thread
From: Vadim Bendebury (вб) @ 2013-04-18 15:50 UTC (permalink / raw)
  To: u-boot

 On Wed, Apr 17, 2013 at 7:13 PM, Simon Glass <sjg@chromium.org> wrote:
>
> This series removes unused x86 code based on advice from Graeme Russ. THis
> code was used for real mode which is no longer needed in U-Boot.
>
> A new more accurate timer is added, and this permits bootstage to be
> enabled and produce useful results on x86.
>
>
> Doug Anderson (2):
>   bootstage: Copy bootstage strings post-relocation
>   Call bootstage_relocate() after malloc is initted
>
> Simon Glass (17):
>   x86: Remove unused bios/pci code
>   x86: Remove unused portion of link script
>   x86: Remove legacy board init code
>   x86: Declare global_data pointer when it is used
>   x86: Implement panic output for coreboot
>   x86: Rationalise kernel booting logic and bootstage
>   x86: Add TSC timer
>   x86: Remove old broken timer implementation
>   x86: Remove ISR timer
>   x86: Re-enable PCAT timer 2 for beeping
>   bootstage: Add stubs for new bootstage functions
>   x86: Enable bootstage for coreboot
>   bootstage: Allow marking a particular line of code
>   x86: Fix warning in cmd_ximg.c when CONFIG_GZIP is not defined
>   x86: config: Enable LZO for coreboot, remove zlib, gzip
>   x86: Support adding coreboot timestanps to bootstage
>   x86: Add coreboot timestamps
>
>  arch/x86/cpu/Makefile                          |   2 +-
>  arch/x86/cpu/coreboot/coreboot.c               |  13 ++
>  arch/x86/cpu/coreboot/timestamp.c              |  42 +++-
>  arch/x86/cpu/cpu.c                             |   5 +
>  arch/x86/cpu/interrupts.c                      |   2 +
>  arch/x86/cpu/timer.c                           |  17 --
>  arch/x86/cpu/u-boot.lds                        |  12 --
>  arch/x86/include/asm/arch-coreboot/timestamp.h |   7 +
>  arch/x86/include/asm/init_helpers.h            |   9 -
>  arch/x86/include/asm/init_wrappers.h           |  42 ----
>  arch/x86/include/asm/pci.h                     |   4 -
>  arch/x86/include/asm/u-boot-x86.h              |   4 +
>  arch/x86/include/asm/u-boot.h                  |  32 ---
>  arch/x86/lib/Makefile                          |  10 +-
>  arch/x86/lib/bios.h                            | 170 ---------------
>  arch/x86/lib/board.c                           | 273 -------------------------
>  arch/x86/lib/bootm.c                           |   8 -
>  arch/x86/lib/cmd_boot.c                        |   2 +
>  arch/x86/lib/init_helpers.c                    |  98 ---------
>  arch/x86/lib/init_wrappers.c                   | 164 ---------------
>  arch/x86/lib/pcat_timer.c                      |  69 +------
>  arch/x86/lib/pci.c                             | 188 -----------------
>  arch/x86/lib/physmem.c                         |   2 +
>  arch/x86/lib/relocate.c                        |   2 +
>  arch/x86/lib/timer.c                           | 116 -----------
>  arch/x86/lib/tsc_timer.c                       | 107 ++++++++++
>  arch/x86/lib/zimage.c                          |  11 +-
>  common/board_r.c                               |   1 +
>  common/bootstage.c                             |  44 ++++
>  common/cmd_ximg.c                              |   2 +
>  include/bootstage.h                            |  54 +++++
>  include/configs/coreboot.h                     |  18 +-
>  32 files changed, 314 insertions(+), 1216 deletions(-)
>  delete mode 100644 arch/x86/cpu/timer.c
>  delete mode 100644 arch/x86/include/asm/init_wrappers.h
>  delete mode 100644 arch/x86/lib/bios.h
>  delete mode 100644 arch/x86/lib/board.c
>  delete mode 100644 arch/x86/lib/init_wrappers.c
>  delete mode 100644 arch/x86/lib/pci.c
>  delete mode 100644 arch/x86/lib/timer.c
>  create mode 100644 arch/x86/lib/tsc_timer.c
>
> --
> 1.8.2.1
>

Simon, just out of curiosity: how was this tested, on what platforms,
what procedure was followed, etc.

--vb

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage
  2013-04-18 15:50 ` [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Vadim Bendebury (вб)
@ 2013-04-25 22:12   ` Simon Glass
  2013-05-09 21:22     ` Simon Glass
  0 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2013-04-25 22:12 UTC (permalink / raw)
  To: u-boot

Hi Vadim,

On Thu, Apr 18, 2013 at 8:50 AM, Vadim Bendebury (??)
<vbendeb@google.com> wrote:
>  On Wed, Apr 17, 2013 at 7:13 PM, Simon Glass <sjg@chromium.org> wrote:
>>
>> This series removes unused x86 code based on advice from Graeme Russ. THis
>> code was used for real mode which is no longer needed in U-Boot.
>>
>> A new more accurate timer is added, and this permits bootstage to be
>> enabled and produce useful results on x86.
>>
>>
>> Doug Anderson (2):
>>   bootstage: Copy bootstage strings post-relocation
>>   Call bootstage_relocate() after malloc is initted
>>
>> Simon Glass (17):
>>   x86: Remove unused bios/pci code
>>   x86: Remove unused portion of link script
>>   x86: Remove legacy board init code
>>   x86: Declare global_data pointer when it is used
>>   x86: Implement panic output for coreboot
>>   x86: Rationalise kernel booting logic and bootstage
>>   x86: Add TSC timer
>>   x86: Remove old broken timer implementation
>>   x86: Remove ISR timer
>>   x86: Re-enable PCAT timer 2 for beeping
>>   bootstage: Add stubs for new bootstage functions
>>   x86: Enable bootstage for coreboot
>>   bootstage: Allow marking a particular line of code
>>   x86: Fix warning in cmd_ximg.c when CONFIG_GZIP is not defined
>>   x86: config: Enable LZO for coreboot, remove zlib, gzip
>>   x86: Support adding coreboot timestanps to bootstage
>>   x86: Add coreboot timestamps
>>
>>  arch/x86/cpu/Makefile                          |   2 +-
>>  arch/x86/cpu/coreboot/coreboot.c               |  13 ++
>>  arch/x86/cpu/coreboot/timestamp.c              |  42 +++-
>>  arch/x86/cpu/cpu.c                             |   5 +
>>  arch/x86/cpu/interrupts.c                      |   2 +
>>  arch/x86/cpu/timer.c                           |  17 --
>>  arch/x86/cpu/u-boot.lds                        |  12 --
>>  arch/x86/include/asm/arch-coreboot/timestamp.h |   7 +
>>  arch/x86/include/asm/init_helpers.h            |   9 -
>>  arch/x86/include/asm/init_wrappers.h           |  42 ----
>>  arch/x86/include/asm/pci.h                     |   4 -
>>  arch/x86/include/asm/u-boot-x86.h              |   4 +
>>  arch/x86/include/asm/u-boot.h                  |  32 ---
>>  arch/x86/lib/Makefile                          |  10 +-
>>  arch/x86/lib/bios.h                            | 170 ---------------
>>  arch/x86/lib/board.c                           | 273 -------------------------
>>  arch/x86/lib/bootm.c                           |   8 -
>>  arch/x86/lib/cmd_boot.c                        |   2 +
>>  arch/x86/lib/init_helpers.c                    |  98 ---------
>>  arch/x86/lib/init_wrappers.c                   | 164 ---------------
>>  arch/x86/lib/pcat_timer.c                      |  69 +------
>>  arch/x86/lib/pci.c                             | 188 -----------------
>>  arch/x86/lib/physmem.c                         |   2 +
>>  arch/x86/lib/relocate.c                        |   2 +
>>  arch/x86/lib/timer.c                           | 116 -----------
>>  arch/x86/lib/tsc_timer.c                       | 107 ++++++++++
>>  arch/x86/lib/zimage.c                          |  11 +-
>>  common/board_r.c                               |   1 +
>>  common/bootstage.c                             |  44 ++++
>>  common/cmd_ximg.c                              |   2 +
>>  include/bootstage.h                            |  54 +++++
>>  include/configs/coreboot.h                     |  18 +-
>>  32 files changed, 314 insertions(+), 1216 deletions(-)
>>  delete mode 100644 arch/x86/cpu/timer.c
>>  delete mode 100644 arch/x86/include/asm/init_wrappers.h
>>  delete mode 100644 arch/x86/lib/bios.h
>>  delete mode 100644 arch/x86/lib/board.c
>>  delete mode 100644 arch/x86/lib/init_wrappers.c
>>  delete mode 100644 arch/x86/lib/pci.c
>>  delete mode 100644 arch/x86/lib/timer.c
>>  create mode 100644 arch/x86/lib/tsc_timer.c
>>
>> --
>> 1.8.2.1
>>
>
> Simon, just out of curiosity: how was this tested, on what platforms,
> what procedure was followed, etc.

I used the time command to test that the time seems about right, by
timing for 10 seconds and comparing against a stopwatch:

boot > time sleep 10

time: 10.000 seconds, 10000 ticks

Also I obtained a bootstage report which looked fairly sane:

boot > bootstage report
Timer summary in microseconds:
       Mark    Elapsed  Stage
          0          0  reset
  1,028,998  1,028,998  board_init_f
  1,035,680      6,682  board_init_r
  1,092,769     57,089  id=64
  1,094,506      1,737  main_loop

Accumulated time:

All testing was done on link only.

Regards,
Simon

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage
  2013-04-25 22:12   ` Simon Glass
@ 2013-05-09 21:22     ` Simon Glass
  2013-05-13 19:25       ` Tom Rini
  0 siblings, 1 reply; 35+ messages in thread
From: Simon Glass @ 2013-05-09 21:22 UTC (permalink / raw)
  To: u-boot

Hi Tom,

On Thu, Apr 25, 2013 at 3:12 PM, Simon Glass <sjg@chromium.org> wrote:
> Hi Vadim,
>
> On Thu, Apr 18, 2013 at 8:50 AM, Vadim Bendebury (??)
> <vbendeb@google.com> wrote:
>>  On Wed, Apr 17, 2013 at 7:13 PM, Simon Glass <sjg@chromium.org> wrote:
>>>
>>> This series removes unused x86 code based on advice from Graeme Russ. THis
>>> code was used for real mode which is no longer needed in U-Boot.
>>>
>>> A new more accurate timer is added, and this permits bootstage to be
>>> enabled and produce useful results on x86.
>>>
>>>
>>> Doug Anderson (2):
>>>   bootstage: Copy bootstage strings post-relocation
>>>   Call bootstage_relocate() after malloc is initted
>>>
>>> Simon Glass (17):
>>>   x86: Remove unused bios/pci code
>>>   x86: Remove unused portion of link script
>>>   x86: Remove legacy board init code
>>>   x86: Declare global_data pointer when it is used
>>>   x86: Implement panic output for coreboot
>>>   x86: Rationalise kernel booting logic and bootstage
>>>   x86: Add TSC timer
>>>   x86: Remove old broken timer implementation
>>>   x86: Remove ISR timer
>>>   x86: Re-enable PCAT timer 2 for beeping
>>>   bootstage: Add stubs for new bootstage functions
>>>   x86: Enable bootstage for coreboot
>>>   bootstage: Allow marking a particular line of code
>>>   x86: Fix warning in cmd_ximg.c when CONFIG_GZIP is not defined
>>>   x86: config: Enable LZO for coreboot, remove zlib, gzip
>>>   x86: Support adding coreboot timestanps to bootstage
>>>   x86: Add coreboot timestamps
>>>
>>>  arch/x86/cpu/Makefile                          |   2 +-
>>>  arch/x86/cpu/coreboot/coreboot.c               |  13 ++
>>>  arch/x86/cpu/coreboot/timestamp.c              |  42 +++-
>>>  arch/x86/cpu/cpu.c                             |   5 +
>>>  arch/x86/cpu/interrupts.c                      |   2 +
>>>  arch/x86/cpu/timer.c                           |  17 --
>>>  arch/x86/cpu/u-boot.lds                        |  12 --
>>>  arch/x86/include/asm/arch-coreboot/timestamp.h |   7 +
>>>  arch/x86/include/asm/init_helpers.h            |   9 -
>>>  arch/x86/include/asm/init_wrappers.h           |  42 ----
>>>  arch/x86/include/asm/pci.h                     |   4 -
>>>  arch/x86/include/asm/u-boot-x86.h              |   4 +
>>>  arch/x86/include/asm/u-boot.h                  |  32 ---
>>>  arch/x86/lib/Makefile                          |  10 +-
>>>  arch/x86/lib/bios.h                            | 170 ---------------
>>>  arch/x86/lib/board.c                           | 273 -------------------------
>>>  arch/x86/lib/bootm.c                           |   8 -
>>>  arch/x86/lib/cmd_boot.c                        |   2 +
>>>  arch/x86/lib/init_helpers.c                    |  98 ---------
>>>  arch/x86/lib/init_wrappers.c                   | 164 ---------------
>>>  arch/x86/lib/pcat_timer.c                      |  69 +------
>>>  arch/x86/lib/pci.c                             | 188 -----------------
>>>  arch/x86/lib/physmem.c                         |   2 +
>>>  arch/x86/lib/relocate.c                        |   2 +
>>>  arch/x86/lib/timer.c                           | 116 -----------
>>>  arch/x86/lib/tsc_timer.c                       | 107 ++++++++++
>>>  arch/x86/lib/zimage.c                          |  11 +-
>>>  common/board_r.c                               |   1 +
>>>  common/bootstage.c                             |  44 ++++
>>>  common/cmd_ximg.c                              |   2 +
>>>  include/bootstage.h                            |  54 +++++
>>>  include/configs/coreboot.h                     |  18 +-
>>>  32 files changed, 314 insertions(+), 1216 deletions(-)
>>>  delete mode 100644 arch/x86/cpu/timer.c
>>>  delete mode 100644 arch/x86/include/asm/init_wrappers.h
>>>  delete mode 100644 arch/x86/lib/bios.h
>>>  delete mode 100644 arch/x86/lib/board.c
>>>  delete mode 100644 arch/x86/lib/init_wrappers.c
>>>  delete mode 100644 arch/x86/lib/pci.c
>>>  delete mode 100644 arch/x86/lib/timer.c
>>>  create mode 100644 arch/x86/lib/tsc_timer.c

Some of these patches touch bootstage which is generic code. Are you
OK with me doing an x86 pull request for this, or should we do
something else?

Regards,
Simon

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage
  2013-05-09 21:22     ` Simon Glass
@ 2013-05-13 19:25       ` Tom Rini
  2013-05-13 21:58         ` Simon Glass
  0 siblings, 1 reply; 35+ messages in thread
From: Tom Rini @ 2013-05-13 19:25 UTC (permalink / raw)
  To: u-boot

On Thu, May 09, 2013 at 02:22:32PM -0700, Simon Glass wrote:

> Hi Tom,
> 
> On Thu, Apr 25, 2013 at 3:12 PM, Simon Glass <sjg@chromium.org> wrote:
> > Hi Vadim,
> >
> > On Thu, Apr 18, 2013 at 8:50 AM, Vadim Bendebury (????)
> > <vbendeb@google.com> wrote:
> >>  On Wed, Apr 17, 2013 at 7:13 PM, Simon Glass <sjg@chromium.org> wrote:
> >>>
> >>> This series removes unused x86 code based on advice from Graeme Russ. THis
> >>> code was used for real mode which is no longer needed in U-Boot.
> >>>
> >>> A new more accurate timer is added, and this permits bootstage to be
> >>> enabled and produce useful results on x86.
> >>>
> >>>
> >>> Doug Anderson (2):
> >>>   bootstage: Copy bootstage strings post-relocation
> >>>   Call bootstage_relocate() after malloc is initted
> >>>
> >>> Simon Glass (17):
> >>>   x86: Remove unused bios/pci code
> >>>   x86: Remove unused portion of link script
> >>>   x86: Remove legacy board init code
> >>>   x86: Declare global_data pointer when it is used
> >>>   x86: Implement panic output for coreboot
> >>>   x86: Rationalise kernel booting logic and bootstage
> >>>   x86: Add TSC timer
> >>>   x86: Remove old broken timer implementation
> >>>   x86: Remove ISR timer
> >>>   x86: Re-enable PCAT timer 2 for beeping
> >>>   bootstage: Add stubs for new bootstage functions
> >>>   x86: Enable bootstage for coreboot
> >>>   bootstage: Allow marking a particular line of code
> >>>   x86: Fix warning in cmd_ximg.c when CONFIG_GZIP is not defined
> >>>   x86: config: Enable LZO for coreboot, remove zlib, gzip
> >>>   x86: Support adding coreboot timestanps to bootstage
> >>>   x86: Add coreboot timestamps
> >>>
> >>>  arch/x86/cpu/Makefile                          |   2 +-
> >>>  arch/x86/cpu/coreboot/coreboot.c               |  13 ++
> >>>  arch/x86/cpu/coreboot/timestamp.c              |  42 +++-
> >>>  arch/x86/cpu/cpu.c                             |   5 +
> >>>  arch/x86/cpu/interrupts.c                      |   2 +
> >>>  arch/x86/cpu/timer.c                           |  17 --
> >>>  arch/x86/cpu/u-boot.lds                        |  12 --
> >>>  arch/x86/include/asm/arch-coreboot/timestamp.h |   7 +
> >>>  arch/x86/include/asm/init_helpers.h            |   9 -
> >>>  arch/x86/include/asm/init_wrappers.h           |  42 ----
> >>>  arch/x86/include/asm/pci.h                     |   4 -
> >>>  arch/x86/include/asm/u-boot-x86.h              |   4 +
> >>>  arch/x86/include/asm/u-boot.h                  |  32 ---
> >>>  arch/x86/lib/Makefile                          |  10 +-
> >>>  arch/x86/lib/bios.h                            | 170 ---------------
> >>>  arch/x86/lib/board.c                           | 273 -------------------------
> >>>  arch/x86/lib/bootm.c                           |   8 -
> >>>  arch/x86/lib/cmd_boot.c                        |   2 +
> >>>  arch/x86/lib/init_helpers.c                    |  98 ---------
> >>>  arch/x86/lib/init_wrappers.c                   | 164 ---------------
> >>>  arch/x86/lib/pcat_timer.c                      |  69 +------
> >>>  arch/x86/lib/pci.c                             | 188 -----------------
> >>>  arch/x86/lib/physmem.c                         |   2 +
> >>>  arch/x86/lib/relocate.c                        |   2 +
> >>>  arch/x86/lib/timer.c                           | 116 -----------
> >>>  arch/x86/lib/tsc_timer.c                       | 107 ++++++++++
> >>>  arch/x86/lib/zimage.c                          |  11 +-
> >>>  common/board_r.c                               |   1 +
> >>>  common/bootstage.c                             |  44 ++++
> >>>  common/cmd_ximg.c                              |   2 +
> >>>  include/bootstage.h                            |  54 +++++
> >>>  include/configs/coreboot.h                     |  18 +-
> >>>  32 files changed, 314 insertions(+), 1216 deletions(-)
> >>>  delete mode 100644 arch/x86/cpu/timer.c
> >>>  delete mode 100644 arch/x86/include/asm/init_wrappers.h
> >>>  delete mode 100644 arch/x86/lib/bios.h
> >>>  delete mode 100644 arch/x86/lib/board.c
> >>>  delete mode 100644 arch/x86/lib/init_wrappers.c
> >>>  delete mode 100644 arch/x86/lib/pci.c
> >>>  delete mode 100644 arch/x86/lib/timer.c
> >>>  create mode 100644 arch/x86/lib/tsc_timer.c
> 
> Some of these patches touch bootstage which is generic code. Are you
> OK with me doing an x86 pull request for this, or should we do
> something else?

I'm OK with the x86 tree.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130513/c257357a/attachment.pgp>

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage
  2013-05-13 19:25       ` Tom Rini
@ 2013-05-13 21:58         ` Simon Glass
  0 siblings, 0 replies; 35+ messages in thread
From: Simon Glass @ 2013-05-13 21:58 UTC (permalink / raw)
  To: u-boot

Hi Tom,

On Mon, May 13, 2013 at 12:25 PM, Tom Rini <trini@ti.com> wrote:
> On Thu, May 09, 2013 at 02:22:32PM -0700, Simon Glass wrote:
>
>> Hi Tom,
>>
>> On Thu, Apr 25, 2013 at 3:12 PM, Simon Glass <sjg@chromium.org> wrote:
>> > Hi Vadim,
>> >
>> > On Thu, Apr 18, 2013 at 8:50 AM, Vadim Bendebury (????)
>> > <vbendeb@google.com> wrote:
>> >>  On Wed, Apr 17, 2013 at 7:13 PM, Simon Glass <sjg@chromium.org> wrote:
>> >>>
>> >>> This series removes unused x86 code based on advice from Graeme Russ. THis
>> >>> code was used for real mode which is no longer needed in U-Boot.
>> >>>
>> >>> A new more accurate timer is added, and this permits bootstage to be
>> >>> enabled and produce useful results on x86.
>> >>>
>> >>>
>> >>> Doug Anderson (2):
>> >>>   bootstage: Copy bootstage strings post-relocation
>> >>>   Call bootstage_relocate() after malloc is initted
>> >>>
>> >>> Simon Glass (17):
>> >>>   x86: Remove unused bios/pci code
>> >>>   x86: Remove unused portion of link script
>> >>>   x86: Remove legacy board init code
>> >>>   x86: Declare global_data pointer when it is used
>> >>>   x86: Implement panic output for coreboot
>> >>>   x86: Rationalise kernel booting logic and bootstage
>> >>>   x86: Add TSC timer
>> >>>   x86: Remove old broken timer implementation
>> >>>   x86: Remove ISR timer
>> >>>   x86: Re-enable PCAT timer 2 for beeping
>> >>>   bootstage: Add stubs for new bootstage functions
>> >>>   x86: Enable bootstage for coreboot
>> >>>   bootstage: Allow marking a particular line of code
>> >>>   x86: Fix warning in cmd_ximg.c when CONFIG_GZIP is not defined
>> >>>   x86: config: Enable LZO for coreboot, remove zlib, gzip
>> >>>   x86: Support adding coreboot timestanps to bootstage
>> >>>   x86: Add coreboot timestamps
>> >>>
>> >>>  arch/x86/cpu/Makefile                          |   2 +-
>> >>>  arch/x86/cpu/coreboot/coreboot.c               |  13 ++
>> >>>  arch/x86/cpu/coreboot/timestamp.c              |  42 +++-
>> >>>  arch/x86/cpu/cpu.c                             |   5 +
>> >>>  arch/x86/cpu/interrupts.c                      |   2 +
>> >>>  arch/x86/cpu/timer.c                           |  17 --
>> >>>  arch/x86/cpu/u-boot.lds                        |  12 --
>> >>>  arch/x86/include/asm/arch-coreboot/timestamp.h |   7 +
>> >>>  arch/x86/include/asm/init_helpers.h            |   9 -
>> >>>  arch/x86/include/asm/init_wrappers.h           |  42 ----
>> >>>  arch/x86/include/asm/pci.h                     |   4 -
>> >>>  arch/x86/include/asm/u-boot-x86.h              |   4 +
>> >>>  arch/x86/include/asm/u-boot.h                  |  32 ---
>> >>>  arch/x86/lib/Makefile                          |  10 +-
>> >>>  arch/x86/lib/bios.h                            | 170 ---------------
>> >>>  arch/x86/lib/board.c                           | 273 -------------------------
>> >>>  arch/x86/lib/bootm.c                           |   8 -
>> >>>  arch/x86/lib/cmd_boot.c                        |   2 +
>> >>>  arch/x86/lib/init_helpers.c                    |  98 ---------
>> >>>  arch/x86/lib/init_wrappers.c                   | 164 ---------------
>> >>>  arch/x86/lib/pcat_timer.c                      |  69 +------
>> >>>  arch/x86/lib/pci.c                             | 188 -----------------
>> >>>  arch/x86/lib/physmem.c                         |   2 +
>> >>>  arch/x86/lib/relocate.c                        |   2 +
>> >>>  arch/x86/lib/timer.c                           | 116 -----------
>> >>>  arch/x86/lib/tsc_timer.c                       | 107 ++++++++++
>> >>>  arch/x86/lib/zimage.c                          |  11 +-
>> >>>  common/board_r.c                               |   1 +
>> >>>  common/bootstage.c                             |  44 ++++
>> >>>  common/cmd_ximg.c                              |   2 +
>> >>>  include/bootstage.h                            |  54 +++++
>> >>>  include/configs/coreboot.h                     |  18 +-
>> >>>  32 files changed, 314 insertions(+), 1216 deletions(-)
>> >>>  delete mode 100644 arch/x86/cpu/timer.c
>> >>>  delete mode 100644 arch/x86/include/asm/init_wrappers.h
>> >>>  delete mode 100644 arch/x86/lib/bios.h
>> >>>  delete mode 100644 arch/x86/lib/board.c
>> >>>  delete mode 100644 arch/x86/lib/init_wrappers.c
>> >>>  delete mode 100644 arch/x86/lib/pci.c
>> >>>  delete mode 100644 arch/x86/lib/timer.c
>> >>>  create mode 100644 arch/x86/lib/tsc_timer.c
>>
>> Some of these patches touch bootstage which is generic code. Are you
>> OK with me doing an x86 pull request for this, or should we do
>> something else?
>
> I'm OK with the x86 tree.

OK, I will do a pull from x86/master then.

Regards,
Simon

^ permalink raw reply	[flat|nested] 35+ messages in thread

end of thread, other threads:[~2013-05-13 21:58 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-18  2:13 [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 01/19] x86: Remove unused bios/pci code Simon Glass
2013-04-18  2:50   ` Graeme Russ
2013-04-18  2:13 ` [U-Boot] [PATCH 02/19] x86: Remove unused portion of link script Simon Glass
2013-04-18  2:50   ` Graeme Russ
2013-04-18  2:13 ` [U-Boot] [PATCH 03/19] x86: Remove legacy board init code Simon Glass
2013-04-18  3:04   ` Graeme Russ
2013-04-18  2:13 ` [U-Boot] [PATCH 04/19] x86: Declare global_data pointer when it is used Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 05/19] x86: Implement panic output for coreboot Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 06/19] x86: Rationalise kernel booting logic and bootstage Simon Glass
2013-04-18  3:05   ` Graeme Russ
2013-04-18  2:13 ` [U-Boot] [PATCH 07/19] x86: Add TSC timer Simon Glass
2013-04-18  3:03   ` Graeme Russ
2013-04-26 13:41     ` Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 08/19] x86: Remove old broken timer implementation Simon Glass
2013-04-18  2:51   ` Graeme Russ
2013-04-18  2:13 ` [U-Boot] [PATCH 09/19] x86: Remove ISR timer Simon Glass
2013-04-18  2:45   ` Graeme Russ
2013-04-18  2:13 ` [U-Boot] [PATCH 10/19] x86: Re-enable PCAT timer 2 for beeping Simon Glass
2013-04-18  2:53   ` Graeme Russ
2013-04-26 13:43     ` Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 11/19] bootstage: Add stubs for new bootstage functions Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 12/19] bootstage: Copy bootstage strings post-relocation Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 13/19] Call bootstage_relocate() after malloc is initted Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 14/19] x86: Enable bootstage for coreboot Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 15/19] bootstage: Allow marking a particular line of code Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 16/19] x86: Fix warning in cmd_ximg.c when CONFIG_GZIP is not defined Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 17/19] x86: config: Enable LZO for coreboot, remove zlib, gzip Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 18/19] x86: Support adding coreboot timestanps to bootstage Simon Glass
2013-04-18  2:13 ` [U-Boot] [PATCH 19/19] x86: Add coreboot timestamps Simon Glass
2013-04-18 15:50 ` [U-Boot] [PATCH 0/19] Remove unused code, add accurate timier and bootstage Vadim Bendebury (вб)
2013-04-25 22:12   ` Simon Glass
2013-05-09 21:22     ` Simon Glass
2013-05-13 19:25       ` Tom Rini
2013-05-13 21:58         ` Simon Glass

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox