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

Commit 50cbc03e authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

Merge tag 'gvt-fixes-2018-09-10' of https://github.com/intel/gvt-linux into drm-intel-fixes 



gvt-fixes-2018-09-10

- KVM mm access reference fix (Zhenyu)
- Fix child device config length for virtual opregion (Weinan)

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180910092212.GZ20737@zhen-hp.sh.intel.com
parents 92a68031 792fab2c

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

+8 −2
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/device.h>

#include <linux/device.h>

#include <linux/mm.h>

#include <linux/mm.h>

#include <linux/mmu_context.h>

#include <linux/mmu_context.h>

#include <linux/sched/mm.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/list.h>

#include <linux/list.h>

#include <linux/rbtree.h>

#include <linux/rbtree.h>
@@ -1792,16 +1793,21 @@ static int kvmgt_rw_gpa(unsigned long handle, unsigned long gpa, 
	info = (struct kvmgt_guest_info *)handle;

	info = (struct kvmgt_guest_info *)handle;

	kvm = info->kvm;

	kvm = info->kvm;





	if (kthread)

	if (kthread) {

		if (!mmget_not_zero(kvm->mm))

			return -EFAULT;

		use_mm(kvm->mm);

		use_mm(kvm->mm);

	}





	idx = srcu_read_lock(&kvm->srcu);

	idx = srcu_read_lock(&kvm->srcu);

	ret = write ? kvm_write_guest(kvm, gpa, buf, len) :

	ret = write ? kvm_write_guest(kvm, gpa, buf, len) :

		      kvm_read_guest(kvm, gpa, buf, len);

		      kvm_read_guest(kvm, gpa, buf, len);

	srcu_read_unlock(&kvm->srcu, idx);

	srcu_read_unlock(&kvm->srcu, idx);





	if (kthread)

	if (kthread) {

		unuse_mm(kvm->mm);

		unuse_mm(kvm->mm);

		mmput(kvm->mm);

	}





	return ret;

	return ret;

}

}

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

+9 −11
Original line number Original line Diff line number Diff line
@@ -42,8 +42,6 @@ 
#define DEVICE_TYPE_EFP3   0x20

#define DEVICE_TYPE_EFP3   0x20

#define DEVICE_TYPE_EFP4   0x10

#define DEVICE_TYPE_EFP4   0x10





#define DEV_SIZE	38



struct opregion_header {

struct opregion_header {

	u8 signature[16];

	u8 signature[16];

	u32 size;

	u32 size;
@@ -63,6 +61,10 @@ struct bdb_data_header { 
	u16 size; /* data size */

	u16 size; /* data size */

} __packed;

} __packed;





/* For supporting windows guest with opregion, here hardcode the emulated

 * bdb header version as '186', and the corresponding child_device_config

 * length should be '33' but not '38'.

 */

struct efp_child_device_config {

struct efp_child_device_config {

	u16 handle;

	u16 handle;

	u16 device_type;

	u16 device_type;
@@ -109,12 +111,6 @@ struct efp_child_device_config { 
	u8 mipi_bridge_type; /* 171 */

	u8 mipi_bridge_type; /* 171 */

	u16 device_class_ext;

	u16 device_class_ext;

	u8 dvo_function;

	u8 dvo_function;

	u8 dp_usb_type_c:1; /* 195 */

	u8 skip6:7;

	u8 dp_usb_type_c_2x_gpio_index; /* 195 */

	u16 dp_usb_type_c_2x_gpio_pin; /* 195 */

	u8 iboost_dp:4; /* 196 */

	u8 iboost_hdmi:4; /* 196 */

} __packed;

} __packed;





struct vbt {

struct vbt {
@@ -155,7 +151,7 @@ static void virt_vbt_generation(struct vbt *v) 
	v->header.bdb_offset = offsetof(struct vbt, bdb_header);

	v->header.bdb_offset = offsetof(struct vbt, bdb_header);





	strcpy(&v->bdb_header.signature[0], "BIOS_DATA_BLOCK");

	strcpy(&v->bdb_header.signature[0], "BIOS_DATA_BLOCK");

	v->bdb_header.version = 186; /* child_dev_size = 38 */

	v->bdb_header.version = 186; /* child_dev_size = 33 */

	v->bdb_header.header_size = sizeof(v->bdb_header);

	v->bdb_header.header_size = sizeof(v->bdb_header);





	v->bdb_header.bdb_size = sizeof(struct vbt) - sizeof(struct vbt_header)

	v->bdb_header.bdb_size = sizeof(struct vbt) - sizeof(struct vbt_header)
@@ -169,11 +165,13 @@ static void virt_vbt_generation(struct vbt *v) 




	/* child device */

	/* child device */

	num_child = 4; /* each port has one child */

	num_child = 4; /* each port has one child */

	v->general_definitions.child_dev_size =

		sizeof(struct efp_child_device_config);

	v->general_definitions_header.id = BDB_GENERAL_DEFINITIONS;

	v->general_definitions_header.id = BDB_GENERAL_DEFINITIONS;

	/* size will include child devices */

	/* size will include child devices */

	v->general_definitions_header.size =

	v->general_definitions_header.size =

		sizeof(struct bdb_general_definitions) + num_child * DEV_SIZE;

		sizeof(struct bdb_general_definitions) +

	v->general_definitions.child_dev_size = DEV_SIZE;

			num_child * v->general_definitions.child_dev_size;





	/* portA */

	/* portA */

	v->child0.handle = DEVICE_TYPE_EFP1;

	v->child0.handle = DEVICE_TYPE_EFP1;