Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1611384

[PATCH v2 3/8] bus: brcmstb_gisb: Use register offsets with writes too

Show all headers | View raw

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>
---
 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 72fe0a5a8bf3..a94598d0945a 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
@@ -127,9 +127,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.12.0

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/8] bus: brcmstb_gisb: add support for GISBv7 arbiter Doug Berger <opendmb@gmail.com> - 2017-03-28 23:40 +0200
  [PATCH v2 5/8] bus: brcmstb_gisb: correct support for 64-bit address output Doug Berger <opendmb@gmail.com> - 2017-03-28 23:40 +0200
  [PATCH v2 2/8] arm64: mm: mark fault_info __ro_after_init Doug Berger <opendmb@gmail.com> - 2017-03-28 23:40 +0200
    Re: [PATCH v2 2/8] arm64: mm: mark fault_info __ro_after_init Mark Rutland <mark.rutland@arm.com> - 2017-03-29 13:30 +0200
  [PATCH v2 4/8] bus: brcmstb_gisb: Correct hooking of ARM aborts Doug Berger <opendmb@gmail.com> - 2017-03-28 23:40 +0200
  [PATCH v2 7/8] bus: brcmstb_gisb: add notifier handling Doug Berger <opendmb@gmail.com> - 2017-03-28 23:40 +0200
    Re: [PATCH v2 7/8] bus: brcmstb_gisb: add notifier handling Mark Rutland <mark.rutland@arm.com> - 2017-03-29 12:20 +0200
      Re: [PATCH v2 7/8] bus: brcmstb_gisb: add notifier handling Doug Berger <opendmb@gmail.com> - 2017-03-29 19:40 +0200
        Re: [PATCH v2 7/8] bus: brcmstb_gisb: add notifier handling Mark Rutland <mark.rutland@arm.com> - 2017-03-29 20:20 +0200
  [PATCH v2 1/8] arm64: mm: Allow installation of memory abort handlers Doug Berger <opendmb@gmail.com> - 2017-03-28 23:40 +0200
    Re: [PATCH v2 1/8] arm64: mm: Allow installation of memory abort  handlers Mark Rutland <mark.rutland@arm.com> - 2017-03-29 13:40 +0200
  [PATCH v2 3/8] bus: brcmstb_gisb: Use register offsets with writes too Doug Berger <opendmb@gmail.com> - 2017-03-28 23:40 +0200

csiph-web