Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1802160ybh; Tue, 14 Jul 2020 07:43:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/1fc7HvzfbWY2lVtwbeCKg/a1vCFU1JuM28R5Y8UJKRiSt+fOYGep+0ZblHGSRDL8afSd X-Received: by 2002:a50:9b18:: with SMTP id o24mr4978193edi.335.1594737836222; Tue, 14 Jul 2020 07:43:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594737836; cv=none; d=google.com; s=arc-20160816; b=T+ueDUWAA9wxauYFq0YEYatmLo9I3XGOHBNCuX+4XHoVjbhYxSvcmuJ53emJ243VWi 5faOlrTH8KpJXHW0j65uPL0GmCzt/VCKLoTjQjL8SdbYwy3yVx0LWyM1i9o+cFnm8+/2 l7lspXBksZE2aTvHxfIgPZmq3GWlrlOUvzUmksxUgNCD59bbQI+HkBen9/giumllLZk0 nbv1JFd4FQZizDw8WWYI7cfK/YEnjcdDAzQGxkJ4T0EPMfW5F7fDlqpBgF46+wdC5J+I CcDxfS0jDZsCCEWlxWZUR/ydjCrbMoZs3aUN5CDKEsDurBVZWzKkdNBP0kTEcVL98gpA EICA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KDc/HeilX7NQ3nlLStEerqyUjvIjJqoFpgeLSjqrLEM=; b=1CMyCVas5aHkfVqcRzMObLvLtvnpz0MYA2FKk1FG6H2gyZO+M3E11vqXBj05WlfCtk FDBqWG8B3pK8eQbki+zbZKJIPAc0sgw8FDwie/szHZCYeLVUHm0/ksnnJh9AuPrWEuWD zjHkh3FSWubwFwvtkk+aNfl0EttO3yf76rDDI7olca3zhvSZqQGk3Zcsf8bVO6hUS+8A a7FQdT/aEwmeQuVOVw95+fmANYzdnU137bvDJRbsgbafNUSZDlu9JzZixhDJaNK9LEtQ cJpPNaBT3oULmwxw3cSqgXpHRPqZ2HMiKIl+IaohnQ8fy3evl/jKUjGA5V/TvQGyDqdi pWeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZCt+cOkU; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d18si11536482ejm.684.2020.07.14.07.43.33; Tue, 14 Jul 2020 07:43:56 -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=ZCt+cOkU; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729439AbgGNOkq (ORCPT + 99 others); Tue, 14 Jul 2020 10:40:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:56520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729403AbgGNOkf (ORCPT ); Tue, 14 Jul 2020 10:40:35 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 51161206F5; Tue, 14 Jul 2020 14:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594737635; bh=l8iMUhDmxL56ZQClu7OIK41mMOrQdimwaf8E9fVcrz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZCt+cOkU/GYtiA4H5sGew/UwZXQeX671WtMZ3W22Iareba4zg1WD1pjQLSUEIxEgh WF6kFgx/fvX71fiIjtcZVhHrHR20YQIK27DmsR+J2uAG2IZAdUsILI5jGgJElwTDVj 7mKHhSgboJvntUrh70SMsA7JvqE8ql9gMRiXMK1Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ben Skeggs , Sasha Levin , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.4 9/9] drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout Date: Tue, 14 Jul 2020 10:40:23 -0400 Message-Id: <20200714144024.4036118-9-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200714144024.4036118-1-sashal@kernel.org> References: <20200714144024.4036118-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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/auxgm204.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 954f5b76bfcf7..d44965f805fe9 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/auxgm204.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c index bed231b56dbd2..7cac8fe372b6b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm204.c @@ -118,10 +118,10 @@ gm204_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