| Message ID | 1459266123-21878-9-git-send-email-bp@alien8.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Mar 29, 2016 at 05:42:01PM +0200, Borislav Petkov wrote: > From: Borislav Petkov <bp@suse.de> > > Signed-off-by: Borislav Petkov <bp@suse.de> > Cc: intel-gfx@lists.freedesktop.org Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > > @tip guys, the pat_bsp_init() and pat_ap_init() hunk will conflict with > > d63dcf49cf5a ("x86/mm/pat: Replace cpu_has_pat with boot_cpu_has()") > > in tip/x86:mm. Let me know how you wanna handle it. Or you can simply > delete those hunks below when applying after merging the above branch. > Or I can send this patch later... Yadda yadda. > > arch/x86/include/asm/cpufeature.h | 1 - > arch/x86/mm/pat.c | 4 ++-- > drivers/gpu/drm/i915/i915_gem.c | 2 +- > 3 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h > index 5e02bc2e8444..ad480c5fb27c 100644 > --- a/arch/x86/include/asm/cpufeature.h > +++ b/arch/x86/include/asm/cpufeature.h > @@ -128,7 +128,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_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) > /* > diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c > index faec01e7a17d..6df20ac83ec3 100644 > --- a/arch/x86/mm/pat.c > +++ b/arch/x86/mm/pat.c > @@ -202,7 +202,7 @@ static void pat_bsp_init(u64 pat) > { > u64 tmp_pat; > > - if (!cpu_has_pat) { > + if (!boot_cpu_has(X86_FEATURE_PAT)) { > pat_disable("PAT not supported by CPU."); > return; > } > @@ -227,7 +227,7 @@ static void pat_ap_init(u64 pat) > if (!pat_enabled()) > return; > > - if (!cpu_has_pat) { > + if (!boot_cpu_has(X86_FEATURE_PAT)) { > /* > * If this happens we are on a secondary CPU, but switched to > * PAT on the boot CPU. We have no way to undo PAT. > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 3d31d3ac589e..aaec8aef9fd4 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1732,7 +1732,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, > if (args->flags & ~(I915_MMAP_WC)) > return -EINVAL; > > - if (args->flags & I915_MMAP_WC && !cpu_has_pat) > + if (args->flags & I915_MMAP_WC && !boot_cpu_has(X86_FEATURE_PAT)) > return -ENODEV; > > obj = drm_gem_object_lookup(dev, file, args->handle); > -- > 2.7.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 5e02bc2e8444..ad480c5fb27c 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -128,7 +128,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_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) /* diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index faec01e7a17d..6df20ac83ec3 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -202,7 +202,7 @@ static void pat_bsp_init(u64 pat) { u64 tmp_pat; - if (!cpu_has_pat) { + if (!boot_cpu_has(X86_FEATURE_PAT)) { pat_disable("PAT not supported by CPU."); return; } @@ -227,7 +227,7 @@ static void pat_ap_init(u64 pat) if (!pat_enabled()) return; - if (!cpu_has_pat) { + if (!boot_cpu_has(X86_FEATURE_PAT)) { /* * If this happens we are on a secondary CPU, but switched to * PAT on the boot CPU. We have no way to undo PAT. diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 3d31d3ac589e..aaec8aef9fd4 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1732,7 +1732,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, if (args->flags & ~(I915_MMAP_WC)) return -EINVAL; - if (args->flags & I915_MMAP_WC && !cpu_has_pat) + if (args->flags & I915_MMAP_WC && !boot_cpu_has(X86_FEATURE_PAT)) return -ENODEV; obj = drm_gem_object_lookup(dev, file, args->handle);