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: Tue, 31 Jan 2017 09:53:13 -0500 Message-ID: <20170131145313.GY20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-11-john@metanate.com> <20170130200811.GK20076@art_vandelay> <20170131115618.633398fc.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: <20170131115618.633398fc.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 T24gVHVlLCBKYW4gMzEsIDIwMTcgYXQgMTE6NTY6MThBTSArMDAwMCwgSm9obiBLZWVwaW5nIHdy b3RlOgo+IE9uIE1vbiwgMzAgSmFuIDIwMTcgMTU6MDg6MTEgLTA1MDAsIFNlYW4gUGF1bCB3cm90 ZToKPiAKPiA+IE9uIFN1biwgSmFuIDI5LCAyMDE3IGF0IDAxOjI0OjMwUE0gKzAwMDAsIEpvaG4g S2VlcGluZyB3cm90ZToKPiA+ID4gQnkgZGVyZWZlcmVuY2luZyB0aGUgTUlQSSBjb21tYW5kIGJ1 ZmZlciBhcyBhIHUzMiogd2UgcmVseSBvbiBpdCBiZWluZwo+ID4gPiBjb3JyZWN0bHkgYWxpZ25l ZCBvbiBBUk0sIGJ1dCB0aGlzIG1heSBub3QgYmUgdGhlIGNhc2UuICBDb3B5IGl0IGludG8gYQo+ ID4gPiBzdGFjayB2YXJpYWJsZSB0aGF0IHdpbGwgYmUgY29ycmVjdGx5IGFsaWduZWQuCj4gPiA+ IAo+ID4gPiBTaWduZWQtb2ZmLWJ5OiBKb2huIEtlZXBpbmcgPGpvaG5AbWV0YW5hdGUuY29tPgo+ ID4gPiBSZXZpZXdlZC1ieTogQ2hyaXMgWmhvbmcgPHp5d0Byb2NrLWNoaXBzLmNvbT4KPiA+ID4g LS0tCj4gPiA+IHYzOgo+ID4gPiAtIEFkZCBDaHJpcycgUmV2aWV3ZWQtYnkKPiA+ID4gVW5jaGFu Z2VkIGluIHYyCj4gPiA+IAo+ID4gPiAgZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGkt ZHNpLmMgfCAxMiArKysrKysrLS0tLS0KPiA+ID4gIDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlv bnMoKyksIDUgZGVsZXRpb25zKC0pCj4gPiA+IAo+ID4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAv ZHctbWlwaS1kc2kuYwo+ID4gPiBpbmRleCAwM2ZjMDk2ZmUxYmQuLmRkYmMwMzdlN2NlZCAxMDA2 NDQKPiA+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKPiA+ ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKPiA+ID4gQEAg LTYwNywxMCArNjA3LDEwIEBAIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfZGNzX3Nob3J0X3dyaXRl KHN0cnVjdCBkd19taXBpX2RzaSAqZHNpLAo+ID4gPiAgc3RhdGljIGludCBkd19taXBpX2RzaV9k Y3NfbG9uZ193cml0ZShzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSwKPiA+ID4gIAkJCQkgICAgICBj b25zdCBzdHJ1Y3QgbWlwaV9kc2lfbXNnICptc2cpCj4gPiA+ICB7Cj4gPiA+IC0JY29uc3QgdTMy ICp0eF9idWYgPSBtc2ctPnR4X2J1ZjsKPiA+ID4gLQlpbnQgbGVuID0gbXNnLT50eF9sZW4sIHBs ZF9kYXRhX2J5dGVzID0gc2l6ZW9mKCp0eF9idWYpLCByZXQ7Cj4gPiA+ICsJY29uc3QgdTggKnR4 X2J1ZiA9IG1zZy0+dHhfYnVmOwo+ID4gPiArCWludCBsZW4gPSBtc2ctPnR4X2xlbiwgcGxkX2Rh dGFfYnl0ZXMgPSBzaXplb2YodTMyKSwgcmV0Owo+ID4gPiAgCXUzMiBoZHJfdmFsID0gR0VOX0hE QVRBKG1zZy0+dHhfbGVuKSB8IEdFTl9IVFlQRShtc2ctPnR5cGUpOwo+ID4gPiAtCXUzMiByZW1h aW5kZXIgPSAwOwo+ID4gPiArCXUzMiByZW1haW5kZXI7Cj4gPiA+ICAJdTMyIHZhbDsKPiA+ID4g IAo+ID4gPiAgCWlmIChtc2ctPnR4X2xlbiA8IDMpIHsKPiA+ID4gQEAgLTYyMSwxMiArNjIxLDE0 IEBAIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfZGNzX2xvbmdfd3JpdGUoc3RydWN0IGR3X21pcGlf ZHNpICpkc2ksCj4gPiA+ICAKPiA+ID4gIAl3aGlsZSAoRElWX1JPVU5EX1VQKGxlbiwgcGxkX2Rh dGFfYnl0ZXMpKSB7Cj4gPiA+ICAJCWlmIChsZW4gPCBwbGRfZGF0YV9ieXRlcykgewo+ID4gPiAr CQkJcmVtYWluZGVyID0gMDsKPiA+ID4gIAkJCW1lbWNweSgmcmVtYWluZGVyLCB0eF9idWYsIGxl bik7Cj4gPiA+ICAJCQlkc2lfd3JpdGUoZHNpLCBEU0lfR0VOX1BMRF9EQVRBLCByZW1haW5kZXIp Owo+ID4gPiAgCQkJbGVuID0gMDsKPiA+ID4gIAkJfSBlbHNlIHsKPiA+ID4gLQkJCWRzaV93cml0 ZShkc2ksIERTSV9HRU5fUExEX0RBVEEsICp0eF9idWYpOwo+ID4gPiAtCQkJdHhfYnVmKys7Cj4g PiA+ICsJCQltZW1jcHkoJnJlbWFpbmRlciwgdHhfYnVmLCBwbGRfZGF0YV9ieXRlcyk7Cj4gPiA+ ICsJCQlkc2lfd3JpdGUoZHNpLCBEU0lfR0VOX1BMRF9EQVRBLCByZW1haW5kZXIpOwo+ID4gPiAr CQkJdHhfYnVmICs9IHBsZF9kYXRhX2J5dGVzOwo+ID4gPiAgCQkJbGVuIC09IHBsZF9kYXRhX2J5 dGVzOwo+ID4gPiAgCQl9ICAKPiA+IAo+ID4gCj4gPiBZb3UgY2FuIGNsZWFuIHRoaXMgdXAgZnVy dGhlciBieSByZW1vdmluZyBhIGNvdXBsZSBvZiB0aGUgbG9jYWxzLCB0aGUKPiA+IGNvbmRpdGlv bmFsIGFuZCB0aGUgZGl2aXNpb246Cj4gPiAKPiA+IHdoaWxlKGxlbiA8IG1zZy0+dHhfbGVuKSB7 Cj4gPiAgICAgICAgIHNpemVfdCB0b193cml0ZSA9IE1JTihtc2ctPnR4X2xlbiAtIGxlbiwgc2l6 ZW9mKHJlbWFpbmRlcikpOwo+ID4gCj4gPiAgICAgICAgIG1lbWNweSgmcmVtYWluZGVyLCBtc2ct PnR4X2J1ZiArIGxlbiwgdG9fd3JpdGUpOwo+ID4gICAgICAgICBkc2lfd3JpdGUoZHNpLCBEU0lf R0VOX1BMRF9EQVRBLCByZW1haW5kZXIpOwo+ID4gICAgICAgICBsZW4gKz0gdG9fd3JpdGU7Cj4g PiAKPiA+ICAgICAgICAgLi4uCj4gPiB9Cj4gCj4gVGhhdCdzIGEgbmljZSBzaW1wbGlmaWNhdGlv biwgYnV0IGl0J3MgbW9yZSB0aGFuIEkgd2FzIHRyeWluZyB0byBkbyB3aXRoCj4gdGhpcyBwYXRj aC4gIEkgY2FuIGFkZCBhIGNsZWFudXAgcGF0Y2ggb24gdG9wIHRvIHNpbXBsaWZ5IHRoZSBmdW5j dGlvbiwKPiBidXQgSSBkb24ndCBoYXZlIHRoYXQgbXVjaCB0aW1lIHRvIHNwZW5kIG9uIHRoaXMg YXQgdGhlIG1vbWVudCBhbmQgSSdkCj4gcmF0aGVyIG5vdCBibG9jayB0aGlzIGZpeCBiZWNhdXNl IHRoZSBvcmlnaW5hbCBjb2RlIHN0cnVjdHVyZSBjb3VsZCBiZQo+IGltcHJvdmVkLgoKT2suIEkn bSBpbmNsaW5lZCB0byBhcmd1ZSB0aGF0IHdyaXRpbmcgeW91ciByZXNwb25zZSBwcm9iYWJseSB0 b29rIG1vcmUgdGltZQp0aGFuIHRoZSBjb3B5L3Bhc3RlIHRvIGZpeCBpdCwgYnV0ICpzaHJ1Zyou CgpTZWFuCgo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Cj4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAoKLS0gClNlYW4gUGF1bCwgU29mdHdhcmUgRW5naW5lZXIsIEdvb2dsZSAvIENocm9taXVt IE9TCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: seanpaul@chromium.org (Sean Paul) Date: Tue, 31 Jan 2017 09:53:13 -0500 Subject: [PATCH v3 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned In-Reply-To: <20170131115618.633398fc.john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-11-john@metanate.com> <20170130200811.GK20076@art_vandelay> <20170131115618.633398fc.john@metanate.com> Message-ID: <20170131145313.GY20076@art_vandelay> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Jan 31, 2017 at 11:56:18AM +0000, John Keeping wrote: > 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. Ok. I'm inclined to argue that writing your response probably took more time than the copy/paste to fix it, but *shrug*. Sean > _______________________________________________ > 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 S1751193AbdAaPAf (ORCPT ); Tue, 31 Jan 2017 10:00:35 -0500 Received: from mail-qt0-f176.google.com ([209.85.216.176]:34180 "EHLO mail-qt0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750990AbdAaPAU (ORCPT ); Tue, 31 Jan 2017 10:00:20 -0500 Date: Tue, 31 Jan 2017 09:53:13 -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 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned Message-ID: <20170131145313.GY20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-11-john@metanate.com> <20170130200811.GK20076@art_vandelay> <20170131115618.633398fc.john@metanate.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170131115618.633398fc.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 Tue, Jan 31, 2017 at 11:56:18AM +0000, John Keeping wrote: > 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. Ok. I'm inclined to argue that writing your response probably took more time than the copy/paste to fix it, but *shrug*. Sean > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Sean Paul, Software Engineer, Google / Chromium OS