lkml.org 
[lkml]   [2015]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19 081/101] drivers/of: Add empty ranges quirk for PA-Semi
    Date
    3.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

    commit 41d9489319f28f06cf51731131bc353d5a6bce59 upstream.

    The "sdc" node is missing the ranges property, it needs to be treated
    as having an empty one otherwise translation fails for its children.

    Fixes 746c9e9f92dd, "of/base: Fix PowerPC address parsing hack"

    Tested-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Grant Likely <grant.likely@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/of/address.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    --- a/drivers/of/address.c
    +++ b/drivers/of/address.c
    @@ -450,12 +450,17 @@ static struct of_bus *of_match_bus(struc
    return NULL;
    }

    -static int of_empty_ranges_quirk(void)
    +static int of_empty_ranges_quirk(struct device_node *np)
    {
    if (IS_ENABLED(CONFIG_PPC)) {
    - /* To save cycles, we cache the result */
    + /* To save cycles, we cache the result for global "Mac" setting */
    static int quirk_state = -1;

    + /* PA-SEMI sdc DT bug */
    + if (of_device_is_compatible(np, "1682m-sdc"))
    + return true;
    +
    + /* Make quirk cached */
    if (quirk_state < 0)
    quirk_state =
    of_machine_is_compatible("Power Macintosh") ||
    @@ -490,7 +495,7 @@ static int of_translate_one(struct devic
    * This code is only enabled on powerpc. --gcl
    */
    ranges = of_get_property(parent, rprop, &rlen);
    - if (ranges == NULL && !of_empty_ranges_quirk()) {
    + if (ranges == NULL && !of_empty_ranges_quirk(parent)) {
    pr_debug("OF: no ranges; cannot translate\n");
    return 1;
    }



    \
     
     \ /
      Last update: 2015-04-17 16:01    [W:4.118 / U:0.544 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site