From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Keeping Subject: [PATCH v3 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned Date: Sun, 29 Jan 2017 13:24:30 +0000 Message-ID: <20170129132444.25251-11-john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170129132444.25251-1-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: Mark Yao 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 QnkgZGVyZWZlcmVuY2luZyB0aGUgTUlQSSBjb21tYW5kIGJ1ZmZlciBhcyBhIHUzMiogd2UgcmVs eSBvbiBpdCBiZWluZwpjb3JyZWN0bHkgYWxpZ25lZCBvbiBBUk0sIGJ1dCB0aGlzIG1heSBub3Qg YmUgdGhlIGNhc2UuICBDb3B5IGl0IGludG8gYQpzdGFjayB2YXJpYWJsZSB0aGF0IHdpbGwgYmUg Y29ycmVjdGx5IGFsaWduZWQuCgpTaWduZWQtb2ZmLWJ5OiBKb2huIEtlZXBpbmcgPGpvaG5AbWV0 YW5hdGUuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXMgWmhvbmcgPHp5d0Byb2NrLWNoaXBzLmNvbT4K LS0tCnYzOgotIEFkZCBDaHJpcycgUmV2aWV3ZWQtYnkKVW5jaGFuZ2VkIGluIHYyCgogZHJpdmVy cy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMgfCAxMiArKysrKysrLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0v cm9ja2NoaXAvZHctbWlwaS1kc2kuYwppbmRleCAwM2ZjMDk2ZmUxYmQuLmRkYmMwMzdlN2NlZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKQEAgLTYwNywxMCArNjA3LDEw IEBAIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfZGNzX3Nob3J0X3dyaXRlKHN0cnVjdCBkd19taXBp X2RzaSAqZHNpLAogc3RhdGljIGludCBkd19taXBpX2RzaV9kY3NfbG9uZ193cml0ZShzdHJ1Y3Qg ZHdfbWlwaV9kc2kgKmRzaSwKIAkJCQkgICAgICBjb25zdCBzdHJ1Y3QgbWlwaV9kc2lfbXNnICpt c2cpCiB7Ci0JY29uc3QgdTMyICp0eF9idWYgPSBtc2ctPnR4X2J1ZjsKLQlpbnQgbGVuID0gbXNn LT50eF9sZW4sIHBsZF9kYXRhX2J5dGVzID0gc2l6ZW9mKCp0eF9idWYpLCByZXQ7CisJY29uc3Qg dTggKnR4X2J1ZiA9IG1zZy0+dHhfYnVmOworCWludCBsZW4gPSBtc2ctPnR4X2xlbiwgcGxkX2Rh dGFfYnl0ZXMgPSBzaXplb2YodTMyKSwgcmV0OwogCXUzMiBoZHJfdmFsID0gR0VOX0hEQVRBKG1z Zy0+dHhfbGVuKSB8IEdFTl9IVFlQRShtc2ctPnR5cGUpOwotCXUzMiByZW1haW5kZXIgPSAwOwor CXUzMiByZW1haW5kZXI7CiAJdTMyIHZhbDsKIAogCWlmIChtc2ctPnR4X2xlbiA8IDMpIHsKQEAg LTYyMSwxMiArNjIxLDE0IEBAIHN0YXRpYyBpbnQgZHdfbWlwaV9kc2lfZGNzX2xvbmdfd3JpdGUo c3RydWN0IGR3X21pcGlfZHNpICpkc2ksCiAKIAl3aGlsZSAoRElWX1JPVU5EX1VQKGxlbiwgcGxk X2RhdGFfYnl0ZXMpKSB7CiAJCWlmIChsZW4gPCBwbGRfZGF0YV9ieXRlcykgeworCQkJcmVtYWlu ZGVyID0gMDsKIAkJCW1lbWNweSgmcmVtYWluZGVyLCB0eF9idWYsIGxlbik7CiAJCQlkc2lfd3Jp dGUoZHNpLCBEU0lfR0VOX1BMRF9EQVRBLCByZW1haW5kZXIpOwogCQkJbGVuID0gMDsKIAkJfSBl bHNlIHsKLQkJCWRzaV93cml0ZShkc2ksIERTSV9HRU5fUExEX0RBVEEsICp0eF9idWYpOwotCQkJ dHhfYnVmKys7CisJCQltZW1jcHkoJnJlbWFpbmRlciwgdHhfYnVmLCBwbGRfZGF0YV9ieXRlcyk7 CisJCQlkc2lfd3JpdGUoZHNpLCBEU0lfR0VOX1BMRF9EQVRBLCByZW1haW5kZXIpOworCQkJdHhf YnVmICs9IHBsZF9kYXRhX2J5dGVzOwogCQkJbGVuIC09IHBsZF9kYXRhX2J5dGVzOwogCQl9CiAK LS0gCjIuMTEuMC4xOTcuZ2I1NTZkZTUuZGlydHkKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: john@metanate.com (John Keeping) Date: Sun, 29 Jan 2017 13:24:30 +0000 Subject: [PATCH v3 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned In-Reply-To: <20170129132444.25251-1-john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> Message-ID: <20170129132444.25251-11-john@metanate.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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; } -- 2.11.0.197.gb556de5.dirty From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751444AbdA2OIt (ORCPT ); Sun, 29 Jan 2017 09:08:49 -0500 Received: from dougal.metanate.com ([90.155.101.14]:11137 "EHLO metanate.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751311AbdA2OIq (ORCPT ); Sun, 29 Jan 2017 09:08:46 -0500 From: John Keeping To: Mark Yao Cc: Chris Zhong , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, John Keeping Subject: [PATCH v3 10/24] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned Date: Sun, 29 Jan 2017 13:24:30 +0000 Message-Id: <20170129132444.25251-11-john@metanate.com> X-Mailer: git-send-email 2.11.0.197.gb556de5.dirty In-Reply-To: <20170129132444.25251-1-john@metanate.com> References: <20170129132444.25251-1-john@metanate.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; } -- 2.11.0.197.gb556de5.dirty