| Message ID | 20230105034327.1439-29-mario.limonciello@amd.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp104154wrt;
Wed, 4 Jan 2023 19:47:42 -0800 (PST)
X-Google-Smtp-Source:
AMrXdXuU/rUhWw/XQsNu+JDC663f4vCnQ6McA8m/R1rClCIwW1bC6m4EWJRXhn2DfyReUE6Kx/X+
X-Received: by 2002:a17:90a:4086:b0:226:27c2:829e with SMTP id
l6-20020a17090a408600b0022627c2829emr26574385pjg.32.1672890462197;
Wed, 04 Jan 2023 19:47:42 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1672890462; cv=pass;
d=google.com; s=arc-20160816;
b=G65mu5tYKXIqJJ8QrrVNpiX/tt7aDziCYxg/Yl3jZ5+faSPv3SCngz7JfSnmKuw1xq
ko/KMEdYQNuCOAS+cfB7yq5xfPbSw1Mng0wRDf5kM7G8Xxi4nshbQ5pyK13DzcXxGeD0
GfG4KaYLau/6SPdELaiL0wCyv1V+DEHsXehdCsZK+W4UxWninD1thb3hxUA9eCN+hMdz
BA3qfk9BQIBtnmFZCPVG6t2l3YlKaM+qnfzmxZFMxKNK4YJtMvrxIhDHLdvLtbZHWnBd
9nNmaqNvNwb+XzGPN2wAGFSMixdluxhP2U/uWxdhrahDsemd1Isi91AY00Ki7JEEEM93
t3cg==
ARC-Message-Signature: i=2; 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=JXk+zF5O3IxPLeHM04mNh3UGzDXvGu7UFYGMaHfAepA=;
b=npk2ZfdmN7Qy5bYkKkJGJcP/nCY7WyUinE3a0u5QJw4DJPrcj4AJJhi2AJ9ack4Dq8
KIsrJTNpMrlsnEeubRPNbUYouie7J6aQvlans6+zhNicje8PNYSPWGbCs4jOSwiu24oV
NsMtdXYzWScTmeI5mG710uZDTG/sD8vdt63aWgVlywNSrn7msCxKHVOCkDh4PIxREIdh
AFs3S+6IH6o30G4MBDzMpg3ZlU2lXrzF2yE0fQOXtInEWKoFo9VaeKVatqvSS4mOTXUO
xQxosz8GVEo/Jn9xGpdmw+bK4mC7zwioyaRSgtlC+PMD+bH+5KuaCsdlKS3lE/rWHW2G
nnfw==
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@amd.com header.s=selector1 header.b=W+OfXP2k;
arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass
fromdomain=amd.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;
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
c10-20020a655a8a000000b004779a46d07csi37116714pgt.183.2023.01.04.19.47.28;
Wed, 04 Jan 2023 19:47:42 -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;
dkim=pass header.i=@amd.com header.s=selector1 header.b=W+OfXP2k;
arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass
fromdomain=amd.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;
dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230185AbjAEDqZ (ORCPT <rfc822;tmhikaru@gmail.com> + 99 others);
Wed, 4 Jan 2023 22:46:25 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45340 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230407AbjAEDpX (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 4 Jan 2023 22:45:23 -0500
Received: from NAM11-DM6-obe.outbound.protection.outlook.com
(mail-dm6nam11on2073.outbound.protection.outlook.com [40.107.223.73])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8A984FCED
for <linux-kernel@vger.kernel.org>;
Wed, 4 Jan 2023 19:44:47 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=Vwd/lQZKxkkZpImOkzIB9kwf+PfmdSNFHFRiQ4PR7/oxqEcCYeAU3cPQgjcPvZURAXlM7QeXr6pSr7mg/tRu/mcSxc1ArQN+LjRxKf4M4OqPW+tRm9fgJ8ifMRodJrU7DWBW2TGb7YI3cl9uXab+VXfK8Q4WcLHrarlOU8pVX9Fw2gl+xuzlgJBFOuL8gBKR5xEHJn3780V1QxAQvotssMqYJVpMnjrDryk1dPEIdeEOg+5zUpll3Rv9NJ3qZMQ/rIc/CV28m/1jktGhXIMrIMtobeZV7RVpTrhaMUIOr3gxhpaFbP0pBHGZFf/1letwEHPK7HVI+nU2DWcOw579uQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector9901;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=JXk+zF5O3IxPLeHM04mNh3UGzDXvGu7UFYGMaHfAepA=;
b=Sxzdy32BirjoE3JupZXqngdh4IjEDbBc0J7dF4nA1TLJi/tt62y/e06X4nNEsnilpA2Q8QiG1Dq2vzx4vFSJzybYirOb7rB5BanR5sgImAG0418Mgdy4gfYSzdsckNztGsNChKdyBx5UVM0eXtuENVWr/WTihCY9SE0K7EDIm/G/mWPmbyE9bo1eoY3fJrJNwGvFl+U5oAcub9G9qievyS+OGD8fiJUmNFFqKDT6E+FiPzBfHFX+e0CEwV2c6wstoz05BvzKdlceoQYKfojmQsftnhjQI8spehOYQ4x/E/h23ZOy0eeyLUXeT56R1t0EVEeOpWpT/cQTymYnCFFC9Q==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com;
dmarc=pass (p=quarantine sp=quarantine pct=100) action=none
header.from=amd.com; dkim=none (message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=JXk+zF5O3IxPLeHM04mNh3UGzDXvGu7UFYGMaHfAepA=;
b=W+OfXP2k+NHJrOStBjnCBueHMsK/1BH7GvBpu//D3Zy+qvmOHDWDZyy9a5YXWAYNJ85jE2un83u0o7+2WlSWLGv1y7eB20VTqAMvZLnU1AnKrBfj/lqxot/UqK9ncG5lcQWCWh0B/61COOoHf1QfKAyB0HsgpFY6ey0qZ29+a4s=
Received: from BN9PR03CA0046.namprd03.prod.outlook.com (2603:10b6:408:fb::21)
by DS0PR12MB8019.namprd12.prod.outlook.com (2603:10b6:8:14e::9) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Thu, 5 Jan
2023 03:44:46 +0000
Received: from BN8NAM11FT103.eop-nam11.prod.protection.outlook.com
(2603:10b6:408:fb:cafe::f) by BN9PR03CA0046.outlook.office365.com
(2603:10b6:408:fb::21) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5966.19 via Frontend
Transport; Thu, 5 Jan 2023 03:44:46 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17)
smtp.mailfrom=amd.com; dkim=none (message not signed)
header.d=none;dmarc=pass action=none header.from=amd.com;
Received-SPF: Pass (protection.outlook.com: domain of amd.com designates
165.204.84.17 as permitted sender) receiver=protection.outlook.com;
client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C
Received: from SATLEXMB04.amd.com (165.204.84.17) by
BN8NAM11FT103.mail.protection.outlook.com (10.13.176.181) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.20.5966.17 via Frontend Transport; Thu, 5 Jan 2023 03:44:46 +0000
Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com
(10.181.40.145) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 4 Jan
2023 21:44:44 -0600
From: Mario Limonciello <mario.limonciello@amd.com>
To: Alex Deucher <alexander.deucher@amd.com>,
<linux-kernel@vger.kernel.org>
CC: Javier Martinez Canillas <javierm@redhat.com>,
Carlos Soriano Sanchez <csoriano@redhat.com>,
<amd-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org>,
David Airlie <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>, <christian.koenig@amd.com>,
Lazar Lijo <Lijo.Lazar@amd.com>,
Mario Limonciello <mario.limonciello@amd.com>,
"Pan, Xinhui" <Xinhui.Pan@amd.com>
Subject: [PATCH v6 28/45] drm/amd: Optimize SRIOV switch/case for PSP
microcode load
Date: Wed, 4 Jan 2023 21:43:02 -0600
Message-ID: <20230105034327.1439-29-mario.limonciello@amd.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20230105034327.1439-1-mario.limonciello@amd.com>
References: <20230105034327.1439-1-mario.limonciello@amd.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
X-Originating-IP: [10.180.168.240]
X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com
(10.181.40.145)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: BN8NAM11FT103:EE_|DS0PR12MB8019:EE_
X-MS-Office365-Filtering-Correlation-Id: 91dfc648-911a-4ad3-2af5-08daeecf3039
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
+ICosUsaeYYbNSThLE2QIeZFYO5aeP2NloH+3tVg/+S8dgcDtaFgrVSXlwvX0IPQtF5IyOEKD+jZSjitIcS+AKTljwLBK34obV9S14KWaSmbMR865o4WgFJofB4UvrTBMfsCQO5f34yYyQ0MQr1wb6LeJrS84zHtOmVKuhTyNfretMnhmKnpJN1vcCxDUX0MNmJIX21O4KwiOwYyAJPJJYtPCngezLrdAOkym6zDQNBF/Pc8JsXD+Hkg8tVjFcE0uCraRCTkRr3JFy6F2Ef0alWr/PdhegO6m8hD1sRnzoDwMvcblCfvZILUyFxQPpKVht/VN6bphdXN5iUfz3KTVFGHy+wmFnyP5P6eA33jfCSgF6u+nfzYUTEG3xMC+0/v2UgnU9wx+uEoctbR0MIqJzZUnYfkJjieFFTPOZvmnhAhwqArLF9HlCInK6CC5+aCrE+jgLy9vxbmQwe/Q9ySux879nr8Z8riCij6OXf+oAoor6vG6IXn/z4ACaYP5E+cSpyzZ6b8qZ1FqmIP8QNAun5r1SFDW6I0BvS50KVRgRba3FfplaDU0j8Z07uu+GLSHyn9v8u1zi0jau6LX2pvBTxjM/zo0JvXfmDLRWECqee2yS8UiI+3eeOESXBfWjSS5ukFWgnB8DKmAIqZHeOGaGKcA2u5+8I/67xQLrLzvtk2ckE29fFg9/sffUnkOS34lWKMRdAHX4Ds74tZGI9S915vwBQ7sMiiC52ddb5rrFA=
X-Forefront-Antispam-Report:
CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(136003)(396003)(376002)(346002)(451199015)(46966006)(40470700004)(36840700001)(47076005)(2906002)(426003)(36860700001)(356005)(86362001)(83380400001)(81166007)(8936002)(41300700001)(44832011)(5660300002)(70586007)(1076003)(70206006)(40480700001)(40460700003)(82310400005)(478600001)(6666004)(316002)(2616005)(16526019)(186003)(8676002)(336012)(26005)(4326008)(54906003)(110136005)(82740400003)(7696005)(36756003)(36900700001);DIR:OUT;SFP:1101;
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2023 03:44:46.0571
(UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id:
91dfc648-911a-4ad3-2af5-08daeecf3039
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp:
TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com]
X-MS-Exchange-CrossTenant-AuthSource:
BN8NAM11FT103.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8019
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1754152788931591134?=
X-GMAIL-MSGID: =?utf-8?q?1754152788931591134?=
|
| Series |
Recover from failure to probe GPU
|
|
Commit Message
Mario Limonciello
Jan. 5, 2023, 3:43 a.m. UTC
Now that IP version decoding is used, a number of case statements can be combined. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index aaef30bba97f..380e08affc25 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -132,14 +132,8 @@ static int psp_init_sriov_microcode(struct psp_context *psp) switch (adev->ip_versions[MP0_HWIP][0]) { case IP_VERSION(9, 0, 0): - adev->virt.autoload_ucode_id = AMDGPU_UCODE_ID_CP_MEC2; - ret = psp_init_cap_microcode(psp, ucode_prefix); - break; - case IP_VERSION(11, 0, 9): - adev->virt.autoload_ucode_id = AMDGPU_UCODE_ID_CP_MEC2; - ret = psp_init_cap_microcode(psp, ucode_prefix); - break; case IP_VERSION(11, 0, 7): + case IP_VERSION(11, 0, 9): adev->virt.autoload_ucode_id = AMDGPU_UCODE_ID_CP_MEC2; ret = psp_init_cap_microcode(psp, ucode_prefix); break;