Skip to content

Commit 8ebd655

Browse files
dsdgregkh
authored andcommitted
PCI: Reprogram bridge prefetch registers on resume
commit 0838745 upstream. On 38+ Intel-based ASUS products, the NVIDIA GPU becomes unusable after S3 suspend/resume. The affected products include multiple generations of NVIDIA GPUs and Intel SoCs. After resume, nouveau logs many errors such as: fifo: fault 00 [READ] at 0000005555555000 engine 00 [GR] client 04 [HUB/FE] reason 4a [] on channel -1 [007fa91000 unknown] DRM: failed to idle channel 0 [DRM] Similarly, the NVIDIA proprietary driver also fails after resume (black screen, 100% CPU usage in Xorg process). We shipped a sample to NVIDIA for diagnosis, and their response indicated that it's a problem with the parent PCI bridge (on the Intel SoC), not the GPU. Runtime suspend/resume works fine, only S3 suspend is affected. We found a workaround: on resume, rewrite the Intel PCI bridge 'Prefetchable Base Upper 32 Bits' register (PCI_PREF_BASE_UPPER32). In the cases that I checked, this register has value 0 and we just have to rewrite that value. Linux already saves and restores PCI config space during suspend/resume, but this register was being skipped because upon resume, it already has value 0 (the correct, pre-suspend value). Intel appear to have previously acknowledged this behaviour and the requirement to rewrite this register: https://bugzilla.kernel.org/show_bug.cgi?id=116851#c23 Based on that, rewrite the prefetch register values even when that appears unnecessary. We have confirmed this solution on all the affected models we have in-hands (X542UQ, UX533FD, X530UN, V272UN). Additionally, this solves an issue where r8169 MSI-X interrupts were broken after S3 suspend/resume on ASUS X441UAR. This issue was recently worked around in commit 7bb05b8 ("r8169: don't use MSI-X on RTL8106e"). It also fixes the same issue on RTL6186evl/8111evl on an Aimfor-tech laptop that we had not yet patched. I suspect it will also fix the issue that was worked around in commit 7c53a72 ("r8169: don't use MSI-X on RTL8168g"). Thomas Martitz reports that this change also solves an issue where the AMD Radeon Polaris 10 GPU on the HP Zbook 14u G5 is unresponsive after S3 suspend/resume. Link: https://bugzilla.kernel.org/show_bug.cgi?id=201069 Signed-off-by: Daniel Drake <drake@endlessm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-By: Peter Wu <peter@lekensteyn.nl> CC: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 25bc6e8 commit 8ebd655

1 file changed

Lines changed: 19 additions & 8 deletions

File tree

drivers/pci/pci.c

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,12 +1112,12 @@ int pci_save_state(struct pci_dev *dev)
11121112
EXPORT_SYMBOL(pci_save_state);
11131113

11141114
static void pci_restore_config_dword(struct pci_dev *pdev, int offset,
1115-
u32 saved_val, int retry)
1115+
u32 saved_val, int retry, bool force)
11161116
{
11171117
u32 val;
11181118

11191119
pci_read_config_dword(pdev, offset, &val);
1120-
if (val == saved_val)
1120+
if (!force && val == saved_val)
11211121
return;
11221122

11231123
for (;;) {
@@ -1136,25 +1136,36 @@ static void pci_restore_config_dword(struct pci_dev *pdev, int offset,
11361136
}
11371137

11381138
static void pci_restore_config_space_range(struct pci_dev *pdev,
1139-
int start, int end, int retry)
1139+
int start, int end, int retry,
1140+
bool force)
11401141
{
11411142
int index;
11421143

11431144
for (index = end; index >= start; index--)
11441145
pci_restore_config_dword(pdev, 4 * index,
11451146
pdev->saved_config_space[index],
1146-
retry);
1147+
retry, force);
11471148
}
11481149

11491150
static void pci_restore_config_space(struct pci_dev *pdev)
11501151
{
11511152
if (pdev->hdr_type == PCI_HEADER_TYPE_NORMAL) {
1152-
pci_restore_config_space_range(pdev, 10, 15, 0);
1153+
pci_restore_config_space_range(pdev, 10, 15, 0, false);
11531154
/* Restore BARs before the command register. */
1154-
pci_restore_config_space_range(pdev, 4, 9, 10);
1155-
pci_restore_config_space_range(pdev, 0, 3, 0);
1155+
pci_restore_config_space_range(pdev, 4, 9, 10, false);
1156+
pci_restore_config_space_range(pdev, 0, 3, 0, false);
1157+
} else if (pdev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
1158+
pci_restore_config_space_range(pdev, 12, 15, 0, false);
1159+
1160+
/*
1161+
* Force rewriting of prefetch registers to avoid S3 resume
1162+
* issues on Intel PCI bridges that occur when these
1163+
* registers are not explicitly written.
1164+
*/
1165+
pci_restore_config_space_range(pdev, 9, 11, 0, true);
1166+
pci_restore_config_space_range(pdev, 0, 8, 0, false);
11561167
} else {
1157-
pci_restore_config_space_range(pdev, 0, 15, 0);
1168+
pci_restore_config_space_range(pdev, 0, 15, 0, false);
11581169
}
11591170
}
11601171

0 commit comments

Comments
 (0)