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

Commit 9ec1e66b authored by Jike Song's avatar Jike Song Committed by Zhenyu Wang
Browse files

drm/i915/gvt: refactor intel_gvt_io_emulation_ops to be intel_gvt_ops 



There are currently 4 methods in intel_gvt_io_emulation_ops
to emulate CFG/MMIO reading/writing for intel vGPU. A possibly
better scope is: add 3 more methods for vgpu create/destroy/reset
respectively, and rename the ops to 'intel_gvt_ops', then pass
it to the MPT module (say the future kvmgt) to use: they are
all methods for external usage.

Signed-off-by: default avatarJike Song <jike.song@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 7b3343b7

drivers/gpu/drm/i915/gvt/cfg_space.c

+2 −5
Original line number Diff line number Diff line
@@ -47,11 +47,9 @@ enum { 
 * Returns:

 * Zero on success, negative error code if failed.

 */

int intel_vgpu_emulate_cfg_read(void *__vgpu, unsigned int offset,

int intel_vgpu_emulate_cfg_read(struct intel_vgpu *vgpu, unsigned int offset,

	void *p_data, unsigned int bytes)

{

	struct intel_vgpu *vgpu = __vgpu;



	if (WARN_ON(bytes > 4))

		return -EINVAL;
@@ -234,10 +232,9 @@ static int emulate_pci_bar_write(struct intel_vgpu *vgpu, unsigned int offset, 
 * Returns:

 * Zero on success, negative error code if failed.

 */

int intel_vgpu_emulate_cfg_write(void *__vgpu, unsigned int offset,

int intel_vgpu_emulate_cfg_write(struct intel_vgpu *vgpu, unsigned int offset,

	void *p_data, unsigned int bytes)

{

	struct intel_vgpu *vgpu = __vgpu;

	int ret;



	if (WARN_ON(bytes > 4))

drivers/gpu/drm/i915/gvt/gvt.c

+5 −2
Original line number Diff line number Diff line
@@ -44,11 +44,14 @@ static const char * const supported_hypervisors[] = { 
	[INTEL_GVT_HYPERVISOR_KVM] = "KVM",

};



struct intel_gvt_io_emulation_ops intel_gvt_io_emulation_ops = {

static const struct intel_gvt_ops intel_gvt_ops = {

	.emulate_cfg_read = intel_vgpu_emulate_cfg_read,

	.emulate_cfg_write = intel_vgpu_emulate_cfg_write,

	.emulate_mmio_read = intel_vgpu_emulate_mmio_read,

	.emulate_mmio_write = intel_vgpu_emulate_mmio_write,

	.vgpu_create = intel_gvt_create_vgpu,

	.vgpu_destroy = intel_gvt_destroy_vgpu,

	.vgpu_reset = intel_gvt_reset_vgpu,

};



/**
@@ -278,7 +281,7 @@ int intel_gvt_init_device(struct drm_i915_private *dev_priv) 
		goto out_clean_thread;



	ret = intel_gvt_hypervisor_host_init(&dev_priv->drm.pdev->dev, gvt,

				&intel_gvt_io_emulation_ops);

				&intel_gvt_ops);

	if (ret) {

		gvt_err("failed to register gvt-g host device: %d\n", ret);

		goto out_clean_types;

drivers/gpu/drm/i915/gvt/gvt.h

+19 −2
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ void intel_gvt_clean_vgpu_types(struct intel_gvt *gvt); 
struct intel_vgpu *intel_gvt_create_vgpu(struct intel_gvt *gvt,

					 struct intel_vgpu_type *type);

void intel_gvt_destroy_vgpu(struct intel_vgpu *vgpu);

void intel_gvt_reset_vgpu(struct intel_vgpu *vgpu);





/* validating GM functions */
@@ -391,10 +392,10 @@ int intel_gvt_ggtt_index_g2h(struct intel_vgpu *vgpu, unsigned long g_index, 
int intel_gvt_ggtt_h2g_index(struct intel_vgpu *vgpu, unsigned long h_index,

			     unsigned long *g_index);



int intel_vgpu_emulate_cfg_read(void *__vgpu, unsigned int offset,

int intel_vgpu_emulate_cfg_read(struct intel_vgpu *vgpu, unsigned int offset,

		void *p_data, unsigned int bytes);



int intel_vgpu_emulate_cfg_write(void *__vgpu, unsigned int offset,

int intel_vgpu_emulate_cfg_write(struct intel_vgpu *vgpu, unsigned int offset,

		void *p_data, unsigned int bytes);



void intel_gvt_clean_opregion(struct intel_gvt *gvt);
@@ -407,6 +408,22 @@ int intel_vgpu_emulate_opregion_request(struct intel_vgpu *vgpu, u32 swsci); 
int setup_vgpu_mmio(struct intel_vgpu *vgpu);

void populate_pvinfo_page(struct intel_vgpu *vgpu);



struct intel_gvt_ops {

	int (*emulate_cfg_read)(struct intel_vgpu *, unsigned int, void *,

				unsigned int);

	int (*emulate_cfg_write)(struct intel_vgpu *, unsigned int, void *,

				unsigned int);

	int (*emulate_mmio_read)(struct intel_vgpu *, u64, void *,

				unsigned int);

	int (*emulate_mmio_write)(struct intel_vgpu *, u64, void *,

				unsigned int);

	struct intel_vgpu *(*vgpu_create)(struct intel_gvt *,

				struct intel_vgpu_type *);

	void (*vgpu_destroy)(struct intel_vgpu *);

	void (*vgpu_reset)(struct intel_vgpu *);

};





#include "mpt.h"



#endif

drivers/gpu/drm/i915/gvt/hypercall.h

+0 −9
Original line number Diff line number Diff line
@@ -33,15 +33,6 @@ 
#ifndef _GVT_HYPERCALL_H_

#define _GVT_HYPERCALL_H_



struct intel_gvt_io_emulation_ops {

	int (*emulate_cfg_read)(void *, unsigned int, void *, unsigned int);

	int (*emulate_cfg_write)(void *, unsigned int, void *, unsigned int);

	int (*emulate_mmio_read)(void *, u64, void *, unsigned int);

	int (*emulate_mmio_write)(void *, u64, void *, unsigned int);

};



extern struct intel_gvt_io_emulation_ops intel_gvt_io_emulation_ops;



/*

 * Specific GVT-g MPT modules function collections. Currently GVT-g supports

 * both Xen and KVM by providing dedicated hypervisor-related MPT modules.

drivers/gpu/drm/i915/gvt/mmio.c

+2 −4
Original line number Diff line number Diff line
@@ -67,10 +67,9 @@ int intel_vgpu_gpa_to_mmio_offset(struct intel_vgpu *vgpu, u64 gpa) 
 * Returns:

 * Zero on success, negative error code if failed

 */

int intel_vgpu_emulate_mmio_read(void *__vgpu, uint64_t pa,

int intel_vgpu_emulate_mmio_read(struct intel_vgpu *vgpu, uint64_t pa,

		void *p_data, unsigned int bytes)

{

	struct intel_vgpu *vgpu = __vgpu;

	struct intel_gvt *gvt = vgpu->gvt;

	struct intel_gvt_mmio_info *mmio;

	unsigned int offset = 0;
@@ -179,10 +178,9 @@ int intel_vgpu_emulate_mmio_read(void *__vgpu, uint64_t pa, 
 * Returns:

 * Zero on success, negative error code if failed

 */

int intel_vgpu_emulate_mmio_write(void *__vgpu, uint64_t pa,

int intel_vgpu_emulate_mmio_write(struct intel_vgpu *vgpu, uint64_t pa,

		void *p_data, unsigned int bytes)

{

	struct intel_vgpu *vgpu = __vgpu;

	struct intel_gvt *gvt = vgpu->gvt;

	struct intel_gvt_mmio_info *mmio;

	unsigned int offset = 0;