| Message ID | 20230104164042.30271-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 p1csp5242873wrt;
Wed, 4 Jan 2023 08:49:42 -0800 (PST)
X-Google-Smtp-Source:
AMrXdXtG5zYYZToUFvZ/xqB+Ec7xUyDgks4QXiYc1mQse2P1wPplFyiPqz69wQfS5/bH73AxNFZs
X-Received: by 2002:a17:907:c786:b0:7ad:a797:5bb9 with SMTP id
tz6-20020a170907c78600b007ada7975bb9mr59663473ejc.29.1672850982123;
Wed, 04 Jan 2023 08:49:42 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1672850982; cv=pass;
d=google.com; s=arc-20160816;
b=M8z4XB8WjKw7jhSwifwbz2Wk9YHinmnshl1l2sOJzXN1H3aS16ThLUMIBKteLqOWNy
Q/1GICuIW8aNgYf5uYeeiB9vV7diuJudt8WFDlAS4LXlASeA9JKyDYbLiKLsC+MMGZUz
G4jO19p/LrHfuRub+eWJuOFqWVsro06n22hHQbW/tqVNy3kiSMWbMPBmzp/eRcVZkL3s
whm770yThbNSnVBqfj27gxQtDyRVd7Dnpht/ItNmOz8CvVmZ3CBeQFJqyRvUShvZy157
1U4/vAOfnU+rYFBMuMfToM1HTb+6QWWh+ACCRo1adoeIlvD+U6IkhHRXcVKT6ddRf1N6
YQJA==
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=gAupng/DiBgVq4A49K1akqtvG/HYBBcWMVkzCkT7rmA=;
b=PGLYwbLvhyyUShgQV1MwiCGT59+ckTGsDBuFY3QEVveSAIQT/DRNj2olCQipJ623Tt
OqIQSTNu6BS8Yb1dh0UeH1sBfVgdfJu7x3k6GP/bNCrOwwMUCZ2oVmmqWwzldyV8sH2y
AdOvpL8p3s6LtrsyEey6CF0XcWQonTMAc9hKvIHyPZu9fKJZ6Jrvsg9umH8Mf6edDFVU
1rNmKG+5RYh/Qh/nBb9fcoByYV4DEljTslbRK7r1IX0zAxXCDmKbU+CBDZsuDoCKOPpz
rVeexW5MRi0woS6xuX6h+mqJ0AnfXJiP1ktCyOQG7x6YZLtgbGDmENndWr5oYti66r3h
Pr1w==
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@amd.com header.s=selector1 header.b=tbKPKu7d;
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
dm12-20020a170907948c00b007c115fb9d63si30716543ejc.392.2023.01.04.08.49.15;
Wed, 04 Jan 2023 08:49: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=tbKPKu7d;
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 S239984AbjADQsx (ORCPT <rfc822;tmhikaru@gmail.com> + 99 others);
Wed, 4 Jan 2023 11:48:53 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36892 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S239834AbjADQrI (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 4 Jan 2023 11:47:08 -0500
Received: from NAM10-BN7-obe.outbound.protection.outlook.com
(mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.64])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 767E24916A
for <linux-kernel@vger.kernel.org>;
Wed, 4 Jan 2023 08:45:01 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=dpdwertpqoZUFXacOs5RZjrPAcNzz5vYXnM7u8FuwH+NJ9jHVkefbWNxX8oP9/Yb4LWVmkAF1VNK5dmRhqXS3sz/Y59VRP2oqq2/cXLsjPVgPihBpWhH3++TQaHEi92hc8Xp8axzCOg0RMbMhysWg/z+e2oIMNlOcT9bwilb6D2+s+eIGutn0XdpfFoNLl46AXXzL05RoMtL3095+5kmdEFQQNGY8gGaUM7aHLi/zNn9HU9tg08uMrHGtChGmsrEWrMUyEiKdOwHrG1V8R8q6u/pzxuxd7v+CLSomAkGL3+CSvquCjTC2MNEApqLwwJZWjGcclLizIFFrZSITw9xUg==
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=gAupng/DiBgVq4A49K1akqtvG/HYBBcWMVkzCkT7rmA=;
b=WeeDBP6ZjDC1e6u9e+BOTqwLfxqskJg9Ua1e3EYNwVRLq3CITkyaB0+3+iskfC6OxqEv5r3RlibqhSuvMtxPXmAT8oTyPTgkNoTwkyujI+urxm+HcyU4QcjBvgV8D/aVfBIHL+6efa5DtjaR6oC3pY6+ENgCwpafZBHKaZrRoHiZqRs7r63nA3L7krPC7cwA8suxku3bPmAbALVxbKJrEeLaAnDXxF2NmyPQWqpDyQAP1q5kWPNB4CB9XWZmNBicx/LjWPv8ZZ9c9JuXLXokobGovpxT5oHSG3rR6l4xkF4UfXu5rMpTnNOOnGP5fSD2rFZB/vXDTOlMR5eSXJ9PtQ==
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=gAupng/DiBgVq4A49K1akqtvG/HYBBcWMVkzCkT7rmA=;
b=tbKPKu7d3Jt90B/b+P0HFQNqYp78EP3v5oS93FQdkZns64j99l0Y8S+fTyo1IbhXo/aGTGE1ngYptmZTtWcX572znkf5F3v4aZ6oNTWRqxlYIoR0DnYoW50YgcT0HdRqTXMuRNzzWIKLPP3Bx6PkWaUZA23ebjDXz906tWfnCDE=
Received: from BN9PR03CA0618.namprd03.prod.outlook.com (2603:10b6:408:106::23)
by IA1PR12MB7637.namprd12.prod.outlook.com (2603:10b6:208:427::12) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Wed, 4 Jan
2023 16:44:27 +0000
Received: from BL02EPF00010207.namprd05.prod.outlook.com
(2603:10b6:408:106:cafe::bb) by BN9PR03CA0618.outlook.office365.com
(2603:10b6:408:106::23) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.14 via Frontend
Transport; Wed, 4 Jan 2023 16:44:27 +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
BL02EPF00010207.mail.protection.outlook.com (10.167.241.197) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.20.5944.8 via Frontend Transport; Wed, 4 Jan 2023 16:44:27 +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 10:43:45 -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 v5 28/45] drm/amd: Optimize SRIOV switch/case for PSP
microcode load
Date: Wed, 4 Jan 2023 10:40:17 -0600
Message-ID: <20230104164042.30271-29-mario.limonciello@amd.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20230104164042.30271-1-mario.limonciello@amd.com>
References: <20230104164042.30271-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: BL02EPF00010207:EE_|IA1PR12MB7637:EE_
X-MS-Office365-Filtering-Correlation-Id: e079dd52-a4a9-45eb-dd01-08daee72f1c6
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
llQMKtn8vYUireGEv22YirGj6fil41FDkCuQ0a9cV92cwaw5ah0EMS653X7H9v/+5Qyz/fbGs+ahHqnrmtToBVKw1JBXuEfO3uArCwFBQ0CvD7D7DmUuZGHwI8xR9MSq4l5ZD8xz2oBjAPjcjWhsTsFlmBxZ/xs+/bb7qOajbwtbqALoFdtbtneiuqyA2LIhd87NiFX+WMID/3FyLTDP2zG7gGO9CwXOpETZUhH8bgpq8tFK9WDZ7+sg6wJo1R2/jsrOqNa088hN282HZClRCSeOD9SHZVCCDhkoYtZDeeRDcxgSrmshhFB41GqdLpGM0+XNmuql9aS2zSZKk+NUKQXNE2tWVEgrbXOIw0gdfRlkerG2fv8h6+2Ud3kWD1TrZQ5uVPDKlxAbmP4vIX8S9Dg4KnIlgy48pvPRxeDtK57yGCu9XX7MPaWxC4N2rtn1macfMexpbYNpSXxSlCi6QXPSEJZimvUhF07RBfI1fv+rgtZyVkMO3tw/8K3vi47/1r+Nccu5n5l515Z2tEdDSzf+Yf4W/wj2YUKgs4MVYcJEsYqss/RGRMS1QMF1MLTGFAhYppEFcLtBf9x1s9qfD+btaV7Qc9o6QTwVuJTlrgEbOczMp09tRtQgeNL4Mroc+pf2bhxhxJeS2uGNYJMKstE1I1jZlG9qrgQDqdEv0+jNDHBX9Zd6ld26Z8XVvmnB7cq4Fg25elC8S5m09r3v10ZrqDHQJMC385c1Arxc8Ts=
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)(376002)(136003)(396003)(346002)(451199015)(46966006)(40470700004)(36840700001)(6666004)(110136005)(36756003)(478600001)(36860700001)(82310400005)(40460700003)(86362001)(82740400003)(81166007)(40480700001)(356005)(426003)(47076005)(7696005)(16526019)(1076003)(2616005)(26005)(186003)(336012)(83380400001)(70586007)(5660300002)(70206006)(44832011)(8676002)(4326008)(8936002)(2906002)(41300700001)(316002)(54906003)(36900700001);DIR:OUT;SFP:1101;
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 16:44:27.5745
(UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id:
e079dd52-a4a9-45eb-dd01-08daee72f1c6
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:
BL02EPF00010207.namprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7637
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?1754111391344540215?=
X-GMAIL-MSGID: =?utf-8?q?1754111391344540215?=
|
| Series |
Recover from failure to probe GPU
|
|
Commit Message
Mario Limonciello
Jan. 4, 2023, 4:40 p.m. UTC
Now that IP version decoding is used, a number of case statements can be combined. 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 8a3a38ea7b46..15ffc5a6e4da 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;