public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Wang YanQing <udknight@gmail.com>
To: x86@kernel.org
Cc: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com,
	pjones@redhat.com, dh.herrmann@gmail.com, tomi.valkeinen@ti.com,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2] x86:sysfb_efi:efifb_set_system: fix miss valid address range in later BARs
Date: Sun, 1 May 2016 00:21:05 +0800	[thread overview]
Message-ID: <20160430162105.GA9955@udknight> (raw)

We can't just break out when meet start is equal to zero,
this will cause we miss valid address range in later BARs.

On the other hand, it isn't enough to test start only
for below situation:
0(start) <= lfb_base < end

Note: 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 <udknight@gmail.com>
---
 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.

 Changes:
 v1-v2:
 1: Do a trivial code optimization.

 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 b285d4e..5da924b 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;
 					}
 				}
 			}
-- 
1.8.5.6.2.g3d8a54e.dirty

             reply	other threads:[~2016-04-30 16:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-30 16:21 Wang YanQing [this message]
2016-05-02 19:11 ` [PATCH v2] x86:sysfb_efi:efifb_set_system: fix miss valid address range in later BARs Peter Jones
2016-05-03 15:20   ` Matt Fleming

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160430162105.GA9955@udknight \
    --to=udknight@gmail.com \
    --cc=dh.herrmann@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=pjones@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=tomi.valkeinen@ti.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox