lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0776/1157] PCI: dwc: Always enable CDM check if "snps,enable-cdm-check" exists
    Date
    From: Serge Semin <Sergey.Semin@baikalelectronics.ru>

    [ Upstream commit ec7b952f453ce7eabe7e1bea584626934d44f668 ]

    If the "snps,enable-cdm-check" property exists, we should enable the CDM
    check. But previously dw_pcie_setup() could exit before doing so if the
    "num-lanes" property was absent or invalid.

    Move the CDM enable earlier so we do it regardless of whether "num-lanes"
    is present.

    [bhelgaas: commit log]
    Fixes: 07f123def73e ("PCI: dwc: Add support to enable CDM register check")
    Link: https://lore.kernel.org/r/20220624143428.8334-7-Sergey.Semin@baikalelectronics.ru
    Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Reviewed-by: Vidya Sagar <vidyas@nvidia.com>
    Reviewed-by: Rob Herring <robh@kernel.org>
    Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/controller/dwc/pcie-designware.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
    index 347251bf87d0..5848cc520b52 100644
    --- a/drivers/pci/controller/dwc/pcie-designware.c
    +++ b/drivers/pci/controller/dwc/pcie-designware.c
    @@ -740,6 +740,13 @@ void dw_pcie_setup(struct dw_pcie *pci)
    val |= PORT_LINK_DLL_LINK_EN;
    dw_pcie_writel_dbi(pci, PCIE_PORT_LINK_CONTROL, val);

    + if (of_property_read_bool(np, "snps,enable-cdm-check")) {
    + val = dw_pcie_readl_dbi(pci, PCIE_PL_CHK_REG_CONTROL_STATUS);
    + val |= PCIE_PL_CHK_REG_CHK_REG_CONTINUOUS |
    + PCIE_PL_CHK_REG_CHK_REG_START;
    + dw_pcie_writel_dbi(pci, PCIE_PL_CHK_REG_CONTROL_STATUS, val);
    + }
    +
    of_property_read_u32(np, "num-lanes", &pci->num_lanes);
    if (!pci->num_lanes) {
    dev_dbg(pci->dev, "Using h/w default number of lanes\n");
    @@ -786,11 +793,4 @@ void dw_pcie_setup(struct dw_pcie *pci)
    break;
    }
    dw_pcie_writel_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL, val);
    -
    - if (of_property_read_bool(np, "snps,enable-cdm-check")) {
    - val = dw_pcie_readl_dbi(pci, PCIE_PL_CHK_REG_CONTROL_STATUS);
    - val |= PCIE_PL_CHK_REG_CHK_REG_CONTINUOUS |
    - PCIE_PL_CHK_REG_CHK_REG_START;
    - dw_pcie_writel_dbi(pci, PCIE_PL_CHK_REG_CONTROL_STATUS, val);
    - }
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 06:42    [W:3.720 / U:0.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site