From patchwork Wed Dec 28 16:30:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 37240 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1977507wrt; Wed, 28 Dec 2022 08:35:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXshrCRfV4Z2cDwgKMRdLYAlRu31dM9eQbQwlNihFKenmXfgA+pXVzK2DYqeOROXi0MkWjNn X-Received: by 2002:a50:9f09:0:b0:467:4df0:718c with SMTP id b9-20020a509f09000000b004674df0718cmr21959314edf.9.1672245339626; Wed, 28 Dec 2022 08:35:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672245339; cv=pass; d=google.com; s=arc-20160816; b=RHMUTGY5x3V64bTJnm8801piWQP5PG6/g9sc3G8rtjoq7HxknCT0tqE3DPnFzE92i4 hxhsDq6BGKdl0GfCAB6/lCjDR4bk+vmUdvrOIp0sWmwVw9wx8bSuiz9Svg09+oOSg+xc 311GccePHP2SvEYgy6vRV4r+K2dKF5qzo+bboY/96rMzPapJgjYtqvlAv9SNlaWgCtgg ecK6ugJfh1qjA+uabeBtezhK+4Nsa1USCF0b6jLaWYmGcJpmFDSHgZQosnCchzp3yqIo kIJ7JHa/IhBPzUYJnVOtbsvprPozx/9W7OWKwLRGqKzTCFKAAo5SkPzqyey5XH1pZgR4 oJ1Q== 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=PqzjHR50u8col4Qg0Tv77O/+5WqAjV7+m5KHlYTwwXI=; b=pD5GvvsmDaQDCHr9hzKLGGRyIzaWdP1SX5EB6Vg9fWYjhQ8EocrPV51MboI/vqhicz 2gQeDZJBvkgdg13BSQYE6GPI8UwJN0RW4k5q5fz/1vMenfgSjEfO2RkCoflcpL/N1Hev 7YB/TfB9s2gmlF0FJ8AE1Gpa+cwjBR36I6ifat0S4CDKqHdOEpqSK93dSId/0ug3yzcb 1RbT6DNAcTBz0NeHkjqSBhxeK4/sxm2r4lWMB44j6xGSfqYp3efMNxVzsrAE0Lr/KH6Y XMtzQRAjREiaJX5cK6vpT1Y2O7EL3ZYVhK9s2N3ydIJDubm1KoETWpH6kM0/XYH1xku3 lWMA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=acals505; 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 d20-20020aa7d5d4000000b0045d5b83114esi12829810eds.112.2022.12.28.08.35.15; Wed, 28 Dec 2022 08:35:39 -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=acals505; 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 S234842AbiL1Qe2 (ORCPT + 99 others); Wed, 28 Dec 2022 11:34:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234721AbiL1Qd4 (ORCPT ); Wed, 28 Dec 2022 11:33:56 -0500 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2080.outbound.protection.outlook.com [40.107.96.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A27A1C43C for ; Wed, 28 Dec 2022 08:31:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OX907+Z3Z1ugjzJL8eXPnP/LO8rX+8+ZoMrN+Lb/k9HkGsAwZVmyqdf23pGFAc6bEjtunSELcT1y0Vk43KA1qMr4noXR+8WJwDDBA4zRTpvksBsNs4d+ZP5pZ7wsDQnq6NFhBayjA3mIdt6JKBNmeJCtlsNEG7JkzlNmbUOSqvghUl0ss4lj/c4Gn02Z4QjqVkPabksexq1IEXPT92hDjRIUB+6pSevP+2gMLnyZBSYKONmovJHEqKYJQTnwoYIueLN+6p8cvtkfvZp3XG+z2N7d8VyvEf76GtoZVZg8JKSXr7DDitiffrsmTFIDnGszfqRoCftTB63OlBtLXxEoqw== 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=PqzjHR50u8col4Qg0Tv77O/+5WqAjV7+m5KHlYTwwXI=; b=mgR0J7BxLGXhGrCJ0xA5iFVAFCEVcs7mG7ukKQCC05E789PzzjhOs6aWtIu+6f6w5RRs8LAmicybHQ3MQlpq8poDP+GIwzuoOpu1mbwMWNUbAi6Rwap0K4a3sIFH0B10dgkq9R2xSeizbcyBnPACMxzmGjf4n1I7/0+qG2vEFYUDulAZ21Ea64FdY98S7CJOWlrV5rDzAnWK6NiUhc+yBJElxTNnexFjogz38reCzQNedTWtYd2Pg4wEKu5E/AlAI9ZfW5GOloNTsaGQLLKQ/cnIVxWhSNYLracD8VTV2VCk54i6gvLJh4c34bUS0Ja0OEE0sQJkvcsO+jgevCjUiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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=PqzjHR50u8col4Qg0Tv77O/+5WqAjV7+m5KHlYTwwXI=; b=acals505G0iqFj6iKZcXK9g31v6+UH6UOTDex+QKSKrq/hXMQjxgJ2qXkPz/UxANQoIrWsytMY/UCV9yAi9gXbBxSXooIq2oepcgOOpO99tTJl0kKgPQRBYJ3uHdk55MpLN9AS1uSEKOHRO7dhMbfE8ocbilXrzlfiMShbwJT1Q= Received: from MW4PR03CA0311.namprd03.prod.outlook.com (2603:10b6:303:dd::16) by BN9PR12MB5163.namprd12.prod.outlook.com (2603:10b6:408:11c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.16; Wed, 28 Dec 2022 16:31:18 +0000 Received: from CO1NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dd:cafe::c5) by MW4PR03CA0311.outlook.office365.com (2603:10b6:303:dd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.17 via Frontend Transport; Wed, 28 Dec 2022 16:31:18 +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 CO1NAM11FT032.mail.protection.outlook.com (10.13.174.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5966.17 via Frontend Transport; Wed, 28 Dec 2022 16:31:17 +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, 28 Dec 2022 10:31:16 -0600 From: Mario Limonciello To: Javier Martinez Canillas , Alex Deucher , CC: Carlos Soriano Sanchez , , , "David Airlie" , Daniel Vetter , , Mario Limonciello , Evan Quan , "Pan, Xinhui" Subject: [PATCH v2 03/11] drm/amd: Convert SMUv11 microcode init to use `amdgpu_ucode_ip_version_decode` Date: Wed, 28 Dec 2022 10:30:50 -0600 Message-ID: <20221228163102.468-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221228163102.468-1-mario.limonciello@amd.com> References: <20221228163102.468-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: CO1NAM11FT032:EE_|BN9PR12MB5163:EE_ X-MS-Office365-Filtering-Correlation-Id: 2807ebe4-8dd4-4dd2-cc06-08dae8f0f243 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TMQffrBDMJCv3B+F9u5Ai2bGKsY4dHokw7s1XH+ByeyNnEVF4x8cneA3P3DvHUVCaDyVg83dhaKWV9XUpZpFUt5DIGIgUUjbzIyco+HietG/7zSns1R0ih/UYSC+Wn7hUkEmR+91peKwnxsxcu2gF93mi6n1c5af2TosmTHMpX+IxNENz2J8MDvAnCCxJe6hxEqkSLaTWdLQK6RgsMBVEo/H7DMXmrbSOfbSEVwITwar8T8UA5dEQwTmOSMgI8husxrLN8YKZq9/ytJShd9xUmNI5oQSiOWeGu7Jdi+o9fpUjrWvfvu+KjIok1oYQjoGEqWS8BfM2b661NP7MUBUN6a6tNwsQbIYYUB+0uBcSemxPp8UV4El0UEhl2ASZv22zSGPmHyAMNCQHSawZoVP9+hgTXCVoyyzeLpqZOfGmzHTBE0Pm+TPNwDFQRtq4S9gFRcskOJdale5c3IVM7O7j5fdebuISc5JwCZ8rmtJgigpgkP0wfcCcuzBcjmRhUadkitHJhbFnWE8e2K9CWOH3wQpakrZ6HVkScyo8ARjqaFFuJWfHbMK686OUOsdf65e4VYQ2wFOCGjtY1GZ2hmpsGJR5/fgDaVTCHk7CLLxrUMUfeWG7EqWw9LUwt6tj3S8zZfrLO7x4gdmBS2ko4MH6p3oqF4lWsOzGWDllUrhHJty/ZNJNob2xkHW8dSzFCJON9jFvsFSAo62wh4i5OPsR8HH8PQlZtViZbns74NIP3RXyWsNXPQBvzEDP2bzCt8uYG8RxLuQTmn/vi0zJnFmRw== 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)(136003)(396003)(376002)(346002)(39860400002)(451199015)(40470700004)(46966006)(36840700001)(2906002)(70206006)(44832011)(8936002)(186003)(4326008)(70586007)(8676002)(41300700001)(54906003)(316002)(110136005)(356005)(16526019)(7696005)(478600001)(6666004)(82310400005)(40480700001)(336012)(2616005)(83380400001)(36756003)(1076003)(426003)(47076005)(5660300002)(81166007)(82740400003)(26005)(40460700003)(86362001)(36860700001)(81973001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Dec 2022 16:31:17.8952 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2807ebe4-8dd4-4dd2-cc06-08dae8f0f243 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: CO1NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5163 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?1753476328846551684?= X-GMAIL-MSGID: =?utf-8?q?1753476328846551684?= Remove the special casing from SMU v11 code. No intended functional changes. Signed-off-by: Mario Limonciello --- .../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)