lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.4 030/167] bus: brcmstb_gisb: Use register offsets with writes too
    Date
    From: Doug Berger <opendmb@gmail.com>

    [ Upstream commit 856c7ccb9ce7a061f04bdf586f649cb93654e294 ]

    This commit corrects the bug introduced in commit f80835875d3d
    ("bus: brcmstb_gisb: Look up register offsets in a table") such
    that gisb_write() translates the register enumeration into an
    offset from the base address for writes as well as reads.

    Fixes: f80835875d3d ("bus: brcmstb_gisb: Look up register offsets in a table")
    Signed-off-by: Doug Berger <opendmb@gmail.com>
    Acked-by: Gregory Fong <gregory.0xf0@gmail.com>
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/bus/brcmstb_gisb.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c
    index f364fa4d24eb..4917d649fa41 100644
    --- a/drivers/bus/brcmstb_gisb.c
    +++ b/drivers/bus/brcmstb_gisb.c
    @@ -1,5 +1,5 @@
    /*
    - * Copyright (C) 2014 Broadcom Corporation
    + * Copyright (C) 2014-2017 Broadcom
    *
    * This program is free software; you can redistribute it and/or modify
    * it under the terms of the GNU General Public License version 2 as
    @@ -123,9 +123,9 @@ static void gisb_write(struct brcmstb_gisb_arb_device *gdev, u32 val, int reg)
    return;

    if (gdev->big_endian)
    - iowrite32be(val, gdev->base + reg);
    + iowrite32be(val, gdev->base + offset);
    else
    - iowrite32(val, gdev->base + reg);
    + iowrite32(val, gdev->base + offset);
    }

    static ssize_t gisb_arb_get_timeout(struct device *dev,
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 18:31    [W:2.260 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site