From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Zhong Subject: Re: [05/26] drm/rockchip: dw-mipi-dsi: fix command header writes Date: Tue, 17 Jan 2017 17:32:30 +0800 Message-ID: <587DE4AE.8070608@rock-chips.com> References: <20160919171747.28512-6-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160919171747.28512-6-john@metanate.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: John Keeping , Mark Yao Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: linux-rockchip.vger.kernel.org c2FtZSBhcyBodHRwczovL3BhdGNod29yay5rZXJuZWwub3JnL3BhdGNoLzk1MTg0MTcvCgpUZXN0 ZWQtYnk6IENocmlzIFpob25nIDx6eXdAcm9jay1jaGlwcy5jb20+ClJldmlld2VkLWJ5OiBDaHJp cyBaaG9uZyA8enl3QHJvY2stY2hpcHMuY29tPgoKT24gMDkvMjAvMjAxNiAwMToxNyBBTSwgSm9o biBLZWVwaW5nIHdyb3RlOgo+IEluIGEgY291cGxlIG9mIHBsYWNlcyBoZXJlIHdlIHVzZSAidmFs IiBmb3IgdGhlIHZhbHVlIHRoYXQgaXMgYWJvdXQgdG8KPiBiZSB3cml0dGVuIHRvIGEgcmVnaXN0 ZXIgYnV0IHRoZW4gcmV1c2UgdGhlIHNhbWUgdmFyaWFibGUgZm9yIHRoZSB2YWx1ZQo+IG9mIGEg c3RhdHVzIHJlZ2lzdGVyIGJlZm9yZSB3ZSBnZXQgYXJvdW5kIHRvIHdyaXRpbmcgaXQuICBSZW5h bWUgdGhlCj4gdmFsdWUgdG8gYmUgd3JpdHRlbiB0byBzbyB0aGF0IHdlIHdyaXRlIHRoZSB2YWx1 ZSB3ZSBpbnRlbmQgdG8gYW5kIG5vdAo+IHdoYXQgd2UgaGF2ZSBqdXN0IHJlYWQgZnJvbSB0aGUg c3RhdHVzIHJlZ2lzdGVyLgo+Cj4gU2lnbmVkLW9mZi1ieTogSm9obiBLZWVwaW5nIDxqb2huQG1l dGFuYXRlLmNvbT4KPiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRz aS5jIHwgMTAgKysrKysrLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwg NCBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAv ZHctbWlwaS1kc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jCj4g aW5kZXggZmFjMjQyOWI5ZDZkLi4wMzkxNWJmOWM5N2QgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9j a2NoaXAvZHctbWlwaS1kc2kuYwo+IEBAIC01NDMsOSArNTQzLDEwIEBAIHN0YXRpYyBpbnQgZHdf bWlwaV9kc2lfaG9zdF9kZXRhY2goc3RydWN0IG1pcGlfZHNpX2hvc3QgKmhvc3QsCj4gICAJcmV0 dXJuIDA7Cj4gICB9Cj4gICAKPiAtc3RhdGljIGludCBkd19taXBpX2RzaV9nZW5fcGt0X2hkcl93 cml0ZShzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSwgdTMyIHZhbCkKPiArc3RhdGljIGludCBkd19t aXBpX2RzaV9nZW5fcGt0X2hkcl93cml0ZShzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSwgdTMyIGhk cl92YWwpCj4gICB7Cj4gICAJaW50IHJldDsKPiArCXUzMiB2YWw7Cj4gICAKPiAgIAlyZXQgPSBy ZWFkeF9wb2xsX3RpbWVvdXQocmVhZGwsIGRzaS0+YmFzZSArIERTSV9DTURfUEtUX1NUQVRVUywK PiAgIAkJCQkgdmFsLCAhKHZhbCAmIEdFTl9DTURfRlVMTCksIDEwMDAsCj4gQEAgLTU1NSw3ICs1 NTYsNyBAQCBzdGF0aWMgaW50IGR3X21pcGlfZHNpX2dlbl9wa3RfaGRyX3dyaXRlKHN0cnVjdCBk d19taXBpX2RzaSAqZHNpLCB1MzIgdmFsKQo+ICAgCQlyZXR1cm4gcmV0Owo+ICAgCX0KPiAgIAo+ IC0JZHNpX3dyaXRlKGRzaSwgRFNJX0dFTl9IRFIsIHZhbCk7Cj4gKwlkc2lfd3JpdGUoZHNpLCBE U0lfR0VOX0hEUiwgaGRyX3ZhbCk7Cj4gICAKPiAgIAlyZXQgPSByZWFkeF9wb2xsX3RpbWVvdXQo cmVhZGwsIGRzaS0+YmFzZSArIERTSV9DTURfUEtUX1NUQVRVUywKPiAgIAkJCQkgdmFsLCB2YWwg JiAoR0VOX0NNRF9FTVBUWSB8IEdFTl9QTERfV19FTVBUWSksCj4gQEAgLTU4OCw4ICs1ODksOSBA QCBzdGF0aWMgaW50IGR3X21pcGlfZHNpX2Rjc19sb25nX3dyaXRlKHN0cnVjdCBkd19taXBpX2Rz aSAqZHNpLAo+ICAgewo+ICAgCWNvbnN0IHUzMiAqdHhfYnVmID0gbXNnLT50eF9idWY7Cj4gICAJ aW50IGxlbiA9IG1zZy0+dHhfbGVuLCBwbGRfZGF0YV9ieXRlcyA9IHNpemVvZigqdHhfYnVmKSwg cmV0Owo+IC0JdTMyIHZhbCA9IEdFTl9IREFUQShtc2ctPnR4X2xlbikgfCBHRU5fSFRZUEUobXNn LT50eXBlKTsKPiArCXUzMiBoZHJfdmFsID0gR0VOX0hEQVRBKG1zZy0+dHhfbGVuKSB8IEdFTl9I VFlQRShtc2ctPnR5cGUpOwo+ICAgCXUzMiByZW1haW5kZXIgPSAwOwo+ICsJdTMyIHZhbDsKPiAg IAo+ICAgCWlmIChtc2ctPnR4X2xlbiA8IDMpIHsKPiAgIAkJZGV2X2Vycihkc2ktPmRldiwgIndy b25nIHR4IGJ1ZiBsZW5ndGggJXp1IGZvciBsb25nIHdyaXRlXG4iLAo+IEBAIC02MTgsNyArNjIw LDcgQEAgc3RhdGljIGludCBkd19taXBpX2RzaV9kY3NfbG9uZ193cml0ZShzdHJ1Y3QgZHdfbWlw aV9kc2kgKmRzaSwKPiAgIAkJfQo+ICAgCX0KPiAgIAo+IC0JcmV0dXJuIGR3X21pcGlfZHNpX2dl bl9wa3RfaGRyX3dyaXRlKGRzaSwgdmFsKTsKPiArCXJldHVybiBkd19taXBpX2RzaV9nZW5fcGt0 X2hkcl93cml0ZShkc2ksIGhkcl92YWwpOwo+ICAgfQo+ICAgCj4gICBzdGF0aWMgc3NpemVfdCBk d19taXBpX2RzaV9ob3N0X3RyYW5zZmVyKHN0cnVjdCBtaXBpX2RzaV9ob3N0ICpob3N0LAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Tue, 17 Jan 2017 17:32:30 +0800 Subject: [05/26] drm/rockchip: dw-mipi-dsi: fix command header writes In-Reply-To: <20160919171747.28512-6-john@metanate.com> References: <20160919171747.28512-6-john@metanate.com> Message-ID: <587DE4AE.8070608@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org same as https://patchwork.kernel.org/patch/9518417/ Tested-by: Chris Zhong Reviewed-by: Chris Zhong On 09/20/2016 01:17 AM, John Keeping wrote: > In a couple of places here we use "val" for the value that is about to > be written to a register but then reuse the same variable for the value > of a status register before we get around to writing it. Rename the > value to be written to so that we write the value we intend to and not > what we have just read from the status register. > > Signed-off-by: John Keeping > --- > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index fac2429b9d6d..03915bf9c97d 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -543,9 +543,10 @@ static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host, > return 0; > } > > -static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 val) > +static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val) > { > int ret; > + u32 val; > > ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, > val, !(val & GEN_CMD_FULL), 1000, > @@ -555,7 +556,7 @@ static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 val) > return ret; > } > > - dsi_write(dsi, DSI_GEN_HDR, val); > + dsi_write(dsi, DSI_GEN_HDR, hdr_val); > > ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, > val, val & (GEN_CMD_EMPTY | GEN_PLD_W_EMPTY), > @@ -588,8 +589,9 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > { > const u32 *tx_buf = msg->tx_buf; > int len = msg->tx_len, pld_data_bytes = sizeof(*tx_buf), ret; > - u32 val = GEN_HDATA(msg->tx_len) | GEN_HTYPE(msg->type); > + u32 hdr_val = GEN_HDATA(msg->tx_len) | GEN_HTYPE(msg->type); > u32 remainder = 0; > + u32 val; > > if (msg->tx_len < 3) { > dev_err(dsi->dev, "wrong tx buf length %zu for long write\n", > @@ -618,7 +620,7 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > } > } > > - return dw_mipi_dsi_gen_pkt_hdr_write(dsi, val); > + return dw_mipi_dsi_gen_pkt_hdr_write(dsi, hdr_val); > } > > static ssize_t dw_mipi_dsi_host_transfer(struct mipi_dsi_host *host, From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751640AbdAQJcz (ORCPT ); Tue, 17 Jan 2017 04:32:55 -0500 Received: from regular1.263xmail.com ([211.150.99.135]:42176 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751608AbdAQJcw (ORCPT ); Tue, 17 Jan 2017 04:32:52 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: zyw@rock-chips.com X-FST-TO: linux-arm-kernel@lists.infradead.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: zyw@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [05/26] drm/rockchip: dw-mipi-dsi: fix command header writes To: John Keeping , Mark Yao References: <20160919171747.28512-6-john@metanate.com> Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org From: Chris Zhong Message-ID: <587DE4AE.8070608@rock-chips.com> Date: Tue, 17 Jan 2017 17:32:30 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <20160919171747.28512-6-john@metanate.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org same as https://patchwork.kernel.org/patch/9518417/ Tested-by: Chris Zhong Reviewed-by: Chris Zhong On 09/20/2016 01:17 AM, John Keeping wrote: > In a couple of places here we use "val" for the value that is about to > be written to a register but then reuse the same variable for the value > of a status register before we get around to writing it. Rename the > value to be written to so that we write the value we intend to and not > what we have just read from the status register. > > Signed-off-by: John Keeping > --- > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index fac2429b9d6d..03915bf9c97d 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -543,9 +543,10 @@ static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host, > return 0; > } > > -static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 val) > +static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val) > { > int ret; > + u32 val; > > ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, > val, !(val & GEN_CMD_FULL), 1000, > @@ -555,7 +556,7 @@ static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 val) > return ret; > } > > - dsi_write(dsi, DSI_GEN_HDR, val); > + dsi_write(dsi, DSI_GEN_HDR, hdr_val); > > ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, > val, val & (GEN_CMD_EMPTY | GEN_PLD_W_EMPTY), > @@ -588,8 +589,9 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > { > const u32 *tx_buf = msg->tx_buf; > int len = msg->tx_len, pld_data_bytes = sizeof(*tx_buf), ret; > - u32 val = GEN_HDATA(msg->tx_len) | GEN_HTYPE(msg->type); > + u32 hdr_val = GEN_HDATA(msg->tx_len) | GEN_HTYPE(msg->type); > u32 remainder = 0; > + u32 val; > > if (msg->tx_len < 3) { > dev_err(dsi->dev, "wrong tx buf length %zu for long write\n", > @@ -618,7 +620,7 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > } > } > > - return dw_mipi_dsi_gen_pkt_hdr_write(dsi, val); > + return dw_mipi_dsi_gen_pkt_hdr_write(dsi, hdr_val); > } > > static ssize_t dw_mipi_dsi_host_transfer(struct mipi_dsi_host *host,