Simply add all pci memory bars to struct apertures_struct in
remove_conflicting_pci_framebuffers(). That allows to drop
the res_id parameter.
TODO: actually remove the res_id parameter.
Signed-off-by: Gerd Hoffmann <[email protected]>
---
drivers/video/fbdev/core/fbmem.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index cb43a2258c51..e8223c231de2 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1879,14 +1879,28 @@ int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, int res_id, const
{
struct apertures_struct *ap;
bool primary = false;
- int err;
+ int err, idx, cnt, bar;
- ap = alloc_apertures(1);
+ for (cnt = 0, bar = 0; bar < PCI_ROM_RESOURCE; bar++) {
+ if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
+ continue;
+ cnt++;
+ }
+
+ ap = alloc_apertures(cnt);
if (!ap)
return -ENOMEM;
- ap->ranges[0].base = pci_resource_start(pdev, res_id);
- ap->ranges[0].size = pci_resource_len(pdev, res_id);
+ for (idx = 0, bar = 0; bar < PCI_ROM_RESOURCE; bar++) {
+ if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
+ continue;
+ ap->ranges[idx].base = pci_resource_start(pdev, bar);
+ ap->ranges[idx].size = pci_resource_len(pdev, bar);
+ pci_info(pdev, "%s: bar %d: 0x%lx -> 0x%lx\n", __func__, bar,
+ (unsigned long)pci_resource_start(pdev, bar),
+ (unsigned long)pci_resource_end(pdev, bar));
+ idx++;
+ }
#ifdef CONFIG_X86
primary = pdev->resource[PCI_ROM_RESOURCE].flags &
IORESOURCE_ROM_SHADOW;
--
2.18.1
On Wed, Mar 13, 2019 at 12:07:41PM +0100, Gerd Hoffmann wrote:
> Simply add all pci memory bars to struct apertures_struct in
> remove_conflicting_pci_framebuffers(). That allows to drop
> the res_id parameter.
>
> TODO: actually remove the res_id parameter.
I think best to do that in a cleanup patch afterwards.
>
> Signed-off-by: Gerd Hoffmann <[email protected]>
> ---
> drivers/video/fbdev/core/fbmem.c | 22 ++++++++++++++++++----
> 1 file changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
> index cb43a2258c51..e8223c231de2 100644
> --- a/drivers/video/fbdev/core/fbmem.c
> +++ b/drivers/video/fbdev/core/fbmem.c
> @@ -1879,14 +1879,28 @@ int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, int res_id, const
> {
> struct apertures_struct *ap;
> bool primary = false;
> - int err;
> + int err, idx, cnt, bar;
>
> - ap = alloc_apertures(1);
> + for (cnt = 0, bar = 0; bar < PCI_ROM_RESOURCE; bar++) {
> + if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
> + continue;
> + cnt++;
> + }
> +
> + ap = alloc_apertures(cnt);
> if (!ap)
> return -ENOMEM;
>
> - ap->ranges[0].base = pci_resource_start(pdev, res_id);
> - ap->ranges[0].size = pci_resource_len(pdev, res_id);
> + for (idx = 0, bar = 0; bar < PCI_ROM_RESOURCE; bar++) {
> + if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM))
> + continue;
> + ap->ranges[idx].base = pci_resource_start(pdev, bar);
> + ap->ranges[idx].size = pci_resource_len(pdev, bar);
> + pci_info(pdev, "%s: bar %d: 0x%lx -> 0x%lx\n", __func__, bar,
> + (unsigned long)pci_resource_start(pdev, bar),
> + (unsigned long)pci_resource_end(pdev, bar));
> + idx++;
> + }
lgtm. I think this is ok to merge as-is already ...
Reviewed-by: Daniel Vetter <[email protected]>
Maybe if you want to be paranoid in the conversion add a check that we're
not skipping the pci bar requested in res_id. Then we could test this for
a kernel and remove the parameter later on.
-Daniel
> #ifdef CONFIG_X86
> primary = pdev->resource[PCI_ROM_RESOURCE].flags &
> IORESOURCE_ROM_SHADOW;
> --
> 2.18.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
On Thu, Mar 14, 2019 at 11:37:13AM +0100, Daniel Vetter wrote:
> On Wed, Mar 13, 2019 at 12:07:41PM +0100, Gerd Hoffmann wrote:
> > Simply add all pci memory bars to struct apertures_struct in
> > remove_conflicting_pci_framebuffers(). That allows to drop
> > the res_id parameter.
> >
> > TODO: actually remove the res_id parameter.
>
> I think best to do that in a cleanup patch afterwards.
I was just lazy and didn't want update all callers for the first patch
draft. But doing a test run ...
> Maybe if you want to be paranoid in the conversion add a check that we're
> not skipping the pci bar requested in res_id. Then we could test this for
> a kernel and remove the parameter later on.
... that way before actually dropping the parameter surely makes sense.
New version on the way,
Gerd