From patchwork Wed Jan 4 16:40:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 39037 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5243293wrt; Wed, 4 Jan 2023 08:50:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXueC2KDYqWW767bFOFJ3bSzRfLvwgZcoqbOVOC0tAxWrHCy0wuVT50qcO9a9wTMWfnogu3N X-Received: by 2002:a17:906:30ca:b0:7c1:6091:e73 with SMTP id b10-20020a17090630ca00b007c160910e73mr42740514ejb.1.1672851042910; Wed, 04 Jan 2023 08:50:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672851042; cv=pass; d=google.com; s=arc-20160816; b=V/pUyBxPcWFhMQRLsf3lB/NHojpor8CbcqCZ79d7H3Pl/wmG+QkjTPi9dZj7RohvV6 V5Qw+SQ0Nt4S2Z9I3sWGHJMoCxfjJrgfTJPLFsdUdCn9ftDl5lej5pqqSyK6t2xsC3I7 CIMhWzYz7J07Tq996v+FOK+/rTmUbSko8s46C0gJ3iKepGNknQcHLrEmvTNKZO1xwXbC DzDTdHE84eCF/7lqKeY1V7iJRem4mLFQ3lE28G9WTdDWLdbFRfq9IPjb4SpPr+YrVKr7 tagieGBJ9ZzSJrtbOGAoeYNad0BvidIJej+XqCRzaKM92DM4xIOujjowCA9YZFe8cKZ0 oJfg== 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=H+0rKKn9CEDRtNlIfOYexIP6ICDHD9e6fRkgwYHK7L0=; b=xlv4/p+bcNc0/2GDBJh+caI20trfgXh5XNeSD9JiOMoX3TMQaNBQWZ1z4DrUWDzBVt 2DXF4gFgQb2Ecde+bY5InM8ZM31UL54HePp/Y7DPOhT6n8o6mSDq6zAZ6RDSXGLh5vs0 NIVsedPHhgW8v/GBw+wLRwrGi6HM+/53MfYN3DA7psPU5PgV3T87LmMU/g4/jP5kY8dy YNUWXHkTwJ27suqJV2kCY5rWrHAkOc1HOb5bNeiTjf4fYYqqA1gnTIf9LNA/fje9pLmT Pc5AQMbYh9ya0aEF2qnrXdIUVqxiweT/SrZU8JPticGDKMtIgFoYwOFMnX9PFsHn4rv+ H2yw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=vXoTxZR0; 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 hq28-20020a1709073f1c00b007d5291a692bsi30338567ejc.260.2023.01.04.08.50.19; Wed, 04 Jan 2023 08:50: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=vXoTxZR0; 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 S240013AbjADQtE (ORCPT + 99 others); Wed, 4 Jan 2023 11:49:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239837AbjADQrJ (ORCPT ); Wed, 4 Jan 2023 11:47:09 -0500 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2065.outbound.protection.outlook.com [40.107.220.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 761FD49167 for ; Wed, 4 Jan 2023 08:45:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lRQrEf22bhe0qJlXgB007L5IpfI+rlG4ZpBZfzwcP11Dvs5G80f0mmA6BDWlMZOTJV4e22VePkic1oRys3v9AKbstQ/FNZy7LHJqgLLbCll166+4GpgkPvEdP7j3OW0oZ5x13SbIUAVXRie2QZ4Mu8C0e1bz6kuVEKJp+sLKu4K91o4+S72cOoNucbRqJbEuYaHeqA8ZUafYJam1PLhyZog2p7qFyZ+46E5Qra8g0PoJfn/w6NfzVt7h/fP1g9Saa+ZOIP4MMDbBY6BpcD7QQyepKPTvLh71OJpQTc22PfynDwHn5lvoZWMkoPWIeR5V4mWaK03Y9SrWDA183SIxhA== 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=H+0rKKn9CEDRtNlIfOYexIP6ICDHD9e6fRkgwYHK7L0=; b=gVYG8Ix0qQpxCHLd5kUPfQS+aBJ90/KzX8meLBnLZF+Gd1YSeI2K3XyqaE7mLDRIoPi6JgZILzFmkMSUhSs8bxDCTQWC8rodZio+jNmvjhqgC+vZj9t9ZK1POrNgiSp5y1jdR1SMY2a7okNUgojXQxW1hcHYs4l1C9EwV3B7MlS0w4FWCYisDm5vRKw6EHYXR2vtWPp3pbZFOeC9TlrrL14WVaUYNxVO4JVAG0sYnmHyTdgyStTlnSIWh/nW6rTWo9mwJtEP4gwknoyMHdyeRy+o/BoJ6PwaaZ8eUZhuEeP0+jA5C+5PgbxkW7l/pR0kyhsy+C8OgzNWLHZBa8TtlQ== 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=H+0rKKn9CEDRtNlIfOYexIP6ICDHD9e6fRkgwYHK7L0=; b=vXoTxZR0QzTGVSzW6vcJhg2E689riv1kin8jxvx9D77kT1jigiwG4H/iVs+RjYGrscHjgUG3fduTEex22pZiE+s7/9CYDxmNBAPbj9GgfQB3ro7NI2KnVztQhzDC7BUUv/d3qoiuI5aTdT/UjxMutQbSQ7DOS3/SsMWpVDtJ56U= Received: from MN2PR14CA0002.namprd14.prod.outlook.com (2603:10b6:208:23e::7) by PH7PR12MB6657.namprd12.prod.outlook.com (2603:10b6:510:212::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.21; Wed, 4 Jan 2023 16:44:27 +0000 Received: from BL02EPF00010208.namprd05.prod.outlook.com (2603:10b6:208:23e:cafe::48) by MN2PR14CA0002.outlook.office365.com (2603:10b6:208:23e::7) 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 BL02EPF00010208.mail.protection.outlook.com (10.167.241.199) 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:47 -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 30/45] drm/amd: Use `amdgpu_ucode_*` helpers for GFX7 Date: Wed, 4 Jan 2023 10:40:19 -0600 Message-ID: <20230104164042.30271-31-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: BL02EPF00010208:EE_|PH7PR12MB6657:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c47fdf4-eb7d-4be0-b9e5-08daee72f188 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fI3a3TzhwWDAH7Em+JuFwlfPkq8Nf33P1oSVOvcVLKyNL8z4U0Grp+tovswAs+nhCRhJW4IMBXpUz2dyrFCKz59b8KCQJl7F39CxUBGi6lSdIyuHmtxIrbceGyi0YQuejhCOiZYhz56EyCg0XQC34zdmby4ryEBpSAHOoWo/eNlBOgNJAH7CHwZgGsubLLfNht9MBGDzxKl5sWIlbOSloe6Xrm+wtrykF65Ry2BXxaMhffn6fMzBuQ+x3rfUHEKKY9BtLh8Lit9fM/rh6WzxWv61axbv5T9oVM30u1pyGJ87VnUQVr4tIXMHvfV6fJPTzgKvXDy8kBQrIwstIurFxc7L3NrVjeECtEyzxIBhOKuPC7npzXaoPTFflutquSYxYp/WX2+m5xSMj0Yg//3XS22zotkZwtco0cDE98W7WxwPxvYJSKvrZytavMc+iQ5p/08a0d1KJIJLN9e0eUjdUAuV9FkelcCwFasrJeLNa8UTR/gW0Db0meHhkAd87Z/qAB1OTNF9NpCAbUyiucqMMh27/AAPrr+oz6/ITd48opsjjji+V9BzzTP24/cGYpZ3k7DXPyxKwMGow5dQfyXtiL39iQeykF/BkNSiviRhpMZ4+ODIaz7u5LE9/Z0PlN7GXF0ezu/VubaudAypG599NviAkZWxV7NvSs73K/GdOABLNxCr3mnuexwUJ/Npma8h5pn2yDddfr+N+yLbc/DDEqQqjD3SLDk1dOogUE9r3rfhLlpZX25eEaaDpeuYI7r6//sksecUEeepoksY7Yt8yA== 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)(376002)(136003)(39860400002)(451199015)(36840700001)(40470700004)(46966006)(478600001)(186003)(26005)(36756003)(36860700001)(82310400005)(4326008)(1076003)(2616005)(44832011)(5660300002)(316002)(6666004)(70206006)(16526019)(2906002)(110136005)(83380400001)(40480700001)(41300700001)(81166007)(8936002)(54906003)(40460700003)(426003)(47076005)(7696005)(336012)(8676002)(70586007)(82740400003)(356005)(86362001)(81973001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 16:44:27.1829 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1c47fdf4-eb7d-4be0-b9e5-08daee72f188 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: BL02EPF00010208.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6657 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?1754111455222349885?= X-GMAIL-MSGID: =?utf-8?q?1754111455222349885?= The `amdgpu_ucode_request` helper will ensure that the return code for missing firmware is -ENODEV so that early_init can fail. The `amdgpu_ucode_release` helper is for symmetry on unloading. Signed-off-by: Mario Limonciello --- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 68 +++++++-------------------- 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c index 0f2976507e48..a16a44e5fb32 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c @@ -887,6 +887,16 @@ static void gfx_v7_0_get_csb_buffer(struct amdgpu_device *adev, volatile u32 *bu static void gfx_v7_0_init_pg(struct amdgpu_device *adev); static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev); +static void gfx_v7_0_free_microcode(struct amdgpu_device *adev) +{ + amdgpu_ucode_release(adev->gfx.pfp_fw); + amdgpu_ucode_release(adev->gfx.me_fw); + amdgpu_ucode_release(adev->gfx.ce_fw); + amdgpu_ucode_release(adev->gfx.mec_fw); + amdgpu_ucode_release(adev->gfx.mec2_fw); + amdgpu_ucode_release(adev->gfx.rlc_fw); +} + /* * Core functions */ @@ -927,88 +937,44 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev) } snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp.bin", chip_name); - err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev); - if (err) - goto out; - err = amdgpu_ucode_validate(adev->gfx.pfp_fw); + err = amdgpu_ucode_request(adev, &adev->gfx.pfp_fw, fw_name); if (err) goto out; snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me.bin", chip_name); - err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev); - if (err) - goto out; - err = amdgpu_ucode_validate(adev->gfx.me_fw); + err = amdgpu_ucode_request(adev, &adev->gfx.me_fw, fw_name); if (err) goto out; snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce.bin", chip_name); - err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev); - if (err) - goto out; - err = amdgpu_ucode_validate(adev->gfx.ce_fw); + err = amdgpu_ucode_request(adev, &adev->gfx.ce_fw, fw_name); if (err) goto out; snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name); - err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev); - if (err) - goto out; - err = amdgpu_ucode_validate(adev->gfx.mec_fw); + err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw, fw_name); if (err) goto out; if (adev->asic_type == CHIP_KAVERI) { snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name); - err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev); - if (err) - goto out; - err = amdgpu_ucode_validate(adev->gfx.mec2_fw); + err = amdgpu_ucode_request(adev, &adev->gfx.mec2_fw, fw_name); if (err) goto out; } snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", chip_name); - err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev); + err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw, fw_name); if (err) goto out; - err = amdgpu_ucode_validate(adev->gfx.rlc_fw); - out: if (err) { pr_err("gfx7: Failed to load firmware \"%s\"\n", fw_name); - release_firmware(adev->gfx.pfp_fw); - adev->gfx.pfp_fw = NULL; - release_firmware(adev->gfx.me_fw); - adev->gfx.me_fw = NULL; - release_firmware(adev->gfx.ce_fw); - adev->gfx.ce_fw = NULL; - release_firmware(adev->gfx.mec_fw); - adev->gfx.mec_fw = NULL; - release_firmware(adev->gfx.mec2_fw); - adev->gfx.mec2_fw = NULL; - release_firmware(adev->gfx.rlc_fw); - adev->gfx.rlc_fw = NULL; + gfx_v7_0_free_microcode(adev); } return err; } -static void gfx_v7_0_free_microcode(struct amdgpu_device *adev) -{ - release_firmware(adev->gfx.pfp_fw); - adev->gfx.pfp_fw = NULL; - release_firmware(adev->gfx.me_fw); - adev->gfx.me_fw = NULL; - release_firmware(adev->gfx.ce_fw); - adev->gfx.ce_fw = NULL; - release_firmware(adev->gfx.mec_fw); - adev->gfx.mec_fw = NULL; - release_firmware(adev->gfx.mec2_fw); - adev->gfx.mec2_fw = NULL; - release_firmware(adev->gfx.rlc_fw); - adev->gfx.rlc_fw = NULL; -} - /** * gfx_v7_0_tiling_mode_table_init - init the hw tiling table *