diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-01-29 11:32:06 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-01-29 11:32:06 +0000 |
| commit | a2e15112374cf37c5bbf7c6db90c33ecc1c4b872 (patch) | |
| tree | 475bef12e77431339ce427439132a000fb6c0649 | |
| parent | 6fd8a628cfe4f9249031f8c920d9963ae79db274 (diff) | |
| download | xen-a2e15112374cf37c5bbf7c6db90c33ecc1c4b872.tar.gz xen-a2e15112374cf37c5bbf7c6db90c33ecc1c4b872.tar.bz2 xen-a2e15112374cf37c5bbf7c6db90c33ecc1c4b872.zip | |
tboot: single tboot entry point for shutdown
tboot removed the shutdown_entry32 and shutdown_entry64 from
tboot_shared_t and now has just a single shutdown_entry field.
Signed-off-by: Joseph Cihula <joseph.cihula@intel.com>
| -rw-r--r-- | xen/arch/x86/tboot.c | 9 | ||||
| -rw-r--r-- | xen/include/asm-x86/tboot.h | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index 697ca9f461..b03338f54f 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -37,8 +37,7 @@ void __init tboot_probe(void) printk("TBOOT: found shared page at phys addr %lx:\n", p_tboot_shared); printk(" version: %d\n", tboot_shared->version); printk(" log_addr: 0x%08x\n", tboot_shared->log_addr); - printk(" shutdown_entry32: 0x%08x\n", tboot_shared->shutdown_entry32); - printk(" shutdown_entry64: 0x%08x\n", tboot_shared->shutdown_entry64); + printk(" shutdown_entry: 0x%08x\n", tboot_shared->shutdown_entry); printk(" shutdown_type: %d\n", tboot_shared->shutdown_type); printk(" s3_tb_wakeup_entry: 0x%08x\n", tboot_shared->s3_tb_wakeup_entry); printk(" s3_k_wakeup_entry: 0x%08x\n", tboot_shared->s3_k_wakeup_entry); @@ -82,11 +81,7 @@ void tboot_shutdown(uint32_t shutdown_type) write_ptbase(idle_vcpu[0]); -#ifdef __x86_64__ - asm volatile ( "call *%%rdi" :: "D" (g_tboot_shared->shutdown_entry64) ); -#else - asm volatile ( "call *%0" :: "r" (g_tboot_shared->shutdown_entry32) ); -#endif + ((void(*)(void))(unsigned long)g_tboot_shared->shutdown_entry)(); BUG(); /* should not reach here */ } diff --git a/xen/include/asm-x86/tboot.h b/xen/include/asm-x86/tboot.h index 64883ceb7f..282ad667b5 100644 --- a/xen/include/asm-x86/tboot.h +++ b/xen/include/asm-x86/tboot.h @@ -61,8 +61,7 @@ typedef struct __attribute__ ((__packed__)) { uuid_t uuid; /* {663C8DFF-E8B3-4b82-AABF-19EA4D057A08} */ uint32_t version; /* Version number: 0x01, 0x02, ... */ uint32_t log_addr; /* physical addr of tb_log_t log */ - uint32_t shutdown_entry32; /* entry point for tboot shutdown from 32b */ - uint32_t shutdown_entry64; /* entry point for tboot shutdown from 64b */ + uint32_t shutdown_entry; /* entry point for tboot shutdown */ uint32_t shutdown_type; /* type of shutdown (TB_SHUTDOWN_*) */ uint32_t s3_tb_wakeup_entry;/* entry point for tboot s3 wake up */ uint32_t s3_k_wakeup_entry; /* entry point for xen s3 wake up */ |