From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.14 10/12] drm/ast: Fixed reboot test may cause system hanged Date: Tue, 20 Aug 2019 09:42:51 -0400 Message-ID: <20190820134253.11562-10-sashal@kernel.org> References: <20190820134253.11562-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC9426E7DC for ; Tue, 20 Aug 2019 13:43:10 +0000 (UTC) In-Reply-To: <20190820134253.11562-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , dri-devel@lists.freedesktop.org, Dave Airlie List-Id: dri-devel@lists.freedesktop.org RnJvbTogIlkuQy4gQ2hlbiIgPHljX2NoZW5AYXNwZWVkdGVjaC5jb20+CgpbIFVwc3RyZWFtIGNv bW1pdCAwNWI0Mzk3MTFmNmZmODcwMGU4NjYwZjk3YTExNzk2NTA3NzhiOWNiIF0KClRoZXJlIGlz IGFub3RoZXIgdGhyZWFkIHN0aWxsIGFjY2VzcyBzdGFuZGFyZCBWR0EgSS9PIHdoaWxlIGxvYWRp bmcgZHJtIGRyaXZlci4KRGlzYWJsZSBzdGFuZGFyZCBWR0EgSS9PIGRlY29kZSB0byBhdm9pZCB0 aGlzIGlzc3VlLgoKU2lnbmVkLW9mZi1ieTogWS5DLiBDaGVuIDx5Y19jaGVuQGFzcGVlZHRlY2gu Y29tPgpSZXZpZXdlZC1ieTogQmVuamFtaW4gSGVycmVuc2NobWlkdCA8YmVuaEBrZXJuZWwuY3Jh c2hpbmcub3JnPgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQuY29t PgpMaW5rOiBodHRwczovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQvMTUy MzQxMDA1OS0xODQxNS0xLWdpdC1zZW5kLWVtYWlsLXljX2NoZW5AYXNwZWVkdGVjaC5jb20KU2ln bmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9hc3QvYXN0X21haW4uYyB8IDUgKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9hc3QvYXN0 X21vZGUuYyB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9hc3QvYXN0X3Bvc3QuYyB8IDIgKy0KIDMg ZmlsZXMgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hc3QvYXN0X21haW4uYyBiL2RyaXZlcnMvZ3B1L2RybS9hc3Qv YXN0X21haW4uYwppbmRleCAzNzM3MDBjMDVhMDBmLi4yMjRmYTFlZjg3ZmY5IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYXN0L2FzdF9tYWluLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Fz dC9hc3RfbWFpbi5jCkBAIC0xMzEsOCArMTMxLDggQEAgc3RhdGljIGludCBhc3RfZGV0ZWN0X2No aXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9vbCAqbmVlZF9wb3N0KQogCiAKIAkvKiBFbmFi bGUgZXh0ZW5kZWQgcmVnaXN0ZXIgYWNjZXNzICovCi0JYXN0X2VuYWJsZV9tbWlvKGRldik7CiAJ YXN0X29wZW5fa2V5KGFzdCk7CisJYXN0X2VuYWJsZV9tbWlvKGRldik7CiAKIAkvKiBGaW5kIG91 dCB3aGV0aGVyIFAyQSB3b3JrcyBvciB3aGV0aGVyIHRvIHVzZSBkZXZpY2UtdHJlZSAqLwogCWFz dF9kZXRlY3RfY29uZmlnX21vZGUoZGV2LCAmc2N1X3Jldik7CkBAIC01NzYsNiArNTc2LDkgQEAg dm9pZCBhc3RfZHJpdmVyX3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVj dCBhc3RfcHJpdmF0ZSAqYXN0ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAorCS8qIGVuYWJsZSBzdGFu ZGFyZCBWR0EgZGVjb2RlICovCisJYXN0X3NldF9pbmRleF9yZWcoYXN0LCBBU1RfSU9fQ1JUQ19Q T1JULCAweGExLCAweDA0KTsKKwogCWFzdF9yZWxlYXNlX2Zpcm13YXJlKGRldik7CiAJa2ZyZWUo YXN0LT5kcDUwMV9md19hZGRyKTsKIAlhc3RfbW9kZV9maW5pKGRldik7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYXN0L2FzdF9tb2RlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYXN0L2FzdF9t b2RlLmMKaW5kZXggMzQzODY3YjE4MmRkOC4uYTA5ZmFmYTI3MDgyMiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FzdC9hc3RfbW9kZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hc3QvYXN0 X21vZGUuYwpAQCAtNjAwLDcgKzYwMCw3IEBAIHN0YXRpYyBpbnQgYXN0X2NydGNfbW9kZV9zZXQo c3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlyZXR1cm4gLUVJTlZBTDsKIAlhc3Rfb3Blbl9rZXko YXN0KTsKIAotCWFzdF9zZXRfaW5kZXhfcmVnX21hc2soYXN0LCBBU1RfSU9fQ1JUQ19QT1JULCAw eGExLCAweGZmLCAweDA0KTsKKwlhc3Rfc2V0X2luZGV4X3JlZyhhc3QsIEFTVF9JT19DUlRDX1BP UlQsIDB4YTEsIDB4MDYpOwogCiAJYXN0X3NldF9zdGRfcmVnKGNydGMsIGFkanVzdGVkX21vZGUs ICZ2Ymlvc19tb2RlKTsKIAlhc3Rfc2V0X2NydGNfcmVnKGNydGMsIGFkanVzdGVkX21vZGUsICZ2 Ymlvc19tb2RlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hc3QvYXN0X3Bvc3QuYyBi L2RyaXZlcnMvZ3B1L2RybS9hc3QvYXN0X3Bvc3QuYwppbmRleCBmN2Q0MjEzNTlkNTY0Li5jMWQx YWM1MWQxYzIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYXN0L2FzdF9wb3N0LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FzdC9hc3RfcG9zdC5jCkBAIC00Niw3ICs0Niw3IEBAIHZvaWQg YXN0X2VuYWJsZV9tbWlvKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGFzdF9w cml2YXRlICphc3QgPSBkZXYtPmRldl9wcml2YXRlOwogCi0JYXN0X3NldF9pbmRleF9yZWdfbWFz ayhhc3QsIEFTVF9JT19DUlRDX1BPUlQsIDB4YTEsIDB4ZmYsIDB4MDQpOworCWFzdF9zZXRfaW5k ZXhfcmVnKGFzdCwgQVNUX0lPX0NSVENfUE9SVCwgMHhhMSwgMHgwNik7CiB9CiAKIAotLSAKMi4y MC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C488EC3A589 for ; Tue, 20 Aug 2019 13:44:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96FC422DA7 for ; Tue, 20 Aug 2019 13:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566308665; bh=TEL9wBgPW75cphadyHMqEYnF7SZMdviPo/Asrg6Z0v4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=B1gI+gTmAvv4Ws+4j9+bCVP/fXUqwXlYI5wU1Ejo5/BrbMZ7JJJtjoGyXFzua64ko SnJbD7jje9oz+NDtZjs6WJtDQBgOoSkA3BpghAEFsA82PoOF7Mlgt/7WswiJcPBWei wjQcTFsD5VHTxzIGTfS88K1J5ahAjSTy1sSlfAnY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730524AbfHTNoY (ORCPT ); Tue, 20 Aug 2019 09:44:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:38832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730799AbfHTNnL (ORCPT ); Tue, 20 Aug 2019 09:43:11 -0400 Received: from sasha-vm.mshome.net (unknown [12.236.144.82]) (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 47E8422DA9; Tue, 20 Aug 2019 13:43:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566308590; bh=TEL9wBgPW75cphadyHMqEYnF7SZMdviPo/Asrg6Z0v4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y07fiW++il7IORTY6E4MyXIGJ1PIEJZQISr1h6dvJb6ZydQc26M+VsZ51Dwfrg9K+ vTC96Zmk/jM+sjS4/4V/Y7EiPnMzpXWypkRgQR03aG/NnhlvwkoBZUyEcpDktoBnxg YJr6Sn0AmdX51pSPpx2PRcD8dRzClqwxTNQG6pMs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Y.C. Chen" , Benjamin Herrenschmidt , Dave Airlie , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.14 10/12] drm/ast: Fixed reboot test may cause system hanged Date: Tue, 20 Aug 2019 09:42:51 -0400 Message-Id: <20190820134253.11562-10-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190820134253.11562-1-sashal@kernel.org> References: <20190820134253.11562-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: "Y.C. Chen" [ Upstream commit 05b439711f6ff8700e8660f97a1179650778b9cb ] There is another thread still access standard VGA I/O while loading drm driver. Disable standard VGA I/O decode to avoid this issue. Signed-off-by: Y.C. Chen Reviewed-by: Benjamin Herrenschmidt Signed-off-by: Dave Airlie Link: https://patchwork.freedesktop.org/patch/msgid/1523410059-18415-1-git-send-email-yc_chen@aspeedtech.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/ast/ast_main.c | 5 ++++- drivers/gpu/drm/ast/ast_mode.c | 2 +- drivers/gpu/drm/ast/ast_post.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 373700c05a00f..224fa1ef87ff9 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -131,8 +131,8 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post) /* Enable extended register access */ - ast_enable_mmio(dev); ast_open_key(ast); + ast_enable_mmio(dev); /* Find out whether P2A works or whether to use device-tree */ ast_detect_config_mode(dev, &scu_rev); @@ -576,6 +576,9 @@ void ast_driver_unload(struct drm_device *dev) { struct ast_private *ast = dev->dev_private; + /* enable standard VGA decode */ + ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x04); + ast_release_firmware(dev); kfree(ast->dp501_fw_addr); ast_mode_fini(dev); diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 343867b182dd8..a09fafa270822 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -600,7 +600,7 @@ static int ast_crtc_mode_set(struct drm_crtc *crtc, return -EINVAL; ast_open_key(ast); - ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa1, 0xff, 0x04); + ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x06); ast_set_std_reg(crtc, adjusted_mode, &vbios_mode); ast_set_crtc_reg(crtc, adjusted_mode, &vbios_mode); diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c index f7d421359d564..c1d1ac51d1c20 100644 --- a/drivers/gpu/drm/ast/ast_post.c +++ b/drivers/gpu/drm/ast/ast_post.c @@ -46,7 +46,7 @@ void ast_enable_mmio(struct drm_device *dev) { struct ast_private *ast = dev->dev_private; - ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa1, 0xff, 0x04); + ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x06); } -- 2.20.1