From: Simon Horman <horms@verge.net.au>
To: marek.vasut@gmail.com
Cc: devicetree@vger.kernel.org,
Marek Vasut <marek.vasut+renesas@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH] of: Fix of_empty_ranges_quirk()
Date: Fri, 9 Aug 2019 13:41:49 -0700 [thread overview]
Message-ID: <20190809204148.fv3cvdbgg5e3mzq5@verge.net.au> (raw)
In-Reply-To: <20190809173321.19944-1-marek.vasut@gmail.com>
On Fri, Aug 09, 2019 at 07:33:21PM +0200, marek.vasut@gmail.com wrote:
> From: Marek Vasut <marek.vasut+renesas@gmail.com>
>
> The of_empty_ranges_quirk() returns a mix of boolean and signed integer
> types, which cannot work well. Replace that with boolean only and fix
> usage logic in of_translate_one() -- the check should trigger when the
> ranges are NULL and the quirk is applicable on the hardware.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Frank Rowand <frowand.list@gmail.com>
> Cc: linux-renesas-soc@vger.kernel.org
> To: devicetree@vger.kernel.org
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> drivers/of/address.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/of/address.c b/drivers/of/address.c
> index b492176c0572..ae2819e148b8 100644
> --- a/drivers/of/address.c
> +++ b/drivers/of/address.c
> @@ -616,7 +616,7 @@ static struct of_bus *of_match_bus(struct device_node *np)
> return NULL;
> }
>
> -static int of_empty_ranges_quirk(struct device_node *np)
> +static bool of_empty_ranges_quirk(struct device_node *np)
> {
> if (IS_ENABLED(CONFIG_PPC)) {
> /* To save cycles, we cache the result for global "Mac" setting */
> @@ -631,7 +631,8 @@ static int of_empty_ranges_quirk(struct device_node *np)
> quirk_state =
> of_machine_is_compatible("Power Macintosh") ||
> of_machine_is_compatible("MacRISC");
> - return quirk_state;
> + if (quirk_state > 0)
> + return true;
> }
> return false;
> }
> @@ -662,8 +663,8 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
> * This code is only enabled on powerpc. --gcl
> */
> ranges = of_get_property(parent, rprop, &rlen);
> - if (ranges == NULL && !of_empty_ranges_quirk(parent)) {
> - pr_debug("no ranges; cannot translate\n");
> + if (ranges == NULL && of_empty_ranges_quirk(parent)) {
> + pr_err("no ranges; cannot translate\n");
> return 1;
> }
> if (ranges == NULL || rlen == 0) {
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-08-09 20:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 17:33 [PATCH] of: Fix of_empty_ranges_quirk() marek.vasut
2019-08-09 20:41 ` Simon Horman [this message]
2019-08-09 22:34 ` Rob Herring
2019-08-10 13:39 ` Marek Vasut
2019-08-10 19:47 ` Frank Rowand
2019-09-07 15:15 ` Marek Vasut
2019-08-10 23:06 ` Rob Herring
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=20190809204148.fv3cvdbgg5e3mzq5@verge.net.au \
--to=horms@verge.net.au \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=marek.vasut+renesas@gmail.com \
--cc=marek.vasut@gmail.com \
--cc=robh+dt@kernel.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).