From patchwork Fri Nov 18 07:48:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5p2O55yf6IO9?= X-Patchwork-Id: 22170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp53704wrr; Fri, 18 Nov 2022 00:00:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf4hXJGWbd3j8966qXqEMST8aF3VtJN/51lfiuOS49fVcHI7GTmQrcZDdIqBMllYXzr/Ligr X-Received: by 2002:a05:6402:150:b0:468:fdc3:6b44 with SMTP id s16-20020a056402015000b00468fdc36b44mr3015956edu.388.1668758426085; Fri, 18 Nov 2022 00:00:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668758426; cv=none; d=google.com; s=arc-20160816; b=hB05slkvva1zkLfB1DM7YvSCEvgm2d7EEmxa+/L2v9+t89hgmG3wzJxMCm48ZvDIi2 htUNvZgs/LpbR00ublhW3rv45WxStL/+XgIFkYDQ5vq8Dy6pnTQt/UGO4NKfa2mED5Vd r+xiIvV1TNHH1sJQGCC1re+o6ug/oCujWez5Y7WtMHfo2fcSrM3w3USdRyJ4ZzMg6/FJ UYJwHJi1RaUSMCGVGWIc/vB0Q/rUwOyNC0zyS/Z0MbbVU+bOgQmiB15cKmuAUZwOtSOm m5cztaeo8TmokdhNwM6QcaEyGA8grCygvX2V/+HCEionSbnyvdh/ZuANOECJwX4jo+Vz JviQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=iiX8KWY83eAeqCIAj9x8KENhrg5CCb/889I4apjyHEk=; b=G9D5Me8WmoQwzjab0qzFSGftBo9h08D+dFsUbaVuyvdeVdwOZbc093OOHHS4FVhRR7 DQ+tmYmmvFD3tuXB1QYg1Yred9NcGK0sSZJtshOkmwnarT2RBoj5DLf6UtHMUSD4vHJt +mekB1/HXoMS8FkGsDiCKdfAuZEIxjRHC3BWis6avpmcLxHRl/RJbxk/wxSGbBEn8On+ 2xfDSe7ynCAvZogATboh0plbACgTm7QS/FBSBa6FQ6DzWOBFpqt7KihqPYVFGudzhiHX 9SHz1Pg/b3gmd+8ZMXgl087PohmDfrJyySULSIHKaBP046REQ9E2r/7YdxMHQSmdVm64 haVA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ga5-20020a1709070c0500b0078a19032c70si3007434ejc.334.2022.11.18.00.00.01; Fri, 18 Nov 2022 00:00:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241276AbiKRHsv (ORCPT + 99 others); Fri, 18 Nov 2022 02:48:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241110AbiKRHst (ORCPT ); Fri, 18 Nov 2022 02:48:49 -0500 Received: from mailgw.kylinos.cn (unknown [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93C6113D41 for ; Thu, 17 Nov 2022 23:48:44 -0800 (PST) X-UUID: e2b1022d870444de904bc7758601fd3f-20221118 X-CPASD-INFO: 2196396c782b4b0f9f54fe0c44f3a206@e4FzVmBrZJNjWHSug6V7oFmXZWSWkVC ydm6GY49iXFaVhH5xTV5uYFV9fWtVYV9dYVR6eGxQYmBgZFJ4i3-XblBgXoZgUZB3gXNzVmNnZg== X-CLOUD-ID: 2196396c782b4b0f9f54fe0c44f3a206 X-CPASD-SUMMARY: SIP:-1,APTIP:-2.0,KEY:0.0,FROMBLOCK:1,OB:0.0,URL:-5,TVAL:196. 0,ESV:0.0,ECOM:-5.0,ML:0.0,FD:0.0,CUTS:123.0,IP:-2.0,MAL:-5.0,PHF:-5.0,PHC:-5 .0,SPF:4.0,EDMS:-5,IPLABEL:4480.0,FROMTO:0,AD:0,FFOB:0.0,CFOB:0.0,SPC:0,SIG:- 5,AUF:6,DUF:8732,ACD:145,DCD:145,SL:0,EISP:0,AG:0,CFC:0.421,CFSR:0.046,UAT:0, RAF:0,IMG:-5.0,DFA:0,DTA:0,IBL:-2.0,ADI:-5,SBL:0,REDM:0,REIP:0,ESB:0,ATTNUM:0 ,EAF:0,CID:-5.0,VERSION:2.3.17 X-CPASD-ID: e2b1022d870444de904bc7758601fd3f-20221118 X-CPASD-BLOCK: 1000 X-CPASD-STAGE: 1 X-UUID: e2b1022d870444de904bc7758601fd3f-20221118 X-User: lizhenneng@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 1969169403; Fri, 18 Nov 2022 15:49:02 +0800 From: Zhenneng Li To: Alex Deucher Cc: =?utf-8?q?Christian_K=C3=B6nig?= , Xinhui.Pan@amd.com, David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Zhenneng Li Subject: [PATCH] drm/amdgpu: add mb for si Date: Fri, 18 Nov 2022 15:48:10 +0800 Message-Id: <20221118074810.380368-1-lizhenneng@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,PDS_RDNS_DYNAMIC_FP, RDNS_DYNAMIC,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749820035316805617?= X-GMAIL-MSGID: =?utf-8?q?1749820035316805617?= During reboot test on arm64 platform, it may failure on boot, so add this mb in smc. The error message are as follows: [ 6.996395][ 7] [ T295] [drm:amdgpu_device_ip_late_init [amdgpu]] *ERROR* late_init of IP block failed -22 [ 7.006919][ 7] [ T295] amdgpu 0000:04:00.0: amdgpu_device_ip_late_init failed [ 7.014224][ 7] [ T295] amdgpu 0000:04:00.0: Fatal error during GPU init Signed-off-by: Zhenneng Li --- drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c b/drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c index 8f994ffa9cd1..c7656f22278d 100644 --- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c @@ -155,6 +155,8 @@ bool amdgpu_si_is_smc_running(struct amdgpu_device *adev) u32 rst = RREG32_SMC(SMC_SYSCON_RESET_CNTL); u32 clk = RREG32_SMC(SMC_SYSCON_CLOCK_CNTL_0); + mb(); + if (!(rst & RST_REG) && !(clk & CK_DISABLE)) return true;