vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-08-05 Colin D Bennett <colin@gibibit.com>

Browse source 
High resolution timer support.  Implemented for x86 CPUs using TSC.
	Extracted generic grub_millisleep() so it's linked in only as needed.
	This requires a Pentium compatible CPU; if the RDTSC instruction is
	not supported, then it falls back on the generic grub_get_time_ms()
	implementation that uses the machine's RTC.

	* conf/i386-pc.rmk (kernel_img_SOURCES): Add `kern/time.c',
	`kern/i386/tsc.c', `kern/generic/rtc_get_time_ms.c' and
	`kern/generic/millisleep.c'.

	* conf/i386-efi.rmk (kernel_mod_SOURCES): Add `kern/i386/tsc.c',
	`kern/generic/rtc_get_time_ms.c' and `kern/generic/millisleep.c'.

	* conf/x86_64-efi.rml (kernel_mod_SOURCES): Add
	`kern/generic/millisleep.c' and `kern/generic/rtc_get_time_ms.c'.

	* conf/sparc64-ieee1275.rmk (kernel_elf_SOURCES): Likewise.

	* conf/powerpc-ieee1275.rmk (kernel_elf_SOURCES): Add
	`kern/generic/millisleep.c'.

	* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Likewise.

	* conf/i386-coreboot.rmk (kernel_elf_SOURCES): Add `kern/time.c'.

	* kern/generic/rtc_get_time_ms.c: New file.

	* kern/generic/millisleep.c: New file.
 	
	* kern/misc.c: Don't include
	<kern/time.h> anymore.
	(grub_millisleep_generic): Removed.

	* commands/sleep.c (grub_interruptible_millisleep): Uses
	grub_get_time_ms() instead of grub_get_rtc().

	* include/grub/i386/tsc.h (grub_get_tsc): New file.  New inline
	function.
	(grub_cpu_is_cpuid_supported): New inline function.
	(grub_cpu_is_tsc_supported): New inline function.
	(grub_tsc_init): New function prototype.
	(grub_tsc_get_time_ms): New function prototype.

	* kern/i386/tsc.c (grub_get_time_ms): New file.

	* include/grub/time.h: Include <grub/types.h.
	(grub_millisleep_generic): Removed.
	(grub_get_time_ms): New prototype.
	(grub_install_get_time_ms): New prototype.
	(grub_rtc_get_time_ms): New prototype.

	* kern/time.c (grub_get_time_ms): New function.
	(grub_install_get_time_ms): New function.

	* kern/i386/efi/init.c: Include <grub/cpu/tsc.h>.  Don't include
	<grub/time.h> anymore.
	(grub_millisleep): Removed.
	(grub_machine_init): Call grub_tsc_init.

	* kern/i386/linuxbios/init.c (grub_machine_init): Install the RTC
	get_time_ms() implementation.

	* kern/sparc64/ieee1275/init.c (grub_millisleep): Removed.
	(ieee1275_get_time_ms): New function.
	(grub_machine_init): Install get_time_ms() implementation.

	* kern/i386/pc/init.c: Include <grub/cpu/tsc.h>.
	(grub_machine_init): Call grub_tsc_init().
	(grub_millisleep): Removed.
 
	* kern/ieee1275/init.c (grub_millisleep): Removed.
	(grub_machine_init): Install ieee1275_get_time_ms()
	implementation.
	(ieee1275_get_time_ms): New function.
	(grub_get_rtc): Now calls ieee1275_get_time_ms(), which does the
	real work.
This commit is contained in:
marco_g 2008-08-05 11:54:37 +00:00
parent 9ec92aaf1f
commit 9c2ff3eefe
16 changed files with 133 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kern/i386/efi/init.c
View file

@ -25,18 +25,13 @@
#include <grub/cache.h>
#include <grub/kernel.h>
#include <grub/efi/efi.h>
#include <grub/time.h>
void
grub_millisleep (grub_uint32_t ms)
{
grub_millisleep_generic (ms);
}
#include <grub/cpu/tsc.h>
void
grub_machine_init (void)
{
grub_efi_init ();
grub_tsc_init ();
}
void

2
kern/i386/linuxbios/init.c
View file

@ -143,6 +143,8 @@ grub_machine_init (void)
/* This variable indicates size, not offset. */
grub_upper_mem -= GRUB_MEMORY_MACHINE_UPPER_START;
grub_install_get_time_ms (grub_rtc_get_time_ms);
}
void

9
kern/i386/pc/init.c
View file

@ -30,6 +30,7 @@
#include <grub/env.h>
#include <grub/cache.h>
#include <grub/time.h>
#include <grub/cpu/tsc.h>
struct mem_region
{
@ -46,12 +47,6 @@ grub_addr_t grub_os_area_addr;
grub_size_t grub_os_area_size;
grub_size_t grub_lower_mem, grub_upper_mem;
void
grub_millisleep (grub_uint32_t ms)
{
grub_millisleep_generic (ms);
}
void
grub_arch_sync_caches (void *address __attribute__ ((unused)),
grub_size_t len __attribute__ ((unused)))
@ -231,6 +226,8 @@ grub_machine_init (void)
if (! grub_os_area_addr)
grub_fatal ("no upper memory");
grub_tsc_init ();
}
void

20
kern/ieee1275/init.c
View file

@ -46,12 +46,6 @@
extern char _start[];
extern char _end[];
void
grub_millisleep (grub_uint32_t ms)
{
grub_millisleep_generic (ms);
}
void
grub_exit (void)
{
@ -209,6 +203,8 @@ grub_get_extended_memory (void)
#endif
static grub_uint64_t ieee1275_get_time_ms (void);
void
grub_machine_init (void)
{
@ -258,6 +254,8 @@ grub_machine_init (void)
}
}
}
grub_install_get_time_ms (ieee1275_get_time_ms);
}
void
@ -267,8 +265,8 @@ grub_machine_fini (void)
grub_console_fini ();
}
grub_uint32_t
grub_get_rtc (void)
static grub_uint64_t
ieee1275_get_time_ms (void)
{
grub_uint32_t msecs = 0;
@ -277,6 +275,12 @@ grub_get_rtc (void)
return msecs;
}
grub_uint32_t
grub_get_rtc (void)
{
return ieee1275_get_time_ms ();
}
grub_addr_t
grub_arch_modules_addr (void)
{

12
kern/misc.c
View file

@ -23,7 +23,6 @@
#include <stdarg.h>
#include <grub/term.h>
#include <grub/env.h>
#include <grub/time.h>
void *
grub_memmove (void *dest, const void *src, grub_size_t n)
@ -1018,17 +1017,6 @@ grub_utf8_to_ucs4 (grub_uint32_t *dest, const grub_uint8_t *src,
return p - dest;
}
void
grub_millisleep_generic (grub_uint32_t ms)
{
grub_uint32_t end_at;
end_at = grub_get_rtc () + grub_div_roundup (ms * GRUB_TICKS_PER_SECOND, 1000);
while (grub_get_rtc () < end_at)
grub_cpu_idle ();
}
/* Abort GRUB. This function does not return. */
void
grub_abort (void)

15
kern/sparc64/ieee1275/init.c
View file

@ -66,12 +66,6 @@ _start (uint64_t r0 __attribute__((unused)),
/* Never reached. */
}
void
grub_millisleep (grub_uint32_t ms)
{
grub_millisleep_generic (ms);
}
int
grub_ieee1275_test_flag (enum grub_ieee1275_flag flag)
{
@ -145,6 +139,8 @@ grub_machine_set_prefix (void)
grub_free (prefix);
}
grub_uint64_t ieee1275_get_time_ms (void);
void
grub_machine_init (void)
{
@ -201,6 +197,7 @@ grub_machine_init (void)
}
}
grub_install_get_time_ms (ieee1275_get_time_ms);
}
void
@ -216,6 +213,12 @@ grub_exit (void)
grub_ieee1275_enter ();
}
grub_uint64_t
ieee1275_get_time_ms (void)
{
return grub_get_rtc ();
}
grub_uint32_t
grub_get_rtc (void)
{