From patchwork Mon Dec 4 18:37:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Tucker X-Patchwork-Id: 120577 Delivered-To: patch@linaro.org Received: by 10.80.152.193 with SMTP id j59csp1226930edb; Mon, 4 Dec 2017 10:38:46 -0800 (PST) X-Google-Smtp-Source: AGs4zMacPR5YWpV6U8nzaj3wWZC3ea7KIGJO31fXwJPNOoWBvfGWjCXMMK4l1jOhGZ4U9m9XI7nG X-Received: by 10.159.246.134 with SMTP id c6mr15317346pls.371.1512412726100; Mon, 04 Dec 2017 10:38:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512412726; cv=none; d=google.com; s=arc-20160816; b=H2B99Jp42ZVvnlM3KflzrBXZvUOmXgOBen3NTeSWebhmFNSLetQ0CEW59FO8jcH9tx Om7UheFuCAsb5+pHt4J8FKX8nH75LXtsQSJ4DY9lu+Su5ioYx2HrFfZJB/hrWUi1QJ4w m+Nx94pjQZ722FZi+w7iEF0Ii41DXG4hvwd7frsqbPM+BN+znSoYdq+inEQXsepkHixS 9Gc1oLlLM5Du+gmjwgivEFKpWjZUq1L0dEe3GhnwsuMBzaK+NOVSr7UxJNzmNbasluqD lSl2ngaF4H6n62k+YW4tyvYeryBUjZIFYvMx7DYsJ+ph8kW2bOfn3hMBH1Y4nUmiCXCU gFew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=SDMKOyQDw8pBZBwwBIp1Oicxs2ig/lwOtiKyzaCKFhg=; b=LvWCxR6MKdDHBGnWNMhUIEg+25K7O1pjWO1iXO6hY31RR86wmdWVKD8xjHd0IhWrM5 bo7yuI7ey+7M2bAJXiV7qQKREk/+hJqKGpqrNEXignTs7eWRsQGqa/gw3FRg2YBgtmhS WtWIHOVk9wiubOc0g9eTHzBfBN7VnxTFyAmc3A/fldxFDOjtKrIPuPpt+GhVEDGmfkOa Yf1/IPYjsU2pLuawFfhYkPc3CPNsdDd5oJ9fqqgiqPqmKaUK2AEbMxQUJw3JI5WY5bUt OZVwYrLRMOlxG0RFUPf+kpBtD3LvBfgCghd59fQQXm1nRvpmNpGTlmhQXtegKa4y7/07 MjwA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v85si9756029pgb.584.2017.12.04.10.38.45; Mon, 04 Dec 2017 10:38:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752699AbdLDSin (ORCPT + 28 others); Mon, 4 Dec 2017 13:38:43 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:52800 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752218AbdLDSii (ORCPT ); Mon, 4 Dec 2017 13:38:38 -0500 Received: from submarine.cbg.collabora.co.uk (unknown [IPv6:2a00:5f00:102:0:d0a5:4565:9830:3aaf]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: gtucker) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 970EF26ECFB; Mon, 4 Dec 2017 18:38:36 +0000 (GMT) From: Guillaume Tucker To: Jonathan Hunter , David Airlie Cc: dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Guillaume Tucker , Ben Skeggs Subject: [PATCH 1/2] drm/nouveau/bar/gf100: fix hang when calling ->fini() before ->init() Date: Mon, 4 Dec 2017 18:37:58 +0000 Message-Id: X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the firmware fails to load then ->fini() will be called before the device has been initialised, causing the kernel to hang while trying to write to a register. Add a test in ->fini() to avoid this issue. This fixes a kernel hang on tegra124. Fixes: b17de35a2ebbe ("drm/nouveau/bar: implement bar1 teardown") Signed-off-by: Guillaume Tucker CC: Ben Skeggs --- drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.11.0 diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c index a3ba7f50198b..95e2aba64aad 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c @@ -43,9 +43,12 @@ gf100_bar_bar1_wait(struct nvkm_bar *base) } void -gf100_bar_bar1_fini(struct nvkm_bar *bar) +gf100_bar_bar1_fini(struct nvkm_bar *base) { - nvkm_mask(bar->subdev.device, 0x001704, 0x80000000, 0x00000000); + struct nvkm_device *device = base->subdev.device; + + if (base->subdev.oneinit) + nvkm_mask(device, 0x001704, 0x80000000, 0x00000000); } void