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 10:26:11 -0500 Message-ID: <20170130152611.GA20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-25-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: <20170129132444.25251-25-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: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Chris Zhong , linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org T24gU3VuLCBKYW4gMjksIDIwMTcgYXQgMDE6MjQ6NDRQTSArMDAwMCwgSm9obiBLZWVwaW5nIHdy b3RlOgo+IEkgaGF2ZW4ndCBmb3VuZCBhbnkgbWV0aG9kIGZvciBnZXR0aW5nIHRoZSBsZW5ndGgg b2YgYSByZXNwb25zZSwgc28gdGhpcwo+IGp1c3QgdXNlcyB0aGUgcmVxdWVzdGVkIHJ4X2xlbgo+ IAo+IFNpZ25lZC1vZmYtYnk6IEpvaG4gS2VlcGluZyA8am9obkBtZXRhbmF0ZS5jb20+Cj4gLS0t Cj4gdjM6Cj4gLSBGaXggY2hlY2twYXRjaCB3YXJuaW5ncwo+IFVuY2hhbmdlZCBpbiB2Mgo+IAo+ ICBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYyB8IDU2ICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKPiAgMSBmaWxlIGNoYW5nZWQsIDU2IGluc2VydGlvbnMo KykKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNp LmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYwo+IGluZGV4IGNmM2Nh NmIwY2JkYi4uY2M1OGFkYTc1NDI1IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yb2Nr Y2hpcC9kdy1taXBpLWRzaS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1p cGktZHNpLmMKPiBAQCAtNjc4LDYgKzY3OCw1NiBAQCBzdGF0aWMgaW50IGR3X21pcGlfZHNpX2Rj c19sb25nX3dyaXRlKHN0cnVjdCBkd19taXBpX2RzaSAqZHNpLAo+ICAJcmV0dXJuIGR3X21pcGlf ZHNpX2dlbl9wa3RfaGRyX3dyaXRlKGRzaSwgaGRyX3ZhbCk7Cj4gIH0KPiAgCj4gK3N0YXRpYyBp bnQgZHdfbWlwaV9kc2lfZGNzX3JlYWQoc3RydWN0IGR3X21pcGlfZHNpICpkc2ksCj4gKwkJCQlj b25zdCBzdHJ1Y3QgbWlwaV9kc2lfbXNnICptc2cpCj4gK3sKPiArCWNvbnN0IHU4ICp0eF9idWYg PSBtc2ctPnR4X2J1ZjsKPiArCXU4ICpyeF9idWYgPSBtc2ctPnJ4X2J1ZjsKPiArCXNpemVfdCBp Owo+ICsJaW50IHJldCwgdmFsOwo+ICsKPiArCWRzaV93cml0ZShkc2ksIERTSV9QQ0tIRExfQ0ZH LCBFTl9DUkNfUlggfCBFTl9FQ0NfUlggfCBFTl9CVEEpOwo+ICsJZHNpX3dyaXRlKGRzaSwgRFNJ X0dFTl9IRFIsCj4gKwkJICBHRU5fSERBVEEodHhfYnVmWzBdKSB8IEdFTl9IVFlQRShtc2ctPnR5 cGUpKTsKPiArCj4gKwlyZXQgPSByZWFkbF9wb2xsX3RpbWVvdXQoZHNpLT5iYXNlICsgRFNJX0NN RF9QS1RfU1RBVFVTLAo+ICsJCQkJIHZhbCwgISh2YWwgJiBHRU5fUkRfQ01EX0JVU1kpLCAxMDAw LAo+ICsJCQkJIENNRF9QS1RfU1RBVFVTX1RJTUVPVVRfVVMpOwo+ICsJaWYgKHJldCA8IDApIHsK PiArCQlkZXZfZXJyKGRzaS0+ZGV2LCAiZmFpbGVkIHRvIHJlYWQgY29tbWFuZCByZXNwb25zZVxu Iik7Cj4gKwkJcmV0dXJuIHJldDsKPiArCX0KPiArCj4gKwlmb3IgKGkgPSAwOyBpIDwgbXNnLT5y eF9sZW47KSB7Cj4gKwkJdTMyIHBsZCA9IGRzaV9yZWFkKGRzaSwgRFNJX0dFTl9QTERfREFUQSk7 Cj4gKwo+ICsJCXdoaWxlIChpIDwgbXNnLT5yeF9sZW4pIHsKPiArCQkJcnhfYnVmW2ldID0gcGxk ICYgMHhmZjsKPiArCQkJcGxkID4+PSA4Owo+ICsJCQlpKys7Cj4gKwkJfQo+ICsJfQoKQUZBSUNU LCB0aGUgb3V0ZXIgZm9yIGxvb3AganVzdCBpbml0aWFsaXplcyBpIGFuZCBlbnN1cmVzIG1zZy0+ cnhfbGVuIGlzCm5vbi16ZXJvPyAKCkkgdGhpbmsgdGhlIGZvbGxvd2luZyB3b3VsZCBiZSBlYXNp ZXIgdG8gcmVhZCAoYW5kIHNhZmUgYWdhaW5zdCB0aGUgY2FzZSB3aGVyZQptc2ctPnJ4X2xlbiA+ IHNpemVvZihwbGQpIChldmVuIHRob3VnaCB0aGlzIHNob3VsZG4ndCBoYXBwZW4gYWNjb3JkaW5n IHRvIERDUwpzcGVjKSkuCgppZiAobXNnLT5yeF9sZW4gPiAwKSB7CiAgICAgICAgdTMyIHBsZCA9 IGRzaV9yZWFkKGRzaSwgRFNJX0dFTl9QTERfREFUQSk7CiAgICAgICAgbWVtY3B5KHJ4X2J1Ziwg JnBsZCwgTUlOKG1zZy0+cnhfbGVuLCBzaXplb2YocGxkKSk7Cn0KCgo+ICsKPiArCXJldHVybiBt c2ctPnJ4X2xlbjsKPiArfQo+ICsKPiArc3RhdGljIGludCBkd19taXBpX2RzaV9zZXRfbWF4X3Jl dHVybl9wYWNrZXRfc2l6ZShzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSwKPiArCQkJCQkJICBzaXpl X3QgbGVuKQo+ICt7Cj4gKwl1OCB2YWxbXSA9IHsgbGVuICYgMHhmZiwgKGxlbiA+PiA4KSAmIDB4 ZmYgfTsKPiArCXN0cnVjdCBtaXBpX2RzaV9tc2cgbXNnID0gewo+ICsJCS5jaGFubmVsID0gZHNp LT5jaGFubmVsLAo+ICsJCS50eXBlID0gTUlQSV9EU0lfU0VUX01BWElNVU1fUkVUVVJOX1BBQ0tF VF9TSVpFLAo+ICsJCS50eF9idWYgPSB2YWwsCj4gKwkJLnR4X2xlbiA9IDIsCj4gKwl9Owo+ICsK PiArCWlmIChsZW4gPiAweGZmZmYpCj4gKwkJcmV0dXJuIC1FSU5WQUw7Cj4gKwo+ICsJcmV0dXJu IGR3X21pcGlfZHNpX2Rjc19zaG9ydF93cml0ZShkc2ksICZtc2cpOwo+ICt9Cj4gKwo+ICBzdGF0 aWMgc3NpemVfdCBkd19taXBpX2RzaV9ob3N0X3RyYW5zZmVyKHN0cnVjdCBtaXBpX2RzaV9ob3N0 ICpob3N0LAo+ICAJCQkJCSBjb25zdCBzdHJ1Y3QgbWlwaV9kc2lfbXNnICptc2cpCj4gIHsKPiBA QCAtNjk1LDYgKzc0NSwxMiBAQCBzdGF0aWMgc3NpemVfdCBkd19taXBpX2RzaV9ob3N0X3RyYW5z ZmVyKHN0cnVjdCBtaXBpX2RzaV9ob3N0ICpob3N0LAo+ICAJY2FzZSBNSVBJX0RTSV9EQ1NfTE9O R19XUklURToKPiAgCQlyZXQgPSBkd19taXBpX2RzaV9kY3NfbG9uZ193cml0ZShkc2ksIG1zZyk7 Cj4gIAkJYnJlYWs7Cj4gKwljYXNlIE1JUElfRFNJX0RDU19SRUFEOgo+ICsJCXJldCA9IGR3X21p cGlfZHNpX3NldF9tYXhfcmV0dXJuX3BhY2tldF9zaXplKGRzaSwgbXNnLT5yeF9sZW4pOwo+ICsJ CWlmIChyZXQgPCAwKQo+ICsJCQlyZXR1cm4gcmV0Owo+ICsJCXJldCA9IGR3X21pcGlfZHNpX2Rj c19yZWFkKGRzaSwgbXNnKTsKPiArCQlicmVhazsKPiAgCWRlZmF1bHQ6Cj4gIAkJZGV2X2Vycihk c2ktPmRldiwgInVuc3VwcG9ydGVkIG1lc3NhZ2UgdHlwZSAweCUwMnhcbiIsCj4gIAkJCW1zZy0+ dHlwZSk7Cj4gLS0gCj4gMi4xMS4wLjE5Ny5nYjU1NmRlNS5kaXJ0eQo+IAo+IF9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gZHJpLWRldmVsIG1haWxpbmcg bGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAoKLS0gClNlYW4gUGF1bCwg U29mdHdhcmUgRW5naW5lZXIsIEdvb2dsZSAvIENocm9taXVtIE9TCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: seanpaul@chromium.org (Sean Paul) Date: Mon, 30 Jan 2017 10:26:11 -0500 Subject: [PATCH v3 24/24] drm/rockchip: dw-mipi-dsi: support read commands In-Reply-To: <20170129132444.25251-25-john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-25-john@metanate.com> Message-ID: <20170130152611.GA20076@art_vandelay> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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)); } > + > + return msg->rx_len; > +} > + > +static int dw_mipi_dsi_set_max_return_packet_size(struct dw_mipi_dsi *dsi, > + size_t len) > +{ > + u8 val[] = { len & 0xff, (len >> 8) & 0xff }; > + struct mipi_dsi_msg msg = { > + .channel = dsi->channel, > + .type = MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE, > + .tx_buf = val, > + .tx_len = 2, > + }; > + > + if (len > 0xffff) > + return -EINVAL; > + > + return dw_mipi_dsi_dcs_short_write(dsi, &msg); > +} > + > static ssize_t dw_mipi_dsi_host_transfer(struct mipi_dsi_host *host, > const struct mipi_dsi_msg *msg) > { > @@ -695,6 +745,12 @@ static ssize_t dw_mipi_dsi_host_transfer(struct mipi_dsi_host *host, > case MIPI_DSI_DCS_LONG_WRITE: > ret = dw_mipi_dsi_dcs_long_write(dsi, msg); > break; > + case MIPI_DSI_DCS_READ: > + ret = dw_mipi_dsi_set_max_return_packet_size(dsi, msg->rx_len); > + if (ret < 0) > + return ret; > + ret = dw_mipi_dsi_dcs_read(dsi, msg); > + break; > default: > dev_err(dsi->dev, "unsupported message type 0x%02x\n", > msg->type); > -- > 2.11.0.197.gb556de5.dirty > > _______________________________________________ > 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 S932435AbdA3Pet (ORCPT ); Mon, 30 Jan 2017 10:34:49 -0500 Received: from mail-qk0-f182.google.com ([209.85.220.182]:34396 "EHLO mail-qk0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751752AbdA3PeI (ORCPT ); Mon, 30 Jan 2017 10:34:08 -0500 Date: Mon, 30 Jan 2017 10:26:11 -0500 From: Sean Paul To: John Keeping Cc: Mark Yao , 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: <20170130152611.GA20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-25-john@metanate.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170129132444.25251-25-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 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)); } > + > + return msg->rx_len; > +} > + > +static int dw_mipi_dsi_set_max_return_packet_size(struct dw_mipi_dsi *dsi, > + size_t len) > +{ > + u8 val[] = { len & 0xff, (len >> 8) & 0xff }; > + struct mipi_dsi_msg msg = { > + .channel = dsi->channel, > + .type = MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE, > + .tx_buf = val, > + .tx_len = 2, > + }; > + > + if (len > 0xffff) > + return -EINVAL; > + > + return dw_mipi_dsi_dcs_short_write(dsi, &msg); > +} > + > static ssize_t dw_mipi_dsi_host_transfer(struct mipi_dsi_host *host, > const struct mipi_dsi_msg *msg) > { > @@ -695,6 +745,12 @@ static ssize_t dw_mipi_dsi_host_transfer(struct mipi_dsi_host *host, > case MIPI_DSI_DCS_LONG_WRITE: > ret = dw_mipi_dsi_dcs_long_write(dsi, msg); > break; > + case MIPI_DSI_DCS_READ: > + ret = dw_mipi_dsi_set_max_return_packet_size(dsi, msg->rx_len); > + if (ret < 0) > + return ret; > + ret = dw_mipi_dsi_dcs_read(dsi, msg); > + break; > default: > dev_err(dsi->dev, "unsupported message type 0x%02x\n", > msg->type); > -- > 2.11.0.197.gb556de5.dirty > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Sean Paul, Software Engineer, Google / Chromium OS