lkml.org 
[lkml]   [2021]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 370/384] PCI: dwc: Move iATU detection earlier
    Date
    From: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

    commit 8bcca26585585ae4b44d25d30f351ad0afa4976b upstream.

    dw_pcie_ep_init() depends on the detected iATU region numbers to allocate
    the in/outbound window management bitmap. It fails after 281f1f99cf3a
    ("PCI: dwc: Detect number of iATU windows").

    Move the iATU region detection into a new function, move the detection to
    the very beginning of dw_pcie_host_init() and dw_pcie_ep_init(). Also
    remove it from the dw_pcie_setup(), since it's more like a software
    initialization step than hardware setup.

    Link: https://lore.kernel.org/r/20210125044803.4310-1-Zhiqiang.Hou@nxp.com
    Link: https://lore.kernel.org/linux-pci/20210407131255.702054-1-dmitry.baryshkov@linaro.org
    Link: https://lore.kernel.org/r/20210413142219.2301430-1-dmitry.baryshkov@linaro.org
    Fixes: 281f1f99cf3a ("PCI: dwc: Detect number of iATU windows")
    Tested-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
    Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Tested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
    Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
    [DB: moved dw_pcie_iatu_detect to happen after host_init callback]
    Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Reviewed-by: Rob Herring <robh@kernel.org>
    Cc: stable@vger.kernel.org # v5.11+
    Cc: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/pci/controller/dwc/pcie-designware-ep.c | 2 ++
    drivers/pci/controller/dwc/pcie-designware-host.c | 1 +
    drivers/pci/controller/dwc/pcie-designware.c | 11 ++++++++---
    drivers/pci/controller/dwc/pcie-designware.h | 1 +
    4 files changed, 12 insertions(+), 3 deletions(-)

    --- a/drivers/pci/controller/dwc/pcie-designware-ep.c
    +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
    @@ -705,6 +705,8 @@ int dw_pcie_ep_init(struct dw_pcie_ep *e
    }
    }

    + dw_pcie_iatu_detect(pci);
    +
    res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space");
    if (!res)
    return -EINVAL;
    --- a/drivers/pci/controller/dwc/pcie-designware-host.c
    +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
    @@ -398,6 +398,7 @@ int dw_pcie_host_init(struct pcie_port *
    if (ret)
    goto err_free_msi;
    }
    + dw_pcie_iatu_detect(pci);

    dw_pcie_setup_rc(pp);
    dw_pcie_msi_init(pp);
    --- a/drivers/pci/controller/dwc/pcie-designware.c
    +++ b/drivers/pci/controller/dwc/pcie-designware.c
    @@ -660,11 +660,9 @@ static void dw_pcie_iatu_detect_regions(
    pci->num_ob_windows = ob;
    }

    -void dw_pcie_setup(struct dw_pcie *pci)
    +void dw_pcie_iatu_detect(struct dw_pcie *pci)
    {
    - u32 val;
    struct device *dev = pci->dev;
    - struct device_node *np = dev->of_node;
    struct platform_device *pdev = to_platform_device(dev);

    if (pci->version >= 0x480A || (!pci->version &&
    @@ -693,6 +691,13 @@ void dw_pcie_setup(struct dw_pcie *pci)

    dev_info(pci->dev, "Detected iATU regions: %u outbound, %u inbound",
    pci->num_ob_windows, pci->num_ib_windows);
    +}
    +
    +void dw_pcie_setup(struct dw_pcie *pci)
    +{
    + u32 val;
    + struct device *dev = pci->dev;
    + struct device_node *np = dev->of_node;

    if (pci->link_gen > 0)
    dw_pcie_link_set_max_speed(pci, pci->link_gen);
    --- a/drivers/pci/controller/dwc/pcie-designware.h
    +++ b/drivers/pci/controller/dwc/pcie-designware.h
    @@ -306,6 +306,7 @@ int dw_pcie_prog_inbound_atu(struct dw_p
    void dw_pcie_disable_atu(struct dw_pcie *pci, int index,
    enum dw_pcie_region_type type);
    void dw_pcie_setup(struct dw_pcie *pci);
    +void dw_pcie_iatu_detect(struct dw_pcie *pci);

    static inline void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val)
    {

    \
     
     \ /
      Last update: 2021-05-10 15:02    [W:4.470 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site