From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com ([134.134.136.100]:55566 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750784AbdLMUIZ (ORCPT ); Wed, 13 Dec 2017 15:08:25 -0500 From: Lucas De Marchi To: intel-gfx@lists.freedesktop.org Cc: Lucas De Marchi , Rodrigo Vivi , Anusha Srivatsa , Jani Nikula , Joonas Lahtinen , David Airlie , dri-devel@lists.freedesktop.org, Ingo Molnar , "H . Peter Anvin" , Thomas Gleixner , x86@kernel.org, stable@vger.kernel.org Subject: [PATCH v2] x86/gpu: add CFL to early quirks Date: Wed, 13 Dec 2017 12:04:25 -0800 Message-Id: <20171213200425.2954-1-lucas.demarchi@intel.com> Sender: stable-owner@vger.kernel.org List-ID: CFL was missing from intel_early_ids[]. The PCI ID needs to be there to allow the memory region to be stolen, otherwise we could have RAM being arbitrarily overwritten if for example we keep using the UEFI framebuffer, depending on how BIOS has set up the e820 map. Fixes: b056f8f3d6b9 ("drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.") Signed-off-by: Lucas De Marchi Cc: Rodrigo Vivi Cc: Anusha Srivatsa Cc: Jani Nikula Cc: Joonas Lahtinen Cc: David Airlie Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Thomas Gleixner Cc: x86@kernel.org Cc: # v4.13+ 0890540e21cf drm/i915: add GT number to intel_device_info Cc: # v4.13+ 41693fd52373 drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5 Cc: # v4.13+ Reviewed-by: Rodrigo Vivi --- v2: improve commit message, add Fixes tag and CC stable arch/x86/kernel/early-quirks.c | 1 + include/drm/i915_pciids.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 3cbb2c78a9df..bae0d32e327b 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -528,6 +528,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = { INTEL_SKL_IDS(&gen9_early_ops), INTEL_BXT_IDS(&gen9_early_ops), INTEL_KBL_IDS(&gen9_early_ops), + INTEL_CFL_IDS(&gen9_early_ops), INTEL_GLK_IDS(&gen9_early_ops), INTEL_CNL_IDS(&gen9_early_ops), }; diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 972a25633525..c65e4489006d 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -392,6 +392,12 @@ INTEL_VGA_DEVICE(0x3EA8, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x3EA5, info) /* ULT GT3 */ +#define INTEL_CFL_IDS(info) \ + INTEL_CFL_S_GT1_IDS(info), \ + INTEL_CFL_S_GT2_IDS(info), \ + INTEL_CFL_H_GT2_IDS(info), \ + INTEL_CFL_U_GT3_IDS(info) + /* CNL U 2+2 */ #define INTEL_CNL_U_GT2_IDS(info) \ INTEL_VGA_DEVICE(0x5A52, info), \ -- 2.14.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas De Marchi Subject: [PATCH v2] x86/gpu: add CFL to early quirks Date: Wed, 13 Dec 2017 12:04:25 -0800 Message-ID: <20171213200425.2954-1-lucas.demarchi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: "H . Peter Anvin" , David Airlie , Lucas De Marchi , x86@kernel.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi , stable@vger.kernel.org, Thomas Gleixner , Ingo Molnar List-Id: dri-devel@lists.freedesktop.org Q0ZMIHdhcyBtaXNzaW5nIGZyb20gaW50ZWxfZWFybHlfaWRzW10uIFRoZSBQQ0kgSUQgbmVlZHMg dG8gYmUgdGhlcmUgdG8KYWxsb3cgdGhlIG1lbW9yeSByZWdpb24gdG8gYmUgc3RvbGVuLCBvdGhl cndpc2Ugd2UgY291bGQgaGF2ZSBSQU0gYmVpbmcKYXJiaXRyYXJpbHkgb3ZlcndyaXR0ZW4gaWYg Zm9yIGV4YW1wbGUgd2Uga2VlcCB1c2luZyB0aGUgVUVGSSBmcmFtZWJ1ZmZlciwKZGVwZW5kaW5n IG9uIGhvdyBCSU9TIGhhcyBzZXQgdXAgdGhlIGU4MjAgbWFwLgoKRml4ZXM6IGIwNTZmOGYzZDZi OSAoImRybS9pOTE1L2NmbDogQWRkIENvZmZlZSBMYWtlIFBDSSBJRHMgZm9yIFMgU2t1cy4iKQpT aWduZWQtb2ZmLWJ5OiBMdWNhcyBEZSBNYXJjaGkgPGx1Y2FzLmRlbWFyY2hpQGludGVsLmNvbT4K Q2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KQ2M6IEFudXNoYSBTcml2 YXRzYSA8YW51c2hhLnNyaXZhdHNhQGludGVsLmNvbT4KQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5p a3VsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5l bkBsaW51eC5pbnRlbC5jb20+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+CkNj OiBpbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCkNjOiBJbmdvIE1vbG5hciA8bWluZ29Aa2VybmVsLm9yZz4KQ2M6IEguIFBl dGVyIEFudmluIDxocGFAenl0b3IuY29tPgpDYzogVGhvbWFzIEdsZWl4bmVyIDx0Z2x4QGxpbnV0 cm9uaXguZGU+CkNjOiB4ODZAa2VybmVsLm9yZwpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+ ICMgdjQuMTMrIDA4OTA1NDBlMjFjZiBkcm0vaTkxNTogYWRkIEdUIG51bWJlciB0byBpbnRlbF9k ZXZpY2VfaW5mbwpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+ICMgdjQuMTMrIDQxNjkzZmQ1 MjM3MyBkcm0vaTkxNS9rYmw6IENoYW5nZSBhIEtCTCBwY2kgaWQgdG8gR1QyIGZyb20gR1QxLjUK Q2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPiAjIHY0LjEzKwpSZXZpZXdlZC1ieTogUm9kcmln byBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgotLS0KCnYyOiBpbXByb3ZlIGNvbW1pdCBt ZXNzYWdlLCBhZGQgRml4ZXMgdGFnIGFuZCBDQyBzdGFibGUKCiBhcmNoL3g4Ni9rZXJuZWwvZWFy bHktcXVpcmtzLmMgfCAxICsKIGluY2x1ZGUvZHJtL2k5MTVfcGNpaWRzLmggICAgICB8IDYgKysr KysrCiAyIGZpbGVzIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2FyY2gv eDg2L2tlcm5lbC9lYXJseS1xdWlya3MuYyBiL2FyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3Mu YwppbmRleCAzY2JiMmM3OGE5ZGYuLmJhZTBkMzJlMzI3YiAxMDA2NDQKLS0tIGEvYXJjaC94ODYv a2VybmVsL2Vhcmx5LXF1aXJrcy5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3Mu YwpAQCAtNTI4LDYgKzUyOCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgcGNpX2RldmljZV9pZCBp bnRlbF9lYXJseV9pZHNbXSBfX2luaXRjb25zdCA9IHsKIAlJTlRFTF9TS0xfSURTKCZnZW45X2Vh cmx5X29wcyksCiAJSU5URUxfQlhUX0lEUygmZ2VuOV9lYXJseV9vcHMpLAogCUlOVEVMX0tCTF9J RFMoJmdlbjlfZWFybHlfb3BzKSwKKwlJTlRFTF9DRkxfSURTKCZnZW45X2Vhcmx5X29wcyksCiAJ SU5URUxfR0xLX0lEUygmZ2VuOV9lYXJseV9vcHMpLAogCUlOVEVMX0NOTF9JRFMoJmdlbjlfZWFy bHlfb3BzKSwKIH07CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9pOTE1X3BjaWlkcy5oIGIvaW5j bHVkZS9kcm0vaTkxNV9wY2lpZHMuaAppbmRleCA5NzJhMjU2MzM1MjUuLmM2NWU0NDg5MDA2ZCAx MDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vaTkxNV9wY2lpZHMuaAorKysgYi9pbmNsdWRlL2RybS9p OTE1X3BjaWlkcy5oCkBAIC0zOTIsNiArMzkyLDEyIEBACiAJSU5URUxfVkdBX0RFVklDRSgweDNF QTgsIGluZm8pLCAvKiBVTFQgR1QzICovIFwKIAlJTlRFTF9WR0FfREVWSUNFKDB4M0VBNSwgaW5m bykgIC8qIFVMVCBHVDMgKi8KIAorI2RlZmluZSBJTlRFTF9DRkxfSURTKGluZm8pIFwKKwlJTlRF TF9DRkxfU19HVDFfSURTKGluZm8pLCBcCisJSU5URUxfQ0ZMX1NfR1QyX0lEUyhpbmZvKSwgXAor CUlOVEVMX0NGTF9IX0dUMl9JRFMoaW5mbyksIFwKKwlJTlRFTF9DRkxfVV9HVDNfSURTKGluZm8p CisKIC8qIENOTCBVIDIrMiAqLwogI2RlZmluZSBJTlRFTF9DTkxfVV9HVDJfSURTKGluZm8pIFwK IAlJTlRFTF9WR0FfREVWSUNFKDB4NUE1MiwgaW5mbyksIFwKLS0gCjIuMTQuMwoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==