From patchwork Thu Apr 2 15:29:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 6149161 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9FF9ABF4A6 for ; Thu, 2 Apr 2015 15:31:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3F01203AD for ; Thu, 2 Apr 2015 15:31:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C0CA6203AB for ; Thu, 2 Apr 2015 15:31:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 278266EA3E; Thu, 2 Apr 2015 08:30:57 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 4390E6EA44 for ; Thu, 2 Apr 2015 08:30:56 -0700 (PDT) Received: from dude.hi.4.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Ydh55-0005OD-GT; Thu, 02 Apr 2015 17:30:55 +0200 From: Lucas Stach To: dri-devel@lists.freedesktop.org Subject: [PATCH RFC 009/111] staging: etnaviv: fix etnaviv_hw_reset() Date: Thu, 2 Apr 2015 17:29:11 +0200 Message-Id: <1427988653-754-10-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: dri-devel@lists.freedesktop.org Cc: Russell King , kernel@pengutronix.de X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Russell King Ensure that we reset the GPU with the clocks on, and restore the clock state after GPU reset has completed. Without this, register accesses can fail: Unhandled fault: external abort on non-linefetch (0x1828) at 0xfe640418 Internal error: : 1828 [#1] PREEMPT ARM Modules linked in: etnaviv(C+) ... CPU: 0 PID: 1617 Comm: modprobe Tainted: G C 3.16.0+ #1010 task: d6210140 ti: d4102000 task.ti: d4102000 PC is at etnaviv_writel+0x2c/0x38 [etnaviv] LR is at etnaviv_gpu_init+0x304/0x5cc [etnaviv] pc : [] lr : [] psr: 600f0013 sp : d4103ba8 ip : d4103bc0 fp : d4103bbc r10: 00000000 r9 : 00000000 r8 : cd45b034 r7 : d43ee480 r6 : d5ab1c10 r5 : 00000000 r4 : fe640418 r3 : 00000000 r2 : 00000000 r1 : fe640418 r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 10c5387d Table: 143d4019 DAC: 00000015 Process modprobe (pid: 1617, stack limit = 0xd4102250) Backtrace: [] (etnaviv_writel [etnaviv]) from [] (etnaviv_gpu_init+0x304/0x5cc [etnaviv]) [] (etnaviv_gpu_init [etnaviv]) from [] (etnaviv_load+0xbc/0x128 [etnaviv]) [] (etnaviv_load [etnaviv]) from [] (drm_dev_register+0xa8/0x108) [] (drm_dev_register) from [] (drm_platform_init+0x50/0xe8) ... Signed-off-by: Russell King --- drivers/staging/etnaviv/etnaviv_gpu.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/staging/etnaviv/etnaviv_gpu.c b/drivers/staging/etnaviv/etnaviv_gpu.c index 40ee6ac2ccd7..56afba7625ed 100644 --- a/drivers/staging/etnaviv/etnaviv_gpu.c +++ b/drivers/staging/etnaviv/etnaviv_gpu.c @@ -260,7 +260,16 @@ static void etnaviv_hw_reset(struct etnaviv_gpu *gpu) */ while (true) { - control = gpu_read(gpu, VIVS_HI_CLOCK_CONTROL); + control = VIVS_HI_CLOCK_CONTROL_DISABLE_DEBUG_REGISTERS | + VIVS_HI_CLOCK_CONTROL_FSCALE_VAL(0x40); + + /* enable clock */ + gpu_write(gpu, VIVS_HI_CLOCK_CONTROL, control | + VIVS_HI_CLOCK_CONTROL_FSCALE_CMD_LOAD); + gpu_write(gpu, VIVS_HI_CLOCK_CONTROL, control); + + /* Wait for stable clock. Vivante's code waited for 1ms */ + usleep_range(1000, 10000); /* isolate the GPU. */ control |= VIVS_HI_CLOCK_CONTROL_ISOLATE_GPU; @@ -302,6 +311,15 @@ static void etnaviv_hw_reset(struct etnaviv_gpu *gpu) break; } + + /* We rely on the GPU running, so program the clock */ + control = VIVS_HI_CLOCK_CONTROL_DISABLE_DEBUG_REGISTERS | + VIVS_HI_CLOCK_CONTROL_FSCALE_VAL(0x40); + + /* enable clock */ + gpu_write(gpu, VIVS_HI_CLOCK_CONTROL, control | + VIVS_HI_CLOCK_CONTROL_FSCALE_CMD_LOAD); + gpu_write(gpu, VIVS_HI_CLOCK_CONTROL, control); } int etnaviv_gpu_init(struct etnaviv_gpu *gpu)