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

Commit cdcc4347 authored by Changbin Du's avatar Changbin Du Committed by Zhenyu Wang
Browse files

drm/i915/gvt: move mmio init/clean function to mmio.c 



Move the mmio space inititation function setup_vgpu_mmio()
and cleanup function clean_vgpu_mmio() in vgpu.c to dedicated
source file mmio.c, and rename them as intel_vgpu_init_mmio()
and intel_vgpu_clean_mmio() respectively.

Signed-off-by: default avatarChangbin Du <changbin.du@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent c64ff6c7

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

+0 −1
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ void intel_vgpu_clean_opregion(struct intel_vgpu *vgpu); 
int intel_vgpu_init_opregion(struct intel_vgpu *vgpu, u32 gpa);



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 {

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

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int handle_device_reset(struct intel_vgpu *vgpu, unsigned int offset, 
		mutex_unlock(&vgpu->gvt->lock);

		intel_vgpu_clean_gtt(vgpu);

		mutex_lock(&vgpu->gvt->lock);

		setup_vgpu_mmio(vgpu);

		intel_vgpu_init_mmio(vgpu);

		populate_pvinfo_page(vgpu);

		intel_vgpu_init_gtt(vgpu);

	}

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

+42 −0
Original line number Diff line number Diff line
@@ -303,3 +303,45 @@ int intel_vgpu_emulate_mmio_write(struct intel_vgpu *vgpu, uint64_t pa, 
	mutex_unlock(&gvt->lock);

	return ret;

}



/**

 * intel_vgpu_init_mmio - init MMIO  space

 * @vgpu: a vGPU

 *

 * Returns:

 * Zero on success, negative error code if failed

 */

int intel_vgpu_init_mmio(struct intel_vgpu *vgpu)

{

	const struct intel_gvt_device_info *info = &vgpu->gvt->device_info;



	if (vgpu->mmio.vreg)

		memset(vgpu->mmio.vreg, 0, info->mmio_size * 2);

	else {

		vgpu->mmio.vreg = vzalloc(info->mmio_size * 2);

		if (!vgpu->mmio.vreg)

			return -ENOMEM;

	}

	vgpu->mmio.sreg = vgpu->mmio.vreg + info->mmio_size;



	memcpy(vgpu->mmio.vreg, vgpu->gvt->firmware.mmio, info->mmio_size);

	memcpy(vgpu->mmio.sreg, vgpu->gvt->firmware.mmio, info->mmio_size);



	vgpu_vreg(vgpu, GEN6_GT_THREAD_STATUS_REG) = 0;



	/* set the bit 0:2(Core C-State ) to C0 */

	vgpu_vreg(vgpu, GEN6_GT_CORE_STATUS) = 0;



	return 0;

}



/**

 * intel_vgpu_clean_mmio - clean MMIO space

 * @vgpu: a vGPU

 *

 */

void intel_vgpu_clean_mmio(struct intel_vgpu *vgpu)

{

	vfree(vgpu->mmio.vreg);

	vgpu->mmio.vreg = vgpu->mmio.sreg = NULL;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ struct intel_gvt_mmio_info *intel_gvt_find_mmio_info(struct intel_gvt *gvt, 
	*offset; \

})



int intel_vgpu_init_mmio(struct intel_vgpu *vgpu);

void intel_vgpu_clean_mmio(struct intel_vgpu *vgpu);



int intel_vgpu_gpa_to_mmio_offset(struct intel_vgpu *vgpu, u64 gpa);



int intel_vgpu_emulate_mmio_read(struct intel_vgpu *vgpu, u64 pa,

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

+3 −34
Original line number Diff line number Diff line
@@ -35,37 +35,6 @@ 
#include "gvt.h"

#include "i915_pvinfo.h"



static void clean_vgpu_mmio(struct intel_vgpu *vgpu)

{

	vfree(vgpu->mmio.vreg);

	vgpu->mmio.vreg = vgpu->mmio.sreg = NULL;

}



int setup_vgpu_mmio(struct intel_vgpu *vgpu)

{

	struct intel_gvt *gvt = vgpu->gvt;

	const struct intel_gvt_device_info *info = &gvt->device_info;



	if (vgpu->mmio.vreg)

		memset(vgpu->mmio.vreg, 0, info->mmio_size * 2);

	else {

		vgpu->mmio.vreg = vzalloc(info->mmio_size * 2);

		if (!vgpu->mmio.vreg)

			return -ENOMEM;

	}



	vgpu->mmio.sreg = vgpu->mmio.vreg + info->mmio_size;



	memcpy(vgpu->mmio.vreg, gvt->firmware.mmio, info->mmio_size);

	memcpy(vgpu->mmio.sreg, gvt->firmware.mmio, info->mmio_size);



	vgpu_vreg(vgpu, GEN6_GT_THREAD_STATUS_REG) = 0;



	/* set the bit 0:2(Core C-State ) to C0 */

	vgpu_vreg(vgpu, GEN6_GT_CORE_STATUS) = 0;

	return 0;

}



void populate_pvinfo_page(struct intel_vgpu *vgpu)

{

	/* setup the ballooning information */
@@ -226,7 +195,7 @@ void intel_gvt_destroy_vgpu(struct intel_vgpu *vgpu) 
	intel_vgpu_clean_gtt(vgpu);

	intel_gvt_hypervisor_detach_vgpu(vgpu);

	intel_vgpu_free_resource(vgpu);

	clean_vgpu_mmio(vgpu);

	intel_vgpu_clean_mmio(vgpu);

	vfree(vgpu);



	intel_gvt_update_vgpu_types(gvt);
@@ -260,7 +229,7 @@ static struct intel_vgpu *__intel_gvt_create_vgpu(struct intel_gvt *gvt, 


	intel_vgpu_init_cfg_space(vgpu, param->primary);



	ret = setup_vgpu_mmio(vgpu);

	ret = intel_vgpu_init_mmio(vgpu);

	if (ret)

		goto out_clean_idr;
@@ -312,7 +281,7 @@ static struct intel_vgpu *__intel_gvt_create_vgpu(struct intel_gvt *gvt, 
out_clean_vgpu_resource:

	intel_vgpu_free_resource(vgpu);

out_clean_vgpu_mmio:

	clean_vgpu_mmio(vgpu);

	intel_vgpu_clean_mmio(vgpu);

out_clean_idr:

	idr_remove(&gvt->vgpu_idr, vgpu->id);

out_free_vgpu: