Received: by 2002:a17:90b:8d0:0:0:0:0 with SMTP id ds16csp4890157pjb; Mon, 27 Jul 2020 07:41:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzcOC1A78bCbY5JNy5MqXtp+sihBt3C6XEZnhuy/+5CQp1lQMB4ytYxyIT61x2BP2fOSNs X-Received: by 2002:a17:906:37c3:: with SMTP id o3mr3045147ejc.54.1595860918826; Mon, 27 Jul 2020 07:41:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595860918; cv=none; d=google.com; s=arc-20160816; b=kvAhFvTA3B+Riht+ZwSOJsiEq7xfZ1YGRuYWl33pJKytQ6n4MZ19QOqGXhkRexQRLX 8qMGzWAWTplOaq0bKhdBlhnZyXesOAi7ksiUZQ89RoXRZGbAmJcdjmvW8gRVZWvg2bP7 PJTTdfQEbrb2qv9P9RMYjMFSFwZrAAU+PamHCcsNirLcA5dcx/38NDUkG9T2v/FGyk9s XA91YRwMXYyJ/WemORnyl8V9+B/Lpc/XoJ+wT2SEVBq4suVlZ0kAHtjw+wJd/Cj0hLIP tCgfeZZEc8uT9ykuR1AC03HZwCrdUaremLJv8woAuSXnP1+msHA2R38MQ+Si68FIJYWb uasw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Grm1EgJKWoWE3r35YWZiXEIXwC6PP4IzheNDjd09NYc=; b=naI2m6CRPO1VWjOCcmYpdDuxI7KxjOAuG5XcNMid+i68DZ7aXEA01oburnq6TuWYPW cCCll3Y0CN/BQrpUf3Tcn8OaHId5w5ozV5dHfvLF1ehZtHLJUF1tmsyNmF6rMpuiPcIL ryeMon7bBrejsJShVn5Jbci8dK/DqtCQgQXvqaF02PfRd7zFvS78puSLbZrQe8hxheck hZVfMJfpjDXrNsBB0NoynGhpPfEXxTwmYpx8ekEgJd6GLzkoLOWnjJSq3c0uo0FbB+bj xo13AOKE6Q98tcgMau7pr0zbBwReblVbM4TiqEHcaG2kwLCZxN4QCEMtL2gBpJXYj0/P U0SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZBR2YcLY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l12si5590971ejq.20.2020.07.27.07.41.36; Mon, 27 Jul 2020 07:41:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZBR2YcLY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733024AbgG0OkM (ORCPT + 99 others); Mon, 27 Jul 2020 10:40:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:59258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729604AbgG0OJQ (ORCPT ); Mon, 27 Jul 2020 10:09:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 73A5120838; Mon, 27 Jul 2020 14:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595858956; bh=Nq5QR3iG8Cr3ox2BQ3/zYb67ZQcxz9425Pv2U2LcgGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZBR2YcLYOBiVEzhmhmOnkM9iUe/fO6GfE8fg9K+SK95Y6REs4bcuyPm70v11YFkoB s3T8hqlCH/AEpj4B4RVEVdI9ubS0Q8Q+kiwh6cECjZ8Hd8RDlbsHgTmVAAQxoCFpfI LuW5qz4q1WQTksSz9xdLOUAC49wgM4Ecib7pAMuw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Skeggs , Sasha Levin Subject: [PATCH 4.19 11/86] drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout Date: Mon, 27 Jul 2020 16:03:45 +0200 Message-Id: <20200727134914.906792115@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134914.312934924@linuxfoundation.org> References: <20200727134914.312934924@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Skeggs [ Upstream commit 0156e76d388310a490aeb0f2fbb5b284ded3aecc ] Tegra TRM says worst-case reply time is 1216us, and this should fix some spurious timeouts that have been popping up. Signed-off-by: Ben Skeggs Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 4 ++-- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c index c8ab1b5741a3e..db7769cb33eba 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c @@ -118,10 +118,10 @@ g94_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry, if (retries) udelay(400); - /* transaction request, wait up to 1ms for it to complete */ + /* transaction request, wait up to 2ms for it to complete */ nvkm_wr32(device, 0x00e4e4 + base, 0x00010000 | ctrl); - timeout = 1000; + timeout = 2000; do { ctrl = nvkm_rd32(device, 0x00e4e4 + base); udelay(1); diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c index 7ef60895f43a7..edb6148cbca04 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c @@ -118,10 +118,10 @@ gm200_i2c_aux_xfer(struct nvkm_i2c_aux *obj, bool retry, if (retries) udelay(400); - /* transaction request, wait up to 1ms for it to complete */ + /* transaction request, wait up to 2ms for it to complete */ nvkm_wr32(device, 0x00d954 + base, 0x00010000 | ctrl); - timeout = 1000; + timeout = 2000; do { ctrl = nvkm_rd32(device, 0x00d954 + base); udelay(1); -- 2.25.1