From patchwork Tue Mar 26 10:31:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 161177 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp5038421jan; Tue, 26 Mar 2019 03:32:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxy9gBxAaAyQYi+k62RcrhOaeZonRoEASnsVXH7bVT+3eGjNGBhXvB1cVEuA6RIsn75cXf+ X-Received: by 2002:a63:694a:: with SMTP id e71mr28712863pgc.129.1553596357084; Tue, 26 Mar 2019 03:32:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553596357; cv=none; d=google.com; s=arc-20160816; b=dwB1+VhxmPFm0JY4kn17nrvE6EmkVPsj2r3KaLCAYRtSVdHAsL32OPEM263RcE7OV3 sKBGjHvLuZRnxyIdKnrmsvNBKG3h2KWWlheo8urEygKanOfLGvCjRm1FQ8pxleu/bK0P XK+GGkXxhYDXS9u5Fxi2crlBXU3tKovbIVowT6XoUMJWepsbnyna8Y6wkQBFy003rg3K lNU6pgsPMpKQxtSfHD5tn9Arg0Q3/4Pmpm73jaXDfeQmsUvhPyaVEg0l7wDIf6vu+DSe 9rHpOpfbnxsHsKq5QeVijbtSGobZbd94UD6X7sQ2K2agglpSPY0v3uL6zyY3SlacJ2OC 3kUg== 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:references:in-reply-to:message-id:date :subject:to:from:delivered-to; bh=WqyVrv84AFbIBLfEWD5/0enlT7dcqxDFuAC6h53RpSo=; b=JGie5LUFDiGywdWp9kvt6YmtHt1pluojMmYt9zymzZAAf30RxKC3AqMN2CEtAnE3cW eWNIjA0zWWIwnRuRwj8sfZ8+p7i6iHQjn4rHC9DyxnZ1wIp8QVawXljXLQEGzXntXEKh H3BIwA48tEYRCOrPVYTdpJyIvRt69J3jg9nRNTNKWbBw5buJhqVlfzKDfvhD75vZnFLo lW1ufDob3ulHCnEwKf4J7wbBxa7xQXAPWZIVWRCBxr+We0aT49HjXo3qyKKQ7NnF7AUE CMG2d+Os/Pz1DUaw62ImeWhGGh6mNIrpd2/w2Cw9ZTQcHPcFLmukt76OQaCsaI12Dmfl NzBw== 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 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id n5si15676982pgn.105.2019.03.26.03.32.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Mar 2019 03:32:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FDFB6E7DF; Tue, 26 Mar 2019 10:32:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by gabe.freedesktop.org (Postfix) with ESMTPS id E9E396E7DF for ; Tue, 26 Mar 2019 10:32:32 +0000 (UTC) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x2QAWTjH081208; Tue, 26 Mar 2019 05:32:29 -0500 Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x2QAWTl1002600 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 26 Mar 2019 05:32:29 -0500 Received: from DFLE107.ent.ti.com (10.64.6.28) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 26 Mar 2019 05:32:28 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Tue, 26 Mar 2019 05:32:28 -0500 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x2QAWN23071249; Tue, 26 Mar 2019 05:32:26 -0500 From: Tomi Valkeinen To: Andrzej Hajda , Laurent Pinchart , , Lucas Stach , Andrey Gusakov , Philipp Zabel , Andrey Smirnov , Jyri Sarha , Peter Ujfalusi , Benoit Parrot Subject: [PATCHv2 01/22] drm/bridge: tc358767: fix tc_aux_get_status error handling Date: Tue, 26 Mar 2019 12:31:25 +0200 Message-ID: <20190326103146.24795-2-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190326103146.24795-1-tomi.valkeinen@ti.com> References: <20190326103146.24795-1-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1553596349; bh=KpmV4wsUtpZXmBy1gNs1XdBpmyEcmJ2GQvQUmMElCDg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=YbjljOBXHWCUHsIIPFVGoGJzdasDq12URlt4XUNKyoK88KVYFzd5yYEYcE1fzRKFT dRtk/NCbXRoFp20dTwO0Yut7OSQkoZSWlaqUUewZh0sZnswQ3jUnkk6KuWfFhCVaPW glVWFo8MFVkO9BI5i0dtiAlcVob16jWt9K3Y7lqI= 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: Tomi Valkeinen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" tc_aux_get_status() does not report AUX_TIMEOUT correctly, as it only checks the AUX_TIMEOUT if aux is still busy. Fix this by always checking for AUX_TIMEOUT. Signed-off-by: Tomi Valkeinen Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/bridge/tc358767.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 888980d4bc74..7031c4f52c57 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -286,14 +286,17 @@ static int tc_aux_get_status(struct tc_data *tc, u8 *reply) ret = regmap_read(tc->regmap, DP0_AUXSTATUS, &value); if (ret < 0) return ret; + if (value & AUX_BUSY) { - if (value & AUX_TIMEOUT) { - dev_err(tc->dev, "i2c access timeout!\n"); - return -ETIMEDOUT; - } + dev_err(tc->dev, "aux busy!\n"); return -EBUSY; } + if (value & AUX_TIMEOUT) { + dev_err(tc->dev, "aux access timeout!\n"); + return -ETIMEDOUT; + } + *reply = (value & AUX_STATUS_MASK) >> AUX_STATUS_SHIFT; return 0; }