From patchwork Fri Mar 22 03:28:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10867709 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 15EE11390 for ; Sun, 24 Mar 2019 21:04:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 007ED20415 for ; Sun, 24 Mar 2019 21:04:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E21BC28635; Sun, 24 Mar 2019 21:04:36 +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 7F75E20415 for ; Sun, 24 Mar 2019 21:04:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 11BCF6E63B; Sun, 24 Mar 2019 21:03:34 +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 D32276E238 for ; Fri, 22 Mar 2019 03:29:28 +0000 (UTC) Received: by mail-pf1-x444.google.com with SMTP id c207so528760pfc.7 for ; Thu, 21 Mar 2019 20:29:28 -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=c9KJU5GGLHd0BB33nLbrEqhw9z1YlxFx7twPur0/P5o=; b=qNwZFmJeMYcZ5N4HB2qyR8DHISasJzz5vh807VAN0PF3YZGpJgZOHdF5s71tEw+2ef eEYbUGhuGkJkAk+2KWiR8DsCEgudBituP2kNEEOw2U1OFNwXzGPxsLzga73f10kjbV5H MJBDSHG0p4b1IwrpI1IKhUiH5SLGWeOLJBXq7pcoRsSkixV4E52YOCa/z0C70ATdLJql mcSvVcu3SuyPkJ65fAnYAciqIMaJK1JB9rU/v+Lys1SscagZgmMXWR7DVVqqEUplZdSD nZ/3i7qN34EVFq2jVnoCkzFwKhMUEVnifrZFOuWGOWMAlWB1Dcm7/8Nyo1HR4e8GciYz Gb8g== X-Gm-Message-State: APjAAAVNHW6lp/hcc5caXhiumTO3RIxWxDB+FuX0TB9RV7ChEyrt9zaJ LasY0lNxC1p/DrXr6HPqKg/LS6Cpi24= X-Google-Smtp-Source: APXvYqzTmIrFqQ4GtBBFMrgQ/hYXApdmhbK6u3RR41S5P6FQPM3eM51k8mgqm2l4Q915j+Y6Dxd0Ew== X-Received: by 2002:a17:902:7c8f:: with SMTP id y15mr7067357pll.44.1553225368095; Thu, 21 Mar 2019 20:29:28 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2019 20:29:27 -0700 (PDT) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 10/15] drm/bridge: tc358767: Add support for address-only I2C transfers Date: Thu, 21 Mar 2019 20:28:56 -0700 Message-Id: <20190322032901.12045-11-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=c9KJU5GGLHd0BB33nLbrEqhw9z1YlxFx7twPur0/P5o=; b=ByvcdlD8zmiJ/1V7dJ36mjbjXQb7bpoJAmvuQPm36AJR72ZD65gXwrFKv3xbOfqU12 vsx9rZ9BwcYwOEB7YLXJUs0Mu0PWLvuL+xeTtpSxEJma48PjQAvWyaXTlSio7q1Qh1Bl UtOJgh631ZK+J0Kun94jbZX2sX2GI/28F2MJ5NmuFNi2Y0gzzS0PYGUQxWCBxkVTSep6 TUYmI3h2MtUIqd9ahsIYtXb7Rw2mkiuFlxAFfPhljcpaeQcQVRDsEz3C2+rMXer5IAJj Pw+Wz1CFXMr1LY8kKrd3seIF4Jao2anT1qUXkfSzhDyFy66TPuQ1bKCiZL5ttZmGMLuR /tcQ== 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 , 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 Transfer size of zero means a request to do an address-only transfer. Since the HW support this, we probably shouldn't be just ignoring such requests. While at it allow DP_AUX_I2C_MOT flag to pass through, since it is supported by the HW as well. Signed-off-by: Andrey Smirnov Cc: Archit Taneja Cc: Andrzej Hajda Cc: Laurent Pinchart Cc: Tomi Valkeinen Cc: Andrey Gusakov Cc: Philipp Zabel Cc: Chris Healy Cc: Lucas Stach Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org --- drivers/gpu/drm/bridge/tc358767.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 7e4607c6907f..768f01cc2a30 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -137,6 +137,8 @@ /* AUX channel */ #define DP0_AUXCFG0 0x0660 +#define DP0_AUXCFG0_BSIZE GENMASK(11, 8) +#define DP0_AUXCFG0_ADDR_ONLY BIT(4) #define DP0_AUXCFG1 0x0664 #define AUX_RX_FILTER_EN BIT(16) @@ -331,6 +333,18 @@ static int tc_aux_read_data(struct tc_data *tc, void *data, size_t size) return size; } +static u32 tc_auxcfg0(struct drm_dp_aux_msg *msg, size_t size) +{ + u32 auxcfg0 = msg->request; + + if (size) + auxcfg0 |= FIELD_PREP(DP0_AUXCFG0_BSIZE, size - 1); + else + auxcfg0 |= DP0_AUXCFG0_ADDR_ONLY; + + return auxcfg0; +} + static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) { @@ -340,9 +354,6 @@ static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, u32 auxstatus; int ret; - if (size == 0) - return 0; - ret = tc_aux_wait_busy(tc, 100); if (ret) return ret; @@ -366,8 +377,7 @@ static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, if (ret) return ret; /* Start transfer */ - ret = regmap_write(tc->regmap, DP0_AUXCFG0, - ((size - 1) << 8) | request); + ret = regmap_write(tc->regmap, DP0_AUXCFG0, tc_auxcfg0(msg, size)); if (ret) return ret; @@ -381,8 +391,14 @@ static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, if (auxstatus & AUX_TIMEOUT) return -ETIMEDOUT; - - size = FIELD_GET(AUX_BYTES, auxstatus); + /* + * For some reason address-only DP_AUX_I2C_WRITE (MOT), still + * reports 1 byte transferred in its status. To deal we that + * we ignore aux_bytes field if we know that this was an + * address-only transfer + */ + if (size) + size = FIELD_GET(AUX_BYTES, auxstatus); msg->reply = FIELD_GET(AUX_STATUS, auxstatus); switch (request) {