From: Brian Norris <briannorris@chromium.org>
To: Stephen Boyd <swboyd@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org,
Wei-Ning Huang <wnhuang@chromium.org>,
Julius Werner <jwerner@chromium.org>,
Samuel Holland <samuel@sholland.org>
Subject: Re: [PATCH v3 1/7] firmware: coreboot: Let OF core populate platform device
Date: Thu, 9 Aug 2018 10:31:59 -0700 [thread overview]
Message-ID: <20180809173158.GB129285@ban.mtv.corp.google.com> (raw)
In-Reply-To: <20180809171722.144325-2-swboyd@chromium.org>
Hi,
On Thu, Aug 09, 2018 at 10:17:16AM -0700, Stephen Boyd wrote:
> Now that the /firmware/coreboot node in DT is populated by the core DT
> platform code with commit 3aa0582fdb82 ("of: platform: populate
> /firmware/ node from of_platform_default_populate_init()") we should and
> can remove the platform device creation here. Otherwise, the
> of_platform_device_create() call will fail, the coreboot of driver won't
> be registered, and this driver will never bind. At the same time, we
> should move this driver to use MODULE_DEVICE_TABLE so that module
> auto-load works properly when the coreboot device is auto-populated and
> we should drop the of_node handling that was presumably placed here to
> hold a reference to the DT node created during module init that no
> longer happens.
Yep, the of_node_put() was to complement of_find_compatible_node() which
was originally done in probe(), and then of_find_node_by_path() in
__init when it was upstreamed, and now it's no longer needed.
>
> Cc: Wei-Ning Huang <wnhuang@chromium.org>
> Cc: Julius Werner <jwerner@chromium.org>
> Cc: Brian Norris <briannorris@chromium.org>
> Cc: Samuel Holland <samuel@sholland.org>
> Reviewed-by: Sudeep Holla <Sudeep.Holla@arm.com>
> Fixes: 3aa0582fdb82 ("of: platform: populate /firmware/ node from of_platform_default_populate_init()")
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
> drivers/firmware/google/coreboot_table-of.c | 28 +++------------------
> 1 file changed, 3 insertions(+), 25 deletions(-)
Change looks good:
Reviewed-by: Brian Norris <briannorris@chromium.org>
Thanks!
Now to go figure out how a simple bugfix managed to blow up into a
7-patch series... If this goes on any longer, patch 1 should probably go
by itself, to fix the regression.
Brian
> diff --git a/drivers/firmware/google/coreboot_table-of.c b/drivers/firmware/google/coreboot_table-of.c
> index f15bf404c579..9b90c0fa4a0b 100644
> --- a/drivers/firmware/google/coreboot_table-of.c
> +++ b/drivers/firmware/google/coreboot_table-of.c
> @@ -19,7 +19,6 @@
> #include <linux/io.h>
> #include <linux/module.h>
> #include <linux/of_address.h>
> -#include <linux/of_platform.h>
> #include <linux/platform_device.h>
>
> #include "coreboot_table.h"
> @@ -30,7 +29,6 @@ static int coreboot_table_of_probe(struct platform_device *pdev)
> void __iomem *ptr;
>
> ptr = of_iomap(fw_dn, 0);
> - of_node_put(fw_dn);
> if (!ptr)
> return -ENOMEM;
>
> @@ -44,8 +42,9 @@ static int coreboot_table_of_remove(struct platform_device *pdev)
>
> static const struct of_device_id coreboot_of_match[] = {
> { .compatible = "coreboot" },
> - {},
> + {}
> };
> +MODULE_DEVICE_TABLE(of, coreboot_of_match);
>
> static struct platform_driver coreboot_table_of_driver = {
> .probe = coreboot_table_of_probe,
> @@ -55,28 +54,7 @@ static struct platform_driver coreboot_table_of_driver = {
> .of_match_table = coreboot_of_match,
> },
> };
> -
> -static int __init platform_coreboot_table_of_init(void)
> -{
> - struct platform_device *pdev;
> - struct device_node *of_node;
> -
> - /* Limit device creation to the presence of /firmware/coreboot node */
> - of_node = of_find_node_by_path("/firmware/coreboot");
> - if (!of_node)
> - return -ENODEV;
> -
> - if (!of_match_node(coreboot_of_match, of_node))
> - return -ENODEV;
> -
> - pdev = of_platform_device_create(of_node, "coreboot_table_of", NULL);
> - if (!pdev)
> - return -ENODEV;
> -
> - return platform_driver_register(&coreboot_table_of_driver);
> -}
> -
> -module_init(platform_coreboot_table_of_init);
> +module_platform_driver(coreboot_table_of_driver);
>
> MODULE_AUTHOR("Google, Inc.");
> MODULE_LICENSE("GPL");
> --
> Sent by a computer through tubes
>
next prev parent reply other threads:[~2018-08-09 17:32 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-09 17:17 [PATCH v3 0/7] firmware: coreboot: Fix probe and simplify code Stephen Boyd
2018-08-09 17:17 ` [PATCH v3 1/7] firmware: coreboot: Let OF core populate platform device Stephen Boyd
2018-08-09 17:31 ` Brian Norris [this message]
2018-08-09 17:17 ` [PATCH v3 2/7] firmware: coreboot: Unmap ioregion on failure Stephen Boyd
2018-08-09 17:49 ` Brian Norris
2018-08-09 19:40 ` Stephen Boyd
2018-08-09 19:52 ` Brian Norris
2018-08-09 23:25 ` Stephen Boyd
2018-08-09 17:17 ` [PATCH v3 3/7] firmware: coreboot: Make bus registration symmetric Stephen Boyd
2018-08-09 18:10 ` Julius Werner
2018-08-09 23:30 ` Stephen Boyd
2018-08-09 17:17 ` [PATCH v3 4/7] firmware: coreboot: Collapse platform drivers into bus core Stephen Boyd
2018-08-09 17:17 ` [PATCH v3 5/7] firmware: coreboot: Remap RAM with memremap() instead of ioremap() Stephen Boyd
2018-08-09 18:24 ` Julius Werner
2018-08-09 22:07 ` Stephen Boyd
2018-08-09 17:17 ` [PATCH v3 6/7] firmware: coreboot: Only populate devices in coreboot_table_init() Stephen Boyd
2018-08-09 21:02 ` Julius Werner
2018-08-09 23:43 ` Stephen Boyd
2018-08-09 17:17 ` [PATCH v3 7/7] firmware: coreboot: Request table region for exclusive access Stephen Boyd
2018-08-09 21:07 ` Julius Werner
2018-08-09 23:03 ` Stephen Boyd
2018-08-09 23:37 ` Julius Werner
2018-08-09 23:44 ` Julius Werner
2018-08-10 2:54 ` Stephen Boyd
2018-08-10 23:24 ` Stephen Boyd
2018-08-09 18:03 ` [PATCH v3 0/7] firmware: coreboot: Fix probe and simplify code Brian Norris
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=20180809173158.GB129285@ban.mtv.corp.google.com \
--to=briannorris@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=jwerner@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=samuel@sholland.org \
--cc=swboyd@chromium.org \
--cc=wnhuang@chromium.org \
/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).