From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Linux PCI <linux-pci@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@infradead.org>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Subject: Re: [RFC 08/15] x86: PCI: clean up pcibios_scan_root()
Date: Mon, 20 Aug 2018 10:31:38 +0200 [thread overview]
Message-ID: <CAJZ5v0jjZx3xCbPK5vfx-OCRNtMt59WQOxCYkWNj33Js_2Xi=A@mail.gmail.com> (raw)
In-Reply-To: <20180817102645.3839621-9-arnd@arndb.de>
On Fri, Aug 17, 2018 at 12:32 PM Arnd Bergmann <arnd@arndb.de> wrote:
>
> pcibios_scan_root() is now just a wrapper around pci_scan_root_bus(),
> and merging the two into one makes it shorter and more readable.
>
> We can also take advantage of pci_alloc_host_bridge() doing the
> allocation of the sysdata for us, which helps if we ever want to
> allow hot-unplugging the host bridge itself.
>
> We might be able to simplify it further using pci_host_probe(),
> but I wasn't sure about the resource registration there.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/x86/pci/common.c | 53 ++++++++++++++-----------------------------
> 1 file changed, 17 insertions(+), 36 deletions(-)
>
> diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
> index e740d9aa4024..920d0885434c 100644
> --- a/arch/x86/pci/common.c
> +++ b/arch/x86/pci/common.c
> @@ -453,54 +453,35 @@ void __init dmi_check_pciprobe(void)
> dmi_check_system(pciprobe_dmi_table);
> }
>
> -static struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
> - struct pci_ops *ops, void *sysdata, struct list_head *resources)
> +void pcibios_scan_root(int busnum)
> {
> + struct pci_sysdata *sd;
> struct pci_host_bridge *bridge;
> int error;
>
> - bridge = pci_alloc_host_bridge(0);
> - if (!bridge)
> - return NULL;
> + bridge = pci_alloc_host_bridge(sizeof(sd));
> + if (!bridge) {
> + printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busnum);
> + return;
> + }
> + sd = pci_host_bridge_priv(bridge);
This looks fishy, as bridge->private is not set at this point AFAICS,
unless one of the previous patches changes that.
>
> - list_splice_init(resources, &bridge->windows);
> - bridge->dev.parent = parent;
> - bridge->sysdata = sysdata;
> - bridge->busnr = bus;
> - bridge->ops = ops;
> + sd->node = x86_pci_root_bus_node(busnum);
> + x86_pci_root_bus_resources(busnum, &bridge->windows);
> + bridge->sysdata = sd;
> + bridge->busnr = busnum;
> + bridge->ops = &pci_root_ops;
>
> + printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum);
> error = pci_scan_root_bus_bridge(bridge);
> if (error < 0)
> goto err_out;
>
> - return bridge->bus;
> + pci_bus_add_devices(bridge->bus);
> + return;
>
> err_out:
> - kfree(bridge);
> - return NULL;
> -}
> -
> -void pcibios_scan_root(int busnum)
> -{
> - struct pci_bus *bus;
> - struct pci_sysdata *sd;
> - LIST_HEAD(resources);
> -
> - sd = kzalloc(sizeof(*sd), GFP_KERNEL);
> - if (!sd) {
> - printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busnum);
> - return;
> - }
> - sd->node = x86_pci_root_bus_node(busnum);
> - x86_pci_root_bus_resources(busnum, &resources);
> - printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum);
> - bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources);
> - if (!bus) {
> - pci_free_resource_list(&resources);
> - kfree(sd);
> - return;
> - }
> - pci_bus_add_devices(bus);
> + pci_free_host_bridge(bridge);
> }
>
> void __init pcibios_set_cache_line_size(void)
> --
> 2.18.0
>
next prev parent reply other threads:[~2018-08-20 8:31 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-17 10:26 [RFC 00/15] PCI: turn some __weak functions into callbacks Arnd Bergmann
2018-08-17 10:26 ` [RFC 01/15] PCI: clean up legacy host bridge scan functions Arnd Bergmann
2018-08-17 10:26 ` [RFC 02/15] PCI: move pci_scan_bus into callers Arnd Bergmann
2018-08-17 10:26 ` [RFC 03/15] PCI: move pci_scan_root_bus " Arnd Bergmann
2018-08-17 10:26 ` [RFC 04/15] PCI: export pci_register_host_bridge Arnd Bergmann
2018-08-17 10:26 ` [RFC 05/15] PCI: move pci_create_root_bus into callers Arnd Bergmann
2018-08-17 10:26 ` [RFC 06/15] powerpc/pci: fold pci_create_root_bus into pcibios_scan_phb Arnd Bergmann
2018-08-17 10:26 ` [RFC 07/15] PCI/ACPI: clean up acpi_pci_root_create() Arnd Bergmann
2018-08-20 8:23 ` Rafael J. Wysocki
2018-08-20 11:19 ` Arnd Bergmann
2018-08-20 11:24 ` Rafael J. Wysocki
2018-08-20 11:36 ` Arnd Bergmann
2018-08-17 10:26 ` [RFC 08/15] x86: PCI: clean up pcibios_scan_root() Arnd Bergmann
2018-08-20 8:31 ` Rafael J. Wysocki [this message]
2018-08-20 11:16 ` Arnd Bergmann
2018-08-20 11:26 ` Rafael J. Wysocki
2018-08-17 10:26 ` [RFC 09/15] PCI: xenfront: clean up pcifront_scan_root() Arnd Bergmann
2018-08-17 10:26 ` [RFC 10/15] sparc/PCI: simplify pci_scan_one_pbm Arnd Bergmann
2018-08-17 10:26 ` [RFC 11/15] PCI: hyperv: convert to pci_scan_root_bus_bridge Arnd Bergmann
2018-08-17 10:26 ` [RFC 12/15] PCI: make pcibios_bus_add_device() a callback function Arnd Bergmann
2018-08-17 10:26 ` [RFC 13/15] PCI: turn pcibios_alloc_irq into a callback Arnd Bergmann
2018-08-17 10:26 ` [RFC 14/15] PCI: make pcibios_root_bridge_prepare " Arnd Bergmann
2018-08-17 10:26 ` [RFC 15/15] PCI: make pcibios_add_bus/remove_bus callbacks Arnd Bergmann
2018-08-21 6:14 ` [RFC 00/15] PCI: turn some __weak functions into callbacks Christoph Hellwig
2018-08-21 10:07 ` Arnd Bergmann
2018-08-21 11:30 ` David Woodhouse
2018-08-21 13:14 ` Christoph Hellwig
2018-10-02 20:59 ` Bjorn Helgaas
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='CAJZ5v0jjZx3xCbPK5vfx-OCRNtMt59WQOxCYkWNj33Js_2Xi=A@mail.gmail.com' \
--to=rafael@kernel.org \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=hch@infradead.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lorenzo.pieralisi@arm.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).