This is a note to let you know that I've just added the patch titled
Revert "PCI: Mark NVIDIA T4 GPUs to avoid bus reset"
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-pci-mark-nvidia-t4-gpus-to-avoid-bus-reset.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5260bd6d36c83c5b269c33baaaf8c78e520908b0 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Date: Fri, 8 Sep 2023 14:55:30 -0500
Subject: Revert "PCI: Mark NVIDIA T4 GPUs to avoid bus reset"
From: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
commit 5260bd6d36c83c5b269c33baaaf8c78e520908b0 upstream.
This reverts commit d5af729dc2071273f14cbb94abbc60608142fd83.
d5af729dc207 ("PCI: Mark NVIDIA T4 GPUs to avoid bus reset") avoided
Secondary Bus Reset on the T4 because the reset seemed to not work when the
T4 was directly attached to a Root Port.
But NVIDIA thinks the issue is probably related to some issue with the Root
Port, not with the T4. The T4 provides neither PM nor FLR reset, so
masking bus reset compromises this device for assignment scenarios.
Revert d5af729dc207 as requested by Wu Zongyong. This will leave SBR
broken in the specific configuration Wu tested, as it was in v6.5, so Wu
will debug that further.
Link: https://lore.kernel.org/r/ZPqMCDWvITlOLHgJ@wuzongyong-alibaba
Link: https://lore.kernel.org/r/20230908201104.GA305023@bhelgaas
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/pci/quirks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3566,7 +3566,7 @@ static void quirk_no_bus_reset(struct pc
*/
static void quirk_nvidia_no_bus_reset(struct pci_dev *dev)
{
- if ((dev->device & 0xffc0) == 0x2340 || dev->device == 0x1eb8)
+ if ((dev->device & 0xffc0) == 0x2340)
quirk_no_bus_reset(dev);
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
Patches currently in stable-queue which might be from bhelgaas@xxxxxxxxxx are
queue-5.4/pci-add-defines-for-enter-compliance-transmit-margin.patch
queue-5.4/drm-amdgpu-replace-numbers-with-pci_exp_lnkctl2-defi.patch
queue-5.4/pci-mark-nvidia-t4-gpus-to-avoid-bus-reset.patch
queue-5.4/drm-radeon-correct-transmit-margin-masks.patch
queue-5.4/drm-amdgpu-correct-transmit-margin-masks.patch
queue-5.4/wifi-ath10k-use-rmw-accessors-for-changing-lnkctl.patch
queue-5.4/pci-pciehp-use-rmw-accessors-for-changing-lnkctl.patch
queue-5.4/drm-amdgpu-prefer-pcie_capability_read_word.patch
queue-5.4/revert-pci-mark-nvidia-t4-gpus-to-avoid-bus-reset.patch
queue-5.4/drm-radeon-prefer-pcie_capability_read_word.patch
queue-5.4/drm-radeon-replace-numbers-with-pci_exp_lnkctl2-defi.patch
queue-5.4/pci-aspm-use-rmw-accessors-for-changing-lnkctl.patch
queue-5.4/drm-radeon-use-rmw-accessors-for-changing-lnkctl.patch
queue-5.4/drm-amdgpu-use-rmw-accessors-for-changing-lnkctl.patch
