From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH v3 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned Date: Mon, 30 Jan 2017 15:08:11 -0500 Message-ID: <20170130200811.GK20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-11-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-11-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 T24gU3VuLCBKYW4gMjksIDIwMTcgYXQgMDE6MjQ6MzBQTSArMDAwMCwgSm9obiBLZWVwaW5nIHdy b3RlOgo+IEJ5IGRlcmVmZXJlbmNpbmcgdGhlIE1JUEkgY29tbWFuZCBidWZmZXIgYXMgYSB1MzIq IHdlIHJlbHkgb24gaXQgYmVpbmcKPiBjb3JyZWN0bHkgYWxpZ25lZCBvbiBBUk0sIGJ1dCB0aGlz IG1heSBub3QgYmUgdGhlIGNhc2UuICBDb3B5IGl0IGludG8gYQo+IHN0YWNrIHZhcmlhYmxlIHRo YXQgd2lsbCBiZSBjb3JyZWN0bHkgYWxpZ25lZC4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBKb2huIEtl ZXBpbmcgPGpvaG5AbWV0YW5hdGUuY29tPgo+IFJldmlld2VkLWJ5OiBDaHJpcyBaaG9uZyA8enl3 QHJvY2stY2hpcHMuY29tPgo+IC0tLQo+IHYzOgo+IC0gQWRkIENocmlzJyBSZXZpZXdlZC1ieQo+ IFVuY2hhbmdlZCBpbiB2Mgo+IAo+ICBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1k c2kuYyB8IDEyICsrKysrKystLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCsp LCA1IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2No aXAvZHctbWlwaS1kc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9kdy1taXBpLWRzaS5j Cj4gaW5kZXggMDNmYzA5NmZlMWJkLi5kZGJjMDM3ZTdjZWQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvZHctbWlwaS1kc2kuYwo+IEBAIC02MDcsMTAgKzYwNywxMCBAQCBzdGF0aWMgaW50 IGR3X21pcGlfZHNpX2Rjc19zaG9ydF93cml0ZShzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSwKPiAg c3RhdGljIGludCBkd19taXBpX2RzaV9kY3NfbG9uZ193cml0ZShzdHJ1Y3QgZHdfbWlwaV9kc2kg KmRzaSwKPiAgCQkJCSAgICAgIGNvbnN0IHN0cnVjdCBtaXBpX2RzaV9tc2cgKm1zZykKPiAgewo+ IC0JY29uc3QgdTMyICp0eF9idWYgPSBtc2ctPnR4X2J1ZjsKPiAtCWludCBsZW4gPSBtc2ctPnR4 X2xlbiwgcGxkX2RhdGFfYnl0ZXMgPSBzaXplb2YoKnR4X2J1ZiksIHJldDsKPiArCWNvbnN0IHU4 ICp0eF9idWYgPSBtc2ctPnR4X2J1ZjsKPiArCWludCBsZW4gPSBtc2ctPnR4X2xlbiwgcGxkX2Rh dGFfYnl0ZXMgPSBzaXplb2YodTMyKSwgcmV0Owo+ICAJdTMyIGhkcl92YWwgPSBHRU5fSERBVEEo bXNnLT50eF9sZW4pIHwgR0VOX0hUWVBFKG1zZy0+dHlwZSk7Cj4gLQl1MzIgcmVtYWluZGVyID0g MDsKPiArCXUzMiByZW1haW5kZXI7Cj4gIAl1MzIgdmFsOwo+ICAKPiAgCWlmIChtc2ctPnR4X2xl biA8IDMpIHsKPiBAQCAtNjIxLDEyICs2MjEsMTQgQEAgc3RhdGljIGludCBkd19taXBpX2RzaV9k Y3NfbG9uZ193cml0ZShzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSwKPiAgCj4gIAl3aGlsZSAoRElW X1JPVU5EX1VQKGxlbiwgcGxkX2RhdGFfYnl0ZXMpKSB7Cj4gIAkJaWYgKGxlbiA8IHBsZF9kYXRh X2J5dGVzKSB7Cj4gKwkJCXJlbWFpbmRlciA9IDA7Cj4gIAkJCW1lbWNweSgmcmVtYWluZGVyLCB0 eF9idWYsIGxlbik7Cj4gIAkJCWRzaV93cml0ZShkc2ksIERTSV9HRU5fUExEX0RBVEEsIHJlbWFp bmRlcik7Cj4gIAkJCWxlbiA9IDA7Cj4gIAkJfSBlbHNlIHsKPiAtCQkJZHNpX3dyaXRlKGRzaSwg RFNJX0dFTl9QTERfREFUQSwgKnR4X2J1Zik7Cj4gLQkJCXR4X2J1ZisrOwo+ICsJCQltZW1jcHko JnJlbWFpbmRlciwgdHhfYnVmLCBwbGRfZGF0YV9ieXRlcyk7Cj4gKwkJCWRzaV93cml0ZShkc2ks IERTSV9HRU5fUExEX0RBVEEsIHJlbWFpbmRlcik7Cj4gKwkJCXR4X2J1ZiArPSBwbGRfZGF0YV9i eXRlczsKPiAgCQkJbGVuIC09IHBsZF9kYXRhX2J5dGVzOwo+ICAJCX0KCgpZb3UgY2FuIGNsZWFu IHRoaXMgdXAgZnVydGhlciBieSByZW1vdmluZyBhIGNvdXBsZSBvZiB0aGUgbG9jYWxzLCB0aGUK Y29uZGl0aW9uYWwgYW5kIHRoZSBkaXZpc2lvbjoKCndoaWxlKGxlbiA8IG1zZy0+dHhfbGVuKSB7 CiAgICAgICAgc2l6ZV90IHRvX3dyaXRlID0gTUlOKG1zZy0+dHhfbGVuIC0gbGVuLCBzaXplb2Yo cmVtYWluZGVyKSk7CgogICAgICAgIG1lbWNweSgmcmVtYWluZGVyLCBtc2ctPnR4X2J1ZiArIGxl biwgdG9fd3JpdGUpOwogICAgICAgIGRzaV93cml0ZShkc2ksIERTSV9HRU5fUExEX0RBVEEsIHJl bWFpbmRlcik7CiAgICAgICAgbGVuICs9IHRvX3dyaXRlOwoKICAgICAgICAuLi4KfQoKU2VhbgoK Cj4gIAo+IC0tIAo+IDIuMTEuMC4xOTcuZ2I1NTZkZTUuZGlydHkKPiAKPiBfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKPiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwKCi0tIApTZWFuIFBhdWwsIFNv ZnR3YXJlIEVuZ2luZWVyLCBHb29nbGUgLyBDaHJvbWl1bSBPUwpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: seanpaul@chromium.org (Sean Paul) Date: Mon, 30 Jan 2017 15:08:11 -0500 Subject: [PATCH v3 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned In-Reply-To: <20170129132444.25251-11-john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-11-john@metanate.com> Message-ID: <20170130200811.GK20076@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: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; ... } Sean > > -- > 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 S1754358AbdA3UIP (ORCPT ); Mon, 30 Jan 2017 15:08:15 -0500 Received: from mail-qt0-f175.google.com ([209.85.216.175]:36493 "EHLO mail-qt0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002AbdA3UIO (ORCPT ); Mon, 30 Jan 2017 15:08:14 -0500 Date: Mon, 30 Jan 2017 15:08: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 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned Message-ID: <20170130200811.GK20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-11-john@metanate.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170129132444.25251-11-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: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; ... } Sean > > -- > 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