From patchwork Tue May 28 08:27:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 165242 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp8168642ili; Tue, 28 May 2019 01:28:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqx1k7rqErSFND6wbar7CtmlqPEq5loL5VhghN5/cbNV/PTxYd2n1P6SIoFabrhYzOM4OUwZ X-Received: by 2002:a17:90a:77c4:: with SMTP id e4mr4068270pjs.86.1559032094300; Tue, 28 May 2019 01:28:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559032094; cv=none; d=google.com; s=arc-20160816; b=b4YbIHmUwMGGHL7D1PCbeMm+Yc67dEw7quT5ZDx4N4rkVKGP25YTReRB+dQlMd5c8Q AqZUIekFKYOvdBrg9hcc+qSR7Mb/ekxEZdLvvQEKvuxThdifNReQBenZpbA1uiLW1JSi Z+fgnK/nt3K8tfXizVvUJITzlcxmHLnGyr3KKCB3omzDFDFMHmeqGUsubHbWY3uwSzTn 0s4xOujf1nVsrgUPnL/eGNwpIKs4GXDQ+AaJYdbEIlkGML8vmM/kDgRDvxNkAHSsEcZw fx6OPZVo9vRFOzKor4EDIUyL017Pe2hvUAzRqiQBAuX8MAjlSeitHK+4keXPiODn/Uj0 OfLA== 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=VV8EHg91CnOuYOkFZPeOIo9B/xRVt0kxeChqyacsjQ4=; b=j8kKnmUaL9bZ2z/kUZQrKklAwatk7xd4rAqD+oZiwL24FonFZEWdZqrlhZ8rBnQCY6 TF4/qM13LY+Fbk6eDoJ3cBwA+ezpsfvL1Ficw73uJDbMUhRcxu2KnjaHIz6fXMsMsBJ/ EWCOfTuzqCJLJOkTeUCFIe4FCAGie/rVOlr5QyoPuP3AHzUyNbuN7xEYzeXAp7/IbP89 8EZ+Lv55+DK9i2hOvtNixn51Nm3jJKKZ/+X+iDhrcFmWSTe920ev5Q9IqM8U04IoYbHP 3z9jUlqdsXIn3O6ZJbc+Rq/boyQZVtiqKqXtSjgXoA67C+OJN0Guw3bxLrlZKrHbkx1M DLHQ== 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 h34si22561104pld.42.2019.05.28.01.28.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 May 2019 01:28:14 -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 7989289C21; Tue, 28 May 2019 08:28:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by gabe.freedesktop.org (Postfix) with ESMTPS id 769EC89C37 for ; Tue, 28 May 2019 08:28:08 +0000 (UTC) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id x4S8S55A036533; Tue, 28 May 2019 03:28:05 -0500 Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x4S8S5hm007988 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 28 May 2019 03:28:05 -0500 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 28 May 2019 03:28:04 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE108.ent.ti.com (10.64.6.29) 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, 28 May 2019 03:28:04 -0500 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id x4S8RxuV125039; Tue, 28 May 2019 03:28:02 -0500 From: Tomi Valkeinen To: , Andrzej Hajda , Laurent Pinchart , Lucas Stach , Andrey Gusakov , Philipp Zabel , Andrey Smirnov , Peter Ujfalusi , Jyri Sarha , Benoit Parrot Subject: [PATCHv4 01/24] drm/bridge: tc358767: fix tc_aux_get_status error handling Date: Tue, 28 May 2019 11:27:24 +0300 Message-ID: <20190528082747.3631-2-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190528082747.3631-1-tomi.valkeinen@ti.com> References: <20190528082747.3631-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=1559032085; bh=mue3dbtuKYVRrYReTQ5hjO+JVZtPfyL/5kZXHvJLjfk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=NZ5NQ71uvhT/0F+7bll7Jt2DbtxIbce9yGSadmYPZzup4buzU5jWY3+ZF5q5doXz1 0j6eVIEys4LgIsOH2wU4hT6xtjIfz3VmWOofbOonRAriMCB5+AodA3+SDa37PZAjLd 1+MRBukXeACYkAWWRzbb+QwXFiZGnFnNqsvN/qUk= 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 e570c9dee180..b6c4d1063ccb 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; }