From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B040C3A5A4 for ; Fri, 30 Aug 2019 13:06:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1B4622186A for ; Fri, 30 Aug 2019 13:06:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lGn0Kddi"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="uwd8wpGv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B4622186A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=LB5Z4ryvbpetUK6l33xaSjoA2n9e850fZd01YWF1jgg=; b=lGn0KddivcGUO9 RU7WBW4Eo4I+kMc5ushqqyY/Oyn4IGYL9zZKMy9tRGLXpUAF48BjJ0JmhN7H89CXYXfIWbwNKhfOx pfOFOAd9jX1HJ1y3xmfjD3kOaLoT9Yr7Uu6i1do5nPMXONsk7R6nPGsQKXKA+RkMXwZW0qj02pmuV Q5UXkk2fiaipPP3V1z+DOI+QzLRguEnqCnr6+x3SKYQaA90++3qTb0FmMouL+cI+FcwO7wz54bzuN XD5sHOaXg11Yj2MXsrd7bHMDfFeQTJCrXjtpgeyoRAQqmfig8neSUWiOQyMl4iq++cGt8uhoFFkkX 240dWhqNH8dZ4X3BfAHA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i3gbr-0002z2-EV; Fri, 30 Aug 2019 13:06:35 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i3gbn-0002ye-KQ for linux-arm-kernel@lists.infradead.org; Fri, 30 Aug 2019 13:06:33 +0000 Received: by mail-lf1-x144.google.com with SMTP id n19so5270348lfe.13 for ; Fri, 30 Aug 2019 06:06:30 -0700 (PDT) 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=CEB5ZvNjUPElBE9umR+JJZU4wgevrWXUj1n2n10MLZs=; b=uwd8wpGvjkNaubjt9cnpM6036yUIA8iJpAkMfwRTyg+jknhyyGowZf1ko4n3IvSm2n oAZBqNTS6R+q3h3OKpKow1Rq5OLDKixQjYHQeQp1skVm1KqbhfqLn9z6jr5DtjHpmp0Y Ps7O6kMaTplrkMiCpbf+rGxQuGARV94LgzQeEdjtpycJUjqurOhctuIYkY5o5wxQ+SGL rbWATECNrvU8qWlsZVcGobN/lZUGTtpPujqpTgqHRAR1eKhQbTLqG6Ls4WKfWZABMbnx 2/hOUzJcoJglMPbDpA+4SAegV9rREWDaaNLoqJsVJoPZGS51C1G9iYEM9qWP5iV9KE04 aE9g== 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=CEB5ZvNjUPElBE9umR+JJZU4wgevrWXUj1n2n10MLZs=; b=ASnYekMYUTiB8N11R4cs+l9r7Z+YXWZ6zeFtn14HIx03WtCNIlXtTenrr/+Ax+r5Js kxp1C8SHzHHyIlSrfKDxBWaJpP9K7s2L2FG0KAAebfDR4kuIDh8Khtyt+F9yoZNUTjW8 SlNaXBRp1CA6l8RJJ/7ytZctvqvvmUN7WROHnpmKv7fhrlpD0o9lSOGoBGmOWZHndxWC 9fCNMSDCcMkmZ4L3I2oDLSit3vIZEDCmA2xN0vYH/6a3L7z+vWBvxmZWnHub/2SdoAmx B23r9sfvVB9TsY3EvZo2GpNYPhgKwY/Wj/ROldUg4WkuN+i0Z6O56EPIWMg+8LJe9oAv +oyA== X-Gm-Message-State: APjAAAVir4oqs/c432Vx6FLCV4Sqlaga2TUO1xiYQ0JyF5vQmZmB6dQA AbdwLW90U/gQgEgoRvcCDEbIoA== X-Google-Smtp-Source: APXvYqyHHH8/6/Pp9bt+mcoalxqgoQY4hpFXQVj+h6v+YLA//msOjZDiALKXOOWN6FjLimkObxjKgQ== X-Received: by 2002:a19:e04f:: with SMTP id g15mr9011216lfj.46.1567170388587; Fri, 30 Aug 2019 06:06:28 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id y20sm833319ljy.55.2019.08.30.06.06.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 06:06:27 -0700 (PDT) From: Linus Walleij To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Sean Paul Subject: [PATCH] drm/mcde: Fix DSI transfers Date: Fri, 30 Aug 2019 15:06:23 +0200 Message-Id: <20190830130623.19116-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190830_060631_734839_E41034DD X-CRM114-Status: GOOD ( 16.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , Stephan Gerhold , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. Cc: Stephan Gerhold Fixes: 5fc537bfd000 ("drm/mcde: Add new driver for ST-Ericsson MCDE") Signed-off-by: Linus Walleij --- 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..ad76a36e7bc1 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 write 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 %d got %d\n", + msg->rx_len, rdsz); + return -EIO; + } + /* FIXME: read more than 4 bytes */ + for (i = 0; i < 4 && i < rxlen; i++) rx[i] = (rddat >> (i * 8)) & 0xff; ret = rdsz; } -- 2.21.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Walleij Subject: [PATCH] drm/mcde: Fix DSI transfers Date: Fri, 30 Aug 2019 15:06:23 +0200 Message-ID: <20190830130623.19116-1-linus.walleij@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id E00C36E331 for ; Fri, 30 Aug 2019 13:06:30 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id q27so5289579lfo.10 for ; Fri, 30 Aug 2019 06:06:30 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Sean Paul Cc: Stephan Gerhold , linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org VGhlcmUgd2VyZSBidWdzIGluIHRoZSBEU0kgdHJhbnNmZXIgKHJlYWQgYW5kIHdyaXRlKSBmdW5j dGlvbgphcyBpdCB3YXMgb25seSB0ZXN0ZWQgd2l0aCBkaXNwbGF5cyBldmVyIG5lZWRpbmcgYSBz aW5nbGUgYnl0ZQp0byBiZSB3cml0dGVuLiBGaXhlZCBpdCB1cCBhbmQgdGVzdGVkIHNvIHdlIGNh biBub3cgd3JpdGUKbWVzc2FnZXMgb2YgdXAgdG8gMTYgYnl0ZXMgYW5kIHJlYWQgdXAgdG8gNCBi eXRlcyBmcm9tIHRoZQpkaXNwbGF5LgoKVGVzdGVkIHdpdGggYSBTb255IEFDWDQyNEFLUCBkaXNw bGF5OiB0aGlzIGRpc3BsYXkgbm93IHNlbGYtCmlkZW50aWZpZXMgYW5kIGNhbiBjb250cm9sIGJh Y2tsaWdodCBpbiBjb21tYW5kIG1vZGUuCgpDYzogU3RlcGhhbiBHZXJob2xkIDxzdGVwaGFuQGdl cmhvbGQubmV0PgpGaXhlczogNWZjNTM3YmZkMDAwICgiZHJtL21jZGU6IEFkZCBuZXcgZHJpdmVy IGZvciBTVC1Fcmljc3NvbiBNQ0RFIikKU2lnbmVkLW9mZi1ieTogTGludXMgV2FsbGVpaiA8bGlu dXMud2FsbGVpakBsaW5hcm8ub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9tY2RlL21jZGVfZHNp LmMgfCA3MCArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA0NyBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vbWNkZS9tY2RlX2RzaS5jIGIvZHJpdmVycy9ncHUvZHJtL21jZGUvbWNkZV9kc2ku YwppbmRleCAwN2Y3MDkwZDA4YjMuLmFkNzZhMzZlN2JjMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL21jZGUvbWNkZV9kc2kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbWNkZS9tY2RlX2Rz aS5jCkBAIC0xNzgsMjIgKzE3OCwyNiBAQCBzdGF0aWMgc3NpemVfdCBtY2RlX2RzaV9ob3N0X3Ry YW5zZmVyKHN0cnVjdCBtaXBpX2RzaV9ob3N0ICpob3N0LAogCWNvbnN0IHUzMiBsb29wX2RlbGF5 X3VzID0gMTA7IC8qIHVzICovCiAJY29uc3QgdTggKnR4ID0gbXNnLT50eF9idWY7CiAJdTMyIGxv b3BfY291bnRlcjsKLQlzaXplX3QgdHhsZW47CisJc2l6ZV90IHR4bGVuID0gbXNnLT50eF9sZW47 CisJc2l6ZV90IHJ4bGVuID0gbXNnLT5yeF9sZW47CiAJdTMyIHZhbDsKIAlpbnQgcmV0OwogCWlu dCBpOwogCi0JdHhsZW4gPSBtc2ctPnR4X2xlbjsKLQlpZiAodHhsZW4gPiAxMikgeworCWlmICh0 eGxlbiA+IDE2KSB7CiAJCWRldl9lcnIoZC0+ZGV2LAotCQkJImR1bm5vIGhvdyB0byB3cml0ZSBt b3JlIHRoYW4gMTIgYnl0ZXMgeWV0XG4iKTsKKwkJCSJkdW5ubyBob3cgdG8gd3JpdGUgbW9yZSB0 aGFuIDE2IGJ5dGVzIHlldFxuIik7CisJCXJldHVybiAtRUlPOworCX0KKwlpZiAocnhsZW4gPiA0 KSB7CisJCWRldl9lcnIoZC0+ZGV2LAorCQkJImR1bm5vIGhvdyB0byByZWFkIG1vcmUgdGhhbiA0 IGJ5dGVzIHlldFxuIik7CiAJCXJldHVybiAtRUlPOwogCX0KIAogCWRldl9kYmcoZC0+ZGV2LAot CQkibWVzc2FnZSB0byBjaGFubmVsICVkLCAlemQgYnl0ZXMiLAotCQltc2ctPmNoYW5uZWwsCi0J CXR4bGVuKTsKKwkJIm1lc3NhZ2UgdG8gY2hhbm5lbCAlZCwgd3JpdGUgJXpkIGJ5dGVzIHJlYWQg JXpkIGJ5dGVzXG4iLAorCQltc2ctPmNoYW5uZWwsIHR4bGVuLCByeGxlbik7CiAKIAkvKiBDb21t YW5kICJuYXR1cmUiICovCiAJaWYgKE1DREVfRFNJX0hPU1RfSVNfUkVBRChtc2ctPnR5cGUpKQpA QCAtMjEwLDkgKzIxNCw3IEBAIHN0YXRpYyBzc2l6ZV90IG1jZGVfZHNpX2hvc3RfdHJhbnNmZXIo c3RydWN0IG1pcGlfZHNpX2hvc3QgKmhvc3QsCiAJaWYgKG1pcGlfZHNpX3BhY2tldF9mb3JtYXRf aXNfbG9uZyhtc2ctPnR5cGUpKQogCQl2YWwgfD0gRFNJX0RJUkVDVF9DTURfTUFJTl9TRVRUSU5H U19DTURfTE9OR05PVFNIT1JUOwogCXZhbCB8PSAwIDw8IERTSV9ESVJFQ1RfQ01EX01BSU5fU0VU VElOR1NfQ01EX0lEX1NISUZUOwotCS8qIEFkZCBvbmUgdG8gdGhlIGxlbmd0aCBmb3IgdGhlIE1J UEkgRENTIGNvbW1hbmQgKi8KLQl2YWwgfD0gdHhsZW4KLQkJPDwgRFNJX0RJUkVDVF9DTURfTUFJ Tl9TRVRUSU5HU19DTURfU0laRV9TSElGVDsKKwl2YWwgfD0gdHhsZW4gPDwgRFNJX0RJUkVDVF9D TURfTUFJTl9TRVRUSU5HU19DTURfU0laRV9TSElGVDsKIAl2YWwgfD0gRFNJX0RJUkVDVF9DTURf TUFJTl9TRVRUSU5HU19DTURfTFBfRU47CiAJdmFsIHw9IG1zZy0+dHlwZSA8PCBEU0lfRElSRUNU X0NNRF9NQUlOX1NFVFRJTkdTX0NNRF9IRUFEX1NISUZUOwogCXdyaXRlbCh2YWwsIGQtPnJlZ3Mg KyBEU0lfRElSRUNUX0NNRF9NQUlOX1NFVFRJTkdTKTsKQEAgLTI0OSwxNyArMjUxLDM2IEBAIHN0 YXRpYyBzc2l6ZV90IG1jZGVfZHNpX2hvc3RfdHJhbnNmZXIoc3RydWN0IG1pcGlfZHNpX2hvc3Qg Kmhvc3QsCiAJd3JpdGVsKDEsIGQtPnJlZ3MgKyBEU0lfRElSRUNUX0NNRF9TRU5EKTsKIAogCWxv b3BfY291bnRlciA9IDEwMDAgKiAxMDAwIC8gbG9vcF9kZWxheV91czsKLQl3aGlsZSAoIShyZWFk bChkLT5yZWdzICsgRFNJX0RJUkVDVF9DTURfU1RTKSAmCi0JCSBEU0lfRElSRUNUX0NNRF9TVFNf V1JJVEVfQ09NUExFVEVEKQotCSAgICAgICAmJiAtLWxvb3BfY291bnRlcikKLQkJdXNsZWVwX3Jh bmdlKGxvb3BfZGVsYXlfdXMsIChsb29wX2RlbGF5X3VzICogMykgLyAyKTsKLQotCWlmICghbG9v cF9jb3VudGVyKSB7Ci0JCWRldl9lcnIoZC0+ZGV2LCAiRFNJIHdyaXRlIHRpbWVvdXQhXG4iKTsK LQkJcmV0dXJuIC1FVElNRTsKKwlpZiAoTUNERV9EU0lfSE9TVF9JU19SRUFEKG1zZy0+dHlwZSkp IHsKKwkJLyogUmVhZCBjb21tYW5kICovCisJCXdoaWxlICghKHJlYWRsKGQtPnJlZ3MgKyBEU0lf RElSRUNUX0NNRF9TVFMpICYKKwkJCSAoRFNJX0RJUkVDVF9DTURfU1RTX1JFQURfQ09NUExFVEVE IHwKKwkJCSAgRFNJX0RJUkVDVF9DTURfU1RTX1JFQURfQ09NUExFVEVEX1dJVEhfRVJSKSkKKwkJ ICAgICAgICYmIC0tbG9vcF9jb3VudGVyKQorCQkJdXNsZWVwX3JhbmdlKGxvb3BfZGVsYXlfdXMs IChsb29wX2RlbGF5X3VzICogMykgLyAyKTsKKwkJaWYgKCFsb29wX2NvdW50ZXIpIHsKKwkJCWRl dl9lcnIoZC0+ZGV2LCAiRFNJIHdyaXRlIHRpbWVvdXQhXG4iKTsKKwkJCXJldHVybiAtRVRJTUU7 CisJCX0KKwl9IGVsc2UgeworCQkvKiBXcml0aW5nIG9ubHkgKi8KKwkJd2hpbGUgKCEocmVhZGwo ZC0+cmVncyArIERTSV9ESVJFQ1RfQ01EX1NUUykgJgorCQkJIERTSV9ESVJFQ1RfQ01EX1NUU19X UklURV9DT01QTEVURUQpCisJCSAgICAgICAmJiAtLWxvb3BfY291bnRlcikKKwkJCXVzbGVlcF9y YW5nZShsb29wX2RlbGF5X3VzLCAobG9vcF9kZWxheV91cyAqIDMpIC8gMik7CisKKwkJaWYgKCFs b29wX2NvdW50ZXIpIHsKKwkJCWRldl9lcnIoZC0+ZGV2LCAiRFNJIHdyaXRlIHRpbWVvdXQhXG4i KTsKKwkJCXJldHVybiAtRVRJTUU7CisJCX0KIAl9CiAKIAl2YWwgPSByZWFkbChkLT5yZWdzICsg RFNJX0RJUkVDVF9DTURfU1RTKTsKKwlpZiAodmFsICYgRFNJX0RJUkVDVF9DTURfU1RTX1JFQURf Q09NUExFVEVEX1dJVEhfRVJSKSB7CisJCWRldl9lcnIoZC0+ZGV2LCAicmVhZCBjb21wbGV0ZWQg d2l0aCBlcnJvclxuIik7CisJCXdyaXRlbCgxLCBkLT5yZWdzICsgRFNJX0RJUkVDVF9DTURfUkRf SU5JVCk7CisJCXJldHVybiAtRUlPOworCX0KIAlpZiAodmFsICYgRFNJX0RJUkVDVF9DTURfU1RT X0FDS05PV0xFREdFX1dJVEhfRVJSX1JFQ0VJVkVEKSB7CiAJCXZhbCA+Pj0gRFNJX0RJUkVDVF9D TURfU1RTX0FDS19WQUxfU0hJRlQ7CiAJCWRldl9lcnIoZC0+ZGV2LCAiZXJyb3IgZHVyaW5nIHRy YW5zbWlzc2lvbjogJTA0eFxuIiwKQEAgLTI2OSwxMCArMjkwLDcgQEAgc3RhdGljIHNzaXplX3Qg bWNkZV9kc2lfaG9zdF90cmFuc2ZlcihzdHJ1Y3QgbWlwaV9kc2lfaG9zdCAqaG9zdCwKIAogCWlm ICghTUNERV9EU0lfSE9TVF9JU19SRUFEKG1zZy0+dHlwZSkpIHsKIAkJLyogUmV0dXJuIG51bWJl ciBvZiBieXRlcyB3cml0dGVuICovCi0JCWlmIChtaXBpX2RzaV9wYWNrZXRfZm9ybWF0X2lzX2xv bmcobXNnLT50eXBlKSkKLQkJCXJldCA9IDQgKyB0eGxlbjsKLQkJZWxzZQotCQkJcmV0ID0gNDsK KwkJcmV0ID0gdHhsZW47CiAJfSBlbHNlIHsKIAkJLyogT0sgdGhpcyBpcyBhIHJlYWQgY29tbWFu ZCwgZ2V0IHRoZSByZXNwb25zZSAqLwogCQl1MzIgcmRzejsKQEAgLTI4Miw3ICszMDAsMTMgQEAg c3RhdGljIHNzaXplX3QgbWNkZV9kc2lfaG9zdF90cmFuc2ZlcihzdHJ1Y3QgbWlwaV9kc2lfaG9z dCAqaG9zdCwKIAkJcmRzeiA9IHJlYWRsKGQtPnJlZ3MgKyBEU0lfRElSRUNUX0NNRF9SRF9QUk9Q RVJUWSk7CiAJCXJkc3ogJj0gRFNJX0RJUkVDVF9DTURfUkRfUFJPUEVSVFlfUkRfU0laRV9NQVNL OwogCQlyZGRhdCA9IHJlYWRsKGQtPnJlZ3MgKyBEU0lfRElSRUNUX0NNRF9SRERBVCk7Ci0JCWZv ciAoaSA9IDA7IGkgPCA0ICYmIGkgPCByZHN6OyBpKyspCisJCWlmIChyZHN6IDwgcnhsZW4pIHsK KwkJCWRldl9lcnIoZC0+ZGV2LCAicmVhZCBlcnJvciwgcmVxdWVzdGVkICVkIGdvdCAlZFxuIiwK KwkJCQltc2ctPnJ4X2xlbiwgcmRzeik7CisJCQlyZXR1cm4gLUVJTzsKKwkJfQorCQkvKiBGSVhN RTogcmVhZCBtb3JlIHRoYW4gNCBieXRlcyAqLworCQlmb3IgKGkgPSAwOyBpIDwgNCAmJiBpIDwg cnhsZW47IGkrKykKIAkJCXJ4W2ldID0gKHJkZGF0ID4+IChpICogOCkpICYgMHhmZjsKIAkJcmV0 ID0gcmRzejsKIAl9Ci0tIAoyLjIxLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbA==