OSDN Git Service

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)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 21 Mar 2023 18:06:24 +0000 (13:06 -0500)
commitcdce67099117ece371582f706c6eff7d3a65326d
treee46a9f50c1409a66a1e7c3cc0b589695aa4a3a4f
parentfe15c26ee26efa11741a7b632e9f23b01aca4cc6
PCI: dwc: Fix PORT_LINK_CONTROL update when CDM check enabled

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>
drivers/pci/controller/dwc/pcie-designware.c