From patchwork Sun Sep 8 15:44:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 11137341 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 573B616C1 for ; Mon, 9 Sep 2019 07:23:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3F04621D80 for ; Mon, 9 Sep 2019 07:23:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F04621D80 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 37C2489885; Mon, 9 Sep 2019 07:23:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 195C6894C1 for ; Sun, 8 Sep 2019 15:52:06 +0000 (UTC) X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.90]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M7sDq-1i39de3QNm-0050ua; Sun, 08 Sep 2019 17:46:28 +0200 From: Stefan Wahren To: Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden , Paul Kocialkowski , boris.brezillon@bootlin.com Subject: [PATCH] Revert "ARM: bcm283x: Switch V3D over to using the PM driver instead of firmware." Date: Sun, 8 Sep 2019 17:44:53 +0200 Message-Id: <1567957493-4567-1-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 X-Provags-ID: V03:K1:8SS2m039FZNDDpUlAdXTSHBal6u5+ujaEtxV4T1c3m87WsiWPbb nyfhBWj3eZScVg5xk3v6P65yl3Qcc+sNzVQNDYFzbWY9z61kGwjaU9rkHg7xTLUVfOd5qLt 4iZ5YPEPVod6zIFHiNBxkUea52dqThXP8AhrTbRAEd6R0wJh/otCLINEOIn24Kbj0bmbT1d LIEB9T6Ww3qBlBezldbtA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:/lNEL3G1xVY=:QGo4lhUosV2wQ4ScDJYSyO 7764j9HL0lwyFSTiC5IM2TQu7sm2WwM/t/31W83BuoWhvVQsssxvs+x6hP1WRP+Aw+zV7noSY mzV5h2RMJ5dtL/DDkgjb+xU+yJ2wSmqM8f+dJoRu8LRhwJVE7tThoPJlDcLRw/1zznEheAgM+ dQyxjyt8DBF3rIWMtRqk6Jqq0PbbyOZMZQaGtvE967FDfgcGemG0dpNeCPw1FnY1XmkMh5Uzn GmD5UjIvB1Rx/78HsjrHbaI/8MMgNMxlXMlpKCgG97bxRoaCac1DUbNqSznWoKkL/LUuUCTlS zMvVnHOet2ooiSpGxAKv45hjWkn8yjHc3KfWSv4qDCPB0obgPMAhsoWhPoL7ANBOeY8xWVGFL J+mm0lmb7/6V0CXPcWBI1peya5I6ssHQPBMF62TqQfcUK7eYuNPIthzZqR/ND50ZgYpLWLxLS rS/rzNbcOE10YwSoHs+wuM4WvqA6nf9iuLcvE/2eeLXrBxTApH3M7iI6XN2qi0eujD+YOWQ3y CPOgYmPb7XPYV0dDM+A7vKJdh6jX6kJ27XSHkm7Nm1mCIKrdyB27jgLYi4dZTG7KxM1bTDMCq N2c4L7MFDhw2WKE1UlFT+kGvYWNXd/imhapNz+P0TvtMAj8imll8oGnVzecvHy+wiaQt3PaZX aMtss8nMmRHcfvtfrfd0jQlIP7CUkt8/uE/Sirthp58RMOD4QU0mJ4/vRMLgo4W2w5CkSZEtd WuRE7yy1o8w6nEi4532ORJn33+c5kEqMH/SW6Utmg/cjQ62RaBMBcde3kxtZDTvP0nTpYVnwP NltYx7BdeqaTe5dzxEZYP1XounWrhwnp/7y8GpH+KH6iPQzkDUADNvgm/d1XwRT4FK7HIteMN G/uBxNPGpqnQy5+V8tH3ToqlJUA6ViAvSte2txM4Q31gHRRjoHiJtHD4dj+Y5c+sMlXAorJU/ dUWPqvnyrEQX80Pmci1WYY1SqFtadYAQDcoUl1QTMpf5nta25Kw9YREMnYYsCu05gJGz8FJ8c 9buotNPi6SlXqKK5STwMCMObObWafbuo/PPYph1cPJGL4hux9452SOOdmT1b+wXCmIeE6Jzkj ZyMWc7Qe3MXAyvNss7zgrzI5HQ83oSCON+3SXuJKUbr6bWNZojMM8DaHNPlQXD6CRUKLiJc+B 1EI1eCo1j1gGYdG0hjasegQjfJL+iYC2oAPZUVpugMr1QEoRX5bSQU2r/o0+smX1MMSxw= X-Mailman-Approved-At: Mon, 09 Sep 2019 07:23:02 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1567957925; bh=SFrQS2AE6buvSq2XcNrsQJ4HnzDculs7JE6sErBescQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=Tgvgd927GNu1Yxj7N2kDohgSc9m6dqC2vWkdyXD7WyumMXcnalDXNHBTRDa6jlhB2 aW72+KcD8X0ol+gIM7DNmsx5ImDY8RHconeeCggUIr0uRBekHjGkRERcJ5Q957zcs2 V4SlzInVth4yrZ6c5IUpgzFfHsLz2RlUNF5kRBcw= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, Stefan Wahren MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Since release of the new BCM2835 PM driver there has been several reports of V3D probing issues. This is caused by timeouts during powering-up the GRAFX PM domain: bcm2835-power: Timeout waiting for grafx power OK I was able to reproduce this reliable on my Raspberry Pi 3B+ after setting force_turbo=1 in the firmware configuration. Since there are no issues using the firmware PM driver with the same setup, there must be an issue in the BCM2835 PM driver. Unfortunately there hasn't been much progress in identifying the root cause since June (mostly in the lack of documentation), so i decided to switch back until the issue in the BCM2835 PM driver is fixed. Link: https://github.com/raspberrypi/linux/issues/3046 Fixes: e1dc2b2e1bef (" ARM: bcm283x: Switch V3D over to using the PM driver instead of firmware.") Cc: stable@vger.kernel.org Signed-off-by: Stefan Wahren Acked-by: Eric Anholt --- arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 ++++ arch/arm/boot/dts/bcm283x.dtsi | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 6c6a7f6..b909e3b 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -67,6 +67,10 @@ power-domains = <&power RPI_POWER_DOMAIN_USB>; }; +&v3d { + power-domains = <&power RPI_POWER_DOMAIN_V3D>; +}; + &vec { power-domains = <&power RPI_POWER_DOMAIN_VEC>; status = "okay"; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 2d191fc..b238567 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -3,7 +3,6 @@ #include #include #include -#include /* firmware-provided startup stubs live here, where the secondary CPUs are * spinning. @@ -121,7 +120,7 @@ #interrupt-cells = <2>; }; - pm: watchdog@7e100000 { + watchdog@7e100000 { compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; #power-domain-cells = <1>; #reset-cells = <1>; @@ -641,7 +640,6 @@ compatible = "brcm,bcm2835-v3d"; reg = <0x7ec00000 0x1000>; interrupts = <1 10>; - power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; }; vc4: gpu {