[PATCH V2 1/2] efi/fb: Simplify fixup code to prefer struct resource

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 <redacted>
---
 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

A host bridge is allowed to remap BAR addresses using _TRA attribute in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>
---
 drivers/video/fbdev/efifb.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 6daac8d..429cc85 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c

@@ -431,6 +431,7 @@ static void efifb_fixup_resources(struct pci_dev *dev)
 		.end = screen_info.lfb_base + screen_info.lfb_size - 1,
 		.flags = IORESOURCE_MEM,
 	};
+	struct pci_bus_region region;
 	int i;
 
 	if (efifb_pci_dev || screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)

@@ -442,6 +443,10 @@ static void efifb_fixup_resources(struct pci_dev *dev)
 	if (!screen_res.start)
 		return;
 
+	region.start = screen_res.start;
+	region.end = screen_res.end;
+	pcibios_bus_to_resource(dev->bus, &screen_res, &region);
+
 	for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
 		struct resource *res = &dev->resource[i];
 

-- 
2.7.4

Hi Ard,

On 5/18/2018 10:17 AM, Sinan Kaya wrote:

A host bridge is allowed to remap BAR addresses using _TRA attribute in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>
---

I didn't see any messages about these getting picked up for 4.18.

Are they queued on your own branch?

Sinan

-- 
Sinan Kaya
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.

On 13 June 2018 at 16:22, Sinan Kaya [off-list ref] wrote:

Hi Ard,

On 5/18/2018 10:17 AM, Sinan Kaya wrote:

quoted

A host bridge is allowed to remap BAR addresses using _TRA attribute in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>
---

I didn't see any messages about these getting picked up for 4.18.

Are they queued on your own branch?

No, you never cc'ed me on them until now.

On 2018-06-13 11:06, Ard Biesheuvel wrote:

On 13 June 2018 at 16:22, Sinan Kaya [off-list ref] wrote:

quoted

Hi Ard,

On 5/18/2018 10:17 AM, Sinan Kaya wrote:

quoted

A host bridge is allowed to remap BAR addresses using _TRA attribute 
in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff 
window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>
---

I didn't see any messages about these getting picked up for 4.18.

Are they queued on your own branch?

No, you never cc'ed me on them until now.

Ouch, I hoped that you would get it via get_maintainer script. Sorry for 
that.

On 13 June 2018 at 17:17,  [off-list ref] wrote:

On 2018-06-13 11:06, Ard Biesheuvel wrote:

quoted

On 13 June 2018 at 16:22, Sinan Kaya [off-list ref] wrote:

quoted

Hi Ard,

On 5/18/2018 10:17 AM, Sinan Kaya wrote:

quoted

A host bridge is allowed to remap BAR addresses using _TRA attribute in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff
window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>
---

I didn't see any messages about these getting picked up for 4.18.

Are they queued on your own branch?

No, you never cc'ed me on them until now.

Ouch, I hoped that you would get it via get_maintainer script. Sorry for
that.

Actually, get_maintainer is right: this should go through the fbdev
tree not the EFI tree

Were you going to resend them? If not, I can find them in my archive
and ack them, and we will ask Bartlomiej to take them for v4.19

On 2018-06-13 11:22, Ard Biesheuvel wrote:

On 13 June 2018 at 17:17,  [off-list ref] wrote:

quoted

On 2018-06-13 11:06, Ard Biesheuvel wrote:

quoted

On 13 June 2018 at 16:22, Sinan Kaya [off-list ref] wrote:

quoted

Hi Ard,

On 5/18/2018 10:17 AM, Sinan Kaya wrote:

quoted

A host bridge is allowed to remap BAR addresses using _TRA 
attribute in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff
window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>
---

I didn't see any messages about these getting picked up for 4.18.

Are they queued on your own branch?

No, you never cc'ed me on them until now.

Ouch, I hoped that you would get it via get_maintainer script. Sorry 
for
that.

Actually, get_maintainer is right: this should go through the fbdev
tree not the EFI tree

Were you going to resend them? If not, I can find them in my archive
and ack them, and we will ask Bartlomiej to take them for v4.19

I prefer ack rather than resend to be honest.

On 18 May 2018 at 16:17, Sinan Kaya [off-list ref] wrote:

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 <redacted>

Reviewed-by: Ard Biesheuvel <redacted>

On 18 May 2018 at 16:17, Sinan Kaya [off-list ref] wrote:

A host bridge is allowed to remap BAR addresses using _TRA attribute in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>

Reviewed-by: Ard Biesheuvel <redacted>

Bartlomiej, could you please take these via the fbdev tree for v4.19?
Peter already gave his ack but Sinan dropped it (presumably because of
the split in v2)

Sinan, does this need to go to -stable? I.e., has it ever worked before?

On 2018-06-13 11:45, Ard Biesheuvel wrote:

On 18 May 2018 at 16:17, Sinan Kaya [off-list ref] wrote:

quoted

A host bridge is allowed to remap BAR addresses using _TRA attribute 
in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff 
window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>

Reviewed-by: Ard Biesheuvel <redacted>

Bartlomiej, could you please take these via the fbdev tree for v4.19?
Peter already gave his ack but Sinan dropped it (presumably because of
the split in v2)

Sinan, does this need to go to -stable? I.e., has it ever worked 
before?

Yes, it needs to go to stable. It never worked before. Issue was found 
during a graphics bring up with AST driver.

It needs a 32 bit graphics card and a 32 bit translating host bridge to 
hit the issue.

quoted

---
 drivers/video/fbdev/efifb.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 6daac8d..429cc85 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c

@@ -431,6 +431,7 @@ static void efifb_fixup_resources(struct pci_dev 

*dev)
                .end = screen_info.lfb_base + screen_info.lfb_size - 
1,
                .flags = IORESOURCE_MEM,
        };
+       struct pci_bus_region region;
        int i;

        if (efifb_pci_dev || screen_info.orig_video_isVGA != 
VIDEO_TYPE_EFI)

@@ -442,6 +443,10 @@ static void efifb_fixup_resources(struct pci_dev 

*dev)
        if (!screen_res.start)
                return;

+       region.start = screen_res.start;
+       region.end = screen_res.end;
+       pcibios_bus_to_resource(dev->bus, &screen_res, &region);
+
        for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
                struct resource *res = &dev->resource[i];

--
2.7.4


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

On Wednesday, June 13, 2018 05:45:48 PM Ard Biesheuvel wrote:

On 18 May 2018 at 16:17, Sinan Kaya [off-list ref] wrote:

quoted

A host bridge is allowed to remap BAR addresses using _TRA attribute in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>

Reviewed-by: Ard Biesheuvel <redacted>

Bartlomiej, could you please take these via the fbdev tree for v4.19?

Sure, I will queue it after the current merge window.

Peter already gave his ack but Sinan dropped it (presumably because of
the split in v2)

Peter, can I (re)add your ACK to V2 patches?

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

On 13 June 2018 at 18:08, Bartlomiej Zolnierkiewicz
[off-list ref] wrote:

On Wednesday, June 13, 2018 05:45:48 PM Ard Biesheuvel wrote:

quoted

On 18 May 2018 at 16:17, Sinan Kaya [off-list ref] wrote:

quoted

A host bridge is allowed to remap BAR addresses using _TRA attribute in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>

Reviewed-by: Ard Biesheuvel <redacted>

Bartlomiej, could you please take these via the fbdev tree for v4.19?

Sure, I will queue it after the current merge window.

quoted

Peter already gave his ack but Sinan dropped it (presumably because of
the split in v2)

Peter, can I (re)add your ACK to V2 patches?

Actually, it would be better if we could take this through the EFI
tree instead, with your ack. Would you mind?

There are some other efifb changes coming up, some of which depend on
core EFI changes, and taking these through different trees is going to
be more trouble than it's worth.

https://marc.info/?l=linux-efi&m2929425329015&w=2 from Hans, and the series

[PATCH v2 0/2] efi: add support for cacheable efifb mappings

that I just cc'ed you on a minute ago.

Thanks.

On Friday, June 22, 2018 09:54:22 AM Ard Biesheuvel wrote:

On 13 June 2018 at 18:08, Bartlomiej Zolnierkiewicz
[off-list ref] wrote:

quoted

On Wednesday, June 13, 2018 05:45:48 PM Ard Biesheuvel wrote:

quoted

On 18 May 2018 at 16:17, Sinan Kaya [off-list ref] wrote:

quoted

A host bridge is allowed to remap BAR addresses using _TRA attribute in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>

Reviewed-by: Ard Biesheuvel <redacted>

Bartlomiej, could you please take these via the fbdev tree for v4.19?

Sure, I will queue it after the current merge window.

quoted

Peter already gave his ack but Sinan dropped it (presumably because of
the split in v2)

Peter, can I (re)add your ACK to V2 patches?

Actually, it would be better if we could take this through the EFI
tree instead, with your ack. Would you mind?

Fine with me.

There are some other efifb changes coming up, some of which depend on
core EFI changes, and taking these through different trees is going to
be more trouble than it's worth.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

On Friday, June 22, 2018 12:07:48 PM Bartlomiej Zolnierkiewicz wrote:

On Friday, June 22, 2018 09:54:22 AM Ard Biesheuvel wrote:

quoted

On 13 June 2018 at 18:08, Bartlomiej Zolnierkiewicz
[off-list ref] wrote:

quoted

On Wednesday, June 13, 2018 05:45:48 PM Ard Biesheuvel wrote:

quoted

On 18 May 2018 at 16:17, Sinan Kaya [off-list ref] wrote:

quoted

A host bridge is allowed to remap BAR addresses using _TRA attribute in
_CRS windows.

pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff window] (bus address [0x00100000-0x1fffffff])
pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff]

When a VGA device is behind such a host bridge and the resource is
translated efifb driver is trying to do ioremap against bus address
rather than the resource address and is failing to probe.

efifb: probing for efifb
efifb: cannot reserve video memory at 0x1e000000
efifb: framebuffer at 0x1e000000, using 1920k, total 1875k
efifb: mode is 800x600x32, linelength200, pages=1
efifb: scrolling: redraw
efifb: Truecolor: size=8:8:8:8, shift$:16:8:0

Use the host bridge offset information to convert bus address to
resource address in the fixup.

Signed-off-by: Sinan Kaya <redacted>

Reviewed-by: Ard Biesheuvel <redacted>

Bartlomiej, could you please take these via the fbdev tree for v4.19?

Sure, I will queue it after the current merge window.

quoted

Peter already gave his ack but Sinan dropped it (presumably because of
the split in v2)

Peter, can I (re)add your ACK to V2 patches?

Actually, it would be better if we could take this through the EFI
tree instead, with your ack. Would you mind?

Fine with me.

Acked-by: Bartlomiej Zolnierkiewicz <redacted>

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

On Wednesday, June 13, 2018 05:42:11 PM Ard Biesheuvel wrote:

On 18 May 2018 at 16:17, Sinan Kaya [off-list ref] wrote:

quoted

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 <redacted>

Reviewed-by: Ard Biesheuvel <redacted>

Acked-by: Bartlomiej Zolnierkiewicz <redacted>

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics