On to, 2016-06-02 at 12:36 -0400, Zhi Wang wrote:
> As the PVINFO page definition is used by both GVT-g guest (vGPU) and GVT-g
> host (GVT-g kernel device model), factor it out for better code structure.
>
> v3:
>
> Take Joonas's comments:
> - Use offsetof to calculate the member offset of PVINFO structure
>
Split this patch in two; one to do the move, then other to convert to
offsetof and with that, both patches;
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
> Signed-off-by: Zhi Wang <zhi.a.wang@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_pvinfo.h | 116 +++++++++++++++++++++++++++++++++++++
> drivers/gpu/drm/i915/i915_vgpu.h | 86 +--------------------------
> 2 files changed, 117 insertions(+), 85 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/i915_pvinfo.h
>
> diff --git a/drivers/gpu/drm/i915/i915_pvinfo.h b/drivers/gpu/drm/i915/i915_pvinfo.h
> new file mode 100644
> index 0000000..eb45afb
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/i915_pvinfo.h
> @@ -0,0 +1,116 @@
> +/*
> + * 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.
> + */
> +
> +#ifndef _I915_PVINFO_H_
> +#define _I915_PVINFO_H_
> +
> +/* The MMIO offset of the shared info between guest and host emulator */
> +#define VGT_PVINFO_PAGE 0x78000
> +#define VGT_PVINFO_SIZE 0x1000
> +
> +/*
> + * The following structure pages are defined in GEN MMIO space
> + * for virtualization. (One page for now)
> + */
> +#define VGT_MAGIC 0x4776544776544776ULL /* 'vGTvGTvG' */
> +#define VGT_VERSION_MAJOR 1
> +#define VGT_VERSION_MINOR 0
> +
> +#define INTEL_VGT_IF_VERSION_ENCODE(major, minor) ((major) << 16 | (minor))
> +#define INTEL_VGT_IF_VERSION \
> + INTEL_VGT_IF_VERSION_ENCODE(VGT_VERSION_MAJOR, VGT_VERSION_MINOR)
> +
> +/*
> + * notifications from guest to vgpu device model
> + */
> +enum vgt_g2v_type {
> + VGT_G2V_PPGTT_L3_PAGE_TABLE_CREATE = 2,
> + VGT_G2V_PPGTT_L3_PAGE_TABLE_DESTROY,
> + VGT_G2V_PPGTT_L4_PAGE_TABLE_CREATE,
> + VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY,
> + VGT_G2V_EXECLIST_CONTEXT_CREATE,
> + VGT_G2V_EXECLIST_CONTEXT_DESTROY,
> + VGT_G2V_MAX,
> +};
> +
> +struct vgt_if {
> + uint64_t magic; /* VGT_MAGIC */
> + uint16_t version_major;
> + uint16_t version_minor;
> + uint32_t vgt_id; /* ID of vGT instance */
> + uint32_t rsv1[12]; /* pad to offset 0x40 */
> + /*
> + * Data structure to describe the balooning info of resources.
> + * Each VM can only have one portion of continuous area for now.
> + * (May support scattered resource in future)
> + * (starting from offset 0x40)
> + */
> + struct {
> + /* Aperture register balooning */
> + struct {
> + uint32_t base;
> + uint32_t size;
> + } mappable_gmadr; /* aperture */
> + /* GMADR register balooning */
> + struct {
> + uint32_t base;
> + uint32_t size;
> + } nonmappable_gmadr; /* non aperture */
> + /* allowed fence registers */
> + uint32_t fence_num;
> + uint32_t rsv2[3];
> + } avail_rs; /* available/assigned resource */
> + uint32_t rsv3[0x200 - 24]; /* pad to half page */
> + /*
> + * The bottom half page is for response from Gfx driver to hypervisor.
> + */
> + uint32_t rsv4;
> + uint32_t display_ready; /* ready for display owner switch */
> +
> + uint32_t rsv5[4];
> +
> + uint32_t g2v_notify;
> + uint32_t rsv6[7];
> +
> + struct {
> + uint32_t lo;
> + uint32_t hi;
> + } pdp[4];
> +
> + uint32_t execlist_context_descriptor_lo;
> + uint32_t execlist_context_descriptor_hi;
> +
> + uint32_t rsv7[0x200 - 24]; /* pad to one page */
> +} __packed;
> +
> +#define _vgtif_reg(x) \
> + (VGT_PVINFO_PAGE + offsetof(struct vgt_if, x))
> +
> +#define vgtif_reg(x) \
> + _MMIO(_vgtif_reg(x))
> +
> +/* vGPU display status to be used by the host side */
> +#define VGT_DRV_DISPLAY_NOT_READY 0
> +#define VGT_DRV_DISPLAY_READY 1 /* ready for display switch */
> +
> +#endif /* _I915_PVINFO_H_ */
> diff --git a/drivers/gpu/drm/i915/i915_vgpu.h b/drivers/gpu/drm/i915/i915_vgpu.h
> index 21ffcfe..07e67d5 100644
> --- a/drivers/gpu/drm/i915/i915_vgpu.h
> +++ b/drivers/gpu/drm/i915/i915_vgpu.h
> @@ -24,91 +24,7 @@
> #ifndef _I915_VGPU_H_
> #define _I915_VGPU_H_
>
> -/* The MMIO offset of the shared info between guest and host emulator */
> -#define VGT_PVINFO_PAGE 0x78000
> -#define VGT_PVINFO_SIZE 0x1000
> -
> -/*
> - * The following structure pages are defined in GEN MMIO space
> - * for virtualization. (One page for now)
> - */
> -#define VGT_MAGIC 0x4776544776544776ULL /* 'vGTvGTvG' */
> -#define VGT_VERSION_MAJOR 1
> -#define VGT_VERSION_MINOR 0
> -
> -#define INTEL_VGT_IF_VERSION_ENCODE(major, minor) ((major) << 16 | (minor))
> -#define INTEL_VGT_IF_VERSION \
> - INTEL_VGT_IF_VERSION_ENCODE(VGT_VERSION_MAJOR, VGT_VERSION_MINOR)
> -
> -/*
> - * notifications from guest to vgpu device model
> - */
> -enum vgt_g2v_type {
> - VGT_G2V_PPGTT_L3_PAGE_TABLE_CREATE = 2,
> - VGT_G2V_PPGTT_L3_PAGE_TABLE_DESTROY,
> - VGT_G2V_PPGTT_L4_PAGE_TABLE_CREATE,
> - VGT_G2V_PPGTT_L4_PAGE_TABLE_DESTROY,
> - VGT_G2V_EXECLIST_CONTEXT_CREATE,
> - VGT_G2V_EXECLIST_CONTEXT_DESTROY,
> - VGT_G2V_MAX,
> -};
> -
> -struct vgt_if {
> - uint64_t magic; /* VGT_MAGIC */
> - uint16_t version_major;
> - uint16_t version_minor;
> - uint32_t vgt_id; /* ID of vGT instance */
> - uint32_t rsv1[12]; /* pad to offset 0x40 */
> - /*
> - * Data structure to describe the balooning info of resources.
> - * Each VM can only have one portion of continuous area for now.
> - * (May support scattered resource in future)
> - * (starting from offset 0x40)
> - */
> - struct {
> - /* Aperture register balooning */
> - struct {
> - uint32_t base;
> - uint32_t size;
> - } mappable_gmadr; /* aperture */
> - /* GMADR register balooning */
> - struct {
> - uint32_t base;
> - uint32_t size;
> - } nonmappable_gmadr; /* non aperture */
> - /* allowed fence registers */
> - uint32_t fence_num;
> - uint32_t rsv2[3];
> - } avail_rs; /* available/assigned resource */
> - uint32_t rsv3[0x200 - 24]; /* pad to half page */
> - /*
> - * The bottom half page is for response from Gfx driver to hypervisor.
> - */
> - uint32_t rsv4;
> - uint32_t display_ready; /* ready for display owner switch */
> -
> - uint32_t rsv5[4];
> -
> - uint32_t g2v_notify;
> - uint32_t rsv6[7];
> -
> - struct {
> - uint32_t lo;
> - uint32_t hi;
> - } pdp[4];
> -
> - uint32_t execlist_context_descriptor_lo;
> - uint32_t execlist_context_descriptor_hi;
> -
> - uint32_t rsv7[0x200 - 24]; /* pad to one page */
> -} __packed;
> -
> -#define vgtif_reg(x) \
> - _MMIO((VGT_PVINFO_PAGE + (long)&((struct vgt_if *)NULL)->x))
> -
> -/* vGPU display status to be used by the host side */
> -#define VGT_DRV_DISPLAY_NOT_READY 0
> -#define VGT_DRV_DISPLAY_READY 1 /* ready for display switch */
> +#include "i915_pvinfo.h"
>
> extern void i915_check_vgpu(struct drm_i915_private *dev_priv);
> extern int intel_vgt_balloon(struct drm_device *dev);
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
