From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: [PATCH] drm/rockchip: vop: Correct enabled clocks during setup Date: Tue, 29 Sep 2015 18:14:37 +0800 Message-ID: <560A648D.1060504@rock-chips.com> References: <1443518893-28142-1-git-send-email-sjoerd.simons@collabora.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1443518893-28142-1-git-send-email-sjoerd.simons@collabora.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sjoerd Simons Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org SGkgU2pvZXJkCiAgICAgV2UgZG91YmxlIGNoZWNrIHRoaXMgcHJvYmxlbSwgeWVzLCBib2FyZCB3 aWxsIGhhbmcgaWYgYWNsayBpcyBkaXNhYmxlZAp3aGVuIHNldHRpbmcgdm9wIHJlZ2lzdGVyLgoK ICAgICBBY2tlZC1ieTogTWFyayBZYW8gPG1hcmsueWFvQHJvY2stY2hpcHMuY29tPgoKVGhhbmtz IGZvciB0aGlzIGZpeC4KCk9uIDIwMTXlubQwOeaciDI55pelIDE3OjI4LCBTam9lcmQgU2ltb25z IHdyb3RlOgo+IFdoZW4gZG9pbmcgdGhlIGluaXRpYWwgc2V0dXAgYm90aCB0aGUgaGNsayBhbmQg dGhlIGFjbGsgbmVlZCB0byBiZQo+IGVuYWJsZWQgb3RoZXJ3aXNlIHRoZSBib2FyZCB3aWxsIHNp bXBseSBoYW5nLiBUaGlzIG9ubHkgb2NjdXJzIHdoZW4KPiBidWlsZGluZyB0aGUgdm9wIGRyaXZl ciBhcyBhIG1vZHVsZSwgd2hlbiBpdHMgYnVpbHQtaW4gdGhlIGluaXRpYWwgc2V0dXAKPiBoYXBw ZW5zIHRvIHJ1biBiZWZvcmUgdGhlIGNsb2NrIGZyYW1ld29yayBzaHV0cyBvZiB1bnVzZWQgY2xv Y2tzCj4gKGluY2x1ZGluZyB0aGUgYWNsaykuCj4KPiBXaGlsZSB0aGVyZSBhbHNvIHN3aXRjaCB0 byBkb2luZyBwcmVwYXJlIGFuZCBlbmFibGUgaW4gb25lIHN0ZXAgcmF0aGVyCj4gdGhlbiBzZXBh cmF0ZSBzdGVwcyB0byByZWR1Y2UgdGhlIGFtb3VudCBvZiBjb2RlIHJlcXVpcmVkLgo+Cj4gU2ln bmVkLW9mZi1ieTogU2pvZXJkIFNpbW9ucyA8c2pvZXJkLnNpbW9uc0Bjb2xsYWJvcmEuY28udWs+ Cj4KPiAtLS0KPgo+ICAgZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3Au YyB8IDM2ICsrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCj4gICAxIGZpbGUgY2hhbmdlZCwg MTQgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYyBiL2RyaXZlcnMvZ3B1L2RybS9y b2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKPiBpbmRleCA1ZDhhZTVlLi40ODcxOWRmIDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jCj4gQEAgLTE1 NzUsMzIgKzE1NzUsMjUgQEAgc3RhdGljIGludCB2b3BfaW5pdGlhbChzdHJ1Y3Qgdm9wICp2b3Ap Cj4gICAJCXJldHVybiBQVFJfRVJSKHZvcC0+ZGNsayk7Cj4gICAJfQo+ICAgCj4gLQlyZXQgPSBj bGtfcHJlcGFyZSh2b3AtPmhjbGspOwo+IC0JaWYgKHJldCA8IDApIHsKPiAtCQlkZXZfZXJyKHZv cC0+ZGV2LCAiZmFpbGVkIHRvIHByZXBhcmUgaGNsa1xuIik7Cj4gLQkJcmV0dXJuIHJldDsKPiAt CX0KPiAtCj4gICAJcmV0ID0gY2xrX3ByZXBhcmUodm9wLT5kY2xrKTsKPiAgIAlpZiAocmV0IDwg MCkgewo+ICAgCQlkZXZfZXJyKHZvcC0+ZGV2LCAiZmFpbGVkIHRvIHByZXBhcmUgZGNsa1xuIik7 Cj4gLQkJZ290byBlcnJfdW5wcmVwYXJlX2hjbGs7Cj4gKwkJcmV0dXJuIHJldDsKPiAgIAl9Cj4g ICAKPiAtCXJldCA9IGNsa19wcmVwYXJlKHZvcC0+YWNsayk7Cj4gKwkvKiBFbmFibGUgYm90aCB0 aGUgaGNsayBhbmQgYWNsayB0byBzZXR1cCB0aGUgdm9wICovCj4gKwlyZXQgPSBjbGtfcHJlcGFy ZV9lbmFibGUodm9wLT5oY2xrKTsKPiAgIAlpZiAocmV0IDwgMCkgewo+IC0JCWRldl9lcnIodm9w LT5kZXYsICJmYWlsZWQgdG8gcHJlcGFyZSBhY2xrXG4iKTsKPiArCQlkZXZfZXJyKHZvcC0+ZGV2 LCAiZmFpbGVkIHRvIHByZXBhcmUvZW5hYmxlIGhjbGtcbiIpOwo+ICAgCQlnb3RvIGVycl91bnBy ZXBhcmVfZGNsazsKPiAgIAl9Cj4gICAKPiAtCS8qCj4gLQkgKiBlbmFibGUgaGNsaywgc28gdGhh dCB3ZSBjYW4gY29uZmlnIHZvcCByZWdpc3Rlci4KPiAtCSAqLwo+IC0JcmV0ID0gY2xrX2VuYWJs ZSh2b3AtPmhjbGspOwo+ICsJcmV0ID0gY2xrX3ByZXBhcmVfZW5hYmxlKHZvcC0+YWNsayk7Cj4g ICAJaWYgKHJldCA8IDApIHsKPiAtCQlkZXZfZXJyKHZvcC0+ZGV2LCAiZmFpbGVkIHRvIHByZXBh cmUgYWNsa1xuIik7Cj4gLQkJZ290byBlcnJfdW5wcmVwYXJlX2FjbGs7Cj4gKwkJZGV2X2Vycih2 b3AtPmRldiwgImZhaWxlZCB0byBwcmVwYXJlL2VuYWJsZSBhY2xrXG4iKTsKPiArCQlnb3RvIGVy cl9kaXNhYmxlX2hjbGs7Cj4gICAJfQo+ICsKPiAgIAkvKgo+ICAgCSAqIGRvIGhjbGtfcmVzZXQs IHJlc2V0IGFsbCB2b3AgcmVnaXN0ZXJzLgo+ICAgCSAqLwo+IEBAIC0xNjA4LDcgKzE2MDEsNyBA QCBzdGF0aWMgaW50IHZvcF9pbml0aWFsKHN0cnVjdCB2b3AgKnZvcCkKPiAgIAlpZiAoSVNfRVJS KGFoYl9yc3QpKSB7Cj4gICAJCWRldl9lcnIodm9wLT5kZXYsICJmYWlsZWQgdG8gZ2V0IGFoYiBy ZXNldFxuIik7Cj4gICAJCXJldCA9IFBUUl9FUlIoYWhiX3JzdCk7Cj4gLQkJZ290byBlcnJfZGlz YWJsZV9oY2xrOwo+ICsJCWdvdG8gZXJyX2Rpc2FibGVfYWNsazsKPiAgIAl9Cj4gICAJcmVzZXRf Y29udHJvbF9hc3NlcnQoYWhiX3JzdCk7Cj4gICAJdXNsZWVwX3JhbmdlKDEwLCAyMCk7Cj4gQEAg LTE2MzQsMjYgKzE2MjcsMjUgQEAgc3RhdGljIGludCB2b3BfaW5pdGlhbChzdHJ1Y3Qgdm9wICp2 b3ApCj4gICAJaWYgKElTX0VSUih2b3AtPmRjbGtfcnN0KSkgewo+ICAgCQlkZXZfZXJyKHZvcC0+ ZGV2LCAiZmFpbGVkIHRvIGdldCBkY2xrIHJlc2V0XG4iKTsKPiAgIAkJcmV0ID0gUFRSX0VSUih2 b3AtPmRjbGtfcnN0KTsKPiAtCQlnb3RvIGVycl91bnByZXBhcmVfYWNsazsKPiArCQlnb3RvIGVy cl9kaXNhYmxlX2FjbGs7Cj4gICAJfQo+ICAgCXJlc2V0X2NvbnRyb2xfYXNzZXJ0KHZvcC0+ZGNs a19yc3QpOwo+ICAgCXVzbGVlcF9yYW5nZSgxMCwgMjApOwo+ICAgCXJlc2V0X2NvbnRyb2xfZGVh c3NlcnQodm9wLT5kY2xrX3JzdCk7Cj4gICAKPiAgIAljbGtfZGlzYWJsZSh2b3AtPmhjbGspOwo+ ICsJY2xrX2Rpc2FibGUodm9wLT5hY2xrKTsKPiAgIAo+ICAgCXZvcC0+aXNfZW5hYmxlZCA9IGZh bHNlOwo+ICAgCj4gICAJcmV0dXJuIDA7Cj4gICAKPiArZXJyX2Rpc2FibGVfYWNsazoKPiArCWNs a19kaXNhYmxlX3VucHJlcGFyZSh2b3AtPmFjbGspOwo+ICAgZXJyX2Rpc2FibGVfaGNsazoKPiAt CWNsa19kaXNhYmxlKHZvcC0+aGNsayk7Cj4gLWVycl91bnByZXBhcmVfYWNsazoKPiAtCWNsa191 bnByZXBhcmUodm9wLT5hY2xrKTsKPiArCWNsa19kaXNhYmxlX3VucHJlcGFyZSh2b3AtPmhjbGsp Owo+ICAgZXJyX3VucHJlcGFyZV9kY2xrOgo+ICAgCWNsa191bnByZXBhcmUodm9wLT5kY2xrKTsK PiAtZXJyX3VucHJlcGFyZV9oY2xrOgo+IC0JY2xrX3VucHJlcGFyZSh2b3AtPmhjbGspOwo+ICAg CXJldHVybiByZXQ7Cj4gICB9Cj4gICAKCgotLSAK77ytYXJrIFlhbwoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Tue, 29 Sep 2015 18:14:37 +0800 Subject: [PATCH] drm/rockchip: vop: Correct enabled clocks during setup In-Reply-To: <1443518893-28142-1-git-send-email-sjoerd.simons@collabora.co.uk> References: <1443518893-28142-1-git-send-email-sjoerd.simons@collabora.co.uk> Message-ID: <560A648D.1060504@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Sjoerd We double check this problem, yes, board will hang if aclk is disabled when setting vop register. Acked-by: Mark Yao Thanks for this fix. On 2015?09?29? 17:28, Sjoerd Simons wrote: > When doing the initial setup both the hclk and the aclk need to be > enabled otherwise the board will simply hang. This only occurs when > building the vop driver as a module, when its built-in the initial setup > happens to run before the clock framework shuts of unused clocks > (including the aclk). > > While there also switch to doing prepare and enable in one step rather > then separate steps to reduce the amount of code required. > > Signed-off-by: Sjoerd Simons > > --- > > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 36 +++++++++++------------------ > 1 file changed, 14 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 5d8ae5e..48719df 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -1575,32 +1575,25 @@ static int vop_initial(struct vop *vop) > return PTR_ERR(vop->dclk); > } > > - ret = clk_prepare(vop->hclk); > - if (ret < 0) { > - dev_err(vop->dev, "failed to prepare hclk\n"); > - return ret; > - } > - > ret = clk_prepare(vop->dclk); > if (ret < 0) { > dev_err(vop->dev, "failed to prepare dclk\n"); > - goto err_unprepare_hclk; > + return ret; > } > > - ret = clk_prepare(vop->aclk); > + /* Enable both the hclk and aclk to setup the vop */ > + ret = clk_prepare_enable(vop->hclk); > if (ret < 0) { > - dev_err(vop->dev, "failed to prepare aclk\n"); > + dev_err(vop->dev, "failed to prepare/enable hclk\n"); > goto err_unprepare_dclk; > } > > - /* > - * enable hclk, so that we can config vop register. > - */ > - ret = clk_enable(vop->hclk); > + ret = clk_prepare_enable(vop->aclk); > if (ret < 0) { > - dev_err(vop->dev, "failed to prepare aclk\n"); > - goto err_unprepare_aclk; > + dev_err(vop->dev, "failed to prepare/enable aclk\n"); > + goto err_disable_hclk; > } > + > /* > * do hclk_reset, reset all vop registers. > */ > @@ -1608,7 +1601,7 @@ static int vop_initial(struct vop *vop) > if (IS_ERR(ahb_rst)) { > dev_err(vop->dev, "failed to get ahb reset\n"); > ret = PTR_ERR(ahb_rst); > - goto err_disable_hclk; > + goto err_disable_aclk; > } > reset_control_assert(ahb_rst); > usleep_range(10, 20); > @@ -1634,26 +1627,25 @@ static int vop_initial(struct vop *vop) > if (IS_ERR(vop->dclk_rst)) { > dev_err(vop->dev, "failed to get dclk reset\n"); > ret = PTR_ERR(vop->dclk_rst); > - goto err_unprepare_aclk; > + goto err_disable_aclk; > } > reset_control_assert(vop->dclk_rst); > usleep_range(10, 20); > reset_control_deassert(vop->dclk_rst); > > clk_disable(vop->hclk); > + clk_disable(vop->aclk); > > vop->is_enabled = false; > > return 0; > > +err_disable_aclk: > + clk_disable_unprepare(vop->aclk); > err_disable_hclk: > - clk_disable(vop->hclk); > -err_unprepare_aclk: > - clk_unprepare(vop->aclk); > + clk_disable_unprepare(vop->hclk); > err_unprepare_dclk: > clk_unprepare(vop->dclk); > -err_unprepare_hclk: > - clk_unprepare(vop->hclk); > return ret; > } > -- ?ark Yao From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934473AbbI2KPB (ORCPT ); Tue, 29 Sep 2015 06:15:01 -0400 Received: from regular1.263xmail.com ([211.150.99.137]:33854 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934223AbbI2KOy (ORCPT ); Tue, 29 Sep 2015 06:14:54 -0400 X-263anti-spam: KSV:0;BIG:0;ABS:1;DNS:0;ATT:0;SPF:S; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ADDR-CHECKED: 0 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: linux-arm-kernel@lists.infradead.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <560A648D.1060504@rock-chips.com> Date: Tue, 29 Sep 2015 18:14:37 +0800 From: Mark yao User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Sjoerd Simons CC: Heiko Stuebner , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, David Airlie , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] drm/rockchip: vop: Correct enabled clocks during setup References: <1443518893-28142-1-git-send-email-sjoerd.simons@collabora.co.uk> In-Reply-To: <1443518893-28142-1-git-send-email-sjoerd.simons@collabora.co.uk> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sjoerd We double check this problem, yes, board will hang if aclk is disabled when setting vop register. Acked-by: Mark Yao Thanks for this fix. On 2015年09月29日 17:28, Sjoerd Simons wrote: > When doing the initial setup both the hclk and the aclk need to be > enabled otherwise the board will simply hang. This only occurs when > building the vop driver as a module, when its built-in the initial setup > happens to run before the clock framework shuts of unused clocks > (including the aclk). > > While there also switch to doing prepare and enable in one step rather > then separate steps to reduce the amount of code required. > > Signed-off-by: Sjoerd Simons > > --- > > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 36 +++++++++++------------------ > 1 file changed, 14 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 5d8ae5e..48719df 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -1575,32 +1575,25 @@ static int vop_initial(struct vop *vop) > return PTR_ERR(vop->dclk); > } > > - ret = clk_prepare(vop->hclk); > - if (ret < 0) { > - dev_err(vop->dev, "failed to prepare hclk\n"); > - return ret; > - } > - > ret = clk_prepare(vop->dclk); > if (ret < 0) { > dev_err(vop->dev, "failed to prepare dclk\n"); > - goto err_unprepare_hclk; > + return ret; > } > > - ret = clk_prepare(vop->aclk); > + /* Enable both the hclk and aclk to setup the vop */ > + ret = clk_prepare_enable(vop->hclk); > if (ret < 0) { > - dev_err(vop->dev, "failed to prepare aclk\n"); > + dev_err(vop->dev, "failed to prepare/enable hclk\n"); > goto err_unprepare_dclk; > } > > - /* > - * enable hclk, so that we can config vop register. > - */ > - ret = clk_enable(vop->hclk); > + ret = clk_prepare_enable(vop->aclk); > if (ret < 0) { > - dev_err(vop->dev, "failed to prepare aclk\n"); > - goto err_unprepare_aclk; > + dev_err(vop->dev, "failed to prepare/enable aclk\n"); > + goto err_disable_hclk; > } > + > /* > * do hclk_reset, reset all vop registers. > */ > @@ -1608,7 +1601,7 @@ static int vop_initial(struct vop *vop) > if (IS_ERR(ahb_rst)) { > dev_err(vop->dev, "failed to get ahb reset\n"); > ret = PTR_ERR(ahb_rst); > - goto err_disable_hclk; > + goto err_disable_aclk; > } > reset_control_assert(ahb_rst); > usleep_range(10, 20); > @@ -1634,26 +1627,25 @@ static int vop_initial(struct vop *vop) > if (IS_ERR(vop->dclk_rst)) { > dev_err(vop->dev, "failed to get dclk reset\n"); > ret = PTR_ERR(vop->dclk_rst); > - goto err_unprepare_aclk; > + goto err_disable_aclk; > } > reset_control_assert(vop->dclk_rst); > usleep_range(10, 20); > reset_control_deassert(vop->dclk_rst); > > clk_disable(vop->hclk); > + clk_disable(vop->aclk); > > vop->is_enabled = false; > > return 0; > > +err_disable_aclk: > + clk_disable_unprepare(vop->aclk); > err_disable_hclk: > - clk_disable(vop->hclk); > -err_unprepare_aclk: > - clk_unprepare(vop->aclk); > + clk_disable_unprepare(vop->hclk); > err_unprepare_dclk: > clk_unprepare(vop->dclk); > -err_unprepare_hclk: > - clk_unprepare(vop->hclk); > return ret; > } > -- Ｍark Yao