From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH v3 24/24] drm/rockchip: dw-mipi-dsi: support read commands Date: Mon, 30 Jan 2017 15:16:09 -0500 Message-ID: <20170130201609.GM20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-25-john@metanate.com> <20170130152611.GA20076@art_vandelay> <20170130181427.1940024f.john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170130181427.1940024f.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 Cc: Chris Zhong , linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org T24gTW9uLCBKYW4gMzAsIDIwMTcgYXQgMDY6MTQ6MjdQTSArMDAwMCwgSm9obiBLZWVwaW5nIHdy b3RlOgo+IE9uIE1vbiwgMzAgSmFuIDIwMTcgMTA6MjY6MTEgLTA1MDAsIFNlYW4gUGF1bCB3cm90 ZToKPiAKPiA+IE9uIFN1biwgSmFuIDI5LCAyMDE3IGF0IDAxOjI0OjQ0UE0gKzAwMDAsIEpvaG4g S2VlcGluZyB3cm90ZToKPiA+ID4gSSBoYXZlbid0IGZvdW5kIGFueSBtZXRob2QgZm9yIGdldHRp bmcgdGhlIGxlbmd0aCBvZiBhIHJlc3BvbnNlLCBzbyB0aGlzCj4gPiA+IGp1c3QgdXNlcyB0aGUg cmVxdWVzdGVkIHJ4X2xlbgo+ID4gPiAKPiA+ID4gU2lnbmVkLW9mZi1ieTogSm9obiBLZWVwaW5n IDxqb2huQG1ldGFuYXRlLmNvbT4KPiA+ID4gLS0tCj4gPiA+IHYzOgo+ID4gPiAtIEZpeCBjaGVj a3BhdGNoIHdhcm5pbmdzCj4gPiA+IFVuY2hhbmdlZCBpbiB2Mgo+ID4gPiAKPiA+ID4gIGRyaXZl cnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jIHwgNTYgKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKwo+ID4gPiAgMSBmaWxlIGNoYW5nZWQsIDU2IGluc2VydGlvbnMoKykK PiA+ID4gCj4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlw aS1kc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jCj4gPiA+IGlu ZGV4IGNmM2NhNmIwY2JkYi4uY2M1OGFkYTc1NDI1IDEwMDY0NAo+ID4gPiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYwo+ID4gPiArKysgYi9kcml2ZXJzL2dwdS9k cm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYwo+ID4gPiBAQCAtNjc4LDYgKzY3OCw1NiBAQCBzdGF0 aWMgaW50IGR3X21pcGlfZHNpX2Rjc19sb25nX3dyaXRlKHN0cnVjdCBkd19taXBpX2RzaSAqZHNp LAo+ID4gPiAgCXJldHVybiBkd19taXBpX2RzaV9nZW5fcGt0X2hkcl93cml0ZShkc2ksIGhkcl92 YWwpOwo+ID4gPiAgfQo+ID4gPiAgCj4gPiA+ICtzdGF0aWMgaW50IGR3X21pcGlfZHNpX2Rjc19y ZWFkKHN0cnVjdCBkd19taXBpX2RzaSAqZHNpLAo+ID4gPiArCQkJCWNvbnN0IHN0cnVjdCBtaXBp X2RzaV9tc2cgKm1zZykKPiA+ID4gK3sKPiA+ID4gKwljb25zdCB1OCAqdHhfYnVmID0gbXNnLT50 eF9idWY7Cj4gPiA+ICsJdTggKnJ4X2J1ZiA9IG1zZy0+cnhfYnVmOwo+ID4gPiArCXNpemVfdCBp Owo+ID4gPiArCWludCByZXQsIHZhbDsKPiA+ID4gKwo+ID4gPiArCWRzaV93cml0ZShkc2ksIERT SV9QQ0tIRExfQ0ZHLCBFTl9DUkNfUlggfCBFTl9FQ0NfUlggfCBFTl9CVEEpOwo+ID4gPiArCWRz aV93cml0ZShkc2ksIERTSV9HRU5fSERSLAo+ID4gPiArCQkgIEdFTl9IREFUQSh0eF9idWZbMF0p IHwgR0VOX0hUWVBFKG1zZy0+dHlwZSkpOwo+ID4gPiArCj4gPiA+ICsJcmV0ID0gcmVhZGxfcG9s bF90aW1lb3V0KGRzaS0+YmFzZSArIERTSV9DTURfUEtUX1NUQVRVUywKPiA+ID4gKwkJCQkgdmFs LCAhKHZhbCAmIEdFTl9SRF9DTURfQlVTWSksIDEwMDAsCj4gPiA+ICsJCQkJIENNRF9QS1RfU1RB VFVTX1RJTUVPVVRfVVMpOwo+ID4gPiArCWlmIChyZXQgPCAwKSB7Cj4gPiA+ICsJCWRldl9lcnIo ZHNpLT5kZXYsICJmYWlsZWQgdG8gcmVhZCBjb21tYW5kIHJlc3BvbnNlXG4iKTsKPiA+ID4gKwkJ cmV0dXJuIHJldDsKPiA+ID4gKwl9Cj4gPiA+ICsKPiA+ID4gKwlmb3IgKGkgPSAwOyBpIDwgbXNn LT5yeF9sZW47KSB7Cj4gPiA+ICsJCXUzMiBwbGQgPSBkc2lfcmVhZChkc2ksIERTSV9HRU5fUExE X0RBVEEpOwo+ID4gPiArCj4gPiA+ICsJCXdoaWxlIChpIDwgbXNnLT5yeF9sZW4pIHsKPiA+ID4g KwkJCXJ4X2J1ZltpXSA9IHBsZCAmIDB4ZmY7Cj4gPiA+ICsJCQlwbGQgPj49IDg7Cj4gPiA+ICsJ CQlpKys7Cj4gPiA+ICsJCX0KPiA+ID4gKwl9ICAKPiA+IAo+ID4gQUZBSUNULCB0aGUgb3V0ZXIg Zm9yIGxvb3AganVzdCBpbml0aWFsaXplcyBpIGFuZCBlbnN1cmVzIG1zZy0+cnhfbGVuIGlzCj4g PiBub24temVybz8gCj4gPiAKPiA+IEkgdGhpbmsgdGhlIGZvbGxvd2luZyB3b3VsZCBiZSBlYXNp ZXIgdG8gcmVhZCAoYW5kIHNhZmUgYWdhaW5zdCB0aGUgY2FzZSB3aGVyZQo+ID4gbXNnLT5yeF9s ZW4gPiBzaXplb2YocGxkKSAoZXZlbiB0aG91Z2ggdGhpcyBzaG91bGRuJ3QgaGFwcGVuIGFjY29y ZGluZyB0byBEQ1MKPiA+IHNwZWMpKS4KPiA+IAo+ID4gaWYgKG1zZy0+cnhfbGVuID4gMCkgewo+ ID4gICAgICAgICB1MzIgcGxkID0gZHNpX3JlYWQoZHNpLCBEU0lfR0VOX1BMRF9EQVRBKTsKPiA+ ICAgICAgICAgbWVtY3B5KHJ4X2J1ZiwgJnBsZCwgTUlOKG1zZy0+cnhfbGVuLCBzaXplb2YocGxk KSk7Cj4gPiB9Cj4gCj4gSSB0aGluayB0aGUgaW50ZW50IHdhcyB0byBoYW5kbGUgcnhfbGVuID4g NCwgYnV0IHRoZSBwYXRjaCBpcyBvYnZvdXNseQo+IGNvbXBsZXRlbHkgYnJva2VuIHJlZ2FyZGlu ZyB0aGF0LiAgQXMgZmFyIGFzIEkgY2FuIHRlbGwsIHJ4X2xlbiBpcwo+IGxpbWl0ZWQgYnkgdGhl IG1heGltdW0gcmV0dXJuIHBhY2tldCBzaXplIHdoaWNoIGNhbiBiZSBhbnkgdmFsdWUgdXAgdG8K PiB0aGUgbWF4aW11bSBzaXplIG9mIGEgbG9uZyBwYWNrZXQsIHNvIHdlIG1heSBuZWVkIHRvIHJl YWQgZnJvbSB0aGUgRklGTwo+IG11bHRpcGxlIHRpbWVzLgo+IAo+IFRoZSBsb29wIHNob3VsZCBi ZSBzb21ldGhpbmcgbGlrZSB0aGlzOgo+IAo+IAlmb3IgKGkgPSAwOyBpIDwgbXNnLT5yeF9sZW47 KSB7Cj4gCQl1MzIgcGxkID0gZHNpX3JlYWQoZHNpLCBEU0lfR0VOX1BMRF9EQVRBKTsKPiAJCWlu dCBqOwo+IAo+IAkJZm9yIChqID0gMDsgaiA8IDQgJiYgaSA8IG1zZy0+cnhfbGVuOyBpKyssIGor Kykgewo+IAkJCXJ4X2J1ZltpXSA9IHBsZCAmIDB4ZmY7Cj4gCQkJcGxkID4+PSA4Owo+IAkJfQo+ IAl9CgpTaG9ydCBwYWNrZXRzIHNob3VsZCBuZXZlciBleGNlZWQgMzIgYml0cywgc28gSSBkb24n dCB0aGluayB5b3UgbmVlZCB0byBhZGQgdGhlCm5lc3RlZCBsb29wLgoKU2VhbgoKCj4gCj4gSSBo YXZlIHN1Y2Nlc3NmdWxseSByZWFkIDUgYnl0ZXMgZnJvbSBhIERTSSBkaXNwbGF5IHVzaW5nIHRo aXMgY29kZSwgYnV0Cj4gSSdtIHRlbXB0ZWQgdG8ganVzdCBkcm9wIHRoaXMgcGF0Y2ggc2luY2Ug SSBvbmx5IHVzZWQgaXQgZm9yIGRlYnVnZ2luZwo+IHdoaWxlIGJyaW5naW5nIHVwIGEgbmV3IHBh bmVsLgo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4g ZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK PiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAoKLS0gClNlYW4gUGF1bCwgU29mdHdhcmUgRW5naW5lZXIsIEdvb2dsZSAvIENocm9taXVtIE9T Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: seanpaul@chromium.org (Sean Paul) Date: Mon, 30 Jan 2017 15:16:09 -0500 Subject: [PATCH v3 24/24] drm/rockchip: dw-mipi-dsi: support read commands In-Reply-To: <20170130181427.1940024f.john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-25-john@metanate.com> <20170130152611.GA20076@art_vandelay> <20170130181427.1940024f.john@metanate.com> Message-ID: <20170130201609.GM20076@art_vandelay> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Jan 30, 2017 at 06:14:27PM +0000, John Keeping wrote: > On Mon, 30 Jan 2017 10:26:11 -0500, Sean Paul wrote: > > > On Sun, Jan 29, 2017 at 01:24:44PM +0000, John Keeping wrote: > > > I haven't found any method for getting the length of a response, so this > > > just uses the requested rx_len > > > > > > Signed-off-by: John Keeping > > > --- > > > v3: > > > - Fix checkpatch warnings > > > Unchanged in v2 > > > > > > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 56 ++++++++++++++++++++++++++++++++++ > > > 1 file changed, 56 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > > index cf3ca6b0cbdb..cc58ada75425 100644 > > > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > > @@ -678,6 +678,56 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > > > return dw_mipi_dsi_gen_pkt_hdr_write(dsi, hdr_val); > > > } > > > > > > +static int dw_mipi_dsi_dcs_read(struct dw_mipi_dsi *dsi, > > > + const struct mipi_dsi_msg *msg) > > > +{ > > > + const u8 *tx_buf = msg->tx_buf; > > > + u8 *rx_buf = msg->rx_buf; > > > + size_t i; > > > + int ret, val; > > > + > > > + dsi_write(dsi, DSI_PCKHDL_CFG, EN_CRC_RX | EN_ECC_RX | EN_BTA); > > > + dsi_write(dsi, DSI_GEN_HDR, > > > + GEN_HDATA(tx_buf[0]) | GEN_HTYPE(msg->type)); > > > + > > > + ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, > > > + val, !(val & GEN_RD_CMD_BUSY), 1000, > > > + CMD_PKT_STATUS_TIMEOUT_US); > > > + if (ret < 0) { > > > + dev_err(dsi->dev, "failed to read command response\n"); > > > + return ret; > > > + } > > > + > > > + for (i = 0; i < msg->rx_len;) { > > > + u32 pld = dsi_read(dsi, DSI_GEN_PLD_DATA); > > > + > > > + while (i < msg->rx_len) { > > > + rx_buf[i] = pld & 0xff; > > > + pld >>= 8; > > > + i++; > > > + } > > > + } > > > > AFAICT, the outer for loop just initializes i and ensures msg->rx_len is > > non-zero? > > > > I think the following would be easier to read (and safe against the case where > > msg->rx_len > sizeof(pld) (even though this shouldn't happen according to DCS > > spec)). > > > > if (msg->rx_len > 0) { > > u32 pld = dsi_read(dsi, DSI_GEN_PLD_DATA); > > memcpy(rx_buf, &pld, MIN(msg->rx_len, sizeof(pld)); > > } > > I think the intent was to handle rx_len > 4, but the patch is obvously > completely broken regarding that. As far as I can tell, rx_len is > limited by the maximum return packet size which can be any value up to > the maximum size of a long packet, so we may need to read from the FIFO > multiple times. > > The loop should be something like this: > > for (i = 0; i < msg->rx_len;) { > u32 pld = dsi_read(dsi, DSI_GEN_PLD_DATA); > int j; > > for (j = 0; j < 4 && i < msg->rx_len; i++, j++) { > rx_buf[i] = pld & 0xff; > pld >>= 8; > } > } Short packets should never exceed 32 bits, so I don't think you need to add the nested loop. Sean > > I have successfully read 5 bytes from a DSI display using this code, but > I'm tempted to just drop this patch since I only used it for debugging > while bringing up a new panel. > _______________________________________________ > dri-devel mailing list > dri-devel at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Sean Paul, Software Engineer, Google / Chromium OS From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754306AbdA3UQp (ORCPT ); Mon, 30 Jan 2017 15:16:45 -0500 Received: from mail-qk0-f173.google.com ([209.85.220.173]:35312 "EHLO mail-qk0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753055AbdA3UQk (ORCPT ); Mon, 30 Jan 2017 15:16:40 -0500 Date: Mon, 30 Jan 2017 15:16:09 -0500 From: Sean Paul To: John Keeping Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Chris Zhong , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v3 24/24] drm/rockchip: dw-mipi-dsi: support read commands Message-ID: <20170130201609.GM20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-25-john@metanate.com> <20170130152611.GA20076@art_vandelay> <20170130181427.1940024f.john@metanate.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170130181427.1940024f.john@metanate.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 30, 2017 at 06:14:27PM +0000, John Keeping wrote: > On Mon, 30 Jan 2017 10:26:11 -0500, Sean Paul wrote: > > > On Sun, Jan 29, 2017 at 01:24:44PM +0000, John Keeping wrote: > > > I haven't found any method for getting the length of a response, so this > > > just uses the requested rx_len > > > > > > Signed-off-by: John Keeping > > > --- > > > v3: > > > - Fix checkpatch warnings > > > Unchanged in v2 > > > > > > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 56 ++++++++++++++++++++++++++++++++++ > > > 1 file changed, 56 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > > index cf3ca6b0cbdb..cc58ada75425 100644 > > > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > > @@ -678,6 +678,56 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > > > return dw_mipi_dsi_gen_pkt_hdr_write(dsi, hdr_val); > > > } > > > > > > +static int dw_mipi_dsi_dcs_read(struct dw_mipi_dsi *dsi, > > > + const struct mipi_dsi_msg *msg) > > > +{ > > > + const u8 *tx_buf = msg->tx_buf; > > > + u8 *rx_buf = msg->rx_buf; > > > + size_t i; > > > + int ret, val; > > > + > > > + dsi_write(dsi, DSI_PCKHDL_CFG, EN_CRC_RX | EN_ECC_RX | EN_BTA); > > > + dsi_write(dsi, DSI_GEN_HDR, > > > + GEN_HDATA(tx_buf[0]) | GEN_HTYPE(msg->type)); > > > + > > > + ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, > > > + val, !(val & GEN_RD_CMD_BUSY), 1000, > > > + CMD_PKT_STATUS_TIMEOUT_US); > > > + if (ret < 0) { > > > + dev_err(dsi->dev, "failed to read command response\n"); > > > + return ret; > > > + } > > > + > > > + for (i = 0; i < msg->rx_len;) { > > > + u32 pld = dsi_read(dsi, DSI_GEN_PLD_DATA); > > > + > > > + while (i < msg->rx_len) { > > > + rx_buf[i] = pld & 0xff; > > > + pld >>= 8; > > > + i++; > > > + } > > > + } > > > > AFAICT, the outer for loop just initializes i and ensures msg->rx_len is > > non-zero? > > > > I think the following would be easier to read (and safe against the case where > > msg->rx_len > sizeof(pld) (even though this shouldn't happen according to DCS > > spec)). > > > > if (msg->rx_len > 0) { > > u32 pld = dsi_read(dsi, DSI_GEN_PLD_DATA); > > memcpy(rx_buf, &pld, MIN(msg->rx_len, sizeof(pld)); > > } > > I think the intent was to handle rx_len > 4, but the patch is obvously > completely broken regarding that. As far as I can tell, rx_len is > limited by the maximum return packet size which can be any value up to > the maximum size of a long packet, so we may need to read from the FIFO > multiple times. > > The loop should be something like this: > > for (i = 0; i < msg->rx_len;) { > u32 pld = dsi_read(dsi, DSI_GEN_PLD_DATA); > int j; > > for (j = 0; j < 4 && i < msg->rx_len; i++, j++) { > rx_buf[i] = pld & 0xff; > pld >>= 8; > } > } Short packets should never exceed 32 bits, so I don't think you need to add the nested loop. Sean > > I have successfully read 5 bytes from a DSI display using this code, but > I'm tempted to just drop this patch since I only used it for debugging > while bringing up a new panel. > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Sean Paul, Software Engineer, Google / Chromium OS