From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EF6C19AA56; Mon, 24 Feb 2025 14:57:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740409058; cv=none; b=ACGJCas4YOIkpESWWr2TRVVcCSmSSlHN1vO3w3y9gbTG8p5D9lwJT8p2FD+3fIQOZ+TfPOFKk1q4wKivhwOodqjhqEDODm9QNjCzbQF20M5zFY9+A04ALv1raLy+NDVdF5Ld3G5cOP9DCzJLAbPo6QhB2+ddBgCj7qDtvMuEqZw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740409058; c=relaxed/simple; bh=rJjiMClB0hJRdraaV5iGH0MBKUaW3Qqw3wPCLiwptUM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y1QRvZWrbpgSYSB2jK1xLS/21tgJjFZ0Abi7oGnJ6I2vAUDo10+AG+nX56NePWWpTge8xDyTDuHe/JD1LZ4ob8c80YRmmufXF28wStHC4cHTN1nUz3dAzeWaEGI7jbuxbrgP+5Sqf6Nbbn79BSzlr1D9IDGV5jMAk7dNlZCR+eQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xrKyLZbJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xrKyLZbJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E78EC4CEE6; Mon, 24 Feb 2025 14:57:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1740409058; bh=rJjiMClB0hJRdraaV5iGH0MBKUaW3Qqw3wPCLiwptUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xrKyLZbJVRQ+AAlQmmyZH/PbrZYLUm74A9iavl6Uo0sz9e3WBzxXEEX4dvHqSlIAr dBcp1tiD3KC4xYxUw2zT0V/1vC7azC/3ni9mv9ZuI1d7J6UlqxK/Tcy8Ih3Uux2geI u1X0pD/PnPnkoy83xIr8SLH5AwTHsyY+8ao585Vo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Aaron Kling , Danilo Krummrich , Sasha Levin Subject: [PATCH 6.13 084/138] drm/nouveau/pmu: Fix gp10b firmware guard Date: Mon, 24 Feb 2025 15:35:14 +0100 Message-ID: <20250224142607.780565629@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224142604.442289573@linuxfoundation.org> References: <20250224142604.442289573@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Aaron Kling [ Upstream commit 3dbc0215e3c502a9f3221576da0fdc9847fb9721 ] 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 Signed-off-by: Danilo Krummrich Link: https://patchwork.freedesktop.org/patch/msgid/20250218-nouveau-gm10b-guard-v2-1-a4de71500d48@gmail.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c index a6f410ba60bc9..d393bc540f862 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"); -- 2.39.5