linux-kernel - Re: [BISECTED] Regression: Solidrun Clearfog Base won't boot since "PCI: mvebu: Only remap I/O space if configured"

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 01 Oct 2018 12:56:37 +0200
From:   Jan Kundrát <jan.kundrat@...net.cz>
To:     Thomas Petazzoni <thomas.petazzoni@...tlin.com>,
        Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
        Russell King - ARM Linux <linux@...linux.org.uk>
Cc:     Baruch Siach <baruch@...s.co.il>,
        Jason Cooper <jason@...edaemon.net>,
        <linux-pci@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        Bjorn Helgaas <bhelgaas@...gle.com>,
        <linux-arm-kernel@...ts.infradead.org>
Subject: Re: [BISECTED] Regression: Solidrun Clearfog Base won't boot since "PCI: mvebu: Only remap I/O space if configured"

On pondělí 24. září 2018 16:52:18 CEST, Thomas Petazzoni wrote:
> Hello,
>
> On Mon, 24 Sep 2018 15:15:12 +0100, Lorenzo Pieralisi wrote:
>
>> I understand that, I wanted to make sure we come up with a fix asap
>> and what I put forward would cover everything discussed in this thread,
>> at least temporarily, giving us time to check ISA related issues while
>> unmapping IO space.
>
> Something like this should implemented what you suggest I guess:
>
> diff --git a/drivers/pci/controller/pci-mvebu.c 
> b/drivers/pci/controller/pci-mvebu.c
> index 50eb0729385b..a41d79b8d46a 100644
> --- a/drivers/pci/controller/pci-mvebu.c
> +++ b/drivers/pci/controller/pci-mvebu.c
> @@ -1145,7 +1145,6 @@ static int 
> mvebu_pcie_parse_request_resources(struct mvebu_pcie *pcie)
>  {
>         struct device *dev = &pcie->pdev->dev;
>         struct device_node *np = dev->of_node;
> -       unsigned int i;
>         int ret;
>  
>         INIT_LIST_HEAD(&pcie->resources);
> @@ -1179,13 +1178,58 @@ static int 
> mvebu_pcie_parse_request_resources(struct mvebu_pcie *pcie)
>                                          resource_size(&pcie->io) - 1);
>                 pcie->realio.name = "PCI I/O";
>  
> +               pci_add_resource(&pcie->resources, &pcie->realio);
> +       }
> +
> +       return devm_request_pci_bus_resources(dev, &pcie->resources);
> +}
> +
> +/*
> + * This is a copy of pci_host_probe(), except that it does the I/O
> + * remap as the last step, once we are sure we won't fail.
> + *
> + * It should be removed once the I/O remap error handling issue has
> + * been sorted out.
> + */
> +static int mvebu_pci_host_probe(struct pci_host_bridge *bridge)
> +{
> +       struct mvebu_pcie *pcie;
> +       struct pci_bus *bus, *child;
> +       int ret;
> +
> +       ret = pci_scan_root_bus_bridge(bridge);
> +       if (ret < 0) {
> +               dev_err(bridge->dev.parent, "Scanning root bridge failed");
> +               return ret;
> +       }
> +
> +       pcie = pci_host_bridge_priv(bridge);
> +       if (resource_size(&pcie->io) != 0) {
> +               unsigned int i;
> +
>                 for (i = 0; i < resource_size(&pcie->realio); i += SZ_64K)
>                         pci_ioremap_io(i, pcie->io.start + i);
> +       }
>  
> -               pci_add_resource(&pcie->resources, &pcie->realio);
> +       bus = bridge->bus;
> +
> +       /*
> +        * We insert PCI resources into the iomem_resource and
> +        * ioport_resource trees in either pci_bus_claim_resources()
> +        * or pci_bus_assign_resources().
> +        */
> +       if (pci_has_flag(PCI_PROBE_ONLY)) {
> +               pci_bus_claim_resources(bus);
> +       } else {
> +               pci_bus_size_bridges(bus);
> +               pci_bus_assign_resources(bus);
> +
> +               list_for_each_entry(child, &bus->children, node)
> +                       pcie_bus_configure_settings(child);
>         }
>  
> -       return devm_request_pci_bus_resources(dev, &pcie->resources);
> +       pci_bus_add_devices(bus);
> +       return 0;
>  }
>  
>  static int mvebu_pcie_probe(struct platform_device *pdev)
> @@ -1268,7 +1312,7 @@ static int mvebu_pcie_probe(struct 
> platform_device *pdev)
>         bridge->align_resource = mvebu_pcie_align_resource;
>         bridge->msi = pcie->msi;
>  
> -       return pci_host_probe(bridge);
> +       return mvebu_pci_host_probe(bridge);
>  }
>  
>  static const struct of_device_id mvebu_pcie_of_match_table[] = {
>
> If that's what you meant, I'll go ahead and test on actual hardware and
> submit as a proper patch.

Thomas, Russell, Lorenzo,
did you have time to convert this into a patch which can hit 4.19? I don't 
see anything related in 4.19-rc6, but perhaps I missed something. Is there 
something that I should test or otherwise help?

With kind regards,
Jan