From patchwork Wed Jan 4 16:39:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 38998 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5240019wrt; Wed, 4 Jan 2023 08:43:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXvw8e2At1zgz61OgP034KiRBFm+dx+kPq+i55Akyquy7yYpTMttsWez8LBKN7QMd9sAvh+f X-Received: by 2002:a17:90a:b296:b0:225:d9e7:2728 with SMTP id c22-20020a17090ab29600b00225d9e72728mr39320269pjr.33.1672850627287; Wed, 04 Jan 2023 08:43:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672850627; cv=pass; d=google.com; s=arc-20160816; b=yc4QgzXWGjuxV8Bd0ZQ9hlJ20viXTekCjq04M0/0zqQ+0/iTWt9uSMcXZcZYmnA+1r Z+TnBmJuOnZilP0LP9X6upV68+F90tW30YccX7MDaKlctO55VaOVQSJvy6KXxkuGa6a7 UN5S7DrF6Eh+FlU1efYtU0MzyJKl7q1cx+BFcARscDNI4rU8hmDh5eCFZCo9BNsoph2x 5cPMOsJN0V+G9ApBED+3jobtfrjZ+hDZt1h7kBUhUjHP5FbdhiLLIg2udXPOWpc8BPvs YVXqZDWbZv0RAWreAL0yO1ey+NNOjtvwvJPftfykryrgsbWd++Mvm7epqpUFMb/ttCmh Ioow== 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=fpx8LEP67+rj/cBdMTpYdHwfGfBYeBDBkIJIzX2znc4=; b=lsTUDtHDlJAFEDljSXR6YUWvq+PSS3qyXU9Nz66T0aSRxkNPBzCN0xYepCUyVwjZFo bos1jUs775mT/xlL3QGcpAVTjW377IttOQZ51S/WGpU4DpzjCHOh00ZLNfW3lro45Ltk 2kgkY1CvRdqk03adnMstmrZsrl/nP2qN2r27yvAmWoeGpoyesWspaqBl1ReV7fWCDqMz ig0BhUxAVEO2Tq92jufDZ15szVSRKVxXP8H72zJd289KALbkLLMvZFllsvat1izx6Z/T ZyrRrgmDkwKODwIRCOeq7gTGzXSNrRGo4TIwcLO/rlMc8Iw/iQoXJhyPzAENQF/7+7wS R+hw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=MsZdlme6; 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 p24-20020a63e658000000b004787004c8dasi36382576pgj.123.2023.01.04.08.43.31; Wed, 04 Jan 2023 08:43:47 -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=MsZdlme6; 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 S239745AbjADQme (ORCPT + 99 others); Wed, 4 Jan 2023 11:42:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239634AbjADQly (ORCPT ); Wed, 4 Jan 2023 11:41:54 -0500 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2045.outbound.protection.outlook.com [40.107.243.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99B401D0EA for ; Wed, 4 Jan 2023 08:41:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bAn35OfBwj+BGxcZDLLhVM1xVQFT6sh7m10yiiOWT3CuyoeKzJQ84mqd02jDgsWiTwJWdTw7SbVkAr0omwUSmRp7Hyb/MIcMUJyaObsgSIq46CJ6VAHCpSBYrUqD5gvkzE7tsoM4fpW2vx34p9QxdZSh3Cic5DHt/bFD2sPGGZqTIebER3TFZgMFlrRbtpBW/655chINQGfe5rSYKPJWqZ80jWWvP6OOJxdg0sxitkhQZ5S2yy5CE7aGMEuPNjrpAbP4MG11U45jdgWjDbzKu3kfx+skioDRhSmpmrJkoXipCR7HVWIImbxFewI4ALsiBVDJOxcYUE1DpEv349Wlcg== 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=fpx8LEP67+rj/cBdMTpYdHwfGfBYeBDBkIJIzX2znc4=; b=R0UYCtTVlejSWWFlG6CU+ZALYEaf/mmQQ0Q4Pqb90Q+3IiXxv7hK2R75KE79CHVSlf+1qpYlPPn41Qw7sz5pQFZtWY36RMHTLbig1YXHi2CYIP9Zob7+s1zn8OwarKJbqBF3pQ4vIRCDzQDQs+p/sWM/uS8iEu0SmcN3/GP8gXLMhN6WQBJTad3t25vHTUy1k9+8HIOIpyG1ILUb/c3lBldLu+uXc9ZRWYcg+s7tdbO0U3U8rY1bUcEbhg44nWPd7UAYqQz4BMEQs8c/CaPsyBvLQmzEBVV9fbSyWvSvEMVaIJSVm+S/ReozqgW8Ootn4Oh+JkbyzqVCe3SWNzZQ0A== 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=fpx8LEP67+rj/cBdMTpYdHwfGfBYeBDBkIJIzX2znc4=; b=MsZdlme6dIZOcwxR3j2XqyygTtUG6hmkOn7KTZI5f4194OYeViGNi/0XM1AVoh1qP0h6qbulL1b35rrGxY6KZOvfNkx4P7tilP2y0+ZOsL8MyonrBTh8jLfmANBHKI6v36kxHdFkDEcv7xsPBPFFPTxLBozpk1Ls1lPqO2wBTy8= Received: from DS7PR03CA0306.namprd03.prod.outlook.com (2603:10b6:8:2b::14) by PH0PR12MB5449.namprd12.prod.outlook.com (2603:10b6:510:e7::24) 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:51 +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:51 +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:48 -0600 From: Mario Limonciello To: Alex Deucher , CC: Javier Martinez Canillas , Carlos Soriano Sanchez , , , David Airlie , "Daniel Vetter" , , Lazar Lijo , Mario Limonciello , "Evan Quan" , "Pan, Xinhui" Subject: [PATCH v5 03/45] drm/amd: Convert SMUv11 microcode to use `amdgpu_ucode_ip_version_decode` Date: Wed, 4 Jan 2023 10:39:52 -0600 Message-ID: <20230104164042.30271-4-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_|PH0PR12MB5449:EE_ X-MS-Office365-Filtering-Correlation-Id: 201f944e-3063-4800-dcc5-08daee729497 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gw8RxR/D61fptW5qfwVXY4FBri0YZo6ZlgYUUvxs0mI0h5/EVljLRd30Ja0/qb+dTbw9W+egVJKbQfAN9zyCQSMLxSRw4E/oNcccgaq5QxtGcn4p8BaeL+mA54GwmLMYbvLNdF9G3j022AwCPhhrPGnTD9TMb/tvVZbZQydSLaawJXZSd8px15oZwsNRKiM1iRinB6CaP1+RWL2v5h97N+uu37ltfxsTm1G5wKNVY9chw7Bc01jH3QZ8ctz/KVSvmKDtcsJcfKXLuN4pn9OJvDqBvHu0ScyPJdvSkEVx3BrGnhOoJy8nJbnuGKsITiv2GsOtR5sfryQdYKWrYJh9Duw3afCiA+ZNUx0t0Xj9sxkuayAd4hjMy/A+jnqWPyaJePeFI/N3oRCn2Dm15OFHbV3anWVoxSYrrLQB9wqEIvP1JSnklBM24wx0Y6F+T316r/Cc366P4oq9AvvQeAy7uuVZEEyg6QobJNF/LZrLjAi9PafgvTy0fSJDHr+ZA8KPmzbpVwYUUmtgeTVjEFR58wh1zxzZej2y/YlepWNtWO66FFfs73w6MD/oWdh85T5bakWqHoQ03GmHhZHcemlmPyKAGYszvGL8faDjHu8NzSczvSmDybBKsP6OQeA8SauM8wjsYE/yor3jSz7wrtxZJE3gE2ceqVZEnn6vx4zF9+b96mv+PQxgS4N/AUlGRbH8vvVZHAQqDX2gCLEuP00dyqA51GR4AErXXazPSyDgtt847Og18yWIYzCCq+KUkCc9qR1Z5k0FvzUgev4aOTXYvA== 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)(376002)(396003)(346002)(39860400002)(136003)(451199015)(46966006)(36840700001)(40470700004)(16526019)(54906003)(316002)(6666004)(7696005)(26005)(110136005)(186003)(1076003)(478600001)(2616005)(70206006)(8676002)(336012)(70586007)(4326008)(82740400003)(426003)(41300700001)(66574015)(2906002)(47076005)(83380400001)(8936002)(5660300002)(44832011)(86362001)(36756003)(36860700001)(40460700003)(356005)(40480700001)(81166007)(82310400005)(81973001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 16:41:51.2228 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 201f944e-3063-4800-dcc5-08daee729497 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: PH0PR12MB5449 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?1754111019210528335?= X-GMAIL-MSGID: =?utf-8?q?1754111019210528335?= Remove the special casing from SMU v11 code. No intended functional changes. Signed-off-by: Mario Limonciello Acked-by: Christian König --- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 35 ++----------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c index ad66d57aa102..d4756bd30830 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c @@ -93,7 +93,7 @@ static void smu_v11_0_poll_baco_exit(struct smu_context *smu) int smu_v11_0_init_microcode(struct smu_context *smu) { struct amdgpu_device *adev = smu->adev; - const char *chip_name; + char ucode_prefix[30]; char fw_name[SMU_FW_NAME_LEN]; int err = 0; const struct smc_firmware_header_v1_0 *hdr; @@ -105,38 +105,9 @@ int smu_v11_0_init_microcode(struct smu_context *smu) (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(11, 0, 7)))) return 0; - switch (adev->ip_versions[MP1_HWIP][0]) { - case IP_VERSION(11, 0, 0): - chip_name = "navi10"; - break; - case IP_VERSION(11, 0, 5): - chip_name = "navi14"; - break; - case IP_VERSION(11, 0, 9): - chip_name = "navi12"; - break; - case IP_VERSION(11, 0, 7): - chip_name = "sienna_cichlid"; - break; - case IP_VERSION(11, 0, 11): - chip_name = "navy_flounder"; - break; - case IP_VERSION(11, 0, 12): - chip_name = "dimgrey_cavefish"; - break; - case IP_VERSION(11, 0, 13): - chip_name = "beige_goby"; - break; - case IP_VERSION(11, 0, 2): - chip_name = "arcturus"; - break; - default: - dev_err(adev->dev, "Unsupported IP version 0x%x\n", - adev->ip_versions[MP1_HWIP][0]); - return -EINVAL; - } + amdgpu_ucode_ip_version_decode(adev, MP1_HWIP, ucode_prefix, sizeof(ucode_prefix)); - snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_smc.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s.bin", ucode_prefix); err = request_firmware(&adev->pm.fw, fw_name, adev->dev); if (err)