From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227vxvXqWSbZLrB3C0AFW8ZJ8ftcjevhvtQJcWxqQJbbUgxloRth9zZ43t9xmkqucBIBBJ/2 ARC-Seal: i=1; a=rsa-sha256; t=1519218070; cv=none; d=google.com; s=arc-20160816; b=u9Im0UlRMnwqh2292Y/gdv5BKW+cBn4qYScZFyosnn3weHKpl0afWDRUNvqnb8W1Rp Zk3l6Lc20+NY6GBXwoayAV/spSO96hZMiXug7XJaVrS3LfmCc1a4RopIEWuDa4LbwZTv GGayrJ45qkK69W16gdPg1eR39O6Op/ydVCrJE++eOwDNlG/c8pURu5+uuGo1jVJHzVnx wDLYGWKOxV00obrk4PftJPyaCpScl3+q6SiRcQp2iXlZHTyQ6XHlsD/82bWU4fzb0TYx jH1pf3YFF7IogCvokUM8FLH2Z9DkqLmEHnzgVeP3MjsJ8LYIHWJdo9o7n23suEoO79+9 7ydw== 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=BczM1cTkz2XzOSRQLlzJ40ntiwG+aZz1HgwufIYjYyI=; b=UXCs06YBbXNATQ6AwwPGF2RRfXzTliDpbhYv/OvstOX3I5SpwlVis2dAbejdGR4k4s OFQjep6H7L8PSMwiROI2Q3LKBRYbKXkKLeYewTz2GS6eEHg5itOTJUW1vap0eUsrW1uU 7g+gAFfUA7CeOtOh3pLdqTMARnceeblDWGu4CDORsmcFZknY3UW29lD3P6TFq22epPFz haZSZW1aD7ZLb3wBt3uNKPgfuBQ0Y7f31mCFYfyjfvJU/FZ/hYlRtgBq2tD1sN5CEUM+ rptBqRGAq2nGe5a7s34wr4dZFET2MjxFrSURf/w0u1JeEU8SzNmV9lRpZTWlHtBJhBf/ 031A== 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.14 036/167] x86/gpu: add CFL to early quirks Date: Wed, 21 Feb 2018 13:47:27 +0100 Message-Id: <20180221124526.577054863@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180221124524.639039577@linuxfoundation.org> References: <20180221124524.639039577@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?1593015607863918761?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-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), \