From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 08/10] x86/cpufeature: Kill cpu_has_pat Date: Wed, 30 Mar 2016 13:28:37 +0200 Message-ID: <20160330112837.GG2510@phenom.ffwll.local> References: <1459266123-21878-1-git-send-email-bp@alien8.de> <1459266123-21878-9-git-send-email-bp@alien8.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F7E36E7A7 for ; Wed, 30 Mar 2016 11:28:35 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id 20so13789010wmh.3 for ; Wed, 30 Mar 2016 04:28:35 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1459266123-21878-9-git-send-email-bp@alien8.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Borislav Petkov Cc: intel-gfx@lists.freedesktop.org, X86 ML , LKML List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBNYXIgMjksIDIwMTYgYXQgMDU6NDI6MDFQTSArMDIwMCwgQm9yaXNsYXYgUGV0a292 IHdyb3RlOgo+IEZyb206IEJvcmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KPiAKPiBTaWduZWQt b2ZmLWJ5OiBCb3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+Cj4gQ2M6IGludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKCkFja2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVy QGZmd2xsLmNoPgoKPiAtLS0KPiAKPiBAdGlwIGd1eXMsIHRoZSBwYXRfYnNwX2luaXQoKSBhbmQg cGF0X2FwX2luaXQoKSBodW5rIHdpbGwgY29uZmxpY3Qgd2l0aAo+IAo+ICAgZDYzZGNmNDljZjVh ICgieDg2L21tL3BhdDogUmVwbGFjZSBjcHVfaGFzX3BhdCB3aXRoIGJvb3RfY3B1X2hhcygpIikK PiAKPiBpbiB0aXAveDg2Om1tLiBMZXQgbWUga25vdyBob3cgeW91IHdhbm5hIGhhbmRsZSBpdC4g T3IgeW91IGNhbiBzaW1wbHkKPiBkZWxldGUgdGhvc2UgaHVua3MgYmVsb3cgd2hlbiBhcHBseWlu ZyBhZnRlciBtZXJnaW5nIHRoZSBhYm92ZSBicmFuY2guCj4gT3IgSSBjYW4gc2VuZCB0aGlzIHBh dGNoIGxhdGVyLi4uIFlhZGRhIHlhZGRhLgo+IAo+ICBhcmNoL3g4Ni9pbmNsdWRlL2FzbS9jcHVm ZWF0dXJlLmggfCAxIC0KPiAgYXJjaC94ODYvbW0vcGF0LmMgICAgICAgICAgICAgICAgIHwgNCAr Ky0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICB8IDIgKy0KPiAgMyBmaWxl cyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdp dCBhL2FyY2gveDg2L2luY2x1ZGUvYXNtL2NwdWZlYXR1cmUuaCBiL2FyY2gveDg2L2luY2x1ZGUv YXNtL2NwdWZlYXR1cmUuaAo+IGluZGV4IDVlMDJiYzJlODQ0NC4uYWQ0ODBjNWZiMjdjIDEwMDY0 NAo+IC0tLSBhL2FyY2gveDg2L2luY2x1ZGUvYXNtL2NwdWZlYXR1cmUuaAo+ICsrKyBiL2FyY2gv eDg2L2luY2x1ZGUvYXNtL2NwdWZlYXR1cmUuaAo+IEBAIC0xMjgsNyArMTI4LDYgQEAgZXh0ZXJu IGNvbnN0IGNoYXIgKiBjb25zdCB4ODZfYnVnX2ZsYWdzW05CVUdJTlRTKjMyXTsKPiAgI2RlZmlu ZSBjcHVfaGFzX2FlcwkJYm9vdF9jcHVfaGFzKFg4Nl9GRUFUVVJFX0FFUykKPiAgI2RlZmluZSBj cHVfaGFzX2F2eAkJYm9vdF9jcHVfaGFzKFg4Nl9GRUFUVVJFX0FWWCkKPiAgI2RlZmluZSBjcHVf aGFzX2F2eDIJCWJvb3RfY3B1X2hhcyhYODZfRkVBVFVSRV9BVlgyKQo+IC0jZGVmaW5lIGNwdV9o YXNfcGF0CQlib290X2NwdV9oYXMoWDg2X0ZFQVRVUkVfUEFUKQo+ICAjZGVmaW5lIGNwdV9oYXNf eHNhdmUJCWJvb3RfY3B1X2hhcyhYODZfRkVBVFVSRV9YU0FWRSkKPiAgI2RlZmluZSBjcHVfaGFz X3hzYXZlcwkJYm9vdF9jcHVfaGFzKFg4Nl9GRUFUVVJFX1hTQVZFUykKPiAgLyoKPiBkaWZmIC0t Z2l0IGEvYXJjaC94ODYvbW0vcGF0LmMgYi9hcmNoL3g4Ni9tbS9wYXQuYwo+IGluZGV4IGZhZWMw MWU3YTE3ZC4uNmRmMjBhYzgzZWMzIDEwMDY0NAo+IC0tLSBhL2FyY2gveDg2L21tL3BhdC5jCj4g KysrIGIvYXJjaC94ODYvbW0vcGF0LmMKPiBAQCAtMjAyLDcgKzIwMiw3IEBAIHN0YXRpYyB2b2lk IHBhdF9ic3BfaW5pdCh1NjQgcGF0KQo+ICB7Cj4gIAl1NjQgdG1wX3BhdDsKPiAgCj4gLQlpZiAo IWNwdV9oYXNfcGF0KSB7Cj4gKwlpZiAoIWJvb3RfY3B1X2hhcyhYODZfRkVBVFVSRV9QQVQpKSB7 Cj4gIAkJcGF0X2Rpc2FibGUoIlBBVCBub3Qgc3VwcG9ydGVkIGJ5IENQVS4iKTsKPiAgCQlyZXR1 cm47Cj4gIAl9Cj4gQEAgLTIyNyw3ICsyMjcsNyBAQCBzdGF0aWMgdm9pZCBwYXRfYXBfaW5pdCh1 NjQgcGF0KQo+ICAJaWYgKCFwYXRfZW5hYmxlZCgpKQo+ICAJCXJldHVybjsKPiAgCj4gLQlpZiAo IWNwdV9oYXNfcGF0KSB7Cj4gKwlpZiAoIWJvb3RfY3B1X2hhcyhYODZfRkVBVFVSRV9QQVQpKSB7 Cj4gIAkJLyoKPiAgCQkgKiBJZiB0aGlzIGhhcHBlbnMgd2UgYXJlIG9uIGEgc2Vjb25kYXJ5IENQ VSwgYnV0IHN3aXRjaGVkIHRvCj4gIAkJICogUEFUIG9uIHRoZSBib290IENQVS4gV2UgaGF2ZSBu byB3YXkgdG8gdW5kbyBQQVQuCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gaW5kZXggM2QzMWQz YWM1ODllLi5hYWVjOGFlZjlmZDQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiBAQCAt MTczMiw3ICsxNzMyLDcgQEAgaTkxNV9nZW1fbW1hcF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB2b2lkICpkYXRhLAo+ICAJaWYgKGFyZ3MtPmZsYWdzICYgfihJOTE1X01NQVBfV0MpKQo+ ICAJCXJldHVybiAtRUlOVkFMOwo+ICAKPiAtCWlmIChhcmdzLT5mbGFncyAmIEk5MTVfTU1BUF9X QyAmJiAhY3B1X2hhc19wYXQpCj4gKwlpZiAoYXJncy0+ZmxhZ3MgJiBJOTE1X01NQVBfV0MgJiYg IWJvb3RfY3B1X2hhcyhYODZfRkVBVFVSRV9QQVQpKQo+ICAJCXJldHVybiAtRU5PREVWOwo+ICAK PiAgCW9iaiA9IGRybV9nZW1fb2JqZWN0X2xvb2t1cChkZXYsIGZpbGUsIGFyZ3MtPmhhbmRsZSk7 Cj4gLS0gCj4gMi43LjMKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwo+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRl bCBDb3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752516AbcC3L2g (ORCPT ); Wed, 30 Mar 2016 07:28:36 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33349 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751393AbcC3L2e (ORCPT ); Wed, 30 Mar 2016 07:28:34 -0400 Date: Wed, 30 Mar 2016 13:28:37 +0200 From: Daniel Vetter To: Borislav Petkov Cc: X86 ML , intel-gfx@lists.freedesktop.org, LKML Subject: Re: [Intel-gfx] [PATCH 08/10] x86/cpufeature: Kill cpu_has_pat Message-ID: <20160330112837.GG2510@phenom.ffwll.local> Mail-Followup-To: Borislav Petkov , X86 ML , intel-gfx@lists.freedesktop.org, LKML References: <1459266123-21878-1-git-send-email-bp@alien8.de> <1459266123-21878-9-git-send-email-bp@alien8.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1459266123-21878-9-git-send-email-bp@alien8.de> X-Operating-System: Linux phenom 4.4.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 29, 2016 at 05:42:01PM +0200, Borislav Petkov wrote: > From: Borislav Petkov > > Signed-off-by: Borislav Petkov > Cc: intel-gfx@lists.freedesktop.org Acked-by: Daniel Vetter > --- > > @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 -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch