Merge patch series "Update PHYTEC SOM Detection"

[J-u-boot.git] / drivers / pci / pcie_layerscape_gen4_fixup.c

diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c
index da9817159fdca8b67927c6bb424df95129aaf853..b2a45bf105c84c2e2fa801f3efdba6177a53302d 100644 (file)
--- a/drivers/pci/pcie_layerscape_gen4_fixup.c
+++ b/drivers/pci/pcie_layerscape_gen4_fixup.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
- * Copyright 2018-2019 NXP
+ * Copyright 2018-2021 NXP
  *
  * PCIe Gen4 driver for NXP Layerscape SoCs
  * Author: Hou Zhiqiang <[email protected]>
@@ -8,6 +8,8 @@
  */
 
 #include <common.h>
+#include <dm.h>
+#include <log.h>
 #include <pci.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/io.h>
@@ -19,6 +21,7 @@
 #include <asm/arch/clock.h>
 #endif
 #include "pcie_layerscape_gen4.h"
+#include "pcie_layerscape_fixup_common.h"
 
 #if defined(CONFIG_FSL_LSCH3) || defined(CONFIG_FSL_LSCH2)
 /*
@@ -32,19 +35,6 @@ static int ls_pcie_g4_next_lut_index(struct ls_pcie_g4 *pcie)
        return -ENOSPC;  /* LUT is full */
 }
 
-/* returns the next available streamid for pcie, -errno if failed */
-static int ls_pcie_g4_next_streamid(struct ls_pcie_g4 *pcie)
-{
-       int stream_id = pcie->stream_id_cur;
-
-       if (stream_id > FSL_PEX_STREAM_ID_END)
-               return -EINVAL;
-
-       pcie->stream_id_cur++;
-
-       return stream_id | ((pcie->idx + 1) << 11);
-}
-
 /*
  * Program a single LUT entry
  */
@@ -161,10 +151,12 @@ static void fdt_fixup_pcie_ls_gen4(void *blob)
                        bus = bus->parent;
                pcie = dev_get_priv(bus);
 
-               streamid = ls_pcie_g4_next_streamid(pcie);
+               streamid = pcie_next_streamid(pcie->stream_id_cur, pcie->idx);
                if (streamid < 0) {
                        debug("ERROR: no stream ids free\n");
                        continue;
+               } else {
+                       pcie->stream_id_cur++;
                }
 
                index = ls_pcie_g4_next_lut_index(pcie);
@@ -174,7 +166,7 @@ static void fdt_fixup_pcie_ls_gen4(void *blob)
                }
 
                /* the DT fixup must be relative to the hose first_busno */
-               bdf = dm_pci_get_bdf(dev) - PCI_BDF(bus->seq, 0, 0);
+               bdf = dm_pci_get_bdf(dev) - PCI_BDF(dev_seq(bus), 0, 0);
                /* map PCI b.d.f to streamID in LUT */
                ls_pcie_g4_lut_set_mapping(pcie, index, bdf >> 8, streamid);
                /* update msi-map in device tree */
@@ -201,9 +193,9 @@ static void ft_pcie_ep_layerscape_gen4_fix(void *blob, struct ls_pcie_g4 *pcie)
        }
 
        if (pcie->enabled && pcie->mode == PCI_HEADER_TYPE_NORMAL)
-               fdt_set_node_status(blob, off, FDT_STATUS_OKAY, 0);
+               fdt_set_node_status(blob, off, FDT_STATUS_OKAY);
        else
-               fdt_set_node_status(blob, off, FDT_STATUS_DISABLED, 0);
+               fdt_set_node_status(blob, off, FDT_STATUS_DISABLED);
 }
 
 static void ft_pcie_rc_layerscape_gen4_fix(void *blob, struct ls_pcie_g4 *pcie)
@@ -222,19 +214,22 @@ static void ft_pcie_rc_layerscape_gen4_fix(void *blob, struct ls_pcie_g4 *pcie)
        }
 
        if (pcie->enabled && pcie->mode == PCI_HEADER_TYPE_BRIDGE)
-               fdt_set_node_status(blob, off, FDT_STATUS_OKAY, 0);
+               fdt_set_node_status(blob, off, FDT_STATUS_OKAY);
        else
-               fdt_set_node_status(blob, off, FDT_STATUS_DISABLED, 0);
+               fdt_set_node_status(blob, off, FDT_STATUS_DISABLED);
 }
 
 static void ft_pcie_layerscape_gen4_setup(void *blob, struct ls_pcie_g4 *pcie)
 {
        ft_pcie_rc_layerscape_gen4_fix(blob, pcie);
        ft_pcie_ep_layerscape_gen4_fix(blob, pcie);
+
+       pcie->stream_id_cur = 0;
+       pcie->next_lut_index = 0;
 }
 
 /* Fixup Kernel DT for PCIe */
-void ft_pci_setup(void *blob, bd_t *bd)
+void ft_pci_setup_ls_gen4(void *blob, struct bd_info *bd)
 {
        struct ls_pcie_g4 *pcie;
 
@@ -247,7 +242,7 @@ void ft_pci_setup(void *blob, bd_t *bd)
 }
 
 #else /* !CONFIG_OF_BOARD_SETUP */
-void ft_pci_setup(void *blob, bd_t *bd)
+void ft_pci_setup_ls_gen4(void *blob, struct bd_info *bd)
 {
 }
 #endif