]> www.infradead.org Git - users/jedix/linux-maple.git/commit
PCI: dwc: Fix PORT_LINK_CONTROL update when CDM check enabled
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Fri, 10 Mar 2023 12:34:58 +0000 (21:34 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Apr 2023 10:10:43 +0000 (12:10 +0200)
commitba85e83f9330b73db7d3f8ea0bf6fc41e65a8633
tree41a49d18d717f4f81bc2116f01c3045965ca5739
parente39afd6095a59ddecfd44422241db7605c8846e7
PCI: dwc: Fix PORT_LINK_CONTROL update when CDM check enabled

[ Upstream commit cdce67099117ece371582f706c6eff7d3a65326d ]

If CDM_CHECK is enabled (by the DT "snps,enable-cdm-check" property), 'val'
is overwritten by PCIE_PL_CHK_REG_CONTROL_STATUS initialization.  Commit
ec7b952f453c ("PCI: dwc: Always enable CDM check if "snps,enable-cdm-check"
exists") did not account for further usage of 'val', so we wrote improper
values to PCIE_PORT_LINK_CONTROL when the CDM check is enabled.

Move the PCIE_PORT_LINK_CONTROL update to be completely after the
PCIE_PL_CHK_REG_CONTROL_STATUS register initialization.

[bhelgaas: commit log adapted from Serge's version]
Fixes: ec7b952f453c ("PCI: dwc: Always enable CDM check if "snps,enable-cdm-check" exists")
Link: https://lore.kernel.org/r/20230310123510.675685-2-yoshihiro.shimoda.uh@renesas.com
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pci/controller/dwc/pcie-designware.c