| Message ID | 1526653072-7153-1-git-send-email-okaya@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 18 May 2018 at 16:17, Sinan Kaya <okaya@codeaurora.org> 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 <okaya@codeaurora.org> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.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 > > > _______________________________________________ > 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 <okaya@codeaurora.org> 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, linelength=3200, pages=1 > > efifb: scrolling: redraw > > efifb: Truecolor: size=8:8:8:8, shift=24:16:8:0 > > > > Use the host bridge offset information to convert bus address to > > resource address in the fixup. > > > > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> > > Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > 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 <b.zolnierkie@samsung.com> wrote: > On Wednesday, June 13, 2018 05:45:48 PM Ard Biesheuvel wrote: >> On 18 May 2018 at 16:17, Sinan Kaya <okaya@codeaurora.org> 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, linelength=3200, pages=1 >> > efifb: scrolling: redraw >> > efifb: Truecolor: size=8:8:8:8, shift=24:16:8:0 >> > >> > Use the host bridge offset information to convert bus address to >> > resource address in the fixup. >> > >> > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> >> >> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> >> >> 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? > 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&m=152929425329015&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 > <b.zolnierkie@samsung.com> wrote: > > On Wednesday, June 13, 2018 05:45:48 PM Ard Biesheuvel wrote: > >> On 18 May 2018 at 16:17, Sinan Kaya <okaya@codeaurora.org> 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, linelength=3200, pages=1 > >> > efifb: scrolling: redraw > >> > efifb: Truecolor: size=8:8:8:8, shift=24:16:8:0 > >> > > >> > Use the host bridge offset information to convert bus address to > >> > resource address in the fixup. > >> > > >> > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> > >> > >> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > >> > >> 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? > > > > 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: > > On 13 June 2018 at 18:08, Bartlomiej Zolnierkiewicz > > <b.zolnierkie@samsung.com> wrote: > > > On Wednesday, June 13, 2018 05:45:48 PM Ard Biesheuvel wrote: > > >> On 18 May 2018 at 16:17, Sinan Kaya <okaya@codeaurora.org> 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, linelength=3200, pages=1 > > >> > efifb: scrolling: redraw > > >> > efifb: Truecolor: size=8:8:8:8, shift=24:16:8:0 > > >> > > > >> > Use the host bridge offset information to convert bus address to > > >> > resource address in the fixup. > > >> > > > >> > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> > > >> > > >> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > >> > > >> 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? > > > > > > > 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 <b.zolnierkie@samsung.com> 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 <okaya@codeaurora.org> 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 <okaya@codeaurora.org> > > Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics
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; } }
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(-)