2 files changed, 9 insertions, 8 deletions

diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
index 8650416f6f9e..04092a7aba89 100644
--- a/drivers/pci/controller/dwc/pcie-designware-ep.c
+++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
@@ -386,15 +386,18 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
                 return -ENOMEM;
         ep->outbound_addr = addr;
 
-        if (ep->ops->ep_init)
-                ep->ops->ep_init(ep);
-
         epc = devm_pci_epc_create(dev, &epc_ops);
         if (IS_ERR(epc)) {
                 dev_err(dev, "Failed to create epc device\n");
                 return PTR_ERR(epc);
         }
 
+        ep->epc = epc;
+        epc_set_drvdata(epc, ep);
+
+        if (ep->ops->ep_init)
+                ep->ops->ep_init(ep);
+
         ret = of_property_read_u8(np, "max-functions", &epc->max_functions);
         if (ret < 0)
                 epc->max_functions = 1;
@@ -413,11 +416,6 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)
                 return -ENOMEM;
         }
 
-        epc->features = EPC_FEATURE_NO_LINKUP_NOTIFIER;
-        EPC_FEATURE_SET_BAR(epc->features, BAR_0);
-
-        ep->epc = epc;
-        epc_set_drvdata(epc, ep);
         dw_pcie_setup(pci);
 
         return 0;
diff --git a/drivers/pci/controller/dwc/pcie-designware-plat.c b/drivers/pci/controller/dwc/pcie-designware-plat.c
index 6e048c0b67f2..a37dc92a03c7 100644
--- a/drivers/pci/controller/dwc/pcie-designware-plat.c
+++ b/drivers/pci/controller/dwc/pcie-designware-plat.c
@@ -70,10 +70,13 @@ static const struct dw_pcie_ops dw_pcie_ops = {
 static void dw_plat_pcie_ep_init(struct dw_pcie_ep *ep)
 {
         struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
+        struct pci_epc *epc = ep->epc;
         enum pci_barno bar;
 
         for (bar = BAR_0; bar <= BAR_5; bar++)
                 dw_pcie_ep_reset_bar(pci, bar);
+
+        epc->features |= EPC_FEATURE_NO_LINKUP_NOTIFIER;
 }
 
 static int dw_plat_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,