update arm/arm64 configs and patches for 6.7

[packages/kernel.git] / atheros-disallow-retrain-nongen1-pcie.patch

diff --git a/atheros-disallow-retrain-nongen1-pcie.patch b/atheros-disallow-retrain-nongen1-pcie.patch
index 99a81c3e347506e8342c5877b92c121d3865e0e0..c295bf23bdfcd1bbe5683c974f6ba03632a0d20d 100644 (file)
--- a/atheros-disallow-retrain-nongen1-pcie.patch
+++ b/atheros-disallow-retrain-nongen1-pcie.patch
@@ -191,8 +191,8 @@ Changes since v2:
   * pcie_aspm_configure_common_clock: check if the 2 ends of a link
   *   could use common clock. If they are, configure them to use the
 @@ -257,7 +295,14 @@
-               reg16 &= ~PCI_EXP_LNKCTL_CCC;
-       pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16);
+       pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL,
+                                          PCI_EXP_LNKCTL_CCC, ccc);
  
 -      if (pcie_retrain_link(link->pdev, true)) {
 +      bool skip_retrain = false;