[PATCH v2 02/12] pci: layerscape: Print pcie controller number starting from 1

2020-09-28 Thread Wasim Khan
Print pcie controller number starting from 1

Signed-off-by: Wasim Khan 
---
Changes in V2:
- No Change

Changes in V3:
- No Change

 drivers/pci/pcie_layerscape_ep.c | 4 +++-
 drivers/pci/pcie_layerscape_rc.c | 6 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index eba230e..26c04a9 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -5,6 +5,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -294,7 +295,8 @@ static int ls_pcie_ep_probe(struct udevice *dev)
pcie_ep->num_ob_wins = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
  "num-ob-windows", 8);
 
-   printf("PCIe%u: %s %s", pcie->idx, dev->name, "Endpoint");
+   printf("PCIe%u: %s %s", PCIE_SRDS_PRTCL(pcie->idx), dev->name,
+  "Endpoint");
ls_pcie_setup_ep(pcie_ep);
 
if (!ls_pcie_link_up(pcie)) {
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 25c6dde..f9e3089 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -273,7 +273,8 @@ static int ls_pcie_probe(struct udevice *dev)
 
pcie_rc->enabled = is_serdes_configured(PCIE_SRDS_PRTCL(pcie->idx));
if (!pcie_rc->enabled) {
-   printf("PCIe%d: %s disabled\n", pcie->idx, dev->name);
+   printf("PCIe%d: %s disabled\n", PCIE_SRDS_PRTCL(pcie->idx),
+  dev->name);
return 0;
}
 
@@ -342,7 +343,8 @@ static int ls_pcie_probe(struct udevice *dev)
  (unsigned long)pcie->ctrl, (unsigned long)pcie_rc->cfg0,
  pcie->big_endian);
 
-   printf("PCIe%u: %s %s", pcie->idx, dev->name, "Root Complex");
+   printf("PCIe%u: %s %s", PCIE_SRDS_PRTCL(pcie->idx), dev->name,
+  "Root Complex");
ls_pcie_setup_ctrl(pcie_rc);
 
if (!ls_pcie_link_up(pcie)) {
-- 
2.7.4



[PATCH v2 02/12] pci: layerscape: Print pcie controller number starting from 1

2020-08-04 Thread Wasim Khan
Print pcie controller number starting from 1

Signed-off-by: Wasim Khan 
---
 drivers/pci/pcie_layerscape_ep.c | 4 +++-
 drivers/pci/pcie_layerscape_rc.c | 6 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index eba230e..35bb726 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -5,6 +5,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -294,7 +295,8 @@ static int ls_pcie_ep_probe(struct udevice *dev)
pcie_ep->num_ob_wins = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
  "num-ob-windows", 8);
 
-   printf("PCIe%u: %s %s", pcie->idx, dev->name, "Endpoint");
+   printf("PCIe%u: %s %s", PCIE_SRDS_PRTCL(pcie->idx), dev->name,
+   "Endpoint");
ls_pcie_setup_ep(pcie_ep);
 
if (!ls_pcie_link_up(pcie)) {
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 25c6dde..f9e3089 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -273,7 +273,8 @@ static int ls_pcie_probe(struct udevice *dev)
 
pcie_rc->enabled = is_serdes_configured(PCIE_SRDS_PRTCL(pcie->idx));
if (!pcie_rc->enabled) {
-   printf("PCIe%d: %s disabled\n", pcie->idx, dev->name);
+   printf("PCIe%d: %s disabled\n", PCIE_SRDS_PRTCL(pcie->idx),
+  dev->name);
return 0;
}
 
@@ -342,7 +343,8 @@ static int ls_pcie_probe(struct udevice *dev)
  (unsigned long)pcie->ctrl, (unsigned long)pcie_rc->cfg0,
  pcie->big_endian);
 
-   printf("PCIe%u: %s %s", pcie->idx, dev->name, "Root Complex");
+   printf("PCIe%u: %s %s", PCIE_SRDS_PRTCL(pcie->idx), dev->name,
+  "Root Complex");
ls_pcie_setup_ctrl(pcie_rc);
 
if (!ls_pcie_link_up(pcie)) {
-- 
2.7.4



[PATCH v2 02/12] pci: layerscape: Print pcie controller number starting from 1

2020-08-04 Thread Wasim Khan
Print pcie controller number starting from 1

Signed-off-by: Wasim Khan 
---
Changes in V2:
- No Change

 drivers/pci/pcie_layerscape_ep.c | 4 +++-
 drivers/pci/pcie_layerscape_rc.c | 6 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c
index eba230e..26c04a9 100644
--- a/drivers/pci/pcie_layerscape_ep.c
+++ b/drivers/pci/pcie_layerscape_ep.c
@@ -5,6 +5,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -294,7 +295,8 @@ static int ls_pcie_ep_probe(struct udevice *dev)
pcie_ep->num_ob_wins = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
  "num-ob-windows", 8);
 
-   printf("PCIe%u: %s %s", pcie->idx, dev->name, "Endpoint");
+   printf("PCIe%u: %s %s", PCIE_SRDS_PRTCL(pcie->idx), dev->name,
+  "Endpoint");
ls_pcie_setup_ep(pcie_ep);
 
if (!ls_pcie_link_up(pcie)) {
diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c
index 25c6dde..f9e3089 100644
--- a/drivers/pci/pcie_layerscape_rc.c
+++ b/drivers/pci/pcie_layerscape_rc.c
@@ -273,7 +273,8 @@ static int ls_pcie_probe(struct udevice *dev)
 
pcie_rc->enabled = is_serdes_configured(PCIE_SRDS_PRTCL(pcie->idx));
if (!pcie_rc->enabled) {
-   printf("PCIe%d: %s disabled\n", pcie->idx, dev->name);
+   printf("PCIe%d: %s disabled\n", PCIE_SRDS_PRTCL(pcie->idx),
+  dev->name);
return 0;
}
 
@@ -342,7 +343,8 @@ static int ls_pcie_probe(struct udevice *dev)
  (unsigned long)pcie->ctrl, (unsigned long)pcie_rc->cfg0,
  pcie->big_endian);
 
-   printf("PCIe%u: %s %s", pcie->idx, dev->name, "Root Complex");
+   printf("PCIe%u: %s %s", PCIE_SRDS_PRTCL(pcie->idx), dev->name,
+  "Root Complex");
ls_pcie_setup_ctrl(pcie_rc);
 
if (!ls_pcie_link_up(pcie)) {
-- 
2.7.4