Received: by 2002:a05:6358:111d:b0:dc:6189:e246 with SMTP id f29csp2175816rwi; Tue, 1 Nov 2022 04:56:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6ahuOin7/lgkYQNXJCYCuDLq6K9iarEMs+lAo2UnHVXnxdze24yeb303e3u27okKynyUza X-Received: by 2002:a17:907:2bdb:b0:7ad:95e5:ce80 with SMTP id gv27-20020a1709072bdb00b007ad95e5ce80mr18163409ejc.625.1667303775358; Tue, 01 Nov 2022 04:56:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667303775; cv=none; d=google.com; s=arc-20160816; b=ukaFD4asfiG7/qZCko4adoMnxzPirsWl+9JCVGHYdwtiCnGcSOx8cnFyK8Z4QOEnHB 6G3Bo/PhThRwIdQfRDdCvmUltthoX7LIanZWIks9rH0qCi+6kv2AdMj1u+KvVfnVUEyV 4t8mp8VfUxexeyus19if2fxr7XgQUdoKmy1CKH0O9z71Feg9IfTkshLgm3etcfZsshY6 vR3u3u2WbyqyRSI2WkFQkY4SxT8WNAjX8SHJdgkGaMZjnXkOfsUuL+Qqb88kdQLIQzHs 1h9a74NE3iJI/02X0Z0VOgfWJK3pJ59ZJMJBR4qWwybQvxw6bAxDa06zYBX7MBbnIkh7 5Mkg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eRGMfpS31Anv5MDdINGwAkjRFNQcoa7iCtSg9asnNwI=; b=YOwZGmlXC3n0I/BtydeomfRoSQ2IoIVw1KXevEms5Gzgw5sl/T8VOe+MRivCjvDWwg r4PwlmyatIjUYuiAQ/fprLSiKaGPp5guPzTxOzn5knc8909lEVzLDWDVrCMxsZQkh3dB T4prAxmXo2ma1tgldzwEpEooIAJ28759Tg5DguQb+2PYnmub42No1Epr8N5BkVFxzXzN 2SJ1+V1T8O7/8gHrGnUAv1+xoaieVLc+MOAFnljVMF12z/8hsQcA4ISVv8LamarPNySR lsrvHW/c0q/K56a5ekgdJRjT99VWO78ZX9D6POINneqPbYVYDzpocgDKQPj4wm0zcI0M Aosg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MToXO5PC; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g18-20020a1709065d1200b007adaedb2f14si12569105ejt.866.2022.11.01.04.55.50; Tue, 01 Nov 2022 04:56:15 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MToXO5PC; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230318AbiKALar (ORCPT + 97 others); Tue, 1 Nov 2022 07:30:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230186AbiKAL3Z (ORCPT ); Tue, 1 Nov 2022 07:29:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D2536331; Tue, 1 Nov 2022 04:28:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EB9EE615E0; Tue, 1 Nov 2022 11:28:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF4C0C433C1; Tue, 1 Nov 2022 11:28:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667302127; bh=xdh7G/bIiGGJA9u5xFJF/ax3tcZiKlc8bZPavpkA3MQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MToXO5PCTAOpwruuD+MifybG+/kXXHpi0H+DgudD695IGxp/aVeW3AXAmswM/Obuc nXX3M1NAOeuwzmX+M6s4itp66gWM8oKj0cUEWw4u0ISyP6WcsrbYFEtQhcr+7LIetX gmz6hwN1lv5rjBTPaClLiGa1Z+QP4vKlbTTTI7OcMgT+LV35WImj1MVN/3OAcSpTRI iwcVMmGcFSMf1wEpX1k+RYNM8vBd/lHHPx7/g3HaXkDgXB4IC+jhV4ADyQghkw8QJC jh9PLn2BlS74GqMW4N62JZQBjld9xy9TGxnyItryT9ywdR6InlsqK1KZmpZmsMAyYK ALghC+3A/BQKg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kenneth Feng , Guan Yu , Alex Deucher , Sasha Levin , evan.quan@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, Hawking.Zhang@amd.com, lijo.lazar@amd.com, mario.limonciello@amd.com, tim.huang@amd.com, tao.zhou1@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.0 27/34] drm/amd/pm: skip loading pptable from driver on secure board for smu_v13_0_10 Date: Tue, 1 Nov 2022 07:27:19 -0400 Message-Id: <20221101112726.799368-27-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221101112726.799368-1-sashal@kernel.org> References: <20221101112726.799368-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 From: Kenneth Feng [ Upstream commit f700486cd1f2bf381671d1c2c7dc9000db10c50e ] skip loading pptable from driver on secure board since it's loaded from psp. Signed-off-by: Kenneth Feng Reviewed-by: Guan Yu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c index 93f9b8377539..750d8da84fac 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c @@ -210,7 +210,8 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu) return 0; if ((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 7)) || - (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 0))) + (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 0)) || + (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 10))) return 0; /* override pptable_id from driver parameter */ -- 2.35.1