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 AB20F23F374; Sun, 24 Nov 2024 13:53:23 +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=1732456403; cv=none; b=JDjmJYpXN4lvnuKsPgUvIPr695//uO/t0vxHkJA7TEpsY+2wr3qSMnmhbjwj6/ca4deqU43KNRqlwD38qpXlMAygKQLn4TyMSqbhbJxzjD4OATvkQXgpuslvY+9yICBLiLUGypcVKtHIf+eeKqQNJrgCzaby8VmLEw/AKaoDYQk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732456403; c=relaxed/simple; bh=+9pyVCoxl4h8+DKMMrcQrcYcR+YPXJMG6l3BihSvykU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bml0ueaWK2zpiZg2knHwntGwdfDJRPkPXsS3ClJpOGo7RDhbWOyEK7LlIUKV6hbOoz//5IVbI+JuuPRoAidt0AJounaseTHebAK6iKVovrIDGHimFLMFUjJbaA6gPxEz51sO0NTOvv6l4c+c4T3oTPYD1l/XaxXbejvqrvZhcvI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MXKp5iC2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MXKp5iC2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBB4AC4CED1; Sun, 24 Nov 2024 13:53:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732456403; bh=+9pyVCoxl4h8+DKMMrcQrcYcR+YPXJMG6l3BihSvykU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MXKp5iC2yv9QOX4OOUGyEKZXCF/8PakTC0gttAQ7UQrd6WRSE9wA9SIus0KTDgiQx x90EPr3AiVv2NL1izessJvsPxIeeZadfqM3aC1n3d7UhmgW+GVBIdBoU3ZsG9TAz6A yK8f3MehJOYV1goF77i87FQdrjeQiD7G8Rn+4C4fREbNFcQMC7fG+680L1teTojR6W uEBmxACWuM+KA5Z5lhDliOlymFbKO8WexEonMBIl80bBNMzA6yYslhnTzBWL4wAshV vrOLSHR03T+hJs01mMhUyCI8V9dkC1Ou42Q5caU5VE+X+HRVElioNIoXzaBtqOA+NY HikoPKkNFjIzg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Victor Zhao , Lijo Lazar , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, simona@ffwll.ch, sunil.khatri@amd.com, Hawking.Zhang@amd.com, mario.limonciello@amd.com, Jun.Ma2@amd.com, Yunxiang.Li@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.15 28/36] drm/amdgpu: skip amdgpu_device_cache_pci_state under sriov Date: Sun, 24 Nov 2024 08:51:42 -0500 Message-ID: <20241124135219.3349183-28-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124135219.3349183-1-sashal@kernel.org> References: <20241124135219.3349183-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.173 Content-Transfer-Encoding: 8bit From: Victor Zhao [ Upstream commit afe260df55ac280cd56306248cb6d8a6b0db095c ] Under sriov, host driver will save and restore vf pci cfg space during reset. And during device init, under sriov, pci_restore_state happens after fullaccess released, and it can have race condition with mmio protection enable from host side leading to missing interrupts. So skip amdgpu_device_cache_pci_state for sriov. Signed-off-by: Victor Zhao Acked-by: Lijo Lazar Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 042f27af6856c..4be8d2ca50f3a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -5743,6 +5743,9 @@ bool amdgpu_device_cache_pci_state(struct pci_dev *pdev) struct amdgpu_device *adev = drm_to_adev(dev); int r; + if (amdgpu_sriov_vf(adev)) + return false; + r = pci_save_state(pdev); if (!r) { kfree(adev->pci_state); -- 2.43.0