From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f49.google.com ([74.125.82.49]:37926 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756347AbcECT3t (ORCPT ); Tue, 3 May 2016 15:29:49 -0400 Received: by mail-wm0-f49.google.com with SMTP id g17so57113277wme.1 for ; Tue, 03 May 2016 12:29:48 -0700 (PDT) From: Matt Fleming To: Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Wang YanQing , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Matt Fleming , David Herrmann , Peter Jones , stable@vger.kernel.org, Tomi Valkeinen Subject: [PATCH 2/3] x86/sysfb_efi: Fix valid BAR address range check Date: Tue, 3 May 2016 20:29:40 +0100 Message-Id: <1462303781-8686-3-git-send-email-matt@codeblueprint.co.uk> In-Reply-To: <1462303781-8686-1-git-send-email-matt@codeblueprint.co.uk> References: <1462303781-8686-1-git-send-email-matt@codeblueprint.co.uk> Sender: stable-owner@vger.kernel.org List-ID: From: Wang YanQing We can't just break out when meet start is equal to zero, this will cause us to miss valid address ranges in later BARs. On the other hand, it isn't enough to test start only for below situation: 0(start) <= lfb_base < end Due to the BUG this patch fix, I can't use video=efifb: boot parameter to get efifb on my new ThinkPad E550 for my old linux system hard disk with 3.10 kernel. In 3.10, efifb is the only choice due to DRM/I915 in it doesn't support the GPU. This patch also add a trivial optimization, break out after we find the address range is valid without test later BARs. Signed-off-by: Wang YanQing Reviewed-by: Peter Jones Cc: David Herrmann Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Tomi Valkeinen Cc: [ Updated changelog ] Signed-off-by: Matt Fleming --- arch/x86/kernel/sysfb_efi.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/sysfb_efi.c b/arch/x86/kernel/sysfb_efi.c index b285d4e8c68e..5da924bbf0a0 100644 --- a/arch/x86/kernel/sysfb_efi.c +++ b/arch/x86/kernel/sysfb_efi.c @@ -106,14 +106,24 @@ static int __init efifb_set_system(const struct dmi_system_id *id) continue; for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { resource_size_t start, end; + unsigned long flags; + + flags = pci_resource_flags(dev, i); + if (!(flags & IORESOURCE_MEM)) + continue; + + if (flags & IORESOURCE_UNSET) + continue; + + if (pci_resource_len(dev, i) == 0) + continue; start = pci_resource_start(dev, i); - if (start == 0) - break; end = pci_resource_end(dev, i); if (screen_info.lfb_base >= start && screen_info.lfb_base < end) { found_bar = 1; + break; } } } -- 2.7.3