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

Commit 906bf7fd authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpufeature: Remove cpu_has_clflush 



Use the fast variant in the DRM code.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Link: http://lkml.kernel.org/r/1459266123-21878-7-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b8291adc

arch/x86/include/asm/cpufeature.h

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
#define cpu_has_aes		boot_cpu_has(X86_FEATURE_AES)

#define cpu_has_avx		boot_cpu_has(X86_FEATURE_AVX)

#define cpu_has_avx2		boot_cpu_has(X86_FEATURE_AVX2)

#define cpu_has_clflush		boot_cpu_has(X86_FEATURE_CLFLUSH)

#define cpu_has_pat		boot_cpu_has(X86_FEATURE_PAT)

#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

arch/x86/kernel/cpu/intel.c

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static void init_intel(struct cpuinfo_x86 *c) 
			set_cpu_cap(c, X86_FEATURE_PEBS);

	}



	if (c->x86 == 6 && cpu_has_clflush &&

	if (c->x86 == 6 && boot_cpu_has(X86_FEATURE_CLFLUSH) &&

	    (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47))

		set_cpu_bug(c, X86_BUG_CLFLUSH_MONITOR);

arch/x86/kernel/tce_64.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
static inline void flush_tce(void* tceaddr)

{

	/* a single tce can't cross a cache line */

	if (cpu_has_clflush)

	if (boot_cpu_has(X86_FEATURE_CLFLUSH))

		clflush(tceaddr);

	else

		wbinvd();

arch/x86/mm/pageattr.c

+1 −1
Original line number Diff line number Diff line
@@ -1460,7 +1460,7 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages, 
	 * error case we fall back to cpa_flush_all (which uses

	 * WBINVD):

	 */

	if (!ret && cpu_has_clflush) {

	if (!ret && boot_cpu_has(X86_FEATURE_CLFLUSH)) {

		if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) {

			cpa_flush_array(addr, numpages, cache,

					cpa.flags, pages);

drivers/gpu/drm/drm_cache.c

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) 
{



#if defined(CONFIG_X86)

	if (cpu_has_clflush) {

	if (static_cpu_has(X86_FEATURE_CLFLUSH)) {

		drm_cache_flush_clflush(pages, num_pages);

		return;

	}
@@ -105,7 +105,7 @@ void 
drm_clflush_sg(struct sg_table *st)

{

#if defined(CONFIG_X86)

	if (cpu_has_clflush) {

	if (static_cpu_has(X86_FEATURE_CLFLUSH)) {

		struct sg_page_iter sg_iter;



		mb();
@@ -129,7 +129,7 @@ void 
drm_clflush_virt_range(void *addr, unsigned long length)

{

#if defined(CONFIG_X86)

	if (cpu_has_clflush) {

	if (static_cpu_has(X86_FEATURE_CLFLUSH)) {

		const int size = boot_cpu_data.x86_clflush_size;

		void *end = addr + length;

		addr = (void *)(((unsigned long)addr) & -size);