Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pci-v6.3-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull PCI fix from Bjorn Helgaas:
- Fix DesignWare PORT_LINK_CONTROL setup, which was corrupted when the
DT "snps,enable-cdm-check" property was present (Yoshihiro Shimoda)
* tag 'pci-v6.3-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
PCI: dwc: Fix PORT_LINK_CONTROL update when CDM check enabled
+5
-5
+5
-5
drivers/pci/controller/dwc/pcie-designware.c
+5
-5
drivers/pci/controller/dwc/pcie-designware.c
···
1001
1001
dw_pcie_writel_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL, val);
1002
1002
}
1003
1003
1004
-
val = dw_pcie_readl_dbi(pci, PCIE_PORT_LINK_CONTROL);
1005
-
val &= ~PORT_LINK_FAST_LINK_MODE;
1006
-
val |= PORT_LINK_DLL_LINK_EN;
1007
-
dw_pcie_writel_dbi(pci, PCIE_PORT_LINK_CONTROL, val);
1008
-
1009
1004
if (dw_pcie_cap_is(pci, CDM_CHECK)) {
1010
1005
val = dw_pcie_readl_dbi(pci, PCIE_PL_CHK_REG_CONTROL_STATUS);
1011
1006
val |= PCIE_PL_CHK_REG_CHK_REG_CONTINUOUS |
1012
1007
PCIE_PL_CHK_REG_CHK_REG_START;
1013
1008
dw_pcie_writel_dbi(pci, PCIE_PL_CHK_REG_CONTROL_STATUS, val);
1014
1009
}
1010
+
1011
+
val = dw_pcie_readl_dbi(pci, PCIE_PORT_LINK_CONTROL);
1012
+
val &= ~PORT_LINK_FAST_LINK_MODE;
1013
+
val |= PORT_LINK_DLL_LINK_EN;
1014
+
dw_pcie_writel_dbi(pci, PCIE_PORT_LINK_CONTROL, val);
1015
1015
1016
1016
if (!pci->num_lanes) {
1017
1017
dev_dbg(pci->dev, "Using h/w default number of lanes\n");