e9daff24a2
This reverts commit 9d02b43dee.
We are doing this b/c on 32-bit PVonHVM with older hypervisors
(Xen 4.1) it ends up bothing up the start_info. This is bad b/c
we use it for the time keeping, and the timekeeping code loops
forever - as the version field never changes. Olaf says to
revert it, so lets do that.
Acked-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
81 lines
1.7 KiB
C
81 lines
1.7 KiB
C
#include <linux/types.h>
|
|
#include <linux/clockchips.h>
|
|
|
|
#include <xen/interface/xen.h>
|
|
#include <xen/grant_table.h>
|
|
#include <xen/events.h>
|
|
|
|
#include <asm/xen/hypercall.h>
|
|
#include <asm/xen/page.h>
|
|
#include <asm/fixmap.h>
|
|
|
|
#include "xen-ops.h"
|
|
#include "mmu.h"
|
|
|
|
void xen_arch_pre_suspend(void)
|
|
{
|
|
xen_start_info->store_mfn = mfn_to_pfn(xen_start_info->store_mfn);
|
|
xen_start_info->console.domU.mfn =
|
|
mfn_to_pfn(xen_start_info->console.domU.mfn);
|
|
|
|
BUG_ON(!irqs_disabled());
|
|
|
|
HYPERVISOR_shared_info = &xen_dummy_shared_info;
|
|
if (HYPERVISOR_update_va_mapping(fix_to_virt(FIX_PARAVIRT_BOOTMAP),
|
|
__pte_ma(0), 0))
|
|
BUG();
|
|
}
|
|
|
|
void xen_arch_hvm_post_suspend(int suspend_cancelled)
|
|
{
|
|
#ifdef CONFIG_XEN_PVHVM
|
|
int cpu;
|
|
xen_hvm_init_shared_info();
|
|
xen_callback_vector();
|
|
xen_unplug_emulated_devices();
|
|
if (xen_feature(XENFEAT_hvm_safe_pvclock)) {
|
|
for_each_online_cpu(cpu) {
|
|
xen_setup_runstate_info(cpu);
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void xen_arch_post_suspend(int suspend_cancelled)
|
|
{
|
|
xen_build_mfn_list_list();
|
|
|
|
xen_setup_shared_info();
|
|
|
|
if (suspend_cancelled) {
|
|
xen_start_info->store_mfn =
|
|
pfn_to_mfn(xen_start_info->store_mfn);
|
|
xen_start_info->console.domU.mfn =
|
|
pfn_to_mfn(xen_start_info->console.domU.mfn);
|
|
} else {
|
|
#ifdef CONFIG_SMP
|
|
BUG_ON(xen_cpu_initialized_map == NULL);
|
|
cpumask_copy(xen_cpu_initialized_map, cpu_online_mask);
|
|
#endif
|
|
xen_vcpu_restore();
|
|
}
|
|
|
|
}
|
|
|
|
static void xen_vcpu_notify_restore(void *data)
|
|
{
|
|
unsigned long reason = (unsigned long)data;
|
|
|
|
/* Boot processor notified via generic timekeeping_resume() */
|
|
if ( smp_processor_id() == 0)
|
|
return;
|
|
|
|
clockevents_notify(reason, NULL);
|
|
}
|
|
|
|
void xen_arch_resume(void)
|
|
{
|
|
on_each_cpu(xen_vcpu_notify_restore,
|
|
(void *)CLOCK_EVT_NOTIFY_RESUME, 1);
|
|
}
|