From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.15 035/163] x86/gpu: add CFL to early quirks Date: Wed, 21 Feb 2018 13:47:44 +0100 Message-ID: <20180221124532.202910761@linuxfoundation.org> References: <20180221124529.931834518@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180221124529.931834518@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: linux-kernel@vger.kernel.org Cc: "H. Peter Anvin" , dri-devel@lists.freedesktop.org, David Airlie , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, Lucas De Marchi , x86@kernel.org, Jani Nikula , stable@vger.kernel.org, Rodrigo Vivi , Thomas Gleixner , Ingo Molnar List-Id: dri-devel@lists.freedesktop.org NC4xNS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBMdWNhcyBEZSBN YXJjaGkgPGx1Y2FzLmRlbWFyY2hpQGludGVsLmNvbT4KCmNvbW1pdCAzM2FhNjllZDhhYWNkOTJk ZWExMjY3MWU1MmViM2NhNmFjMmQ3YTQ5IHVwc3RyZWFtLgoKQ0ZMIHdhcyBtaXNzaW5nIGZyb20g aW50ZWxfZWFybHlfaWRzW10uIFRoZSBQQ0kgSUQgbmVlZHMgdG8gYmUgdGhlcmUgdG8KYWxsb3cg dGhlIG1lbW9yeSByZWdpb24gdG8gYmUgc3RvbGVuLCBvdGhlcndpc2Ugd2UgY291bGQgaGF2ZSBS QU0gYmVpbmcKYXJiaXRyYXJpbHkgb3ZlcndyaXR0ZW4gaWYgZm9yIGV4YW1wbGUgd2Uga2VlcCB1 c2luZyB0aGUgVUVGSSBmcmFtZWJ1ZmZlciwKZGVwZW5kaW5nIG9uIGhvdyBCSU9TIGhhcyBzZXQg dXAgdGhlIGU4MjAgbWFwLgoKRml4ZXM6IGIwNTZmOGYzZDZiOSAoImRybS9pOTE1L2NmbDogQWRk IENvZmZlZSBMYWtlIFBDSSBJRHMgZm9yIFMgU2t1cy4iKQpTaWduZWQtb2ZmLWJ5OiBMdWNhcyBE ZSBNYXJjaGkgPGx1Y2FzLmRlbWFyY2hpQGludGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2aSA8cm9k cmlnby52aXZpQGludGVsLmNvbT4KQ2M6IEFudXNoYSBTcml2YXRzYSA8YW51c2hhLnNyaXZhdHNh QGludGVsLmNvbT4KQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+ CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNj OiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+CkNjOiBpbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCkNjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCkNjOiBJbmdv IE1vbG5hciA8bWluZ29Aa2VybmVsLm9yZz4KQ2M6IEguIFBldGVyIEFudmluIDxocGFAenl0b3Iu Y29tPgpDYzogVGhvbWFzIEdsZWl4bmVyIDx0Z2x4QGxpbnV0cm9uaXguZGU+CkNjOiB4ODZAa2Vy bmVsLm9yZwpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+ICMgdjQuMTMrIDA4OTA1NDBlMjFj ZiBkcm0vaTkxNTogYWRkIEdUIG51bWJlciB0byBpbnRlbF9kZXZpY2VfaW5mbwpDYzogPHN0YWJs ZUB2Z2VyLmtlcm5lbC5vcmc+ICMgdjQuMTMrIDQxNjkzZmQ1MjM3MyBkcm0vaTkxNS9rYmw6IENo YW5nZSBhIEtCTCBwY2kgaWQgdG8gR1QyIGZyb20gR1QxLjUKQ2M6IDxzdGFibGVAdmdlci5rZXJu ZWwub3JnPiAjIHY0LjEzKwpSZXZpZXdlZC1ieTogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlA aW50ZWwuY29tPgpBY2tlZC1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4K QWNrZWQtYnk6IEluZ28gTW9sbmFyIDxtaW5nb0BrZXJuZWwub3JnPgpTaWduZWQtb2ZmLWJ5OiBS b2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+Ckxpbms6IGh0dHBzOi8vcGF0Y2h3 b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE3MTIxMzIwMDQyNS4yOTU0LTEtbHVj YXMuZGVtYXJjaGlAaW50ZWwuY29tClNpZ25lZC1vZmYtYnk6IEdyZWcgS3JvYWgtSGFydG1hbiA8 Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+CgotLS0KIGFyY2gveDg2L2tlcm5lbC9lYXJseS1x dWlya3MuYyB8ICAgIDEgKwogaW5jbHVkZS9kcm0vaTkxNV9wY2lpZHMuaCAgICAgIHwgICAgNiAr KysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspCgotLS0gYS9hcmNoL3g4Ni9r ZXJuZWwvZWFybHktcXVpcmtzLmMKKysrIGIvYXJjaC94ODYva2VybmVsL2Vhcmx5LXF1aXJrcy5j CkBAIC01MjcsNiArNTI3LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkIGlu dGVsXwogCUlOVEVMX1NLTF9JRFMoJmdlbjlfZWFybHlfb3BzKSwKIAlJTlRFTF9CWFRfSURTKCZn ZW45X2Vhcmx5X29wcyksCiAJSU5URUxfS0JMX0lEUygmZ2VuOV9lYXJseV9vcHMpLAorCUlOVEVM X0NGTF9JRFMoJmdlbjlfZWFybHlfb3BzKSwKIAlJTlRFTF9HTEtfSURTKCZnZW45X2Vhcmx5X29w cyksCiAJSU5URUxfQ05MX0lEUygmZ2VuOV9lYXJseV9vcHMpLAogfTsKLS0tIGEvaW5jbHVkZS9k cm0vaTkxNV9wY2lpZHMuaAorKysgYi9pbmNsdWRlL2RybS9pOTE1X3BjaWlkcy5oCkBAIC0zOTIs NiArMzkyLDEyIEBACiAJSU5URUxfVkdBX0RFVklDRSgweDNFQTgsIGluZm8pLCAvKiBVTFQgR1Qz ICovIFwKIAlJTlRFTF9WR0FfREVWSUNFKDB4M0VBNSwgaW5mbykgIC8qIFVMVCBHVDMgKi8KIAor I2RlZmluZSBJTlRFTF9DRkxfSURTKGluZm8pIFwKKwlJTlRFTF9DRkxfU19HVDFfSURTKGluZm8p LCBcCisJSU5URUxfQ0ZMX1NfR1QyX0lEUyhpbmZvKSwgXAorCUlOVEVMX0NGTF9IX0dUMl9JRFMo aW5mbyksIFwKKwlJTlRFTF9DRkxfVV9HVDNfSURTKGluZm8pCisKIC8qIENOTCBVIDIrMiAqLwog I2RlZmluZSBJTlRFTF9DTkxfVV9HVDJfSURTKGluZm8pIFwKIAlJTlRFTF9WR0FfREVWSUNFKDB4 NUE1MiwgaW5mbyksIFwKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227Gp41K5/fg8bQdAWQxbY4Wqb7lKudXTqt70HTOsQAf5sMZ8b9FX4yXMXe+aUP1QaJ1yr5d ARC-Seal: i=1; a=rsa-sha256; t=1519218424; cv=none; d=google.com; s=arc-20160816; b=YP5/AKZE+WnTluDBFUjesfwNisyTwMIvtfx54zhlFXJoeht7YPOw05IvkwFMf0u1vs Nd45/QdFOybq/6MzIYwxnGQYvtztnpeOE2PQDZlLDYPhaV0Ax9B3aF/4UPRFC/Y2mjMQ /YGAnL4nDMgVQQRiWckVOH6qiJ2AcJk+KKXcYmz6N7Mkr8gbtp369eUmv7I9XHl4Jdwc t2PkVrmISzs8DUAtqP8/PmvLez2YqtdPqIR7fzZa5q1iv5BDkZBFmdYPps3NSOsCi8uY xpALz6mjQrMLYn8w0GBJEHWn475WSmCdlwNMjkLJ2n0qxLOSt/XZRiTr4/N44Fg8ifJZ Ruvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=vMT/THJCmOP7fBWPJ5TxEI1BpWrBmLLBqacCY165OMY=; b=CPx8OqiM4FL4Pv1lHmEn/SWoz17LMou1iluWObDBKIVSG7JeYy1lyKbyUy0slxf/fb On2TZ2f32GmHPDZ+7GZGzLy9BMzZxfNs0cje3pWeRZxStIaM64MMjZmPLSB/NBcKa1T4 Xy/JervrGTsLa2M7gA/6ILfJkiegWGzkZITQrzzmpoUu8EWUzfqU5pPiywZMhjFmqaqS qqozqEF+aGewrMisEGzRXjXC+iBKAZ8j57DR8wHFCo9Ppx3mvDsvvH1osbRI/JFFQP2g 0X6J2p140SJbdrXeXIBQY4hpgwmHFiifMeC0E/Ib8CcdCXrbjFUoUfk5LoxLGDAw5uUg Xgag== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lucas De Marchi , Rodrigo Vivi , Anusha Srivatsa , Jani Nikula , Joonas Lahtinen , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , x86@kernel.org, Jani Nikula Subject: [PATCH 4.15 035/163] x86/gpu: add CFL to early quirks Date: Wed, 21 Feb 2018 13:47:44 +0100 Message-Id: <20180221124532.202910761@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180221124529.931834518@linuxfoundation.org> References: <20180221124529.931834518@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1593015607863918761?= X-GMAIL-MSGID: =?utf-8?q?1593015978899399865?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lucas De Marchi commit 33aa69ed8aacd92dea12671e52eb3ca6ac2d7a49 upstream. 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 Acked-by: Jani Nikula Acked-by: Ingo Molnar Signed-off-by: Rodrigo Vivi Link: https://patchwork.freedesktop.org/patch/msgid/20171213200425.2954-1-lucas.demarchi@intel.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/early-quirks.c | 1 + include/drm/i915_pciids.h | 6 ++++++ 2 files changed, 7 insertions(+) --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -527,6 +527,7 @@ static const struct pci_device_id intel_ 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), }; --- 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), \