From patchwork Fri Mar 22 03:28:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10867669 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 E05CE925 for ; Sun, 24 Mar 2019 21:02:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD54028CA8 for ; Sun, 24 Mar 2019 21:02:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1E6128E33; Sun, 24 Mar 2019 21:02:31 +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 7F8DF28CA8 for ; Sun, 24 Mar 2019 21:02:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EC6176E566; Sun, 24 Mar 2019 21:02:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 384996E236 for ; Fri, 22 Mar 2019 03:29:23 +0000 (UTC) Received: by mail-pf1-x442.google.com with SMTP id t21so544654pfe.2 for ; Thu, 21 Mar 2019 20:29:23 -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=IljxguPIAgGK3cARCOGXLGaJ605+7/ZXIJSv/nzP6I8=; b=UAWPqnswNux/emDATaTvcBT8F2vsxDpWUS71BhMh2QIczUj1bhBtKJon8kIoBHumDh NX61KHo38hZFZeXyIq5XRt1LX+wfO89lgxtCt+wEZrSZehn8kHNbLq2NJdEOf9+g7J1m 2WgDS+IBZ2gAVlt0GxfOEPTBapvCzTa9HisGj+Uxxg1w1hWMYvYFyF0QICjt0D7X7NmL 1a+7crBoWwezbYh9pFVnX4st45Q9SaLNI0Ai0XsR2l8Sbw8f52O2IVdNDKHrLTTUQuzp LmmgvtfdsDMtoqgY3Of5hxL5S3loghB4LeyYwakpMlBZlHQVKqtyNRj0dIbV9XbkS6j9 tw/g== X-Gm-Message-State: APjAAAWLGL9IFASJSzcWmhwspbdKW28T0rz01n4lx4SUobUEqSonc1g4 fJrnGq+tnOfvebcyRNjdJTKqltRk6Qo= X-Google-Smtp-Source: APXvYqwtNf+RjcMxY4wpB1wJUD09wZqOsUTuKWRl/07Ry+Ka10JeMG5amymwAXsrblvcIWx6GY+TjQ== X-Received: by 2002:a65:6489:: with SMTP id e9mr6682327pgv.260.1553225362473; Thu, 21 Mar 2019 20:29:22 -0700 (PDT) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id o76sm16154476pfa.156.2019.03.21.20.29.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2019 20:29:21 -0700 (PDT) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 06/15] drm/bridge: tc358767: Simplify AUX data read Date: Thu, 21 Mar 2019 20:28:52 -0700 Message-Id: <20190322032901.12045-7-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190322032901.12045-1-andrew.smirnov@gmail.com> References: <20190322032901.12045-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 24 Mar 2019 21:01:58 +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=IljxguPIAgGK3cARCOGXLGaJ605+7/ZXIJSv/nzP6I8=; b=XmaOBeHCfsIXFwjtHPzBVJeD60VzGz4oMHmkbJhjmdiLntXH14rkC97yv3BMoF8b+b 3OgWz2ybItpKax8Zyqs/bu2guSt2aOU94NIAC5kA+amVXgQMsAJy3AIw/+yBVvzD36oy NsAwa5Cn+qbYkzhZxrIWFqFBt/or222CbPJjW/YItobdc1HLz++YGxnWMXpZIy1xFj2N rfHx+2zwtNKfWohrbqSNHZZI+3HJ+IY9RKxPT6ZOEo4uhflON0ftnGd/wKflwdB5DYar swK+ZRvcbm5F/BGdpjnzlvXfyEOSJKxgd8qaBRBApVsiBoqE/tK3XQ+JAvv9Xu1eubuy xnhQ== 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: Andrey Smirnov 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 --- drivers/gpu/drm/bridge/tc358767.c | 39 ++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 060e4b05095a..81c10a5d8106 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -307,6 +307,28 @@ 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, 4); + + for (i = 0; i < count; i++) { + ret = regmap_read(tc->regmap, DP0_AUXRDATA(i), &auxrdata[i]); + if (ret) + return ret; + /* + * 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) { @@ -365,19 +387,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;