From patchwork Fri Mar 10 04:32:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 9614697 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 01F2560415 for ; Fri, 10 Mar 2017 04:41:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E860B2864A for ; Fri, 10 Mar 2017 04:41:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCBA5286EF; Fri, 10 Mar 2017 04:41:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 88E962864A for ; Fri, 10 Mar 2017 04:41:34 +0000 (UTC) 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:References:In-Reply-To: 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: List-Owner; bh=MwhzwHzmAiTlNG5KF5hoL5VqZu9g+J+0jpedZevMwCU=; b=RM5iglrHmueFm4 1xRQENBE/YeQh2dM3KGyzJhctBGWJZuPf9ehLc9nGGigYXYx0KfAL1PrRdZN8r5T9q0HugFk69vfl 2aIGlCa7KGq8oLFlUfo/RjeZi7Q0ITgVeM1iNONZelh9kjs23rJhmSQPIHVJPlTHfWMvWQOCndUrX r3aHDK+9pem4LKMQUhNvgUCJuS2TPGpOxApBZp3ksqBCzsQ/90wrrMNoFh2spb6VBQ0UC0x3NnMji f1KyXGoF56Pn9ZugD/M9aRqz4oTqbpZFzHzZLOqhum24I/UPED9pQZAjCSCiSCnpbalbifSikPXY6 dzV8vFD3xRXf+gMhS66w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cmCMv-0004lr-4o; Fri, 10 Mar 2017 04:41:33 +0000 Received: from mail-qk0-x22b.google.com ([2607:f8b0:400d:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cmCJD-0001dc-TR for linux-rockchip@lists.infradead.org; Fri, 10 Mar 2017 04:37:46 +0000 Received: by mail-qk0-x22b.google.com with SMTP id p64so152284048qke.1 for ; Thu, 09 Mar 2017 20:37:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gaYYxDfhQJqq1dR+Hchvhp2ovZuqxvt2Y5bPhLjpW00=; b=EtKZQKzxGXff56il7k0DEGJeGY1Mb1QrCZShynKU8E6DiLmvWHvm40rKsKqJg8KVFt ogTxPFnGxD57JfByuToVX6u+FHzhgOQ5GJfcLnu36MBLgPZj6SIgZIwMrurI0lU4Ej2a zGKr2AkJnVO6e0UXWHbWo9XCpq11uCsEH27iI= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=gaYYxDfhQJqq1dR+Hchvhp2ovZuqxvt2Y5bPhLjpW00=; b=lOZrCdtsrGOveAng2INy+RwYNQrTZfKD9KL7F6Rq8cTAIjdAX2rojO0u4Sq4w3wZ8D qGHKh9p9BZbxy0LP/6i3+L0NK1HnIfKUqM7zmKyc9veNFcgf0bVdQSIrbFArSdZjKEaW Hzp95m99LFAa/Qqj+u0+OZXbsLYOxiL3j3niDB0Bpzt6io9f0eoVkg+KWAPO8zYFmgyV +9Cgl5g0JetH0i5g2djYxDUca3Ol4y8CLVSCHoS0ELVoCnbjtx4G8Sn0mgb6zOijqUtm 3m+UEkwe14FrFxkc4nuFYqxl0uyTYhCTmEtV6I06bhCTPSl5KCzQJaSvkfejOAFqnD5a UCmQ== X-Gm-Message-State: AMke39nM2xaxYdo9BWy+bHLm6UlF3gMzuk3hwWKqy8cJf3mcrSqT0HhA598RvpHvGxt9Aj/G X-Received: by 10.200.48.174 with SMTP id v43mr18341765qta.263.1489120642947; Thu, 09 Mar 2017 20:37:22 -0800 (PST) Received: from boxwood.roam.corp.google.com (cpe-75-189-128-87.nc.res.rr.com. [75.189.128.87]) by smtp.gmail.com with ESMTPSA id n19sm5697731qtn.35.2017.03.09.20.37.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Mar 2017 20:37:21 -0800 (PST) From: Sean Paul To: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org Subject: [PATCH 16/41] drm/bridge: analogix_dp: Check AUX_EN status when doing AUX transfer Date: Thu, 9 Mar 2017 23:32:31 -0500 Message-Id: <20170310043305.17216-17-seanpaul@chromium.org> X-Mailer: git-send-email 2.12.0.246.ga2ecc84866-goog In-Reply-To: <20170310043305.17216-1-seanpaul@chromium.org> References: <20170310043305.17216-1-seanpaul@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170309_203744_108628_80710889 X-CRM114-Status: GOOD ( 12.70 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Archit Taneja , zain wang , Lin Huang , Tomeu Vizoso , David Airlie , Douglas Anderson , Sean Paul , Yakir Yang , =?UTF-8?q?St=C3=A9phane=20Marchesin?= Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Lin Huang We should check AUX_EN bit to confirm the AUX CH operation is completed. Cc: Stéphane Marchesin Signed-off-by: Lin Huang Signed-off-by: zain wang Signed-off-by: Sean Paul --- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 25 +++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c index 9df2f3ef000c..e78c861b9e06 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -1073,9 +1073,9 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, { u32 reg; u8 *buffer = msg->buffer; - int timeout_loop = 0; unsigned int i; int num_transferred = 0; + int ret; /* Buffer size of AUX CH is 16 bytes */ if (WARN_ON(msg->size > 16)) @@ -1139,17 +1139,20 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2); - /* Is AUX CH command reply received? */ + ret = readx_poll_timeout(readl, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2, + reg, !(reg & AUX_EN), 25, 500 * 1000); + if (ret) { + dev_err(dp->dev, "AUX CH enable timeout!\n"); + return -ETIMEDOUT; + } + /* TODO: Wait for an interrupt instead of looping? */ - reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA); - while (!(reg & RPLY_RECEIV)) { - timeout_loop++; - if (timeout_loop > DP_TIMEOUT_LOOP_COUNT) { - dev_err(dp->dev, "AUX CH command reply failed!\n"); - return -ETIMEDOUT; - } - reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA); - usleep_range(10, 11); + /* Is AUX CH command reply received? */ + ret = readx_poll_timeout(readl, dp->reg_base + ANALOGIX_DP_INT_STA, + reg, reg & RPLY_RECEIV, 10, 20 * 1000); + if (ret) { + dev_err(dp->dev, "AUX CH cmd reply timeout!\n"); + return -ETIMEDOUT; } /* Clear interrupt source for AUX CH command reply */