From patchwork Wed Jun 5 07:04:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10976417 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 19615924 for ; Wed, 5 Jun 2019 07:33:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0720628849 for ; Wed, 5 Jun 2019 07:33:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF5DF2885F; Wed, 5 Jun 2019 07:33:56 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9972D28849 for ; Wed, 5 Jun 2019 07:33:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 910D4895EE; Wed, 5 Jun 2019 07:33:25 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32DC18901E for ; Wed, 5 Jun 2019 07:05:32 +0000 (UTC) Received: by mail-pf1-x444.google.com with SMTP id c85so5505987pfc.1 for ; Wed, 05 Jun 2019 00:05:32 -0700 (PDT) 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=RWa3xMhIG7h2ZDJedBrnEPzMrydSyBPoX1txGwYk6+U=; b=ZDBGB/we/CicYZinN4nBT7IDvs3oAaXyIlwMWDXHA/EXKk1WYsQYmXg/PEliYR+6nE aN1o2+lWf+ZmZ2WKGuTskwB3cG6VHJdkGkVcSQtcMatZS927dLCJvjqa62oGhp1ZK2zp 7Mu/daC6Nhyn2dQEUW529fbdCa8pX3+7jkR66DXDp19UDmAIuSGe+FtHo3jlCngy9r85 B8/8QpOspjU0zx9VkOfKgiQYWE6xDKOgEaWinhKn7JtCshsn4a5S7rC0B2gsKovLGzeb WRQCfDjyWFmMBkp1R0G5u4SLMMdGBdIYHV0VdLjHaaEtFXAlyOGTFFASqDXjKbfOA1sJ Nn3A== X-Gm-Message-State: APjAAAWX5OWhK2Op/JdUMY+rFsKO7u4M2Ea/sxN1Jd1WysOckIFiIRB5 PFs+Fioqm4UdfGeW6lk4KOWkiOYDffA= X-Google-Smtp-Source: APXvYqzfIFPHQiaOX73DfBXVOSKeNpTqj0fwulD+Nk3oYEtTenve0VlAKDYYowF5v2VUvbCDLrLCrA== X-Received: by 2002:a17:90a:ae10:: with SMTP id t16mr42228780pjq.51.1559718331351; Wed, 05 Jun 2019 00:05:31 -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 d132sm6527348pfd.61.2019.06.05.00.05.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Jun 2019 00:05:30 -0700 (PDT) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 06/15] drm/bridge: tc358767: Simplify AUX data read Date: Wed, 5 Jun 2019 00:04:58 -0700 Message-Id: <20190605070507.11417-7-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190605070507.11417-1-andrew.smirnov@gmail.com> References: <20190605070507.11417-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 05 Jun 2019 07:33:23 +0000 X-Mailman-Original-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=RWa3xMhIG7h2ZDJedBrnEPzMrydSyBPoX1txGwYk6+U=; b=pjTQEQM/NCzvm3rKIdA/jf1ynZxiZDf1SDBIDA4M3O+FwsyScIvnbcO2uajRBeDUtB H8KwDgjBWXNTr778cITsLegfEbxsGpzdjdTK2zo6F2G4Iy0xZDr9X2D9/0I3P5O51IiJ ITp6L+msYtdfxpBb5c+q+0dWFCgZTqojOjEjocVxnPZGZzwE5BHpVOVZZskAAsXR2Ij1 l5iMa1GGT5zjOTltNAP63i3RWMc2hHDu1xt1opU8JDqDW9EXuaOdOCj9fKVJLzDZ5lPK l/CFuL1ntsYHcdvBYjgg5CfcnQaSxnTuzQcLJr9XizuEUxe0QIMS44IbHJkiTP5KDtxV QHLg== 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: Cory Tusar , Archit Taneja , Andrey Smirnov , Andrey Gusakov , linux-kernel@vger.kernel.org, Tomi Valkeinen , Laurent Pinchart , Chris Healy Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Simplify AUX data read by removing index arithmetic and shifting with a helper functions that does three things: 1. Fetch data from up to 4 32-bit registers from the chip 2. Optionally fix data endianness (not needed on LE hosts) 3. Copy read data into user provided array. Signed-off-by: Andrey Smirnov Cc: Archit Taneja 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 Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/bridge/tc358767.c | 40 +++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index e197ce0fb166..da47d81e7109 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -321,6 +321,29 @@ static int tc_aux_get_status(struct tc_data *tc, u8 *reply) return 0; } +static int tc_aux_read_data(struct tc_data *tc, void *data, size_t size) +{ + u32 auxrdata[DP_AUX_MAX_PAYLOAD_BYTES / sizeof(u32)]; + int ret, i, count = DIV_ROUND_UP(size, sizeof(u32)); + + ret = regmap_bulk_read(tc->regmap, DP0_AUXRDATA(0), auxrdata, count); + if (ret) + return ret; + + for (i = 0; i < count; i++) { + /* + * Our regmap is configured as LE for register data, + * so we need undo any byte swapping that might have + * happened to preserve original byte order. + */ + le32_to_cpus(&auxrdata[i]); + } + + memcpy(data, auxrdata, size); + + return size; +} + static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) { @@ -379,19 +402,10 @@ static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, if (ret) return ret; - if (request == DP_AUX_I2C_READ || request == DP_AUX_NATIVE_READ) { - /* Read data */ - while (i < size) { - if ((i % 4) == 0) { - ret = regmap_read(tc->regmap, - DP0_AUXRDATA(i >> 2), &tmp); - if (ret) - return ret; - } - buf[i] = tmp & 0xff; - tmp = tmp >> 8; - i++; - } + switch (request) { + case DP_AUX_NATIVE_READ: + case DP_AUX_I2C_READ: + return tc_aux_read_data(tc, msg->buffer, size); } return size;