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

Commit 352c9624 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Drivers: hv: vmbus: Move the definition of generate_guest_id() 



As part of the effort to separate out architecture specific code, move the
definition of generate_guest_id() to x86 specific header file.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f646ed7

arch/x86/include/asm/mshyperv.h

+43 −0
Original line number Diff line number Diff line
@@ -25,6 +25,49 @@ union hv_x64_msr_hypercall_contents { 
	};

};



/*

 * The guest OS needs to register the guest ID with the hypervisor.

 * The guest ID is a 64 bit entity and the structure of this ID is

 * specified in the Hyper-V specification:

 *

 * msdn.microsoft.com/en-us/library/windows/hardware/ff542653%28v=vs.85%29.aspx

 *

 * While the current guideline does not specify how Linux guest ID(s)

 * need to be generated, our plan is to publish the guidelines for

 * Linux and other guest operating systems that currently are hosted

 * on Hyper-V. The implementation here conforms to this yet

 * unpublished guidelines.

 *

 *

 * Bit(s)

 * 63 - Indicates if the OS is Open Source or not; 1 is Open Source

 * 62:56 - Os Type; Linux is 0x100

 * 55:48 - Distro specific identification

 * 47:16 - Linux kernel version number

 * 15:0  - Distro specific identification

 *

 *

 */



#define HV_LINUX_VENDOR_ID              0x8800



/*

 * Generate the guest ID based on the guideline described above.

 */



static inline  __u64 generate_guest_id(__u64 d_info1, __u64 kernel_version,

				       __u64 d_info2)

{

	__u64 guest_id = 0;



	guest_id = (((__u64)HV_LINUX_VENDOR_ID) << 56);

	guest_id |= (d_info1 << 48);

	guest_id |= (kernel_version << 16);

	guest_id |= d_info2;



	return guest_id;

}



void hyperv_callback_vector(void);

#ifdef CONFIG_TRACING

#define trace_hyperv_callback_vector hyperv_callback_vector

drivers/hv/hyperv_vmbus.h

+0 −43
Original line number Diff line number Diff line
@@ -320,49 +320,6 @@ enum { 


#define HV_PRESENT_BIT			0x80000000



/*

 * The guest OS needs to register the guest ID with the hypervisor.

 * The guest ID is a 64 bit entity and the structure of this ID is

 * specified in the Hyper-V specification:

 *

 * http://msdn.microsoft.com/en-us/library/windows/hardware/ff542653%28v=vs.85%29.aspx

 *

 * While the current guideline does not specify how Linux guest ID(s)

 * need to be generated, our plan is to publish the guidelines for

 * Linux and other guest operating systems that currently are hosted

 * on Hyper-V. The implementation here conforms to this yet

 * unpublished guidelines.

 *

 *

 * Bit(s)

 * 63 - Indicates if the OS is Open Source or not; 1 is Open Source

 * 62:56 - Os Type; Linux is 0x100

 * 55:48 - Distro specific identification

 * 47:16 - Linux kernel version number

 * 15:0  - Distro specific identification

 *

 *

 */



#define HV_LINUX_VENDOR_ID		0x8100



/*

 * Generate the guest ID based on the guideline described above.

 */



static inline  __u64 generate_guest_id(__u8 d_info1, __u32 kernel_version,

					__u16 d_info2)

{

	__u64 guest_id = 0;



	guest_id = (((__u64)HV_LINUX_VENDOR_ID) << 48);

	guest_id |= (((__u64)(d_info1)) << 48);

	guest_id |= (((__u64)(kernel_version)) << 16);

	guest_id |= ((__u64)(d_info2));



	return guest_id;

}





#define HV_CPU_POWER_MANAGEMENT		(1 << 0)

#define HV_RECOMMENDATIONS_MAX		4