From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Zhong Subject: Re: [PATCH v2 11/26] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned Date: Sun, 22 Jan 2017 16:16:48 +0800 Message-ID: <58846A70.5040503@rock-chips.com> References: <20170121163128.22240-1-john@metanate.com> <20170121163128.22240-12-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170121163128.22240-12-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 , Mark Yao Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: linux-rockchip.vger.kernel.org SGkgSm9obgoKUmV2aWV3ZWQtYnk6IENocmlzIFpob25nIDx6eXdAcm9jay1jaGlwcy5jb20+CgoK T24gMDEvMjIvMjAxNyAxMjozMSBBTSwgSm9obiBLZWVwaW5nIHdyb3RlOgo+IEJ5IGRlcmVmZXJl bmNpbmcgdGhlIE1JUEkgY29tbWFuZCBidWZmZXIgYXMgYSB1MzIqIHdlIHJlbHkgb24gaXQgYmVp bmcKPiBjb3JyZWN0bHkgYWxpZ25lZCBvbiBBUk0sIGJ1dCB0aGlzIG1heSBub3QgYmUgdGhlIGNh c2UuICBDb3B5IGl0IGludG8gYQo+IHN0YWNrIHZhcmlhYmxlIHRoYXQgd2lsbCBiZSBjb3JyZWN0 bHkgYWxpZ25lZC4KPgo+IFNpZ25lZC1vZmYtYnk6IEpvaG4gS2VlcGluZyA8am9obkBtZXRhbmF0 ZS5jb20+Cj4gLS0tCj4gVW5jaGFuZ2VkIGluIHYyCj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvZHctbWlwaS1kc2kuYyB8IDEyICsrKysrKystLS0tLQo+ICAgMSBmaWxlIGNoYW5n ZWQsIDcgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2Nr Y2hpcC9kdy1taXBpLWRzaS5jCj4gaW5kZXggMDNmYzA5NmZlMWJkLi5kZGJjMDM3ZTdjZWQgMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKPiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYwo+IEBAIC02MDcsMTAgKzYw NywxMCBAQCBzdGF0aWMgaW50IGR3X21pcGlfZHNpX2Rjc19zaG9ydF93cml0ZShzdHJ1Y3QgZHdf bWlwaV9kc2kgKmRzaSwKPiAgIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfZGNzX2xvbmdfd3JpdGUo c3RydWN0IGR3X21pcGlfZHNpICpkc2ksCj4gICAJCQkJICAgICAgY29uc3Qgc3RydWN0IG1pcGlf ZHNpX21zZyAqbXNnKQo+ICAgewo+IC0JY29uc3QgdTMyICp0eF9idWYgPSBtc2ctPnR4X2J1ZjsK PiAtCWludCBsZW4gPSBtc2ctPnR4X2xlbiwgcGxkX2RhdGFfYnl0ZXMgPSBzaXplb2YoKnR4X2J1 ZiksIHJldDsKPiArCWNvbnN0IHU4ICp0eF9idWYgPSBtc2ctPnR4X2J1ZjsKPiArCWludCBsZW4g PSBtc2ctPnR4X2xlbiwgcGxkX2RhdGFfYnl0ZXMgPSBzaXplb2YodTMyKSwgcmV0Owo+ICAgCXUz MiBoZHJfdmFsID0gR0VOX0hEQVRBKG1zZy0+dHhfbGVuKSB8IEdFTl9IVFlQRShtc2ctPnR5cGUp Owo+IC0JdTMyIHJlbWFpbmRlciA9IDA7Cj4gKwl1MzIgcmVtYWluZGVyOwo+ICAgCXUzMiB2YWw7 Cj4gICAKPiAgIAlpZiAobXNnLT50eF9sZW4gPCAzKSB7Cj4gQEAgLTYyMSwxMiArNjIxLDE0IEBA IHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfZGNzX2xvbmdfd3JpdGUoc3RydWN0IGR3X21pcGlfZHNp ICpkc2ksCj4gICAKPiAgIAl3aGlsZSAoRElWX1JPVU5EX1VQKGxlbiwgcGxkX2RhdGFfYnl0ZXMp KSB7Cj4gICAJCWlmIChsZW4gPCBwbGRfZGF0YV9ieXRlcykgewo+ICsJCQlyZW1haW5kZXIgPSAw Owo+ICAgCQkJbWVtY3B5KCZyZW1haW5kZXIsIHR4X2J1ZiwgbGVuKTsKPiAgIAkJCWRzaV93cml0 ZShkc2ksIERTSV9HRU5fUExEX0RBVEEsIHJlbWFpbmRlcik7Cj4gICAJCQlsZW4gPSAwOwo+ICAg CQl9IGVsc2Ugewo+IC0JCQlkc2lfd3JpdGUoZHNpLCBEU0lfR0VOX1BMRF9EQVRBLCAqdHhfYnVm KTsKPiAtCQkJdHhfYnVmKys7Cj4gKwkJCW1lbWNweSgmcmVtYWluZGVyLCB0eF9idWYsIHBsZF9k YXRhX2J5dGVzKTsKPiArCQkJZHNpX3dyaXRlKGRzaSwgRFNJX0dFTl9QTERfREFUQSwgcmVtYWlu ZGVyKTsKPiArCQkJdHhfYnVmICs9IHBsZF9kYXRhX2J5dGVzOwo+ICAgCQkJbGVuIC09IHBsZF9k YXRhX2J5dGVzOwo+ICAgCQl9Cj4gICAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Sun, 22 Jan 2017 16:16:48 +0800 Subject: [PATCH v2 11/26] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned In-Reply-To: <20170121163128.22240-12-john@metanate.com> References: <20170121163128.22240-1-john@metanate.com> <20170121163128.22240-12-john@metanate.com> Message-ID: <58846A70.5040503@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi John Reviewed-by: Chris Zhong On 01/22/2017 12:31 AM, 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 > --- > 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; > } > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751381AbdAVIRC (ORCPT ); Sun, 22 Jan 2017 03:17:02 -0500 Received: from regular1.263xmail.com ([211.150.99.138]:37200 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750912AbdAVIRB (ORCPT ); Sun, 22 Jan 2017 03:17:01 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: zyw@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: zyw@rock-chips.com X-UNIQUE-TAG: <6ea9f3c08b9ae7ec691df16a6026b3c3> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v2 11/26] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned To: John Keeping , Mark Yao References: <20170121163128.22240-1-john@metanate.com> <20170121163128.22240-12-john@metanate.com> Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org From: Chris Zhong Message-ID: <58846A70.5040503@rock-chips.com> Date: Sun, 22 Jan 2017 16:16:48 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <20170121163128.22240-12-john@metanate.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi John Reviewed-by: Chris Zhong On 01/22/2017 12:31 AM, 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 > --- > 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; > } >