Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfafae94 authored by Stefano Stabellini's avatar Stefano Stabellini Committed by David Vrabel
Browse files

xen: rename dom0_op to platform_op



The dom0_op hypercall has been renamed to platform_op since Xen 3.2,
which is ancient, and modern upstream Linux kernels cannot run as dom0
and it anymore anyway.

Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent 34e38523
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -310,10 +310,10 @@ HYPERVISOR_mca(struct xen_mc *mc_op)
}
}


static inline int
static inline int
HYPERVISOR_dom0_op(struct xen_platform_op *platform_op)
HYPERVISOR_platform_op(struct xen_platform_op *op)
{
{
	platform_op->interface_version = XENPF_INTERFACE_VERSION;
	op->interface_version = XENPF_INTERFACE_VERSION;
	return _hypercall1(int, dom0_op, platform_op);
	return _hypercall1(int, platform_op, op);
}
}


static inline int
static inline int
+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ static u32 xen_apic_read(u32 reg)
	if (reg != APIC_ID)
	if (reg != APIC_ID)
		return 0;
		return 0;


	ret = HYPERVISOR_dom0_op(&op);
	ret = HYPERVISOR_platform_op(&op);
	if (ret)
	if (ret)
		return 0;
		return 0;


+4 −4
Original line number Original line Diff line number Diff line
@@ -415,7 +415,7 @@ static bool __init xen_check_mwait(void)


	set_xen_guest_handle(op.u.set_pminfo.pdc, buf);
	set_xen_guest_handle(op.u.set_pminfo.pdc, buf);


	if ((HYPERVISOR_dom0_op(&op) == 0) &&
	if ((HYPERVISOR_platform_op(&op) == 0) &&
	    (buf[2] & (ACPI_PDC_C_C1_FFH | ACPI_PDC_C_C2C3_FFH))) {
	    (buf[2] & (ACPI_PDC_C_C1_FFH | ACPI_PDC_C_C2C3_FFH))) {
		cpuid_leaf5_ecx_val = cx;
		cpuid_leaf5_ecx_val = cx;
		cpuid_leaf5_edx_val = dx;
		cpuid_leaf5_edx_val = dx;
@@ -1374,7 +1374,7 @@ static void __init xen_boot_params_init_edd(void)
		info->params.length = sizeof(info->params);
		info->params.length = sizeof(info->params);
		set_xen_guest_handle(op.u.firmware_info.u.disk_info.edd_params,
		set_xen_guest_handle(op.u.firmware_info.u.disk_info.edd_params,
				     &info->params);
				     &info->params);
		ret = HYPERVISOR_dom0_op(&op);
		ret = HYPERVISOR_platform_op(&op);
		if (ret)
		if (ret)
			break;
			break;


@@ -1392,7 +1392,7 @@ static void __init xen_boot_params_init_edd(void)
	op.u.firmware_info.type = XEN_FW_DISK_MBR_SIGNATURE;
	op.u.firmware_info.type = XEN_FW_DISK_MBR_SIGNATURE;
	for (nr = 0; nr < EDD_MBR_SIG_MAX; nr++) {
	for (nr = 0; nr < EDD_MBR_SIG_MAX; nr++) {
		op.u.firmware_info.index = nr;
		op.u.firmware_info.index = nr;
		ret = HYPERVISOR_dom0_op(&op);
		ret = HYPERVISOR_platform_op(&op);
		if (ret)
		if (ret)
			break;
			break;
		mbr_signature[nr] = op.u.firmware_info.u.disk_mbr_signature.mbr_signature;
		mbr_signature[nr] = op.u.firmware_info.u.disk_mbr_signature.mbr_signature;
@@ -1698,7 +1698,7 @@ asmlinkage __visible void __init xen_start_kernel(void)
		xen_start_info->console.domU.mfn = 0;
		xen_start_info->console.domU.mfn = 0;
		xen_start_info->console.domU.evtchn = 0;
		xen_start_info->console.domU.evtchn = 0;


		if (HYPERVISOR_dom0_op(&op) == 0)
		if (HYPERVISOR_platform_op(&op) == 0)
			boot_params.kbd_status = op.u.firmware_info.u.kbd_shift_flags;
			boot_params.kbd_status = op.u.firmware_info.u.kbd_shift_flags;


		/* Make sure ACS will be enabled */
		/* Make sure ACS will be enabled */
+1 −1
Original line number Original line Diff line number Diff line
@@ -139,7 +139,7 @@ static int xen_pvclock_gtod_notify(struct notifier_block *nb,
	op.u.settime.nsecs = now.tv_nsec;
	op.u.settime.nsecs = now.tv_nsec;
	op.u.settime.system_time = xen_clocksource_read();
	op.u.settime.system_time = xen_clocksource_read();


	(void)HYPERVISOR_dom0_op(&op);
	(void)HYPERVISOR_platform_op(&op);


	/*
	/*
	 * Move the next drift compensation time 11 minutes
	 * Move the next drift compensation time 11 minutes
+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ static int xen_acpi_notify_hypervisor_state(u8 sleep_state,
		 bits, val_a, val_b))
		 bits, val_a, val_b))
		return -1;
		return -1;


	HYPERVISOR_dom0_op(&op);
	HYPERVISOR_platform_op(&op);
	return 1;
	return 1;
}
}


Loading