Commit b1d522bd authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Zheng Zengkai
Browse files

drm/i915: fix TLB invalidation for Gen12 video and compute engines 

stable inclusion
from stable-v5.10.157
commit 86f0082fb9470904b15546726417f28077088fee
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I640L3
CVE: CVE-2022-4139

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.157&id=86f0082fb9470904b15546726417f28077088fee



--------------------------------

commit 04aa6437 upstream.

In case of Gen12 video and compute engines, TLB_INV registers are masked -
to modify one bit, corresponding bit in upper half of the register must
be enabled, otherwise nothing happens.

CVE: CVE-2022-4139
Suggested-by: default avatarChris Wilson <chris.p.wilson@intel.com>
Signed-off-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Fixes: 7938d615 ("drm/i915: Flush TLBs before releasing backing store")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarRen Zhijie <renzhijie2@huawei.com>
Reviewed-by: default avatarZhang Qiao <zhangqiao22@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 28f6e487

drivers/gpu/drm/i915/gt/intel_gt.c

+4 −0
Original line number Diff line number Diff line
@@ -745,6 +745,10 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt) 
		if (!i915_mmio_reg_offset(rb.reg))

			continue;



		if (INTEL_GEN(i915) == 12 && (engine->class == VIDEO_DECODE_CLASS ||

		    engine->class == VIDEO_ENHANCEMENT_CLASS))

			rb.bit = _MASKED_BIT_ENABLE(rb.bit);



		intel_uncore_write_fw(uncore, rb.reg, rb.bit);

	}