From patchwork Tue Feb 18 09:28:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Kling via B4 Relay X-Patchwork-Id: 13979398 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6C626C02198 for ; Tue, 18 Feb 2025 09:28:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 991FD10E10C; Tue, 18 Feb 2025 09:28:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="oMK47/Sm"; dkim-atps=neutral Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by gabe.freedesktop.org (Postfix) with ESMTPS id D359210E10C; Tue, 18 Feb 2025 09:28:11 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 2F28EA41E16; Tue, 18 Feb 2025 09:26:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id AE1E2C4CEE2; Tue, 18 Feb 2025 09:28:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739870890; bh=nTDz2H8bAQQHerq28wSLdq0QqWnMKAumb1JZb4bf3Gw=; h=From:Date:Subject:To:Cc:Reply-To:From; b=oMK47/SmtupzDs0fY30DFG/ZfykMmjsrjGX+ctO55teDSs+/bhp5VPNV4QXRcf3fJ kKTR8mSl8Gi9rNd2yYHYJmWpLgnFW5RKbk837IJj1df2LxPFv2NyTs03WyMG+Ao+DT YqwLNCVrqFwlPP/48vUjkwQZhXHQjAxmkrpQFXaTI+mWzXtovyfz/Pw9m7gWaCBF8A t+CvbEEtsMUwyWZpIkSzAbObz2zelhDiamiah5bK0ZKDovaEJbhSVVSpo3oKSuWCWj Pf3NcD7q6OYTZlgQbmYuaj01DhhZVQ+SmFTu3Obb9xFjIw+bAIHrgBKtk3iW0zTMCQ PpDev5jjlQMNQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A15F8C02198; Tue, 18 Feb 2025 09:28:10 +0000 (UTC) From: Aaron Kling via B4 Relay Date: Tue, 18 Feb 2025 03:28:03 -0600 Subject: [PATCH v2] drm/nouveau/pmu: Fix gp10b firmware guard MIME-Version: 1.0 Message-Id: <20250218-nouveau-gm10b-guard-v2-1-a4de71500d48@gmail.com> X-B4-Tracking: v=1; b=H4sIAKJStGcC/32NTQ6CMBCFr0Jm7Zhp5U9X3sOwKLSUSSwlrTQaw t2tHMDl9/Le9zaIJrCJcCs2CCZxZD9nkKcChknN1iDrzCBJViRFg7Nfk1ErWieoR7uqoFGVl7Y k2eeGhLxcghn5fVgfXeaJ48uHz3GSxC/970sCBZK+1iNR3VYN3a1T/DwP3kG37/sXkW7/abYAA AA= X-Change-ID: 20250217-nouveau-gm10b-guard-a438402b5022 To: Karol Herbst , Lyude Paul , Danilo Krummrich , David Airlie , Simona Vetter , Ben Skeggs Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Aaron Kling X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1739870890; l=1447; i=webgeek1234@gmail.com; s=20250217; h=from:subject:message-id; bh=oUmXAASwstZ9XuCaJCBOKOPtkuHQeVnyTw6zIVfBoIM=; b=Lc4eulMZkHiDkKi6LmyfgLQk8uAW71n7exKAE83hBn0tADQ7hyCGlswDiVHvEmbVq2f8Kpa5s wlo7lYLG0dRBUP99CQs/v4eg5jVp+iZh9casmSptBVFutS7WfmrcHQ7 X-Developer-Key: i=webgeek1234@gmail.com; a=ed25519; pk=TQwd6q26txw7bkK7B8qtI/kcAohZc7bHHGSD7domdrU= X-Endpoint-Received: by B4 Relay for webgeek1234@gmail.com/20250217 with auth_id=342 X-Original-From: Aaron Kling X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: webgeek1234@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Aaron Kling Most kernel configs enable multiple Tegra SoC generations, causing this typo to go unnoticed. But in the case where a kernel config is strictly for Tegra186, this is a problem. Fixes: 989863d7cbe5 ("drm/nouveau/pmu: select implementation based on available firmware") Signed-off-by: Aaron Kling --- Changes in v2: - Updated commit message to include a body - Link to v1: https://lore.kernel.org/r/20250217-nouveau-gm10b-guard-v1-1-0d96f0068570@gmail.com --- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 2408a807bfc3f738850ef5ad5e3fd59d66168996 change-id: 20250217-nouveau-gm10b-guard-a438402b5022 Best regards, diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c index a6f410ba60bc94ec9d52fc78868acddfc6770e19..d393bc540f8628812990dffe4c2f7e9014be07c5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c @@ -75,7 +75,7 @@ gp10b_pmu_acr = { .bootstrap_multiple_falcons = gp10b_pmu_acr_bootstrap_multiple_falcons, }; -#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) MODULE_FIRMWARE("nvidia/gp10b/pmu/desc.bin"); MODULE_FIRMWARE("nvidia/gp10b/pmu/image.bin"); MODULE_FIRMWARE("nvidia/gp10b/pmu/sig.bin");