From patchwork Wed Jan 4 16:39:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 38997 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5240006wrt; Wed, 4 Jan 2023 08:43:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXtZCtf1eV3TR7bsYguzaqBXourwU9v8CZtMZDWgpWBw5MhSNrug6V0y9wffexYoa66CbR2W X-Received: by 2002:a05:6a20:4911:b0:b0:4dbd:5f86 with SMTP id ft17-20020a056a20491100b000b04dbd5f86mr54491249pzb.62.1672850626417; Wed, 04 Jan 2023 08:43:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672850626; cv=pass; d=google.com; s=arc-20160816; b=Na7/rUYPnEPXJF1eli5ZYfl1M5ZxlW+99TmJW3EMFPvkp0BHtZRlT5ppg3EamqfQ6k P/ADh3v/acjsgwKAu2216C4pB9GyWAvXBi9rr1h2Ocn9pgHdZRvk13VgsFV581tSHv95 qITJ7yMBOp3Arh52H3SL6ezryL1pFspYJmVl12vdP+EGHsrXEV5ut8v1ZjhwwVmdeKXV 6i4hcRcjp3yyY8y3HzIviTLkJsKfmsP977GbOm+aIve/zxxPJ6IURMBQuLZ5BGwBsTE1 SbHe1EGvGj66vau8RJQAjTXm+8z9+ZXS4YFt+lXUExsDoCgbFgqYnX9vb5YGuLVXhekR /zPA== 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=sdWRrWwltduWR39N5OtD4kGLpx64J6ZTI2P9qKz4OCA=; b=oDioWLYW4OeTvtIGWYY4PmMmvveWKD8nr4j2dlvIH9LT6XWqfdT5VdvpjynNIs+m2g weWkE774SVR9oD9FpUKllsUHamxK/6XwmY1uN5LNX0WzxOhTslm2I6vZn97XF1mH3E4p icll2ZSF0BC2Nv/J5UATaaPiOMgeI+jBBFQ8LCGcSTy34Loe4kQlWEUy5B3QBEpzxokP LZ3sbblMbikyPDxICGmQm0+kaPdGylB+qTHJ4FjWuam+wdyJO3BozkyukLgLuAfme4Cj jf6Cf53X2EkFIXKldspHy+xNTnQho2abjyryqNW1YCFw1SOaNGTjMSjFfZLuMGXpvwlW 9gLQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=WGOdYKq9; 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 e69-20020a636948000000b00478ba6cb230si36056185pgc.131.2023.01.04.08.43.31; Wed, 04 Jan 2023 08:43:46 -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=WGOdYKq9; 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 S239739AbjADQmc (ORCPT + 99 others); Wed, 4 Jan 2023 11:42:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239663AbjADQlz (ORCPT ); Wed, 4 Jan 2023 11:41:55 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B5D71C131 for ; Wed, 4 Jan 2023 08:41:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G9fxSreiTA38W1LaxCOS5i4VH/kLGMPnakrVWg2RWpMs9PjknJbp5wRoTJ9DS6S9ml2e6fiRXKj1MJWgLlLzWsHXpEvaxdb0T09BB9/9qKXAOFi9DT10el7J3ztDaLCB8FmcxZfPFkF0FcnAbOcPyN4MZnGiGNr5ca9U2GqfQ447MKe/stunZY2dKHT+eHzyOBM0ZxYJ+tEQbiLKaFGJ4VAu9jKVz6ljrh9frGISJJR0FbuIZKuSG8SNgFJ2WHwT7ZeEPtx3y5OO2dE+qIL/X+e/spi/snEjOICljG07dINozgcscqnDz8V6sIQ5bGkmvBJPFLyx8GKLdly9Hx0Hiw== 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=sdWRrWwltduWR39N5OtD4kGLpx64J6ZTI2P9qKz4OCA=; b=oLiGkp/efzIPrDNuMMXGdA0KUOQ2mhgmtmH17cKF1wz/GWpFwzQhIJ7Reo1+DAzz/GX8U0r58ZGq40WIS+FrPSJggg0OToN0h3uzIRHgYRXWXiYnrxwgUISjgzEMm/GJzjQN8Ch28rCP50KNdWumMDsSaoJmMsCbC5yfImHaHF0TxdhFwXN2RFATXJMfR1ztlG21yTYSXE3wtwZRj1n1aoj2TMQJsqHdJqo3h22NwYcdQav6Df2fSVAg7ZNgcMn8EcJ+DUR5lMlU+LezFFBaeQnFdlhebfnazAa91HJ4QiIoQOJ4V8sxg5/puxR8ZI2OzXJDTID5kFivbW0YXdRn3w== 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=sdWRrWwltduWR39N5OtD4kGLpx64J6ZTI2P9qKz4OCA=; b=WGOdYKq9hFcJwDslYiOrwAecXWYI5xoZ1XTcXL7LJzA+y8Xv5Ol1y5V4Rn4iBsWnloYuOKnoGLZPQ3GxtcbqiLPn0YJHd5A0aaUyikMZRjGkSIP1Vp51HutQObPHgdDX3371m5wgIjcEinjZUxF3X4ccGsTd3MAo3S3Tbi8nJhk= Received: from DS7PR03CA0306.namprd03.prod.outlook.com (2603:10b6:8:2b::14) by SN7PR12MB6814.namprd12.prod.outlook.com (2603:10b6:806:266::6) 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:41:52 +0000 Received: from DS1PEPF0000E644.namprd02.prod.outlook.com (2603:10b6:8:2b:cafe::cf) by DS7PR03CA0306.outlook.office365.com (2603:10b6:8:2b::14) 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:41:52 +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 DS1PEPF0000E644.mail.protection.outlook.com (10.167.17.200) 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:41:51 +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:50 -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 05/45] drm/amd: Add a new helper for loading/validating microcode Date: Wed, 4 Jan 2023 10:39:54 -0600 Message-ID: <20230104164042.30271-6-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 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: DS1PEPF0000E644:EE_|SN7PR12MB6814:EE_ X-MS-Office365-Filtering-Correlation-Id: dc2ebe28-7530-4df3-b014-08daee72950c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /lxtGJcQ47gzXouqvL1lTR+G+GSRrKea2l4XWXt3TR7D5X5jlZvBYsnzQPXFPKMZFn83zAMAOi1YhCvunON3yQ2vidg3SjGE/yQpVUlXYuYl5SZ50ZQw9rZCf1MFZkka5hvv4qugjAikwO/zWLCcvpK6golFhF8DjlLB5UV35lKW3Lx6PnFc+8iIWh1BEjQ/u4W2g2kFHpGHbwwRKjjx2NfmnhsSSYpZS/G+KQd6Xc2zHfex4OgztPMlmPc6+LfuDzZ2dsa+1XpWGISGe5z+o7u14RG+0Ynpvw5EClIApjzZSx7zwjzbMNSj6Gzxmygzo/GF8+fb00/tODXmvpxYQSmbYbTCGut7qea7i6GRTb+yXppcDd23c8Z60zykWKhKuiSUwS8Nt4hv84kDLdMdVNKAGiwQz7GV1vOsFWAFc0UymLo0enO2o2gn1ARtGnHpf/4smgttm6prmlZEDVvkOnAagVgzCjOL6FlUWzR9RYegr0dtZYpFs7gf3qMeDILySuF281mwrVsRKb5XbDeiEcrds1VooaYsGuR4D/DCInkdBhz+jzHSsO+Er3qmCR01C06TbAMUpUPzXUvU5hE+4244a+fef/UnNteuvfE5brH0fszhQwETzjLXkxX0fne6Kn0cnyrI6SjVwSoAMTvqj0EzJDfN8z4JiOkhNGnqmOdBt0RBJqtepaImoqQJflPsAPI5Equ1nKpUpepvTmhaPLRgVJ/bGa0TwJwgdYUDaxU= 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)(396003)(136003)(39860400002)(376002)(451199015)(46966006)(40470700004)(36840700001)(83380400001)(47076005)(426003)(1076003)(16526019)(26005)(336012)(82310400005)(7696005)(40480700001)(86362001)(36860700001)(36756003)(40460700003)(81166007)(82740400003)(356005)(2616005)(186003)(316002)(4326008)(478600001)(41300700001)(8676002)(2906002)(5660300002)(8936002)(44832011)(70586007)(70206006)(54906003)(110136005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 16:41:51.9884 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc2ebe28-7530-4df3-b014-08daee72950c 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: DS1PEPF0000E644.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6814 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754111018503203825?= X-GMAIL-MSGID: =?utf-8?q?1754111018503203825?= All microcode runs a basic validation after it's been loaded. Each IP block as part of init will run both. Introduce a wrapper for request_firmware and amdgpu_ucode_validate. This wrapper will also remap any error codes from request_firmware to -ENODEV. This is so that early_init will fail if firmware couldn't be loaded instead of the IP block being disabled. Signed-off-by: Mario Limonciello --- v4->v5: * Rename symbols for amdgpu_ucode_request/amdgpu_ucode_release * Make argument const --- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 36 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 3 ++ 2 files changed, 39 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index eafcddce58d3..dc6af1fffdd9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c @@ -1312,3 +1312,39 @@ void amdgpu_ucode_ip_version_decode(struct amdgpu_device *adev, int block_type, snprintf(ucode_prefix, len, "%s_%d_%d_%d", ip_name, maj, min, rev); } + +/* + * amdgpu_ucode_request - Fetch and validate amdgpu microcode + * + * @adev: amdgpu device + * @fw: pointer to load firmware to + * @fw_name: firmware to load + * + * This is a helper that will use request_firmware and amdgpu_ucode_validate + * to load and run basic validation on firmware. If the load fails, remap + * the error code to -ENODEV, so that early_init functions will fail to load. + */ +int amdgpu_ucode_request(struct amdgpu_device *adev, const struct firmware **fw, + const char *fw_name) +{ + int err = request_firmware(fw, fw_name, adev->dev); + + if (err) + return -ENODEV; + err = amdgpu_ucode_validate(*fw); + if (err) + dev_dbg(adev->dev, "\"%s\" failed to validate\n", fw_name); + + return err; +} + +/* + * amdgpu_ucode_release - Release firmware microcode + * + * @fw: pointer to firmware to release + */ +void amdgpu_ucode_release(const struct firmware *fw) +{ + release_firmware(fw); + fw = NULL; +} diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h index 552e06929229..7fd2f04f7f98 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h @@ -544,6 +544,9 @@ void amdgpu_ucode_print_sdma_hdr(const struct common_firmware_header *hdr); void amdgpu_ucode_print_psp_hdr(const struct common_firmware_header *hdr); void amdgpu_ucode_print_gpu_info_hdr(const struct common_firmware_header *hdr); int amdgpu_ucode_validate(const struct firmware *fw); +int amdgpu_ucode_request(struct amdgpu_device *adev, const struct firmware **fw, + const char *fw_name); +void amdgpu_ucode_release(const struct firmware *fw); bool amdgpu_ucode_hdr_version(union amdgpu_firmware_header *hdr, uint16_t hdr_major, uint16_t hdr_minor);