From mboxrd@z Thu Jan 1 00:00:00 1970 From: walter harms Date: Sun, 26 Feb 2017 14:28:44 +0000 Subject: Re: [PATCH v2] drm/msm/dsi: Fix the releasing of resources in error path in 'dsi_bus_clk_enable()' Message-Id: <58B2E61C.7020205@bfs.de> List-Id: References: <20170226121057.9717-1-christophe.jaillet@wanadoo.fr> In-Reply-To: <20170226121057.9717-1-christophe.jaillet-39ZsbGIQGT5GWvitb5QawA@public.gmane.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Christophe JAILLET Cc: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, airlied-cv59FeDIM0c@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, hali-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org looks good to me. Reviewed-by: wharms@bfs.de Am 26.02.2017 13:10, schrieb Christophe JAILLET: > If a 'clk_prepare_enable()' fails, then we need to disable_unprepare the > clk already handled. > > With the current implemenatation, we try to do that on the clk that has > triggered the error, which is a no-op and leave msm_host->bus_clks[0] > untouched. > > Count forward in order to fix it and be more future proof. > > Signed-off-by: Christophe JAILLET > --- > v2: change the for loop from a backward to a forward one, to ease reading. > --- > drivers/gpu/drm/msm/dsi/dsi_host.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c > index 1fc07ce24686..e6f56cd8ce08 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_host.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c > @@ -422,7 +422,7 @@ static int dsi_clk_init(struct msm_dsi_host *msm_host) > static int dsi_bus_clk_enable(struct msm_dsi_host *msm_host) > { > const struct msm_dsi_config *cfg = msm_host->cfg_hnd->cfg; > - int i, ret; > + int i, j, ret; > > DBG("id=%d", msm_host->id); > > @@ -437,8 +437,8 @@ static int dsi_bus_clk_enable(struct msm_dsi_host *msm_host) > > return 0; > err: > - for (; i > 0; i--) > - clk_disable_unprepare(msm_host->bus_clks[i]); > + for (j = 0; j < i; j++) > + clk_disable_unprepare(msm_host->bus_clks[j]); > > return ret; > } From mboxrd@z Thu Jan 1 00:00:00 1970 From: walter harms Subject: Re: [PATCH v2] drm/msm/dsi: Fix the releasing of resources in error path in 'dsi_bus_clk_enable()' Date: Sun, 26 Feb 2017 15:28:44 +0100 Message-ID: <58B2E61C.7020205@bfs.de> References: <20170226121057.9717-1-christophe.jaillet@wanadoo.fr> Reply-To: wharms-fPG8STNUNVg@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170226121057.9717-1-christophe.jaillet-39ZsbGIQGT5GWvitb5QawA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: Christophe JAILLET Cc: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, airlied-cv59FeDIM0c@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, yongjun_wei-zrsr2BFq86L20UzCJQGyNP8+0UxHXcjY@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, hali-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org bG9va3MgZ29vZCB0byBtZS4KClJldmlld2VkLWJ5OiB3aGFybXNAYmZzLmRlCgpBbSAyNi4wMi4y MDE3IDEzOjEwLCBzY2hyaWViIENocmlzdG9waGUgSkFJTExFVDoKPiBJZiBhICdjbGtfcHJlcGFy ZV9lbmFibGUoKScgZmFpbHMsIHRoZW4gd2UgbmVlZCB0byBkaXNhYmxlX3VucHJlcGFyZSB0aGUK PiBjbGsgYWxyZWFkeSBoYW5kbGVkLgo+IAo+IFdpdGggdGhlIGN1cnJlbnQgaW1wbGVtZW5hdGF0 aW9uLCB3ZSB0cnkgdG8gZG8gdGhhdCBvbiB0aGUgY2xrIHRoYXQgaGFzCj4gdHJpZ2dlcmVkIHRo ZSBlcnJvciwgd2hpY2ggaXMgYSBuby1vcCBhbmQgbGVhdmUgbXNtX2hvc3QtPmJ1c19jbGtzWzBd Cj4gdW50b3VjaGVkLgo+IAo+IENvdW50IGZvcndhcmQgaW4gb3JkZXIgdG8gZml4IGl0IGFuZCBi ZSBtb3JlIGZ1dHVyZSBwcm9vZi4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBDaHJpc3RvcGhlIEpBSUxM RVQgPGNocmlzdG9waGUuamFpbGxldEB3YW5hZG9vLmZyPgo+IC0tLQo+IHYyOiBjaGFuZ2UgdGhl IGZvciBsb29wIGZyb20gYSBiYWNrd2FyZCB0byBhIGZvcndhcmQgb25lLCB0byBlYXNlIHJlYWRp bmcuCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9tc20vZHNpL2RzaV9ob3N0LmMgfCA2ICsrKy0t LQo+ICAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQo+IAo+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2RzaS9kc2lfaG9zdC5jIGIvZHJpdmVy cy9ncHUvZHJtL21zbS9kc2kvZHNpX2hvc3QuYwo+IGluZGV4IDFmYzA3Y2UyNDY4Ni4uZTZmNTZj ZDhjZTA4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZHNpL2RzaV9ob3N0LmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2RzaS9kc2lfaG9zdC5jCj4gQEAgLTQyMiw3ICs0 MjIsNyBAQCBzdGF0aWMgaW50IGRzaV9jbGtfaW5pdChzdHJ1Y3QgbXNtX2RzaV9ob3N0ICptc21f aG9zdCkKPiAgc3RhdGljIGludCBkc2lfYnVzX2Nsa19lbmFibGUoc3RydWN0IG1zbV9kc2lfaG9z dCAqbXNtX2hvc3QpCj4gIHsKPiAgCWNvbnN0IHN0cnVjdCBtc21fZHNpX2NvbmZpZyAqY2ZnID0g bXNtX2hvc3QtPmNmZ19obmQtPmNmZzsKPiAtCWludCBpLCByZXQ7Cj4gKwlpbnQgaSwgaiwgcmV0 Owo+ICAKPiAgCURCRygiaWQ9JWQiLCBtc21faG9zdC0+aWQpOwo+ICAKPiBAQCAtNDM3LDggKzQz Nyw4IEBAIHN0YXRpYyBpbnQgZHNpX2J1c19jbGtfZW5hYmxlKHN0cnVjdCBtc21fZHNpX2hvc3Qg Km1zbV9ob3N0KQo+ICAKPiAgCXJldHVybiAwOwo+ICBlcnI6Cj4gLQlmb3IgKDsgaSA+IDA7IGkt LSkKPiAtCQljbGtfZGlzYWJsZV91bnByZXBhcmUobXNtX2hvc3QtPmJ1c19jbGtzW2ldKTsKPiAr CWZvciAoaiA9IDA7IGogPCBpOyBqKyspCj4gKwkJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKG1zbV9o b3N0LT5idXNfY2xrc1tqXSk7Cj4gIAo+ICAJcmV0dXJuIHJldDsKPiAgfQpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0 CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9mcmVlZHJlbm8K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752301AbdBZO25 (ORCPT ); Sun, 26 Feb 2017 09:28:57 -0500 Received: from mx02-sz.bfs.de ([194.94.69.103]:10889 "EHLO mx02-sz.bfs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752239AbdBZO2v (ORCPT ); Sun, 26 Feb 2017 09:28:51 -0500 Message-ID: <58B2E61C.7020205@bfs.de> Date: Sun, 26 Feb 2017 15:28:44 +0100 From: walter harms Reply-To: wharms@bfs.de User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.1.16) Gecko/20101125 SUSE/3.0.11 Thunderbird/3.0.11 MIME-Version: 1.0 To: Christophe JAILLET CC: robdclark@gmail.com, airlied@linux.ie, architt@codeaurora.org, hali@codeaurora.org, yongjun_wei@trendmicro.com.cn, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH v2] drm/msm/dsi: Fix the releasing of resources in error path in 'dsi_bus_clk_enable()' References: <20170226121057.9717-1-christophe.jaillet@wanadoo.fr> In-Reply-To: <20170226121057.9717-1-christophe.jaillet@wanadoo.fr> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org looks good to me. Reviewed-by: wharms@bfs.de Am 26.02.2017 13:10, schrieb Christophe JAILLET: > If a 'clk_prepare_enable()' fails, then we need to disable_unprepare the > clk already handled. > > With the current implemenatation, we try to do that on the clk that has > triggered the error, which is a no-op and leave msm_host->bus_clks[0] > untouched. > > Count forward in order to fix it and be more future proof. > > Signed-off-by: Christophe JAILLET > --- > v2: change the for loop from a backward to a forward one, to ease reading. > --- > drivers/gpu/drm/msm/dsi/dsi_host.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c > index 1fc07ce24686..e6f56cd8ce08 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_host.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c > @@ -422,7 +422,7 @@ static int dsi_clk_init(struct msm_dsi_host *msm_host) > static int dsi_bus_clk_enable(struct msm_dsi_host *msm_host) > { > const struct msm_dsi_config *cfg = msm_host->cfg_hnd->cfg; > - int i, ret; > + int i, j, ret; > > DBG("id=%d", msm_host->id); > > @@ -437,8 +437,8 @@ static int dsi_bus_clk_enable(struct msm_dsi_host *msm_host) > > return 0; > err: > - for (; i > 0; i--) > - clk_disable_unprepare(msm_host->bus_clks[i]); > + for (j = 0; j < i; j++) > + clk_disable_unprepare(msm_host->bus_clks[j]); > > return ret; > }