Commit 5f8f3fe6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Zhi Wang
Browse files

drm/i915/gvt: remove struct intel_gvt_mpt 



Just call the initializion and exit functions directly and remove
this abstraction entirely.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarZhi Wang <zhi.a.wang@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220411141403.86980-24-hch@lst.de


Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarZhi Wang <zhi.a.wang@intel.com>
parent 91879bba

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

+9 −2
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ static void intel_gvt_clean_device(struct drm_i915_private *i915) 
	if (drm_WARN_ON(&i915->drm, !gvt))

		return;



	intel_gvt_hypervisor_host_exit(i915->drm.dev, gvt);

	mdev_unregister_device(i915->drm.dev);

	intel_gvt_cleanup_vgpu_type_groups(gvt);

	intel_gvt_destroy_idle_vgpu(gvt->idle_vgpu);

	intel_gvt_clean_vgpu_types(gvt);
@@ -235,13 +236,19 @@ static int intel_gvt_init_device(struct drm_i915_private *i915) 


	intel_gvt_debugfs_init(gvt);



	ret = intel_gvt_hypervisor_host_init(i915->drm.dev, gvt);

	ret = intel_gvt_init_vgpu_type_groups(gvt);

	if (ret)

		goto out_destroy_idle_vgpu;



	ret = mdev_register_device(i915->drm.dev, &intel_vgpu_mdev_ops);

	if (ret)

		goto out_cleanup_vgpu_type_groups;



	gvt_dbg_core("gvt device initialization is done\n");

	return 0;



out_cleanup_vgpu_type_groups:

	intel_gvt_cleanup_vgpu_type_groups(gvt);

out_destroy_idle_vgpu:

	intel_gvt_destroy_idle_vgpu(gvt->idle_vgpu);

	intel_gvt_debugfs_clean(gvt);

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

+4 −8
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include "intel_gvt.h"



#include "debug.h"

#include "hypercall.h"

#include "mmio.h"

#include "reg.h"

#include "interrupt.h"
@@ -59,12 +58,6 @@ 


#define GVT_MAX_VGPU 8



struct intel_gvt_host {

	const struct intel_gvt_mpt *mpt;

};



extern struct intel_gvt_host intel_gvt_host;



/* Describe per-platform limitations. */

struct intel_gvt_device_info {

	u32 max_support_vgpus;
@@ -773,9 +766,12 @@ int intel_gvt_dma_map_guest_page(struct intel_vgpu *vgpu, unsigned long gfn, 
void intel_gvt_dma_unmap_guest_page(struct intel_vgpu *vgpu,

		dma_addr_t dma_addr);



int intel_gvt_init_vgpu_type_groups(struct intel_gvt *gvt);

void intel_gvt_cleanup_vgpu_type_groups(struct intel_gvt *gvt);



#include "trace.h"

#include "mpt.h"



extern const struct intel_vgpu_ops intel_gvt_vgpu_ops;

extern const struct mdev_parent_ops intel_vgpu_mdev_ops;



#endif

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

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
/*

 * Copyright(c) 2011-2016 Intel Corporation. All rights reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 * Authors:

 *    Eddie Dong <eddie.dong@intel.com>

 *    Dexuan Cui

 *    Jike Song <jike.song@intel.com>

 *

 * Contributors:

 *    Zhi Wang <zhi.a.wang@intel.com>

 *

 */



#ifndef _GVT_HYPERCALL_H_

#define _GVT_HYPERCALL_H_



#include <linux/types.h>



struct device;

struct intel_vgpu;



/*

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

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

 */

struct intel_gvt_mpt {

	int (*host_init)(struct device *dev, void *gvt);

	void (*host_exit)(struct device *dev, void *gvt);

};



#endif /* _GVT_HYPERCALL_H_ */

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

+4 −35
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static struct attribute_group *gvt_vgpu_type_groups[] = { 
	[0 ... NR_MAX_INTEL_VGPU_TYPES - 1] = NULL,

};



static int intel_gvt_init_vgpu_type_groups(struct intel_gvt *gvt)

int intel_gvt_init_vgpu_type_groups(struct intel_gvt *gvt)

{

	int i, j;

	struct intel_vgpu_type *type;
@@ -201,7 +201,7 @@ static int intel_gvt_init_vgpu_type_groups(struct intel_gvt *gvt) 
	return -ENOMEM;

}



static void intel_gvt_cleanup_vgpu_type_groups(struct intel_gvt *gvt)

void intel_gvt_cleanup_vgpu_type_groups(struct intel_gvt *gvt)

{

	int i;

	struct attribute_group *group;
@@ -1665,8 +1665,9 @@ static const struct attribute_group *intel_vgpu_groups[] = { 
	NULL,

};



static struct mdev_parent_ops intel_vgpu_mdev_ops = {

const struct mdev_parent_ops intel_vgpu_mdev_ops = {

	.mdev_attr_groups       = intel_vgpu_groups,

	.supported_type_groups	= gvt_vgpu_type_groups,

	.create			= intel_vgpu_create,

	.remove			= intel_vgpu_remove,
@@ -1679,29 +1680,6 @@ static struct mdev_parent_ops intel_vgpu_mdev_ops = { 
	.ioctl			= intel_vgpu_ioctl,

};



static int kvmgt_host_init(struct device *dev, void *gvt)

{

	int ret;



	ret = intel_gvt_init_vgpu_type_groups((struct intel_gvt *)gvt);

	if (ret)

		return ret;



	intel_vgpu_mdev_ops.supported_type_groups = gvt_vgpu_type_groups;



	ret = mdev_register_device(dev, &intel_vgpu_mdev_ops);

	if (ret)

		intel_gvt_cleanup_vgpu_type_groups((struct intel_gvt *)gvt);



	return ret;

}



static void kvmgt_host_exit(struct device *dev, void *gvt)

{

	mdev_unregister_device(dev);

	intel_gvt_cleanup_vgpu_type_groups((struct intel_gvt *)gvt);

}



int intel_gvt_page_track_add(struct intel_vgpu *info, u64 gfn)

{

	struct kvm *kvm = info->kvm;
@@ -1964,15 +1942,6 @@ void intel_gvt_dma_unmap_guest_page(struct intel_vgpu *vgpu, 
	mutex_unlock(&vgpu->cache_lock);

}



static const struct intel_gvt_mpt kvmgt_mpt = {

	.host_init = kvmgt_host_init,

	.host_exit = kvmgt_host_exit,

};



struct intel_gvt_host intel_gvt_host = {

	.mpt		= &kvmgt_mpt,

};



static int __init kvmgt_init(void)

{

	return intel_gvt_set_ops(&intel_gvt_vgpu_ops);

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

deleted100644 → 0
+0 −74
Original line number Diff line number Diff line 
/*

 * Copyright(c) 2011-2016 Intel Corporation. All rights reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 *

 * Authors:

 *    Eddie Dong <eddie.dong@intel.com>

 *    Dexuan Cui

 *    Jike Song <jike.song@intel.com>

 *

 * Contributors:

 *    Zhi Wang <zhi.a.wang@intel.com>

 *

 */



#ifndef _GVT_MPT_H_

#define _GVT_MPT_H_



#include "gvt.h"



/**

 * DOC: Hypervisor Service APIs for GVT-g Core Logic

 *

 * This is the glue layer between specific hypervisor MPT modules and GVT-g core

 * logic. Each kind of hypervisor MPT module provides a collection of function

 * callbacks and will be attached to GVT host when the driver is loading.

 * GVT-g core logic will call these APIs to request specific services from

 * hypervisor.

 */



/**

 * intel_gvt_hypervisor_host_init - init GVT-g host side

 *

 * Returns:

 * Zero on success, negative error code if failed

 */

static inline int intel_gvt_hypervisor_host_init(struct device *dev, void *gvt)

{

	if (!intel_gvt_host.mpt->host_init)

		return -ENODEV;



	return intel_gvt_host.mpt->host_init(dev, gvt);

}



/**

 * intel_gvt_hypervisor_host_exit - exit GVT-g host side

 */

static inline void intel_gvt_hypervisor_host_exit(struct device *dev, void *gvt)

{

	/* optional to provide */

	if (!intel_gvt_host.mpt->host_exit)

		return;



	intel_gvt_host.mpt->host_exit(dev, gvt);

}



#endif /* _GVT_MPT_H_ */