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 C3C8D1AAE3F; Wed, 20 Nov 2024 12:59:11 +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=1732107551; cv=none; b=lmMUjUdPRijDZsjMzz+gy61lZO9SDwfCaRrYxGI009Q166BphKv8nBrifcnbraWcODetJQy2h1Vq2cgF2mKqJzQOJkfBWhilXWl6WRugTEbBPomj7Vo024nctWW4+0uyG6aITRGRYUHZa+r4fjjE7yBRNOLYiapVmQ+O0MMwmFw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732107551; c=relaxed/simple; bh=lR6d73fT818/Bvu7yaIRp1RSoAU2kpNwSy/C1xOUznw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LKAJieDv1lkdds1rKV35+LKvkaQ5ZAEuev3TCTTwWLwEDJF3c1ApzdPqvQJJAmR8ysaiu+fjXXZ7rixXrYrAmQTV0s01uhm3xcPUQIGJFns/KeW5drWvEsW+Lu9zyTLfFsOVwdDdukfxee6+TjFVzsY2LSdBHgNLT6DZApZ4/SI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=z3HJhFXa; 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="z3HJhFXa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9AD52C4CECD; Wed, 20 Nov 2024 12:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1732107551; bh=lR6d73fT818/Bvu7yaIRp1RSoAU2kpNwSy/C1xOUznw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z3HJhFXaEZ6vL3DazOb9h9VUC2DDe58ieMFOxYqTtEZLCbkANUwoiu/NyJ615xeq6 JXHCX3MdKyLl1cvUxNxTdYPiOd2nGaRSOvNgzBC2RY+g2r4Qopb1FssMEaWVkM6TkO l1V6tIEwgdBMC+ypGcvPUn6PNeaVzlmW3F47fzfw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vijendar Mukunda , Mario Limonciello , Alex Deucher Subject: [PATCH 6.11 092/107] drm/amd: Fix initialization mistake for NBIO 7.7.0 Date: Wed, 20 Nov 2024 13:57:07 +0100 Message-ID: <20241120125631.787841299@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241120125629.681745345@linuxfoundation.org> References: <20241120125629.681745345@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vijendar Mukunda commit 7013a8268d311fded6c7a6528fc1de82668e75f6 upstream. There is a strapping issue on NBIO 7.7.0 that can lead to spurious PME events while in the D0 state. Co-developed-by: Mario Limonciello Signed-off-by: Vijendar Mukunda Signed-off-by: Mario Limonciello Acked-by: Alex Deucher Link: https://lore.kernel.org/r/20241112161142.28974-1-mario.limonciello@amd.com Signed-off-by: Alex Deucher (cherry picked from commit 447a54a0f79c9a409ceaa17804bdd2e0206397b9) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c @@ -247,6 +247,12 @@ static void nbio_v7_7_init_registers(str if (def != data) WREG32_SOC15(NBIO, 0, regBIF0_PCIE_MST_CTRL_3, data); + switch (adev->ip_versions[NBIO_HWIP][0]) { + case IP_VERSION(7, 7, 0): + data = RREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF5_STRAP4) & ~BIT(23); + WREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF5_STRAP4, data); + break; + } } static void nbio_v7_7_update_medium_grain_clock_gating(struct amdgpu_device *adev,