linux-kernel - Re: linux-next: manual merge of the pci tree with Linus' tree

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] [day] [month] [year] [list]

Message-ID: <CACMJSeuNPC+=izBa4pN7SYrYP9-Gpf18FuNfSvzbBtHrsGG0KA@mail.gmail.com>
Date: Thu, 14 Nov 2024 09:45:02 +0100
From: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Bjorn Helgaas <bhelgaas@...gle.com>, Lorenzo Pieralisi <lpieralisi@...nel.org>, 
	Krzysztof Wilczyński <kw@...ux.com>, 
	Krishna chaitanya chundru <quic_krichai@...cinc.com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the pci tree with Linus' tree

On Thu, 14 Nov 2024 at 01:03, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
>   drivers/pci/probe.c
>
> between commit:
>
>   1d59d474e1cb ("PCI: Hold rescan lock while adding devices during host probe")
>
> from Linus' tree and commit:
>
>   dc421bb3c0db ("PCI: Enable runtime PM of the host bridge")
>
> from the pci tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/pci/probe.c
> index f1615805f5b0,bf4c76ec8cd4..000000000000
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@@ -3105,9 -3127,18 +3127,20 @@@ int pci_host_probe(struct pci_host_brid
>         list_for_each_entry(child, &bus->children, node)
>                 pcie_bus_configure_settings(child);
>
>  +      pci_lock_rescan_remove();
>         pci_bus_add_devices(bus);
>  +      pci_unlock_rescan_remove();
> +
> +       /*
> +        * Ensure pm_runtime_enable() is called for the controller drivers
> +        * before calling pci_host_probe(). The PM framework expects that
> +        * if the parent device supports runtime PM, it will be enabled
> +        * before child runtime PM is enabled.
> +        */
> +       pm_runtime_set_active(&bridge->dev);
> +       pm_runtime_no_callbacks(&bridge->dev);
> +       devm_pm_runtime_enable(&bridge->dev);
> +
>         return 0;
>   }
>   EXPORT_SYMBOL_GPL(pci_host_probe);

Looks good to me, thanks.

Bartosz