Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Doug Berger <opendmb@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.4 031/167] bus: brcmstb_gisb: correct support
 for 64-bit address output
Thread-Topic: [PATCH AUTOSEL for 4.4 031/167] bus: brcmstb_gisb: correct
 support for 64-bit address output
Thread-Index: AQHTv5wscpwp/djUpk+/9OFJVmSRRw==
Date:   Mon, 19 Mar 2018 16:06:00 +0000
Message-ID: <20180319160513.16384-31-alexander.levin@microsoft.com>
References: <20180319160513.16384-1-alexander.levin@microsoft.com>
In-Reply-To: <20180319160513.16384-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 10fa1d35-0893-4f8b-e5de-08d58db38200
X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:06:00.2072
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1093
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Doug Berger <opendmb@gmail.com>

[ Upstream commit 0c2aa0e4b308815e877601845c1a89913f9bd2b9 ]

The GISB bus can support addresses beyond 32-bits.  So this commit
corrects support for reading a captured 64-bit address into a 64-bit
variable by obtaining the high bits from the ARB_ERR_CAP_HI_ADDR
register (when present) and then outputting the full 64-bit value.

It also removes unused definitions.

Fixes: 44127b771d9c ("bus: add Broadcom GISB bus arbiter timeout/error hand=
ler")
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 | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c
index 4917d649fa41..f59183018280 100644
--- a/drivers/bus/brcmstb_gisb.c
+++ b/drivers/bus/brcmstb_gisb.c
@@ -33,8 +33,6 @@
 #define  ARB_ERR_CAP_CLEAR		(1 << 0)
 #define  ARB_ERR_CAP_STATUS_TIMEOUT	(1 << 12)
 #define  ARB_ERR_CAP_STATUS_TEA		(1 << 11)
-#define  ARB_ERR_CAP_STATUS_BS_SHIFT	(1 << 2)
-#define  ARB_ERR_CAP_STATUS_BS_MASK	0x3c
 #define  ARB_ERR_CAP_STATUS_WRITE	(1 << 1)
 #define  ARB_ERR_CAP_STATUS_VALID	(1 << 0)
=20
@@ -43,7 +41,6 @@ enum {
 	ARB_ERR_CAP_CLR,
 	ARB_ERR_CAP_HI_ADDR,
 	ARB_ERR_CAP_ADDR,
-	ARB_ERR_CAP_DATA,
 	ARB_ERR_CAP_STATUS,
 	ARB_ERR_CAP_MASTER,
 };
@@ -53,7 +50,6 @@ static const int gisb_offsets_bcm7038[] =3D {
 	[ARB_ERR_CAP_CLR]	=3D 0x0c4,
 	[ARB_ERR_CAP_HI_ADDR]	=3D -1,
 	[ARB_ERR_CAP_ADDR]	=3D 0x0c8,
-	[ARB_ERR_CAP_DATA]	=3D 0x0cc,
 	[ARB_ERR_CAP_STATUS]	=3D 0x0d0,
 	[ARB_ERR_CAP_MASTER]	=3D -1,
 };
@@ -63,7 +59,6 @@ static const int gisb_offsets_bcm7400[] =3D {
 	[ARB_ERR_CAP_CLR]	=3D 0x0c8,
 	[ARB_ERR_CAP_HI_ADDR]	=3D -1,
 	[ARB_ERR_CAP_ADDR]	=3D 0x0cc,
-	[ARB_ERR_CAP_DATA]	=3D 0x0d0,
 	[ARB_ERR_CAP_STATUS]	=3D 0x0d4,
 	[ARB_ERR_CAP_MASTER]	=3D 0x0d8,
 };
@@ -73,7 +68,6 @@ static const int gisb_offsets_bcm7435[] =3D {
 	[ARB_ERR_CAP_CLR]	=3D 0x168,
 	[ARB_ERR_CAP_HI_ADDR]	=3D -1,
 	[ARB_ERR_CAP_ADDR]	=3D 0x16c,
-	[ARB_ERR_CAP_DATA]	=3D 0x170,
 	[ARB_ERR_CAP_STATUS]	=3D 0x174,
 	[ARB_ERR_CAP_MASTER]	=3D 0x178,
 };
@@ -83,7 +77,6 @@ static const int gisb_offsets_bcm7445[] =3D {
 	[ARB_ERR_CAP_CLR]	=3D 0x7e4,
 	[ARB_ERR_CAP_HI_ADDR]	=3D 0x7e8,
 	[ARB_ERR_CAP_ADDR]	=3D 0x7ec,
-	[ARB_ERR_CAP_DATA]	=3D 0x7f0,
 	[ARB_ERR_CAP_STATUS]	=3D 0x7f4,
 	[ARB_ERR_CAP_MASTER]	=3D 0x7f8,
 };
@@ -105,9 +98,13 @@ static u32 gisb_read(struct brcmstb_gisb_arb_device *gd=
ev, int reg)
 {
 	int offset =3D gdev->gisb_offsets[reg];
=20
-	/* return 1 if the hardware doesn't have ARB_ERR_CAP_MASTER */
-	if (offset =3D=3D -1)
-		return 1;
+	if (offset < 0) {
+		/* return 1 if the hardware doesn't have ARB_ERR_CAP_MASTER */
+		if (reg =3D=3D ARB_ERR_CAP_MASTER)
+			return 1;
+		else
+			return 0;
+	}
=20
 	if (gdev->big_endian)
 		return ioread32be(gdev->base + offset);
@@ -115,6 +112,16 @@ static u32 gisb_read(struct brcmstb_gisb_arb_device *g=
dev, int reg)
 		return ioread32(gdev->base + offset);
 }
=20
+static u64 gisb_read_address(struct brcmstb_gisb_arb_device *gdev)
+{
+	u64 value;
+
+	value =3D gisb_read(gdev, ARB_ERR_CAP_ADDR);
+	value |=3D (u64)gisb_read(gdev, ARB_ERR_CAP_HI_ADDR) << 32;
+
+	return value;
+}
+
 static void gisb_write(struct brcmstb_gisb_arb_device *gdev, u32 val, int =
reg)
 {
 	int offset =3D gdev->gisb_offsets[reg];
@@ -181,7 +188,7 @@ static int brcmstb_gisb_arb_decode_addr(struct brcmstb_=
gisb_arb_device *gdev,
 					const char *reason)
 {
 	u32 cap_status;
-	unsigned long arb_addr;
+	u64 arb_addr;
 	u32 master;
 	const char *m_name;
 	char m_fmt[11];
@@ -193,10 +200,7 @@ static int brcmstb_gisb_arb_decode_addr(struct brcmstb=
_gisb_arb_device *gdev,
 		return 1;
=20
 	/* Read the address and master */
-	arb_addr =3D gisb_read(gdev, ARB_ERR_CAP_ADDR) & 0xffffffff;
-#if (IS_ENABLED(CONFIG_PHYS_ADDR_T_64BIT))
-	arb_addr |=3D (u64)gisb_read(gdev, ARB_ERR_CAP_HI_ADDR) << 32;
-#endif
+	arb_addr =3D gisb_read_address(gdev);
 	master =3D gisb_read(gdev, ARB_ERR_CAP_MASTER);
=20
 	m_name =3D brcmstb_gisb_master_to_str(gdev, master);
@@ -205,7 +209,7 @@ static int brcmstb_gisb_arb_decode_addr(struct brcmstb_=
gisb_arb_device *gdev,
 		m_name =3D m_fmt;
 	}
=20
-	pr_crit("%s: %s at 0x%lx [%c %s], core: %s\n",
+	pr_crit("%s: %s at 0x%llx [%c %s], core: %s\n",
 		__func__, reason, arb_addr,
 		cap_status & ARB_ERR_CAP_STATUS_WRITE ? 'W' : 'R',
 		cap_status & ARB_ERR_CAP_STATUS_TIMEOUT ? "timeout" : "",
--=20
2.14.1