From patchwork Tue Sep 3 08:11:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 172786 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp5353670ily; Tue, 3 Sep 2019 01:11:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqxsHA1lOV0XFtkyUroyi2j5l1Lbd44tYHUef7pDS14X9U6LnyGoQpjoiJ81f9p505ntybcV X-Received: by 2002:a17:90a:360b:: with SMTP id s11mr17758108pjb.30.1567498298037; Tue, 03 Sep 2019 01:11:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567498298; cv=none; d=google.com; s=arc-20160816; b=Kt+fJvZju2bT/wM75Nw2CrNsHYnpQjTaeRG9RiaBOFVqpyN2+O8EFNjLM//lhykWkH 9ehlrR7lN6zaWQITU8rT3hoZ6p/1ssWtCwdDHRCdTNlcdnORmVimQbaR3Xk218vaJABZ 2YIUhuAB7sci1zM0l/cyd2RhGncx/d6k2OtRNLSwY+sOPQjrU4hNXuI84RHXFqzqxvhE JpgzVJIcqWs3Aekxk0KRmhoOrSVCEPJ5RJSZsVBgOHpRUiejtr1aJZtZfT3u1jcrSTwG CR3l6rOVdmtq3rkSLrRZpi3IhKDf1+H8Fsbg5X8TvwN0MpOQgi4qO2Gzxx89HJZM/DeC NrHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :delivered-to; bh=Yfmgw9esLRraO2S/5sDtzhE7yjaxqMoBiiwMNRNbtXU=; b=i8eII6ChO7zb9O8bBkJ7Lu9nk6yEtgveJ79TrqxsPGLC3J3NrQqzdgS13XKUouasgK g0erGJPiKqVuXi/N7TRDzz9DHJ9RSn7JQ4I4DgXeOX/fCYwMFd0Jel39Rp1O5JWA2zER 6SG+wUmYkMQdAfXty3y5jNpOAEej5BOVQ6kUvKk8vSoWHnLvwAzV0i87rgaYhipEYBYV 9trWyeS2FY9NgT9TeR6eHS7eFLL1m6SjHOKq5CfhGlzbCXffwfZSfCCXnXlApH0Hakod 9xrtDVsjn4bsCKLkQngkNwIl7OzQ03e+1OgcDLYqODfpO1hCogD5+uAK7gICLlPcezuI AEEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id f186si13532279pgc.438.2019.09.03.01.11.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Sep 2019 01:11:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD10E8979F; Tue, 3 Sep 2019 08:11:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D90E8979F for ; Tue, 3 Sep 2019 08:11:35 +0000 (UTC) Received: by mail-lj1-x241.google.com with SMTP id d5so4097888lja.10 for ; Tue, 03 Sep 2019 01:11:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tyymm91MS3uOn9HpSwdxIsV+GT0nl2VitRUl2IB6nOw=; b=RVYIiV0kvFQVop7BI7x2m9aqnV3THjVc2V6HNAgRPvJfFb4BiUo7AdSpLL8imJYXK9 vHZDMp/zD/ZBMbi6tXO2bOI0RBfmqOJfPVi+o9+q3dvbWuSQhCFwWslvWggQ3cGg1qP5 YTc0JUmf14cXfvExMF46WPomfVYluYkn/vceqki02o+8FesLzWAWu4TSMzwpSMnBOvxO VaZK3JsnDaxqaOAdltzwQQNhro/SCxGdmv6/z0aBgVYhVe8uzbThJDRUuEOBFdnsGNxQ 8uYumSCUw8ce5eabqQ2AfaNj5zGEi+T1rwP53k5rp8eAvIXlo4DXNGrB2qYYS+Rqdb+k DoTA== X-Gm-Message-State: APjAAAX3+YA6VOfcY9Wo9ZWGHroHccJevEHw1e4dmIDdeMPPeFQAexBB ea3S+B4y9KUFdxh19e5YSzL1IWQhiwo= X-Received: by 2002:a2e:874a:: with SMTP id q10mr1611312ljj.187.1567498293371; Tue, 03 Sep 2019 01:11:33 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id e21sm2811980lfj.10.2019.09.03.01.11.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 01:11:31 -0700 (PDT) From: Linus Walleij To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Sean Paul Subject: [PATCH v3] drm/mcde: Fix DSI transfers Date: Tue, 3 Sep 2019 10:11:29 +0200 Message-Id: <20190903081129.19617-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tyymm91MS3uOn9HpSwdxIsV+GT0nl2VitRUl2IB6nOw=; b=N5Cb1pysICGuR4xGN0r/C4C9NhXdoMUlkOAomeQyAbbYuBc9My7GQq1DsilPoyBed9 M6n9QwjHaAj+Pl8m9lfve6EF05f4mUpQj/BKtV84kIMeiUvCwY6Cg1V+2Cz7Tyu4TNdU Vax6Uxgi1Q/AYbpWOqzvI7eW2jrkKILoK6FjFxvnEIZa2205QzKm7IWRvxBLQXZo4Mdy mH58L3SteOZsDAcUDBxNrgmPnmTJaAeG6glYyugsCcdNpEWZXRJG8/XJBV/k+Wk75HVS 5h+BHdvWqLmpjJ8PmWft297g7IgsHJjiLGPlm10LsgQ8PrnDyy7h/37WOjujzzes2D8g +caA== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephan Gerhold , kbuild test robot , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" There were bugs in the DSI transfer (read and write) function as it was only tested with displays ever needing a single byte to be written. Fixed it up and tested so we can now write messages of up to 16 bytes and read up to 4 bytes from the display. Tested with a Sony ACX424AKP display: this display now self- identifies and can control backlight in command mode. Reported-by: kbuild test robot Fixes: 5fc537bfd000 ("drm/mcde: Add new driver for ST-Ericsson MCDE") Reviewed-by: Stephan Gerhold Signed-off-by: Linus Walleij --- ChangeLog v2->v3: - Fix an error message to indicate reading error rather than writing error. - Use the local variable for underflow print. - Collected Stephan's reviewed-by. ChangeLog v1->v2: - Fix a print modifier for dev_err() found by the build robot. --- drivers/gpu/drm/mcde/mcde_dsi.c | 70 ++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 07f7090d08b3..cd261c266f35 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -178,22 +178,26 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, const u32 loop_delay_us = 10; /* us */ const u8 *tx = msg->tx_buf; u32 loop_counter; - size_t txlen; + size_t txlen = msg->tx_len; + size_t rxlen = msg->rx_len; u32 val; int ret; int i; - txlen = msg->tx_len; - if (txlen > 12) { + if (txlen > 16) { dev_err(d->dev, - "dunno how to write more than 12 bytes yet\n"); + "dunno how to write more than 16 bytes yet\n"); + return -EIO; + } + if (rxlen > 4) { + dev_err(d->dev, + "dunno how to read more than 4 bytes yet\n"); return -EIO; } dev_dbg(d->dev, - "message to channel %d, %zd bytes", - msg->channel, - txlen); + "message to channel %d, write %zd bytes read %zd bytes\n", + msg->channel, txlen, rxlen); /* Command "nature" */ if (MCDE_DSI_HOST_IS_READ(msg->type)) @@ -210,9 +214,7 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, if (mipi_dsi_packet_format_is_long(msg->type)) val |= DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_LONGNOTSHORT; val |= 0 << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_ID_SHIFT; - /* Add one to the length for the MIPI DCS command */ - val |= txlen - << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_SIZE_SHIFT; + val |= txlen << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_SIZE_SHIFT; val |= DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_LP_EN; val |= msg->type << DSI_DIRECT_CMD_MAIN_SETTINGS_CMD_HEAD_SHIFT; writel(val, d->regs + DSI_DIRECT_CMD_MAIN_SETTINGS); @@ -249,17 +251,36 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, writel(1, d->regs + DSI_DIRECT_CMD_SEND); loop_counter = 1000 * 1000 / loop_delay_us; - while (!(readl(d->regs + DSI_DIRECT_CMD_STS) & - DSI_DIRECT_CMD_STS_WRITE_COMPLETED) - && --loop_counter) - usleep_range(loop_delay_us, (loop_delay_us * 3) / 2); - - if (!loop_counter) { - dev_err(d->dev, "DSI write timeout!\n"); - return -ETIME; + if (MCDE_DSI_HOST_IS_READ(msg->type)) { + /* Read command */ + while (!(readl(d->regs + DSI_DIRECT_CMD_STS) & + (DSI_DIRECT_CMD_STS_READ_COMPLETED | + DSI_DIRECT_CMD_STS_READ_COMPLETED_WITH_ERR)) + && --loop_counter) + usleep_range(loop_delay_us, (loop_delay_us * 3) / 2); + if (!loop_counter) { + dev_err(d->dev, "DSI write timeout!\n"); + return -ETIME; + } + } else { + /* Writing only */ + while (!(readl(d->regs + DSI_DIRECT_CMD_STS) & + DSI_DIRECT_CMD_STS_WRITE_COMPLETED) + && --loop_counter) + usleep_range(loop_delay_us, (loop_delay_us * 3) / 2); + + if (!loop_counter) { + dev_err(d->dev, "DSI read timeout!\n"); + return -ETIME; + } } val = readl(d->regs + DSI_DIRECT_CMD_STS); + if (val & DSI_DIRECT_CMD_STS_READ_COMPLETED_WITH_ERR) { + dev_err(d->dev, "read completed with error\n"); + writel(1, d->regs + DSI_DIRECT_CMD_RD_INIT); + return -EIO; + } if (val & DSI_DIRECT_CMD_STS_ACKNOWLEDGE_WITH_ERR_RECEIVED) { val >>= DSI_DIRECT_CMD_STS_ACK_VAL_SHIFT; dev_err(d->dev, "error during transmission: %04x\n", @@ -269,10 +290,7 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, if (!MCDE_DSI_HOST_IS_READ(msg->type)) { /* Return number of bytes written */ - if (mipi_dsi_packet_format_is_long(msg->type)) - ret = 4 + txlen; - else - ret = 4; + ret = txlen; } else { /* OK this is a read command, get the response */ u32 rdsz; @@ -282,7 +300,13 @@ static ssize_t mcde_dsi_host_transfer(struct mipi_dsi_host *host, rdsz = readl(d->regs + DSI_DIRECT_CMD_RD_PROPERTY); rdsz &= DSI_DIRECT_CMD_RD_PROPERTY_RD_SIZE_MASK; rddat = readl(d->regs + DSI_DIRECT_CMD_RDDAT); - for (i = 0; i < 4 && i < rdsz; i++) + if (rdsz < rxlen) { + dev_err(d->dev, "read error, requested %zd got %zd\n", + msg->rx_len, rxlen); + return -EIO; + } + /* FIXME: read more than 4 bytes */ + for (i = 0; i < 4 && i < rxlen; i++) rx[i] = (rddat >> (i * 8)) & 0xff; ret = rdsz; }