From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Keeping Subject: Re: [PATCH v3 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned Date: Tue, 31 Jan 2017 11:56:18 +0000 Message-ID: <20170131115618.633398fc.john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-11-john@metanate.com> <20170130200811.GK20076@art_vandelay> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170130200811.GK20076@art_vandelay> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sean Paul 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 T24gTW9uLCAzMCBKYW4gMjAxNyAxNTowODoxMSAtMDUwMCwgU2VhbiBQYXVsIHdyb3RlOgoKPiBP biBTdW4sIEphbiAyOSwgMjAxNyBhdCAwMToyNDozMFBNICswMDAwLCBKb2huIEtlZXBpbmcgd3Jv dGU6Cj4gPiBCeSBkZXJlZmVyZW5jaW5nIHRoZSBNSVBJIGNvbW1hbmQgYnVmZmVyIGFzIGEgdTMy KiB3ZSByZWx5IG9uIGl0IGJlaW5nCj4gPiBjb3JyZWN0bHkgYWxpZ25lZCBvbiBBUk0sIGJ1dCB0 aGlzIG1heSBub3QgYmUgdGhlIGNhc2UuICBDb3B5IGl0IGludG8gYQo+ID4gc3RhY2sgdmFyaWFi bGUgdGhhdCB3aWxsIGJlIGNvcnJlY3RseSBhbGlnbmVkLgo+ID4gCj4gPiBTaWduZWQtb2ZmLWJ5 OiBKb2huIEtlZXBpbmcgPGpvaG5AbWV0YW5hdGUuY29tPgo+ID4gUmV2aWV3ZWQtYnk6IENocmlz IFpob25nIDx6eXdAcm9jay1jaGlwcy5jb20+Cj4gPiAtLS0KPiA+IHYzOgo+ID4gLSBBZGQgQ2hy aXMnIFJldmlld2VkLWJ5Cj4gPiBVbmNoYW5nZWQgaW4gdjIKPiA+IAo+ID4gIGRyaXZlcnMvZ3B1 L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jIHwgMTIgKysrKysrKy0tLS0tCj4gPiAgMSBmaWxl IGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKPiA+IAo+ID4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5jIGIvZHJpdmVycy9n cHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKPiA+IGluZGV4IDAzZmMwOTZmZTFiZC4uZGRi YzAzN2U3Y2VkIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1p cGktZHNpLmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5j Cj4gPiBAQCAtNjA3LDEwICs2MDcsMTAgQEAgc3RhdGljIGludCBkd19taXBpX2RzaV9kY3Nfc2hv cnRfd3JpdGUoc3RydWN0IGR3X21pcGlfZHNpICpkc2ksCj4gPiAgc3RhdGljIGludCBkd19taXBp X2RzaV9kY3NfbG9uZ193cml0ZShzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSwKPiA+ICAJCQkJICAg ICAgY29uc3Qgc3RydWN0IG1pcGlfZHNpX21zZyAqbXNnKQo+ID4gIHsKPiA+IC0JY29uc3QgdTMy ICp0eF9idWYgPSBtc2ctPnR4X2J1ZjsKPiA+IC0JaW50IGxlbiA9IG1zZy0+dHhfbGVuLCBwbGRf ZGF0YV9ieXRlcyA9IHNpemVvZigqdHhfYnVmKSwgcmV0Owo+ID4gKwljb25zdCB1OCAqdHhfYnVm ID0gbXNnLT50eF9idWY7Cj4gPiArCWludCBsZW4gPSBtc2ctPnR4X2xlbiwgcGxkX2RhdGFfYnl0 ZXMgPSBzaXplb2YodTMyKSwgcmV0Owo+ID4gIAl1MzIgaGRyX3ZhbCA9IEdFTl9IREFUQShtc2ct PnR4X2xlbikgfCBHRU5fSFRZUEUobXNnLT50eXBlKTsKPiA+IC0JdTMyIHJlbWFpbmRlciA9IDA7 Cj4gPiArCXUzMiByZW1haW5kZXI7Cj4gPiAgCXUzMiB2YWw7Cj4gPiAgCj4gPiAgCWlmIChtc2ct PnR4X2xlbiA8IDMpIHsKPiA+IEBAIC02MjEsMTIgKzYyMSwxNCBAQCBzdGF0aWMgaW50IGR3X21p cGlfZHNpX2Rjc19sb25nX3dyaXRlKHN0cnVjdCBkd19taXBpX2RzaSAqZHNpLAo+ID4gIAo+ID4g IAl3aGlsZSAoRElWX1JPVU5EX1VQKGxlbiwgcGxkX2RhdGFfYnl0ZXMpKSB7Cj4gPiAgCQlpZiAo bGVuIDwgcGxkX2RhdGFfYnl0ZXMpIHsKPiA+ICsJCQlyZW1haW5kZXIgPSAwOwo+ID4gIAkJCW1l bWNweSgmcmVtYWluZGVyLCB0eF9idWYsIGxlbik7Cj4gPiAgCQkJZHNpX3dyaXRlKGRzaSwgRFNJ X0dFTl9QTERfREFUQSwgcmVtYWluZGVyKTsKPiA+ICAJCQlsZW4gPSAwOwo+ID4gIAkJfSBlbHNl IHsKPiA+IC0JCQlkc2lfd3JpdGUoZHNpLCBEU0lfR0VOX1BMRF9EQVRBLCAqdHhfYnVmKTsKPiA+ IC0JCQl0eF9idWYrKzsKPiA+ICsJCQltZW1jcHkoJnJlbWFpbmRlciwgdHhfYnVmLCBwbGRfZGF0 YV9ieXRlcyk7Cj4gPiArCQkJZHNpX3dyaXRlKGRzaSwgRFNJX0dFTl9QTERfREFUQSwgcmVtYWlu ZGVyKTsKPiA+ICsJCQl0eF9idWYgKz0gcGxkX2RhdGFfYnl0ZXM7Cj4gPiAgCQkJbGVuIC09IHBs ZF9kYXRhX2J5dGVzOwo+ID4gIAkJfSAgCj4gCj4gCj4gWW91IGNhbiBjbGVhbiB0aGlzIHVwIGZ1 cnRoZXIgYnkgcmVtb3ZpbmcgYSBjb3VwbGUgb2YgdGhlIGxvY2FscywgdGhlCj4gY29uZGl0aW9u YWwgYW5kIHRoZSBkaXZpc2lvbjoKPiAKPiB3aGlsZShsZW4gPCBtc2ctPnR4X2xlbikgewo+ICAg ICAgICAgc2l6ZV90IHRvX3dyaXRlID0gTUlOKG1zZy0+dHhfbGVuIC0gbGVuLCBzaXplb2YocmVt YWluZGVyKSk7Cj4gCj4gICAgICAgICBtZW1jcHkoJnJlbWFpbmRlciwgbXNnLT50eF9idWYgKyBs ZW4sIHRvX3dyaXRlKTsKPiAgICAgICAgIGRzaV93cml0ZShkc2ksIERTSV9HRU5fUExEX0RBVEEs IHJlbWFpbmRlcik7Cj4gICAgICAgICBsZW4gKz0gdG9fd3JpdGU7Cj4gCj4gICAgICAgICAuLi4K PiB9CgpUaGF0J3MgYSBuaWNlIHNpbXBsaWZpY2F0aW9uLCBidXQgaXQncyBtb3JlIHRoYW4gSSB3 YXMgdHJ5aW5nIHRvIGRvIHdpdGgKdGhpcyBwYXRjaC4gIEkgY2FuIGFkZCBhIGNsZWFudXAgcGF0 Y2ggb24gdG9wIHRvIHNpbXBsaWZ5IHRoZSBmdW5jdGlvbiwKYnV0IEkgZG9uJ3QgaGF2ZSB0aGF0 IG11Y2ggdGltZSB0byBzcGVuZCBvbiB0aGlzIGF0IHRoZSBtb21lbnQgYW5kIEknZApyYXRoZXIg bm90IGJsb2NrIHRoaXMgZml4IGJlY2F1c2UgdGhlIG9yaWdpbmFsIGNvZGUgc3RydWN0dXJlIGNv dWxkIGJlCmltcHJvdmVkLgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: john@metanate.com (John Keeping) Date: Tue, 31 Jan 2017 11:56:18 +0000 Subject: [PATCH v3 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned In-Reply-To: <20170130200811.GK20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-11-john@metanate.com> <20170130200811.GK20076@art_vandelay> Message-ID: <20170131115618.633398fc.john@metanate.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, 30 Jan 2017 15:08:11 -0500, Sean Paul wrote: > On Sun, Jan 29, 2017 at 01:24:30PM +0000, John Keeping wrote: > > By dereferencing the MIPI command buffer as a u32* we rely on it being > > correctly aligned on ARM, but this may not be the case. Copy it into a > > stack variable that will be correctly aligned. > > > > Signed-off-by: John Keeping > > Reviewed-by: Chris Zhong > > --- > > v3: > > - Add Chris' Reviewed-by > > Unchanged in v2 > > > > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 12 +++++++----- > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > index 03fc096fe1bd..ddbc037e7ced 100644 > > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > @@ -607,10 +607,10 @@ static int dw_mipi_dsi_dcs_short_write(struct dw_mipi_dsi *dsi, > > static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > > const struct mipi_dsi_msg *msg) > > { > > - const u32 *tx_buf = msg->tx_buf; > > - int len = msg->tx_len, pld_data_bytes = sizeof(*tx_buf), ret; > > + const u8 *tx_buf = msg->tx_buf; > > + int len = msg->tx_len, pld_data_bytes = sizeof(u32), ret; > > u32 hdr_val = GEN_HDATA(msg->tx_len) | GEN_HTYPE(msg->type); > > - u32 remainder = 0; > > + u32 remainder; > > u32 val; > > > > if (msg->tx_len < 3) { > > @@ -621,12 +621,14 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > > > > while (DIV_ROUND_UP(len, pld_data_bytes)) { > > if (len < pld_data_bytes) { > > + remainder = 0; > > memcpy(&remainder, tx_buf, len); > > dsi_write(dsi, DSI_GEN_PLD_DATA, remainder); > > len = 0; > > } else { > > - dsi_write(dsi, DSI_GEN_PLD_DATA, *tx_buf); > > - tx_buf++; > > + memcpy(&remainder, tx_buf, pld_data_bytes); > > + dsi_write(dsi, DSI_GEN_PLD_DATA, remainder); > > + tx_buf += pld_data_bytes; > > len -= pld_data_bytes; > > } > > > You can clean this up further by removing a couple of the locals, the > conditional and the division: > > while(len < msg->tx_len) { > size_t to_write = MIN(msg->tx_len - len, sizeof(remainder)); > > memcpy(&remainder, msg->tx_buf + len, to_write); > dsi_write(dsi, DSI_GEN_PLD_DATA, remainder); > len += to_write; > > ... > } That's a nice simplification, but it's more than I was trying to do with this patch. I can add a cleanup patch on top to simplify the function, but I don't have that much time to spend on this at the moment and I'd rather not block this fix because the original code structure could be improved. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751855AbdAaL5y (ORCPT ); Tue, 31 Jan 2017 06:57:54 -0500 Received: from dougal.metanate.com ([90.155.101.14]:13325 "EHLO metanate.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750759AbdAaL5t (ORCPT ); Tue, 31 Jan 2017 06:57:49 -0500 Date: Tue, 31 Jan 2017 11:56:18 +0000 From: John Keeping To: Sean Paul 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 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned Message-ID: <20170131115618.633398fc.john@metanate.com> In-Reply-To: <20170130200811.GK20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-11-john@metanate.com> <20170130200811.GK20076@art_vandelay> Organization: Metanate Ltd X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 30 Jan 2017 15:08:11 -0500, Sean Paul wrote: > On Sun, Jan 29, 2017 at 01:24:30PM +0000, John Keeping wrote: > > By dereferencing the MIPI command buffer as a u32* we rely on it being > > correctly aligned on ARM, but this may not be the case. Copy it into a > > stack variable that will be correctly aligned. > > > > Signed-off-by: John Keeping > > Reviewed-by: Chris Zhong > > --- > > v3: > > - Add Chris' Reviewed-by > > Unchanged in v2 > > > > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 12 +++++++----- > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > index 03fc096fe1bd..ddbc037e7ced 100644 > > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > > @@ -607,10 +607,10 @@ static int dw_mipi_dsi_dcs_short_write(struct dw_mipi_dsi *dsi, > > static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > > const struct mipi_dsi_msg *msg) > > { > > - const u32 *tx_buf = msg->tx_buf; > > - int len = msg->tx_len, pld_data_bytes = sizeof(*tx_buf), ret; > > + const u8 *tx_buf = msg->tx_buf; > > + int len = msg->tx_len, pld_data_bytes = sizeof(u32), ret; > > u32 hdr_val = GEN_HDATA(msg->tx_len) | GEN_HTYPE(msg->type); > > - u32 remainder = 0; > > + u32 remainder; > > u32 val; > > > > if (msg->tx_len < 3) { > > @@ -621,12 +621,14 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > > > > while (DIV_ROUND_UP(len, pld_data_bytes)) { > > if (len < pld_data_bytes) { > > + remainder = 0; > > memcpy(&remainder, tx_buf, len); > > dsi_write(dsi, DSI_GEN_PLD_DATA, remainder); > > len = 0; > > } else { > > - dsi_write(dsi, DSI_GEN_PLD_DATA, *tx_buf); > > - tx_buf++; > > + memcpy(&remainder, tx_buf, pld_data_bytes); > > + dsi_write(dsi, DSI_GEN_PLD_DATA, remainder); > > + tx_buf += pld_data_bytes; > > len -= pld_data_bytes; > > } > > > You can clean this up further by removing a couple of the locals, the > conditional and the division: > > while(len < msg->tx_len) { > size_t to_write = MIN(msg->tx_len - len, sizeof(remainder)); > > memcpy(&remainder, msg->tx_buf + len, to_write); > dsi_write(dsi, DSI_GEN_PLD_DATA, remainder); > len += to_write; > > ... > } That's a nice simplification, but it's more than I was trying to do with this patch. I can add a cleanup patch on top to simplify the function, but I don't have that much time to spend on this at the moment and I'd rather not block this fix because the original code structure could be improved.