linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH V2 1/2] efi/fb: Simplify fixup code to prefer struct resource
@ 2018-05-18 14:17 Sinan Kaya
  2018-05-18 14:17 ` [PATCH V2 2/2] efi/fb: Convert PCI bus address to resource if translated by the bridge Sinan Kaya
  2018-06-13 15:42 ` [PATCH V2 1/2] efi/fb: Simplify fixup code to prefer struct resource Ard Biesheuvel
  0 siblings, 2 replies; 27+ messages in thread
From: Sinan Kaya @ 2018-05-18 14:17 UTC (permalink / raw)
  To: linux-fbdev, timur
  Cc: linux-arm-msm, linux-arm-kernel, Sinan Kaya, Peter Jones,
	Bartlomiej Zolnierkiewicz, open list:FRAMEBUFFER LAYER,
	open list

Get rid of base and size variables in favor of a struct resource.
The conditional for checking window can be replaced with
resource_contains().

Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
 drivers/video/fbdev/efifb.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 46a4484..6daac8d 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -426,17 +426,20 @@ static void record_efifb_bar_resource(struct pci_dev *dev, int idx, u64 offset)
 
 static void efifb_fixup_resources(struct pci_dev *dev)
 {
-	u64 base = screen_info.lfb_base;
-	u64 size = screen_info.lfb_size;
+	struct resource screen_res = {
+		.start = screen_info.lfb_base,
+		.end = screen_info.lfb_base + screen_info.lfb_size - 1,
+		.flags = IORESOURCE_MEM,
+	};
 	int i;
 
 	if (efifb_pci_dev || screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
 		return;
 
 	if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
-		base |= (u64)screen_info.ext_lfb_base << 32;
+		screen_res.start |= (u64)screen_info.ext_lfb_base << 32;
 
-	if (!base)
+	if (!screen_res.start)
 		return;
 
 	for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
@@ -445,8 +448,10 @@ static void efifb_fixup_resources(struct pci_dev *dev)
 		if (!(res->flags & IORESOURCE_MEM))
 			continue;
 
-		if (res->start <= base && res->end >= base + size - 1) {
-			record_efifb_bar_resource(dev, i, base - res->start);
+		if (resource_contains(res, &screen_res)) {
+			u64 win_offset =  screen_res.start - res->start;
+
+			record_efifb_bar_resource(dev, i, win_offset);
 			break;
 		}
 	}
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2018-06-25 17:31 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-18 14:17 [PATCH V2 1/2] efi/fb: Simplify fixup code to prefer struct resource Sinan Kaya
2018-05-18 14:17 ` [PATCH V2 2/2] efi/fb: Convert PCI bus address to resource if translated by the bridge Sinan Kaya
2018-06-13 14:22   ` Sinan Kaya
2018-06-13 15:06     ` Ard Biesheuvel
2018-06-13 15:17       ` okaya
2018-06-13 15:22         ` Ard Biesheuvel
2018-06-13 15:29           ` okaya
2018-06-13 15:45   ` Ard Biesheuvel
2018-06-13 15:50     ` okaya
2018-06-13 16:08     ` Bartlomiej Zolnierkiewicz
2018-06-22  7:54       ` Ard Biesheuvel
     [not found]         ` <CGME20180622100749eucas1p2a47cfba3b4d3d5004e9a0068917d5616@eucas1p2.samsung.com>
2018-06-22 10:07           ` Bartlomiej Zolnierkiewicz
     [not found]             ` <CGME20180622101111eucas1p119946679a7686911744b1296c2796b15@eucas1p1.samsung.com>
2018-06-22 10:11               ` Bartlomiej Zolnierkiewicz
2018-06-19 22:29   ` Bjorn Helgaas
2018-06-22 11:21     ` Ard Biesheuvel
2018-06-22 13:52       ` Sinan Kaya
2018-06-22 13:55         ` Ard Biesheuvel
2018-06-22 18:01           ` Ard Biesheuvel
2018-06-22 18:30             ` Sinan Kaya
2018-06-22 19:29               ` Ard Biesheuvel
2018-06-25  8:20                 ` Ard Biesheuvel
2018-06-25 15:52                   ` okaya
2018-06-25 17:28                     ` Sinan Kaya
2018-06-25 17:29                       ` Ard Biesheuvel
2018-06-25 17:31                         ` Sinan Kaya
2018-06-13 15:42 ` [PATCH V2 1/2] efi/fb: Simplify fixup code to prefer struct resource Ard Biesheuvel
2018-06-22 10:11   ` Bartlomiej Zolnierkiewicz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).