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=-5.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,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 866B5C31E5D for ; Wed, 19 Jun 2019 05:27:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55C3A20823 for ; Wed, 19 Jun 2019 05:27:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lYHMZkKm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730989AbfFSF1u (ORCPT ); Wed, 19 Jun 2019 01:27:50 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42727 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730955AbfFSF1q (ORCPT ); Wed, 19 Jun 2019 01:27:46 -0400 Received: by mail-pf1-f193.google.com with SMTP id q10so9017061pff.9 for ; Tue, 18 Jun 2019 22:27:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rLmxJijneHssI0qWBrY0jrua4flRxNh6uldtHldGK3s=; b=lYHMZkKmMbxDgX1dgOxKFf6fF9d9VLylQRc9oC5159OPDIxsqZNkUZUVkJk4mcAPYx YMIQaos8YshHtrx1YqKahyvD89/3pja1RLKbt9K+NAuFpZZvadu3Jue1hF8Lj+HauXmU jC/ajDGW/1uWyUQEnFkyKXj/mJtKLr8eJ3muP6LtBHBLow8D/LixXAEL2i7vPCcNGetp VnetyRvHWNSXxZs+3Jmg/7zILXhozzaOzD0OvuWfAD2NHc57sLuph75H62/yt9qd9VkI CBsJRGMSLSwnDGKziM5CXT0GQlIGXcM9GWRJe92J09N/vVcdbZqFiLVvRN+ywOvotHi8 exWA== 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=rLmxJijneHssI0qWBrY0jrua4flRxNh6uldtHldGK3s=; b=lP9gA5SxHQ90WNYPuYzJnfEhvE6SC6782F1Vu+sqSmtvdteTSd1vx356oh4Zpln8yD nHaXYcnmG4BEWQH6aZlU83JU7PnViGRwaZsgAkRN3i4IgdgaD5mt8+A7dNjLvXSDq/Ed RuKyX1hGDZg2HLJG859B+PVpc6G/2PPT+uqKP1Jl4QRTIzBBBQLwld1I2ui9Z/LuaVUH lY9TAlCWAOHofkb6FsVI9DfLVRDFx+boTGyaKyq/2/kKEgn9qC+6mOSkwAhNu4+tPSUu CkBCd4RiDq/uGF8vKvIMAVKraQL5vqYxFQiRVufCaAPx1LZw1UP+ntHiVqaoZ/YjfgzC 45qw== X-Gm-Message-State: APjAAAWdcLz3hnU5AZosmaBAIJsHmqDNyBhRM4R4tBu4EzErjeoI/uRc sq+Ovkw8ZSAn8CWpYMUQ7rAXmcehd1M= X-Google-Smtp-Source: APXvYqxMUU+MFp9vgjwUaK0oXkXDogLmqSeBTOkHuP0ge5zsQ988YGc/h/hx762RKUbWgVhRc/h7kA== X-Received: by 2002:a63:595e:: with SMTP id j30mr5709750pgm.2.1560922065571; Tue, 18 Jun 2019 22:27:45 -0700 (PDT) Received: from localhost.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id l44sm534742pje.29.2019.06.18.22.27.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 18 Jun 2019 22:27:44 -0700 (PDT) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Cc: Andrey Smirnov , Andrzej Hajda , Laurent Pinchart , Tomi Valkeinen , Andrey Gusakov , Philipp Zabel , Cory Tusar , Chris Healy , Lucas Stach , linux-kernel@vger.kernel.org Subject: [PATCH v6 09/15] drm/bridge: tc358767: Use reported AUX transfer size Date: Tue, 18 Jun 2019 22:27:10 -0700 Message-Id: <20190619052716.16831-10-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190619052716.16831-1-andrew.smirnov@gmail.com> References: <20190619052716.16831-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Don't assume that requested data transfer size is the same as amount of data that was transferred. Change the code to get that information from DP0_AUXSTATUS instead. Since the check for AUX_BUSY in tc_aux_get_status() is pointless (it will always called after tc_aux_wait_busy()) and there's only one user of it, inline its code into tc_aux_transfer() instead of trying to accommodate the change above. Signed-off-by: Andrey Smirnov Reviewed-by: Andrzej Hajda Cc: Andrzej Hajda Cc: Laurent Pinchart Cc: Tomi Valkeinen Cc: Andrey Gusakov Cc: Philipp Zabel Cc: Cory Tusar Cc: Chris Healy Cc: Lucas Stach Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org --- drivers/gpu/drm/bridge/tc358767.c | 40 ++++++++++--------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index bdbf88057946..b01c1c8341e1 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -152,10 +152,10 @@ #define DP0_AUXWDATA(i) (0x066c + (i) * 4) #define DP0_AUXRDATA(i) (0x067c + (i) * 4) #define DP0_AUXSTATUS 0x068c -#define AUX_STATUS_MASK 0xf0 -#define AUX_STATUS_SHIFT 4 -#define AUX_TIMEOUT BIT(1) -#define AUX_BUSY BIT(0) +#define AUX_BYTES GENMASK(15, 8) +#define AUX_STATUS GENMASK(7, 4) +#define AUX_TIMEOUT BIT(1) +#define AUX_BUSY BIT(0) #define DP0_AUXI2CADR 0x0698 /* Link Training */ @@ -298,29 +298,6 @@ static int tc_aux_wait_busy(struct tc_data *tc, unsigned int timeout_ms) 1000, 1000 * timeout_ms); } -static int tc_aux_get_status(struct tc_data *tc, u8 *reply) -{ - int ret; - u32 value; - - ret = regmap_read(tc->regmap, DP0_AUXSTATUS, &value); - if (ret < 0) - return ret; - - if (value & AUX_BUSY) { - 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; -} - static int tc_aux_write_data(struct tc_data *tc, const void *data, size_t size) { @@ -356,6 +333,7 @@ static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, struct tc_data *tc = aux_to_tc(aux); size_t size = min_t(size_t, DP_AUX_MAX_PAYLOAD_BYTES - 1, msg->size); u8 request = msg->request & ~DP_AUX_I2C_MOT; + u32 auxstatus; int ret; if (size == 0) @@ -393,10 +371,16 @@ static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, if (ret) return ret; - ret = tc_aux_get_status(tc, &msg->reply); + ret = regmap_read(tc->regmap, DP0_AUXSTATUS, &auxstatus); if (ret) return ret; + if (auxstatus & AUX_TIMEOUT) + return -ETIMEDOUT; + + size = FIELD_GET(AUX_BYTES, auxstatus); + msg->reply = FIELD_GET(AUX_STATUS, auxstatus); + switch (request) { case DP_AUX_NATIVE_READ: case DP_AUX_I2C_READ: -- 2.21.0