[{"id":1976186,"web_url":"http://patchwork.ozlabs.org/comment/1976186/","msgid":"","date":"2018-08-20T08:31:38","subject":"Re: [RFC 08/15] x86: PCI: clean up pcibios_scan_root()","submitter":{"id":64267,"url":"http://patchwork.ozlabs.org/api/people/64267/","name":"Rafael J. Wysocki","email":"rafael@kernel.org"},"content":"On Fri, Aug 17, 2018 at 12:32 PM Arnd Bergmann wrote:\n>\n> pcibios_scan_root() is now just a wrapper around pci_scan_root_bus(),\n> and merging the two into one makes it shorter and more readable.\n>\n> We can also take advantage of pci_alloc_host_bridge() doing the\n> allocation of the sysdata for us, which helps if we ever want to\n> allow hot-unplugging the host bridge itself.\n>\n> We might be able to simplify it further using pci_host_probe(),\n> but I wasn't sure about the resource registration there.\n>\n> Signed-off-by: Arnd Bergmann \n> ---\n> arch/x86/pci/common.c | 53 ++++++++++++++-----------------------------\n> 1 file changed, 17 insertions(+), 36 deletions(-)\n>\n> diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c\n> index e740d9aa4024..920d0885434c 100644\n> --- a/arch/x86/pci/common.c\n> +++ b/arch/x86/pci/common.c\n> @@ -453,54 +453,35 @@ void __init dmi_check_pciprobe(void)\n> dmi_check_system(pciprobe_dmi_table);\n> }\n>\n> -static struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,\n> - struct pci_ops *ops, void *sysdata, struct list_head *resources)\n> +void pcibios_scan_root(int busnum)\n> {\n> + struct pci_sysdata *sd;\n> struct pci_host_bridge *bridge;\n> int error;\n>\n> - bridge = pci_alloc_host_bridge(0);\n> - if (!bridge)\n> - return NULL;\n> + bridge = pci_alloc_host_bridge(sizeof(sd));\n> + if (!bridge) {\n> + printk(KERN_ERR \"PCI: OOM, skipping PCI bus %02x\\n\", busnum);\n> + return;\n> + }\n> + sd = pci_host_bridge_priv(bridge);\n\nThis looks fishy, as bridge->private is not set at this point AFAICS,\nunless one of the previous patches changes that.\n\n>\n> - list_splice_init(resources, &bridge->windows);\n> - bridge->dev.parent = parent;\n> - bridge->sysdata = sysdata;\n> - bridge->busnr = bus;\n> - bridge->ops = ops;\n> + sd->node = x86_pci_root_bus_node(busnum);\n> + x86_pci_root_bus_resources(busnum, &bridge->windows);\n> + bridge->sysdata = sd;\n> + bridge->busnr = busnum;\n> + bridge->ops = &pci_root_ops;\n>\n> + printk(KERN_DEBUG \"PCI: Probing PCI hardware (bus %02x)\\n\", busnum);\n> error = pci_scan_root_bus_bridge(bridge);\n> if (error < 0)\n> goto err_out;\n>\n> - return bridge->bus;\n> + pci_bus_add_devices(bridge->bus);\n> + return;\n>\n> err_out:\n> - kfree(bridge);\n> - return NULL;\n> -}\n> -\n> -void pcibios_scan_root(int busnum)\n> -{\n> - struct pci_bus *bus;\n> - struct pci_sysdata *sd;\n> - LIST_HEAD(resources);\n> -\n> - sd = kzalloc(sizeof(*sd), GFP_KERNEL);\n> - if (!sd) {\n> - printk(KERN_ERR \"PCI: OOM, skipping PCI bus %02x\\n\", busnum);\n> - return;\n> - }\n> - sd->node = x86_pci_root_bus_node(busnum);\n> - x86_pci_root_bus_resources(busnum, &resources);\n> - printk(KERN_DEBUG \"PCI: Probing PCI hardware (bus %02x)\\n\", busnum);\n> - bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources);\n> - if (!bus) {\n> - pci_free_resource_list(&resources);\n> - kfree(sd);\n> - return;\n> - }\n> - pci_bus_add_devices(bus);\n> + pci_free_host_bridge(bridge);\n> }\n>\n> void __init pcibios_set_cache_line_size(void)\n> --\n> 2.18.0\n>","headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41v6X657Xjz9s4s\n\tfor ;\n\tMon, 20 Aug 2018 18:33:26 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 41v6X63tHQzF15B\n\tfor ;\n\tMon, 20 Aug 2018 18:33:26 +1000 (AEST)","from mail-oi0-f68.google.com (mail-oi0-f68.google.com\n\t[209.85.218.68])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 41v6VJ3vGkzDqp5\n\tfor ;\n\tMon, 20 Aug 2018 18:31:51 +1000 (AEST)","by mail-oi0-f68.google.com with SMTP id j205-v6so24417908oib.4\n\tfor ;\n\tMon, 20 Aug 2018 01:31:51 -0700 (PDT)"],"Authentication-Results":["ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=kernel.org","lists.ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=kernel.org","lists.ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=gmail.com\n\t(client-ip=209.85.218.68; helo=mail-oi0-f68.google.com;\n\tenvelope-from=rjwysocki@gmail.com; receiver=)","lists.ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=kernel.org"],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=b4ivYotING2LikRK6tbQmckQ9q/F60C2I0AptK8CuYE=;\n\tb=Fsh64U6naD98sL20+2ZZwSo+maaPdk2RiOYlh73i1yFB5+6IXfEyt0w4R/yaeJXMcF\n\thAsndPVZr7n/calmS+6/Y2KUuhe/4lh84ppkb/PpiMk8q9VGwE3RfNfXVpgvNsWjQBPG\n\tuivALFaBYgDJ4/DFtuDWDhGfydJvNuuv1pMQod6VFHjFWJgecu1HGv8QzAfuZMy/7U+k\n\tSwFK8TeXgv5q4vf4/gdCddU8ptQPWvQmHWnya2/zHG+3gQcYG2CNEKcq82ul7xWN4JQb\n\t/Gm4Gjoe5B9PHoV1AgtS86HwM5PIcsKpRWqN3nwkaDIGedA/+3byDKQ5qfwGGELgS/nw\n\tmjTg==","X-Gm-Message-State":"AOUpUlE+5uOs/Y2SJ9VgIPOxXYOZ5rPL9zMm+jiRySEHWFGUsgybCSHf\n\tydtvGfNifU8/FJ9A7SvIE7Kl7vACYT48dxHl3YA=","X-Google-Smtp-Source":"AA+uWPyIv9H8FCTp/j0oB9wMcLf/SIuu/FbS8KDeL66XNmmMtGM9UQHVhTQ4PoKK6oPs5D2xFNDxCCxGTosxdVgX2PE=","X-Received":"by 2002:aca:2dd1:: with SMTP id\n\tt200-v6mr13632011oit.152.1534753909365; \n\tMon, 20 Aug 2018 01:31:49 -0700 (PDT)","MIME-Version":"1.0","References":"<20180817102645.3839621-1-arnd@arndb.de>\n\t<20180817102645.3839621-9-arnd@arndb.de>","In-Reply-To":"<20180817102645.3839621-9-arnd@arndb.de>","From":"\"Rafael J. Wysocki\" ","Date":"Mon, 20 Aug 2018 10:31:38 +0200","Message-ID":"","Subject":"Re: [RFC 08/15] x86: PCI: clean up pcibios_scan_root()","To":"Arnd Bergmann ","Content-Type":"text/plain; charset=\"UTF-8\"","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.27","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Lorenzo Pieralisi ,\n\tLinux PCI ,\n\tLinux Kernel Mailing List ,\n\tChristoph Hellwig ,\n\tACPI Devel Maling List ,\n\tBjorn Helgaas ,\n\tlinuxppc-dev ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"}},{"id":1976320,"web_url":"http://patchwork.ozlabs.org/comment/1976320/","msgid":"","date":"2018-08-20T11:16:55","subject":"Re: [RFC 08/15] x86: PCI: clean up pcibios_scan_root()","submitter":{"id":30,"url":"http://patchwork.ozlabs.org/api/people/30/","name":"Arnd Bergmann","email":"arnd@arndb.de"},"content":"On Mon, Aug 20, 2018 at 10:31 AM Rafael J. Wysocki wrote:\n> On Fri, Aug 17, 2018 at 12:32 PM Arnd Bergmann wrote:\n\n> > -static struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,\n> > - struct pci_ops *ops, void *sysdata, struct list_head *resources)\n> > +void pcibios_scan_root(int busnum)\n> > {\n> > + struct pci_sysdata *sd;\n> > struct pci_host_bridge *bridge;\n> > int error;\n> >\n> > - bridge = pci_alloc_host_bridge(0);\n> > - if (!bridge)\n> > - return NULL;\n> > + bridge = pci_alloc_host_bridge(sizeof(sd));\n> > + if (!bridge) {\n> > + printk(KERN_ERR \"PCI: OOM, skipping PCI bus %02x\\n\", busnum);\n> > + return;\n> > + }\n> > + sd = pci_host_bridge_priv(bridge);\n>\n> This looks fishy, as bridge->private is not set at this point AFAICS,\n> unless one of the previous patches changes that.\n\nbridge->private what comes after the bridge structure, and it's allocated\nby pci_alloc_host_bridge() passing the size of the structure we want\nfor this private area.\n\n Arnd","headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41vBBv3YY3z9s3Z\n\tfor ;\n\tMon, 20 Aug 2018 21:18:47 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 41vBBv2QHZzF1rc\n\tfor ;\n\tMon, 20 Aug 2018 21:18:47 +1000 (AEST)","from mail-qt0-f193.google.com (mail-qt0-f193.google.com\n\t[209.85.216.193])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 41vB971x8ZzDrb6\n\tfor ;\n\tMon, 20 Aug 2018 21:17:14 +1000 (AEST)","by mail-qt0-f193.google.com with SMTP id z8-v6so15681718qto.9\n\tfor ;\n\tMon, 20 Aug 2018 04:17:14 -0700 (PDT)"],"Authentication-Results":["ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=arndb.de","lists.ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=arndb.de","lists.ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=gmail.com\n\t(client-ip=209.85.216.193; helo=mail-qt0-f193.google.com;\n\tenvelope-from=arndbergmann@gmail.com; receiver=)","lists.ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=arndb.de"],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=NzVej6cnEk1Sa+NMsNP+/h0Uh5fJedSa1vlz3oD17eo=;\n\tb=BL/Yi0MPX7useP87VTgTw7bOL9AfbYcFoQSeJeqG8SimC3MHLqM45vEgmKsP7XyAmk\n\tYWExF1Kl40y+QT6kP4tRvt6XO9LALJ1iWxsj88IduE6iK0o1XWcVhEloVZOS98EBlOLb\n\tVildQDoCeltaAxPB1GP5Vq+s4RT1/qNVnkNff0JXLgvF06n90EVNV/eKf+CJB6LOYKuY\n\tf7Y0b91DjFIH72naVn7+bODCo0i3Ud0wbf6Wp7Toa83TUrvdBWN3fouSC0DTxt/xbGpR\n\t8HKPI/J4NF93XCo+KBqGW2NsU8JfDqfSVwomtEzVMy5m8ALW7g2CGlPCzY+NDWb4kd2h\n\tl3fA==","X-Gm-Message-State":"AOUpUlFNw6W6k8l0meW/6I66Ji404rAZ2MxYt/Nmu9Bskur+8hLSbPLV\n\tEZmsZcft3cyAbJ++g7TYxRi2Opbc896tNiw5mMc=","X-Google-Smtp-Source":"AA+uWPygvHGExUSA2oHzA5WP3OYO0XK4BvsgQCT4CqGuVcQ2LPOuQzeztm4Ew7nbMqDHq6ULT8ZIWYvgTMmq6kj0l6c=","X-Received":"by 2002:ac8:1645:: with SMTP id\n\tx5-v6mr11215509qtk.389.1534763832046; \n\tMon, 20 Aug 2018 04:17:12 -0700 (PDT)","MIME-Version":"1.0","References":"<20180817102645.3839621-1-arnd@arndb.de>\n\t<20180817102645.3839621-9-arnd@arndb.de>\n\t","In-Reply-To":"","From":"Arnd Bergmann ","Date":"Mon, 20 Aug 2018 13:16:55 +0200","Message-ID":"","Subject":"Re: [RFC 08/15] x86: PCI: clean up pcibios_scan_root()","To":"Rafael Wysocki ","Content-Type":"text/plain; charset=\"UTF-8\"","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.27","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Lorenzo Pieralisi ,\n\tlinux-pci ,\n\tLinux Kernel Mailing List ,\n\tChristoph Hellwig ,\n\tACPI Devel Maling List ,\n\tBjorn Helgaas ,\n\tlinuxppc-dev ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"}},{"id":1976337,"web_url":"http://patchwork.ozlabs.org/comment/1976337/","msgid":"","date":"2018-08-20T11:26:39","subject":"Re: [RFC 08/15] x86: PCI: clean up pcibios_scan_root()","submitter":{"id":64267,"url":"http://patchwork.ozlabs.org/api/people/64267/","name":"Rafael J. Wysocki","email":"rafael@kernel.org"},"content":"On Mon, Aug 20, 2018 at 1:17 PM Arnd Bergmann wrote:\n>\n> On Mon, Aug 20, 2018 at 10:31 AM Rafael J. Wysocki wrote:\n> > On Fri, Aug 17, 2018 at 12:32 PM Arnd Bergmann wrote:\n>\n> > > -static struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,\n> > > - struct pci_ops *ops, void *sysdata, struct list_head *resources)\n> > > +void pcibios_scan_root(int busnum)\n> > > {\n> > > + struct pci_sysdata *sd;\n> > > struct pci_host_bridge *bridge;\n> > > int error;\n> > >\n> > > - bridge = pci_alloc_host_bridge(0);\n> > > - if (!bridge)\n> > > - return NULL;\n> > > + bridge = pci_alloc_host_bridge(sizeof(sd));\n> > > + if (!bridge) {\n> > > + printk(KERN_ERR \"PCI: OOM, skipping PCI bus %02x\\n\", busnum);\n> > > + return;\n> > > + }\n> > > + sd = pci_host_bridge_priv(bridge);\n> >\n> > This looks fishy, as bridge->private is not set at this point AFAICS,\n> > unless one of the previous patches changes that.\n>\n> bridge->private what comes after the bridge structure, and it's allocated\n> by pci_alloc_host_bridge() passing the size of the structure we want\n> for this private area.\n\nI see, sorry for the noise.","headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41vBPs0tKvz9s3Z\n\tfor ;\n\tMon, 20 Aug 2018 21:28:17 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 41vBPr6hbhzDrb6\n\tfor ;\n\tMon, 20 Aug 2018 21:28:16 +1000 (AEST)","from mail-oi0-f68.google.com (mail-oi0-f68.google.com\n\t[209.85.218.68])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 41vBNF0q5GzDqp5\n\tfor ;\n\tMon, 20 Aug 2018 21:26:52 +1000 (AEST)","by mail-oi0-f68.google.com with SMTP id v8-v6so25155978oie.5\n\tfor ;\n\tMon, 20 Aug 2018 04:26:52 -0700 (PDT)"],"Authentication-Results":["ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=kernel.org","lists.ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=kernel.org","lists.ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=gmail.com\n\t(client-ip=209.85.218.68; helo=mail-oi0-f68.google.com;\n\tenvelope-from=rjwysocki@gmail.com; receiver=)","lists.ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=kernel.org"],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=+s9BNrXjQaT22ZS4ts+TSEtQ1Lld4DxSmX/GDfTts9A=;\n\tb=Yxqowrm7wplVDNyDNdY05TZ6jWZy3UJQ7GU+1Hd8w+TFMDkuDPRLEMY2TdEst2RH84\n\tr1Pfg4vSJu2o5jGZYhm3gaVECvgTMiLD7wj7OOBNFveqvRKxK3wW5kvaNmVeeaDKW2h7\n\tboWTl3gsgpRERsm0kqyLMuSpr2dZmE72la6+LGH70GByhObwxobX36Z3TKMyZGWdMPNA\n\t3ns73TfeES9+kzAByzBHlfmEtBgxIKzOfcl7OKv7+4iywVEOFhrakbVyH0gLCmdyxXuy\n\t4QrejFas61QBrmFi5EVkD1QTXjX5iu+Ru8wMPX9wAjgRluaLy84anCm9jxILjHW3Q8SN\n\t8kLA==","X-Gm-Message-State":"AOUpUlFukpMXFVQpoulwMM6gJQCY2ApYQq64ifaODQfnEofNYuXn/9sV\n\tr0157iKoCdKUOyuoYqwQduOXQ2ud1iHpUiEj8IE=","X-Google-Smtp-Source":"AA+uWPwDQsxbAloZ4AVZJBQzSFVqCrRcxF2AngUhXv3ClWxvKkNtEtwaTm4lYDcIj4W9ChMwC30WvGZOEeiijUCJess=","X-Received":"by 2002:aca:fd01:: with SMTP id\n\tb1-v6mr14166441oii.307.1534764410989; \n\tMon, 20 Aug 2018 04:26:50 -0700 (PDT)","MIME-Version":"1.0","References":"<20180817102645.3839621-1-arnd@arndb.de>\n\t<20180817102645.3839621-9-arnd@arndb.de>\n\t\n\t","In-Reply-To":"","From":"\"Rafael J. Wysocki\" ","Date":"Mon, 20 Aug 2018 13:26:39 +0200","Message-ID":"","Subject":"Re: [RFC 08/15] x86: PCI: clean up pcibios_scan_root()","To":"Arnd Bergmann ","Content-Type":"text/plain; charset=\"UTF-8\"","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.27","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Lorenzo Pieralisi ,\n\t\"Rafael J. Wysocki\" ,\n\tLinux PCI , \n\tLinux Kernel Mailing List ,\n\tChristoph Hellwig ,\n\tACPI Devel Maling List ,\n\tBjorn Helgaas ,\n\tlinuxppc-dev ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"}}]