From nobody Tue Sep 16 11:08:23 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95E81C4332F for ; Wed, 4 Jan 2023 16:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239901AbjADQrj (ORCPT ); Wed, 4 Jan 2023 11:47:39 -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 S240069AbjADQqy (ORCPT ); Wed, 4 Jan 2023 11:46:54 -0500 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2047.outbound.protection.outlook.com [40.107.244.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D19B4318D for ; Wed, 4 Jan 2023 08:44:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TidpfAcWyp1oTT2c1ZOlOuN5I2Gyd2KAbHdMTcva2pz22diAnC8ymNMnThKimJ/XESsIczh+RqPX5NrL21cJUoiWywK31v5kYBBjBNHjrRgUNxpl28NFuDQkIM8aXKCyVmM2VQQZsxWP6O4GkkRO3dIrTYD6lJCXDeUtcKU12EQo05K5+B0jdpGxCafene1gJo4Ol2Mb8rwhGnoGzzSn6huysGMNjM/CkAky3rG6VRe/pLku4qphBpZ52T2DsgQotmkv2hdIg/K0wIzmXMaMmbpViFiPBItjAbPOWTKXyk686bvuqv1jxB1LIeF6b/Z8o7zVjrlKEnpM+alybviPag== 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=eOk4MvdTXi2tl/ytowgm5qVNpgWmogBHwW0VsTZ0Azg=; b=F/YAmyy4AasWiggsPmt2sduy5yiY2R39lXQN+nVG25OCB9JZJ433pBc5WwI6Yeav734mojBGOQsu9F8slZD5gDAURNNLvK/g6bv4/tX4aynAJb3+gBTdgc+g5bHLCv06HJWoWpnN/x+/GrYAWypsbR5HH/1uoE2VUVlyyu0ke3kZSBqX9P4xYrkLsAck1N/jPp85xat2cH0SgiGLi77tWa9Sc/LFNZxZMb95s9oHveGoAFYfRewCgfX+4piKNaI9KrR1AimBz6uz8I2eJuQNvOn5W1nvW9VaCCqCiLDiv3g6/FgDSjgNo2jOqZcw7qEwnKnzFXioIaYE5LhMR7Ks6A== 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=eOk4MvdTXi2tl/ytowgm5qVNpgWmogBHwW0VsTZ0Azg=; b=2NZyWHXdw60YRSz7UALtJqYMKP8vVyUIet6Fvnd6pzfihK0aswpe9Ja6DuOm1S0YqsAEd3N+xxtNOhx03QjuwvusGTwfQmUPUIvDYOmsFIyhIImFrvBEIjiPlKan0XMaitUFXlO/ge1cfCU1j5zcgcFpKLT8F5IXVW1HaVw5SOk= Received: from BN8PR15CA0031.namprd15.prod.outlook.com (2603:10b6:408:c0::44) by DS0PR12MB7898.namprd12.prod.outlook.com (2603:10b6:8:14c::20) 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:43:48 +0000 Received: from BL02EPF00010209.namprd05.prod.outlook.com (2603:10b6:408:c0:cafe::13) by BN8PR15CA0031.outlook.office365.com (2603:10b6:408:c0::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5966.20 via Frontend Transport; Wed, 4 Jan 2023 16:43:48 +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 BL02EPF00010209.mail.protection.outlook.com (10.167.241.198) 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:43:15 +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:41:59 -0600 From: Mario Limonciello To: Alex Deucher , CC: Javier Martinez Canillas , Carlos Soriano Sanchez , , , David Airlie , "Daniel Vetter" , , Lazar Lijo , Mario Limonciello , "Pan, Xinhui" Subject: [PATCH v5 11/45] drm/amd: Load MES microcode during early_init Date: Wed, 4 Jan 2023 10:40:00 -0600 Message-ID: <20230104164042.30271-12-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-Transfer-Encoding: quoted-printable 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: BL02EPF00010209:EE_|DS0PR12MB7898:EE_ X-MS-Office365-Filtering-Correlation-Id: fda2b673-3a29-4fac-5a7f-08daee72d70f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KYUpWmVAxVwxEUA1JDw0oHX/qktm5tsZMJcDfbNH99LVVRLmqBCR1D7VV/7k/6BUR/N8+dxazDJe43pqpgq0ABIRYrzyVKKUaBOtZCRIwBQlRziwv2tGtioMD8n6zIj3TgWcwWERdF2CZYUOOqSs14rz2X4tjSl68h38l5l2547OhUY2KwscAN9PuJLODX3QKYA3pIMVBKVz9TqS0DTZZmr2x3ziYUPdn0JFwt409w/KtQG4VHuSH5wthTtUnpKIO0yRj4gYixzhDX9ay5CuS7x8pRATkRvbD4vQMyAmd17vtisdRnLjXZwo3MnUaDJosWiAWsp1LmB3WdCOEBvE5InDHf7me7Y5Mv8O8lF2/8/lwovhaoWtO5Rc+QXv7ze9tiZSY0ZpsqhssUX06J23xnOU6ToMoAYqJCzKeeIGjlq26GD1ATLsXfPAfSMgpBSuGY2MlRRVU/dxCNN0EKEfGkgJ0CkXl348l8/QrBBMC2YYQrTy69sw/sFeBB92u4gbceTc4OW8wt46J7EdkHwMB2aHmcUfjuYZ7VX/wX3fN8g6jDV3X+lo+FLcbmZR7NgJWvCjdaPcYRjCynCP9bz/X7VGV6fr4fuYkUklyEsNma5Q+4p2N6WILM2ZyfcDrPiHrnK/qrrd6pJHl2gqsLWGL9Rv+Hn2ozTGeRg5tw/06kUIgGt1LXGOpoTrvHOxBES6SM1e3c+hb3ovARNN9YaPwaSM6N7ZEESWT7MLCt6Egow= 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)(346002)(376002)(396003)(136003)(39860400002)(451199015)(40470700004)(46966006)(36840700001)(70586007)(4326008)(41300700001)(70206006)(47076005)(8676002)(426003)(356005)(86362001)(336012)(186003)(54906003)(2906002)(83380400001)(81166007)(6666004)(316002)(7696005)(82310400005)(26005)(36860700001)(478600001)(44832011)(16526019)(82740400003)(110136005)(30864003)(1076003)(8936002)(36756003)(40460700003)(5660300002)(40480700001)(2616005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 16:43:15.3289 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fda2b673-3a29-4fac-5a7f-08daee72d70f 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: BL02EPF00010209.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7898 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add an early_init phase to MES for fetching and validating microcode from the filesystem. If MES microcode is required but not available during early init, the firmware framebuffer will have already been released and the screen will freeze. Move the request for MES microcode into the early_init phase so that if it's not available, early_init will fail. Signed-off-by: Mario Limonciello --- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 65 +++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 1 + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 97 +++++-------------------- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 88 +++++----------------- 4 files changed, 100 insertions(+), 151 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_mes.c index 0c546245793b..dd8f35234507 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c @@ -21,6 +21,8 @@ * */ =20 +#include + #include "amdgpu_mes.h" #include "amdgpu.h" #include "soc15_common.h" @@ -1423,3 +1425,66 @@ int amdgpu_mes_self_test(struct amdgpu_device *adev) kfree(vm); return 0; } + +int amdgpu_mes_init_microcode(struct amdgpu_device *adev, int pipe) +{ + const struct mes_firmware_header_v1_0 *mes_hdr; + struct amdgpu_firmware_info *info; + char ucode_prefix[30]; + char fw_name[40]; + int r; + + amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_= prefix)); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mes%s.bin", + ucode_prefix, + pipe =3D=3D AMDGPU_MES_SCHED_PIPE ? "" : "1"); + r =3D request_firmware(&adev->mes.fw[pipe], fw_name, adev->dev); + if (r) + goto out; + + r =3D amdgpu_ucode_validate(adev->mes.fw[pipe]); + if (r) + goto out; + + mes_hdr =3D (const struct mes_firmware_header_v1_0 *) + adev->mes.fw[pipe]->data; + adev->mes.uc_start_addr[pipe] =3D + le32_to_cpu(mes_hdr->mes_uc_start_addr_lo) | + ((uint64_t)(le32_to_cpu(mes_hdr->mes_uc_start_addr_hi)) << 32); + adev->mes.data_start_addr[pipe] =3D + le32_to_cpu(mes_hdr->mes_data_start_addr_lo) | + ((uint64_t)(le32_to_cpu(mes_hdr->mes_data_start_addr_hi)) << 32); + + if (adev->firmware.load_type =3D=3D AMDGPU_FW_LOAD_PSP) { + int ucode, ucode_data; + + if (pipe =3D=3D AMDGPU_MES_SCHED_PIPE) { + ucode =3D AMDGPU_UCODE_ID_CP_MES; + ucode_data =3D AMDGPU_UCODE_ID_CP_MES_DATA; + } else { + ucode =3D AMDGPU_UCODE_ID_CP_MES1; + ucode_data =3D AMDGPU_UCODE_ID_CP_MES1_DATA; + } + + info =3D &adev->firmware.ucode[ucode]; + info->ucode_id =3D ucode; + info->fw =3D adev->mes.fw[pipe]; + adev->firmware.fw_size +=3D + ALIGN(le32_to_cpu(mes_hdr->mes_ucode_size_bytes), + PAGE_SIZE); + + info =3D &adev->firmware.ucode[ucode_data]; + info->ucode_id =3D ucode_data; + info->fw =3D adev->mes.fw[pipe]; + adev->firmware.fw_size +=3D + ALIGN(le32_to_cpu(mes_hdr->mes_ucode_data_size_bytes), + PAGE_SIZE); + } + + return 0; + +out: + release_firmware(adev->mes.fw[pipe]); + adev->mes.fw[pipe] =3D NULL; + return r; +} diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_mes.h index 97c05d08a551..547ec35691fa 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h @@ -306,6 +306,7 @@ struct amdgpu_mes_funcs { =20 int amdgpu_mes_ctx_get_offs(struct amdgpu_ring *ring, unsigned int id_offs= ); =20 +int amdgpu_mes_init_microcode(struct amdgpu_device *adev, int pipe); int amdgpu_mes_init(struct amdgpu_device *adev); void amdgpu_mes_fini(struct amdgpu_device *adev); =20 diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c b/drivers/gpu/drm/amd/a= mdgpu/mes_v10_1.c index 614394118a53..9c5ff8b7c202 100644 --- a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c +++ b/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c @@ -379,82 +379,6 @@ static const struct amdgpu_mes_funcs mes_v10_1_funcs = =3D { .resume_gang =3D mes_v10_1_resume_gang, }; =20 -static int mes_v10_1_init_microcode(struct amdgpu_device *adev, - enum admgpu_mes_pipe pipe) -{ - const char *chip_name; - char fw_name[30]; - int err; - const struct mes_firmware_header_v1_0 *mes_hdr; - struct amdgpu_firmware_info *info; - - switch (adev->ip_versions[GC_HWIP][0]) { - case IP_VERSION(10, 1, 10): - chip_name =3D "navi10"; - break; - case IP_VERSION(10, 3, 0): - chip_name =3D "sienna_cichlid"; - break; - default: - BUG(); - } - - if (pipe =3D=3D AMDGPU_MES_SCHED_PIPE) - snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mes.bin", - chip_name); - else - snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mes1.bin", - chip_name); - - err =3D request_firmware(&adev->mes.fw[pipe], fw_name, adev->dev); - if (err) - return err; - - err =3D amdgpu_ucode_validate(adev->mes.fw[pipe]); - if (err) { - release_firmware(adev->mes.fw[pipe]); - adev->mes.fw[pipe] =3D NULL; - return err; - } - - mes_hdr =3D (const struct mes_firmware_header_v1_0 *) - adev->mes.fw[pipe]->data; - adev->mes.uc_start_addr[pipe] =3D - le32_to_cpu(mes_hdr->mes_uc_start_addr_lo) | - ((uint64_t)(le32_to_cpu(mes_hdr->mes_uc_start_addr_hi)) << 32); - adev->mes.data_start_addr[pipe] =3D - le32_to_cpu(mes_hdr->mes_data_start_addr_lo) | - ((uint64_t)(le32_to_cpu(mes_hdr->mes_data_start_addr_hi)) << 32); - - if (adev->firmware.load_type =3D=3D AMDGPU_FW_LOAD_PSP) { - int ucode, ucode_data; - - if (pipe =3D=3D AMDGPU_MES_SCHED_PIPE) { - ucode =3D AMDGPU_UCODE_ID_CP_MES; - ucode_data =3D AMDGPU_UCODE_ID_CP_MES_DATA; - } else { - ucode =3D AMDGPU_UCODE_ID_CP_MES1; - ucode_data =3D AMDGPU_UCODE_ID_CP_MES1_DATA; - } - - info =3D &adev->firmware.ucode[ucode]; - info->ucode_id =3D ucode; - info->fw =3D adev->mes.fw[pipe]; - adev->firmware.fw_size +=3D - ALIGN(le32_to_cpu(mes_hdr->mes_ucode_size_bytes), - PAGE_SIZE); - - info =3D &adev->firmware.ucode[ucode_data]; - info->ucode_id =3D ucode_data; - info->fw =3D adev->mes.fw[pipe]; - adev->firmware.fw_size +=3D - ALIGN(le32_to_cpu(mes_hdr->mes_ucode_data_size_bytes), - PAGE_SIZE); - } - - return 0; -} - static void mes_v10_1_free_microcode(struct amdgpu_device *adev, enum admgpu_mes_pipe pipe) { @@ -1019,10 +943,6 @@ static int mes_v10_1_sw_init(void *handle) if (!adev->enable_mes_kiq && pipe =3D=3D AMDGPU_MES_KIQ_PIPE) continue; =20 - r =3D mes_v10_1_init_microcode(adev, pipe); - if (r) - return r; - r =3D mes_v10_1_allocate_eop_buf(adev, pipe); if (r) return r; @@ -1229,6 +1149,22 @@ static int mes_v10_1_resume(void *handle) return amdgpu_mes_resume(adev); } =20 +static int mes_v10_0_early_init(void *handle) +{ + struct amdgpu_device *adev =3D (struct amdgpu_device *)handle; + int pipe, r; + + for (pipe =3D 0; pipe < AMDGPU_MAX_MES_PIPES; pipe++) { + if (!adev->enable_mes_kiq && pipe =3D=3D AMDGPU_MES_KIQ_PIPE) + continue; + r =3D amdgpu_mes_init_microcode(adev, pipe); + if (r) + return r; + } + + return 0; +} + static int mes_v10_0_late_init(void *handle) { struct amdgpu_device *adev =3D (struct amdgpu_device *)handle; @@ -1241,6 +1177,7 @@ static int mes_v10_0_late_init(void *handle) =20 static const struct amd_ip_funcs mes_v10_1_ip_funcs =3D { .name =3D "mes_v10_1", + .early_init =3D mes_v10_0_early_init, .late_init =3D mes_v10_0_late_init, .sw_init =3D mes_v10_1_sw_init, .sw_fini =3D mes_v10_1_sw_fini, diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/a= mdgpu/mes_v11_0.c index 970b066b37bb..3af77a32baac 100644 --- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c @@ -459,73 +459,6 @@ static const struct amdgpu_mes_funcs mes_v11_0_funcs = =3D { .misc_op =3D mes_v11_0_misc_op, }; =20 -static int mes_v11_0_init_microcode(struct amdgpu_device *adev, - enum admgpu_mes_pipe pipe) -{ - char fw_name[30]; - char ucode_prefix[30]; - int err; - const struct mes_firmware_header_v1_0 *mes_hdr; - struct amdgpu_firmware_info *info; - - amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_= prefix)); - - if (pipe =3D=3D AMDGPU_MES_SCHED_PIPE) - snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mes.bin", - ucode_prefix); - else - snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mes1.bin", - ucode_prefix); - - err =3D request_firmware(&adev->mes.fw[pipe], fw_name, adev->dev); - if (err) - return err; - - err =3D amdgpu_ucode_validate(adev->mes.fw[pipe]); - if (err) { - release_firmware(adev->mes.fw[pipe]); - adev->mes.fw[pipe] =3D NULL; - return err; - } - - mes_hdr =3D (const struct mes_firmware_header_v1_0 *) - adev->mes.fw[pipe]->data; - adev->mes.uc_start_addr[pipe] =3D - le32_to_cpu(mes_hdr->mes_uc_start_addr_lo) | - ((uint64_t)(le32_to_cpu(mes_hdr->mes_uc_start_addr_hi)) << 32); - adev->mes.data_start_addr[pipe] =3D - le32_to_cpu(mes_hdr->mes_data_start_addr_lo) | - ((uint64_t)(le32_to_cpu(mes_hdr->mes_data_start_addr_hi)) << 32); - - if (adev->firmware.load_type =3D=3D AMDGPU_FW_LOAD_PSP) { - int ucode, ucode_data; - - if (pipe =3D=3D AMDGPU_MES_SCHED_PIPE) { - ucode =3D AMDGPU_UCODE_ID_CP_MES; - ucode_data =3D AMDGPU_UCODE_ID_CP_MES_DATA; - } else { - ucode =3D AMDGPU_UCODE_ID_CP_MES1; - ucode_data =3D AMDGPU_UCODE_ID_CP_MES1_DATA; - } - - info =3D &adev->firmware.ucode[ucode]; - info->ucode_id =3D ucode; - info->fw =3D adev->mes.fw[pipe]; - adev->firmware.fw_size +=3D - ALIGN(le32_to_cpu(mes_hdr->mes_ucode_size_bytes), - PAGE_SIZE); - - info =3D &adev->firmware.ucode[ucode_data]; - info->ucode_id =3D ucode_data; - info->fw =3D adev->mes.fw[pipe]; - adev->firmware.fw_size +=3D - ALIGN(le32_to_cpu(mes_hdr->mes_ucode_data_size_bytes), - PAGE_SIZE); - } - - return 0; -} - static void mes_v11_0_free_microcode(struct amdgpu_device *adev, enum admgpu_mes_pipe pipe) { @@ -1100,10 +1033,6 @@ static int mes_v11_0_sw_init(void *handle) if (!adev->enable_mes_kiq && pipe =3D=3D AMDGPU_MES_KIQ_PIPE) continue; =20 - r =3D mes_v11_0_init_microcode(adev, pipe); - if (r) - return r; - r =3D mes_v11_0_allocate_eop_buf(adev, pipe); if (r) return r; @@ -1338,6 +1267,22 @@ static int mes_v11_0_resume(void *handle) return amdgpu_mes_resume(adev); } =20 +static int mes_v11_0_early_init(void *handle) +{ + struct amdgpu_device *adev =3D (struct amdgpu_device *)handle; + int pipe, r; + + for (pipe =3D 0; pipe < AMDGPU_MAX_MES_PIPES; pipe++) { + if (!adev->enable_mes_kiq && pipe =3D=3D AMDGPU_MES_KIQ_PIPE) + continue; + r =3D amdgpu_mes_init_microcode(adev, pipe); + if (r) + return r; + } + + return 0; +} + static int mes_v11_0_late_init(void *handle) { struct amdgpu_device *adev =3D (struct amdgpu_device *)handle; @@ -1352,6 +1297,7 @@ static int mes_v11_0_late_init(void *handle) =20 static const struct amd_ip_funcs mes_v11_0_ip_funcs =3D { .name =3D "mes_v11_0", + .early_init =3D mes_v11_0_early_init, .late_init =3D mes_v11_0_late_init, .sw_init =3D mes_v11_0_sw_init, .sw_fini =3D mes_v11_0_sw_fini, --=20 2.34.1