niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

pci-v6.14-fixes-2

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCgAyFiEEgMe7l+5h9hnxdsnuWYigwDrT+vwFAmelDIoUHGJoZWxnYWFz
 QGdvb2dsZS5jb20ACgkQWYigwDrT+vxzhQ/8CDqrVGq+nWgXs9NGYBfbWrIH39Lh
 k7PZA/GHvDSaMaFsCZ3tba7HtYNjcVjn6GPCYwHDjPY3oRmMwb63rSfbdtslR6l6
 CJRMETWVU9LIi9vGxb0nFBRkBE9+tHrIZXAndJZmfimDnYAHraM7S1F63+AvcyqA
 1AxJk8Vb2EtiDvbBYhwq4ef716zuzdC9b45N9fLodtROKpd14DPvicM1TNu2eMaT
 D8NhIiQQtHwPqqj0S4ai0O4xyfHVvJsQijmpyaADFwYNtqVptsou7MG2v9iZR8KX
 jYVjvcHlqwJc2D1VKSA6nsU+cV8ChIBrwdoHgWw4fS87QSuOd8WupLmszQJTj2xw
 Hj+8Z1S911PuQr97lO97l8BGxU0Talv3DY1o3B7I4N5bbFJgCut5fLU8YjPxUmEa
 PxY7YkHVEhP2PSuw9Em5u15MWF972OI9hz86Nl8F701KzgDu2SGSWq3yUpz1w+EZ
 DZSXJnPH2jGhc6bMlSEmVse36wKigETnbNOyEuFAe6iJ7ZHrU1uqS5GLTnuCkn3V
 +Y4x3txq8GGlNpEt9gR/0r2C7bUNTreN28/x2ot1Be9P0Wc2Xj9OTglzbirg2KBq
 n2Uw70lhqCaELM/2QGsxW2bI0r1nIPlQ2t64hbBQ6g6bS43Xi5OqiGI2m9qycILZ
 x2wnC2qU+NvDLqw=
 =Nh1D
 -----END PGP SIGNATURE-----

Merge tag 'pci-v6.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

Pull pci fixes from Bjorn Helgaas:

 - When saving a device's state, always save the upstream bridge's PM L1
   Substates configuration as well because the bridge never saves its
   own state, and restoring a device needs the state for both ends; this
   was a regression that caused link and power management errors after
   suspend/resume (Ilpo Järvinen)

 - Correct TPH Control Register write, where we wrote the ST Mode where
   the THP Requester Enable value was intended (Robin Murphy)

* tag 'pci-v6.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI/TPH: Restore TPH Requester Enable correctly
  PCI/ASPM: Fix L1SS saving
This commit is contained in:
Linus Torvalds 2025-02-06 12:32:03 -08:00
commit bb066fe812
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/pci/pcie/aspm.c
View file

@ -108,9 +108,6 @@ void pci_save_aspm_l1ss_state(struct pci_dev *pdev)
pci_read_config_dword(pdev, pdev->l1ss + PCI_L1SS_CTL2, cap++);
pci_read_config_dword(pdev, pdev->l1ss + PCI_L1SS_CTL1, cap++);
if (parent->state_saved)
return;
/*
* Save parent's L1 substate configuration so we have it for
* pci_restore_aspm_l1ss_state(pdev) to restore.

2
drivers/pci/tph.c
View file

@ -360,7 +360,7 @@ int pcie_tph_set_st_entry(struct pci_dev *pdev, unsigned int index, u16 tag)
return err;
}
set_ctrl_reg_req_en(pdev, pdev->tph_mode);
set_ctrl_reg_req_en(pdev, pdev->tph_req_type);
pci_dbg(pdev, "set steering tag: %s table, index=%d, tag=%#04x\n",
(loc == PCI_TPH_LOC_MSIX) ? "MSI-X" : "ST", index, tag);