From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: Sam Bobroff <sbobroff@linux.ibm.com>, linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH 1/8] powerpc/64: Adjust order in pcibios_init()
Date: Wed, 20 Mar 2019 17:03:07 +1100 [thread overview]
Message-ID: <bf640b19-0cf5-217c-4871-9e61f3e78f26@ozlabs.ru> (raw)
In-Reply-To: <fcdb48612cb4cb777ed33a617b932b054170b074.1553050609.git.sbobroff@linux.ibm.com>
On 20/03/2019 13:58, Sam Bobroff wrote:
> The pcibios_init() function for 64 bit PowerPC currently calls
> pci_bus_add_devices() before pcibios_resource_survey(), which seems
> incorrect because it adds devices and attempts to bind their drivers
> before allocating their resources (although no problems seem to be
> apparent).
>
> So move the call to pci_bus_add_devices() to after
> pcibios_resource_survey(), while extracting call to the
> pcibios_fixup() hook so that it remains in the same location.
>
> This will also allow the ppc_md.pcibios_bus_add_device() hooks to
> perform actions that depend on PCI resources, both during rescanning
> (where this is already the case) and at boot time, to support future
> work.
>
> Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> arch/powerpc/kernel/pci-common.c | 4 ----
> arch/powerpc/kernel/pci_32.c | 4 ++++
> arch/powerpc/kernel/pci_64.c | 12 +++++++++---
> 3 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
> index ff4b7539cbdf..3146eb73e3b3 100644
> --- a/arch/powerpc/kernel/pci-common.c
> +++ b/arch/powerpc/kernel/pci-common.c
> @@ -1383,10 +1383,6 @@ void __init pcibios_resource_survey(void)
> pr_debug("PCI: Assigning unassigned resources...\n");
> pci_assign_unassigned_resources();
> }
> -
> - /* Call machine dependent fixup */
> - if (ppc_md.pcibios_fixup)
> - ppc_md.pcibios_fixup();
> }
>
> /* This is used by the PCI hotplug driver to allocate resource
> diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
> index d3f04f2d8249..40aaa1a6e193 100644
> --- a/arch/powerpc/kernel/pci_32.c
> +++ b/arch/powerpc/kernel/pci_32.c
> @@ -259,6 +259,10 @@ static int __init pcibios_init(void)
> /* Call common code to handle resource allocation */
> pcibios_resource_survey();
>
> + /* Call machine dependent fixup */
> + if (ppc_md.pcibios_fixup)
> + ppc_md.pcibios_fixup();
> +
> /* Call machine dependent post-init code */
> if (ppc_md.pcibios_after_init)
> ppc_md.pcibios_after_init();
> diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
> index 9d8c10d55407..6f16f30031d7 100644
> --- a/arch/powerpc/kernel/pci_64.c
> +++ b/arch/powerpc/kernel/pci_64.c
> @@ -58,14 +58,20 @@ static int __init pcibios_init(void)
> pci_add_flags(PCI_ENABLE_PROC_DOMAINS | PCI_COMPAT_DOMAIN_0);
>
> /* Scan all of the recorded PCI controllers. */
> - list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
> + list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
> pcibios_scan_phb(hose);
> - pci_bus_add_devices(hose->bus);
> - }
>
> /* Call common code to handle resource allocation */
> pcibios_resource_survey();
>
> + /* Add devices. */
> + list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
> + pci_bus_add_devices(hose->bus);
> +
> + /* Call machine dependent fixup */
> + if (ppc_md.pcibios_fixup)
> + ppc_md.pcibios_fixup();
> +
> printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
>
> return 0;
>
--
Alexey
next prev parent reply other threads:[~2019-03-20 6:14 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 2:58 [PATCH 0/8] Sam Bobroff
2019-03-20 2:58 ` [PATCH 1/8] powerpc/64: Adjust order in pcibios_init() Sam Bobroff
2019-03-20 6:03 ` Alexey Kardashevskiy [this message]
2019-03-20 2:58 ` [PATCH 2/8] powerpc/eeh: Clear stale EEH_DEV_NO_HANDLER flag Sam Bobroff
2019-03-20 6:02 ` Alexey Kardashevskiy
2019-04-08 6:50 ` Sam Bobroff
2019-03-20 2:58 ` [PATCH 3/8] powerpc/eeh: Convert PNV_PHB_FLAG_EEH to global flag Sam Bobroff
2019-03-20 6:02 ` Alexey Kardashevskiy
2019-04-09 1:41 ` Sam Bobroff
2019-04-18 9:51 ` Oliver O'Halloran
2019-04-30 5:30 ` Sam Bobroff
2019-03-20 2:58 ` [PATCH 4/8] powerpc/eeh: Improve debug messages around device addition Sam Bobroff
2019-03-20 6:02 ` Alexey Kardashevskiy
2019-03-20 2:58 ` [PATCH 5/8] powerpc/eeh: Add eeh_show_enabled() Sam Bobroff
2019-03-20 6:02 ` Alexey Kardashevskiy
2019-03-20 6:24 ` Oliver
2019-04-09 3:30 ` Sam Bobroff
2019-04-18 10:01 ` Oliver O'Halloran
2019-04-30 5:44 ` Sam Bobroff
2019-03-20 2:58 ` [PATCH 6/8] powerpc/eeh: Initialize EEH address cache earlier Sam Bobroff
2019-03-20 6:02 ` Alexey Kardashevskiy
2019-04-18 10:13 ` Oliver O'Halloran
2019-04-30 5:54 ` Sam Bobroff
2019-03-20 2:58 ` [PATCH 7/8] powerpc/eeh: EEH for pSeries hot plug Sam Bobroff
2019-03-20 6:02 ` Alexey Kardashevskiy
2019-03-20 2:58 ` [PATCH 8/8] powerpc/eeh: Remove eeh_probe_devices() and eeh_addr_cache_build() Sam Bobroff
2019-03-20 6:05 ` Alexey Kardashevskiy
2019-04-09 3:31 ` Sam Bobroff
2019-04-12 0:55 ` [PATCH 0/8] Tyrel Datwyler
2019-04-15 3:41 ` Sam Bobroff
2019-04-19 22:36 ` Tyrel Datwyler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bf640b19-0cf5-217c-4871-9e61f3e78f26@ozlabs.ru \
--to=aik@ozlabs.ru \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=sbobroff@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).