From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3339499-1523479724-2-5038882170663828659 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523479723; b=EDPEZaQpgfPE/mURQ/s68wHupU7T6sNGAuje1dlC4GAiMoXF1E POjyxtSvhrFYzHRp3wdtzUd5OIGzJHEDPzgXTzsTkM5QlTHGlUYxOZEOoHFr6DSt FAf1cI6Qt+Z2WWgTXdkut8aaS+s3eWiN38T/x7qD5/+uZBD41UEFXmVA2/Gde5t1 PplCD4l9jsHXWl4bZvhFMoYlf10WxDNTqdovAMxftaU/4gpF9FKH3061krV/alTJ xgOBukg0FtYJ5FPmxRIDJPJRo2rEQnNJyfgIoLUUIWk5wUIQun+TZFFS7Zhr1PJ0 bBtIn3MLwePq/fwmPJ0GocBIPcToMUgGCtZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523479723; bh=GMWriwjYNDne6w79nSIkTANagH0li2 OSS6JqvS+E+lg=; b=Vl7b8MK/un23TuhZM6FUzJPvLPpd/lWd/iy7uIL5XMc5F6 TleHyVB2F6p8couMiHzMcSSor+yEiQkMWxhGGe3we5f0NvWKzvCVxB/PQdzIVUwT CC04Gne8kDQJpOgpCu7N0IDO2x5kijdiFbySz5aOuHSd6VI38xdjVWScNN5cyuSy DX2fE4j1WxNGvxsZj0eGBYxB9MV1gKEPY/2HFWrDCf6GEi78KdZqn8QBsSPH2ouO RdTedm0OOqLlAPliLiUX3c3d6Xsdudvnug/5MExa2OzTW7bfuc/lP90t2LnPkk22 6W0c1ZDkF+X2RF+sODcYY3n5L6Wq2had6t1cktnA== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfAulrb0rXt/3c4QEz5K9jnEMj/XLIDl81C4Cfp23hI48crbN/4Zw8cRIUgK7Zs9JElArGoiDzZxJ23ybuDDJ5rNrO6VooIQiovdrKdm88EcbjbFr4aWl 8/EPEqAmw+D/eml3N0/1kZwB0YLYpyXkC41I4Y/WKZ6Kx768bH6sNhRI+sLCbCWhyNifpUk5iDJve1iqPKF42LqD17Bt3csGCiQbTto5/4haWE4eXBVchpLN X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=pGLkceISAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=CaJNc-nyaQXWHGQ9a10A:9 a=QEXdDO2ut3YA:10 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755710AbeDKSqO (ORCPT ); Wed, 11 Apr 2018 14:46:14 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:58842 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754987AbeDKSqM (ORCPT ); Wed, 11 Apr 2018 14:46:12 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Doug Berger , Gregory Fong , Florian Fainelli , Sasha Levin Subject: [PATCH 4.4 029/190] bus: brcmstb_gisb: Use register offsets with writes too Date: Wed, 11 Apr 2018 20:34:35 +0200 Message-Id: <20180411183551.900210934@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183550.114495991@linuxfoundation.org> References: <20180411183550.114495991@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Doug Berger [ 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 Acked-by: Gregory Fong Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/bus/brcmstb_gisb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- 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_gi 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,