Add support to defer core initialization
Subsystems (4)
v3 cover Add support to defer core initialization
EPC/DesignWare core endpoint subsystems assume that the core registers are available always for SW to initialize. But, that may not be the case always. For example, Tegra194 hardware has the core running on a clock that is derived from reference clock that is coming into the endpoint system from host. Hence core is made available asynchronously based on when host system is going for enumeration of devices. To accommodate this kind of hardwares, support is required to defer the core initialization until the respective platform driver informs the EPC/DWC endpoint sub-systems that the core is indeed available for initiaization. This patch series is attempting to add precisely that. This series is based on Kishon's patch that adds notification mechanism support from EPC to EPF @ http://patchwork.ozlabs.org/patch/1236793/ from the series @ http://patchwork.ozlabs.org/project/linux-pci/list/?series=158088
V3:
* Rebased this series on top of kishon's new patch series as mentioned above
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>
V2:
* Addressed review comments from Kishon
Vidya Sagar (5):
PCI: endpoint: Add core init notifying feature
PCI: dwc: Refactor core initialization code for EP mode
PCI: endpoint: Add notification for core init completion
PCI: dwc: Add API to notify core initialization completion
PCI: pci-epf-test: Add support to defer core initialization
.../pci/controller/dwc/pcie-designware-ep.c | 79 +++++++----- drivers/pci/controller/dwc/pcie-designware.h | 11 ++ drivers/pci/endpoint/functions/pci-epf-test.c | 118 ++++++++++++------ drivers/pci/endpoint/pci-epc-core.c | 19 ++- include/linux/pci-epc.h | 2 + include/linux/pci-epf.h | 5 + 6 files changed, 164 insertions(+), 70 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/5 PCI: endpoint: Add core init notifying feature
Add a new feature core_init_notifier for cores that can notify about their availability for initialization (Ex:- Tegra194).
---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>
V2:
* This is a new patch in this series
include/linux/pci-epc.h | 1 + 1 file changed, 1 insertion(+)
include/linux/pci-epc.h +1 -0
@@ -120,6 +120,7 @@ struct pci_epc {*/ struct pci_epc_features {unsigned int linkup_notifier :1 ; +unsigned int core_init_notifier :1 ;unsigned int msi_capable :1 ;unsigned int msix_capable :1 ;u8 reserved_bar;
Signature · 1 line
2.17.1
PATCH v3 2/5 PCI: dwc: Refactor core initialization code for EP mode
In reply to Vidya SagarSplits core initialization code for EP mode into two, one that doesn't touch core registers and the other that touches core registers. The latter would be called/skipped based on the EPC feature 'core_init_notifier'. In case of platforms where this is skipped (Ex:- Tegra194), it would be called indirectly through hooks from the function driver.
---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>
V2:
* Changed EPC feature name from 'skip_core_init' to 'core_init_notifier'
* Made the pci-epc.h header file change as a separate patch as per the review comment from Kishon
.../pci/controller/dwc/pcie-designware-ep.c | 72 +++++++++++-------- drivers/pci/controller/dwc/pcie-designware.h | 6 ++ 2 files changed, 50 insertions(+), 28 deletions(-)
drivers/pci/controller/dwc/pcie-designware-ep.c +44 -28
@@ -492,19 +492,53 @@ static unsigned int dw_pcie_ep_find_ext_capability(struct dw_pcie *pci, int cap)return 0 ; } -int dw_pcie_ep_init (struct dw_pcie_ep *ep) +int dw_pcie_ep_init_complete (struct dw_pcie_ep *ep) { +struct dw_pcie *pci =to_dw_pcie_from_ep (ep); +unsigned int offset; +unsigned int nbars; +u8 hdr_type; +u32 reg;int i; + + hdr_type =dw_pcie_readb_dbi (pci,PCI_HEADER_TYPE ); +if (hdr_type !=PCI_HEADER_TYPE_NORMAL ) { +dev_err (pci->dev, +"PCIe controller is not set to EP mode (hdr_type:0x%x)!\n" , + hdr_type); +return -EIO ; + } + + ep->msi_cap =dw_pcie_find_capability (pci,PCI_CAP_ID_MSI ); + + ep->msix_cap =dw_pcie_find_capability (pci,PCI_CAP_ID_MSIX ); + + offset =dw_pcie_ep_find_ext_capability (pci,PCI_EXT_CAP_ID_REBAR ); +if (offset) { + reg =dw_pcie_readl_dbi (pci, offset +PCI_REBAR_CTRL ); + nbars = (reg &PCI_REBAR_CTRL_NBAR_MASK ) >> +PCI_REBAR_CTRL_NBAR_SHIFT ; + +dw_pcie_dbi_ro_wr_en (pci); +for (i =0 ; i < nbars; i++, offset +=PCI_REBAR_CTRL ) +dw_pcie_writel_dbi (pci, offset +PCI_REBAR_CAP ,0x0 ); +dw_pcie_dbi_ro_wr_dis (pci); + } + +dw_pcie_setup (pci); + +return 0 ; +} + +int dw_pcie_ep_init (struct dw_pcie_ep *ep) +{int ret; -u32 reg;void *addr; -u8 hdr_type; -unsigned int nbars; -unsigned int offset;struct pci_epc *epc;struct dw_pcie *pci =to_dw_pcie_from_ep (ep);struct device *dev = pci->dev;struct device_node *np = dev->of_node; +const struct pci_epc_features *epc_features;if (!pci->dbi_base || !pci->dbi_base2) {dev_err (dev,"dbi_base/dbi_base2 is not populated\n" );
@@ -563,13 +597,6 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)if (ep->ops->ep_init) ep->ops->ep_init (ep); - hdr_type =dw_pcie_readb_dbi (pci,PCI_HEADER_TYPE ); -if (hdr_type !=PCI_HEADER_TYPE_NORMAL ) { -dev_err (pci->dev,"PCIe controller is not set to EP mode (hdr_type:0x%x)!\n" , - hdr_type); -return -EIO ; - } - ret =of_property_read_u8 (np,"max-functions" , &epc->max_functions);if (ret <0 ) epc->max_functions =1 ;
@@ -587,23 +614,12 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)dev_err (dev,"Failed to reserve memory for MSI/MSI-X\n" );return -ENOMEM ; } - ep->msi_cap =dw_pcie_find_capability (pci,PCI_CAP_ID_MSI ); - ep->msix_cap =dw_pcie_find_capability (pci,PCI_CAP_ID_MSIX ); - - offset =dw_pcie_ep_find_ext_capability (pci,PCI_EXT_CAP_ID_REBAR ); -if (offset) { - reg =dw_pcie_readl_dbi (pci, offset +PCI_REBAR_CTRL ); - nbars = (reg &PCI_REBAR_CTRL_NBAR_MASK ) >> -PCI_REBAR_CTRL_NBAR_SHIFT ; - -dw_pcie_dbi_ro_wr_en (pci); -for (i =0 ; i < nbars; i++, offset +=PCI_REBAR_CTRL ) -dw_pcie_writel_dbi (pci, offset +PCI_REBAR_CAP ,0x0 ); -dw_pcie_dbi_ro_wr_dis (pci); +if (ep->ops->get_features) { + epc_features = ep->ops->get_features (ep); +if (epc_features->core_init_notifier) +return 0 ; } -dw_pcie_setup (pci); - -return 0 ; +return dw_pcie_ep_init_complete (ep); }
drivers/pci/controller/dwc/pcie-designware.h +6 -0
@@ -411,6 +411,7 @@ static inline int dw_pcie_allocate_domains(struct pcie_port *pp)#ifdef CONFIG_PCIE_DW_EP void dw_pcie_ep_linkup (struct dw_pcie_ep *ep);int dw_pcie_ep_init (struct dw_pcie_ep *ep); +int dw_pcie_ep_init_complete (struct dw_pcie_ep *ep);void dw_pcie_ep_exit (struct dw_pcie_ep *ep);int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no); int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
@@ -428,6 +429,11 @@ static inline int dw_pcie_ep_init(struct dw_pcie_ep *ep)return 0 ; } +static inline int dw_pcie_ep_init_complete (struct dw_pcie_ep *ep) +{ +return 0 ; +} +static inline void dw_pcie_ep_exit (struct dw_pcie_ep *ep) { }
Signature · 1 line
2.17.1
PATCH v3 3/5 PCI: endpoint: Add notification for core init completion
In reply to Vidya SagarAdd support to send notifications to EPF from EPC once the core registers initialization is complete.
---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>
V2:
* None
drivers/pci/endpoint/pci-epc-core.c | 19 ++++++++++++++++++- include/linux/pci-epc.h | 1 + include/linux/pci-epf.h | 5 +++++ 3 files changed, 24 insertions(+), 1 deletion(-)
drivers/pci/endpoint/pci-epc-core.c +18 -1
@@ -540,10 +540,27 @@ void pci_epc_linkup(struct pci_epc *epc)if (!epc ||IS_ERR (epc))return ; -atomic_notifier_call_chain (&epc->notifier,0 ,NULL ); +atomic_notifier_call_chain (&epc->notifier,LINK_UP ,NULL ); }EXPORT_SYMBOL_GPL (pci_epc_linkup); +/** +* pci_epc_init_notify() - Notify the EPF device that EPC device's core +* initialization is completed. +* @epc: the EPC device whose core initialization is completeds +* +* Invoke to Notify the EPF device that the EPC device's initialization +* is completed. +*/ +void pci_epc_init_notify (struct pci_epc *epc) +{ +if (!epc ||IS_ERR (epc)) +return ; + +atomic_notifier_call_chain (&epc->notifier,CORE_INIT ,NULL ); +} +EXPORT_SYMBOL_GPL (pci_epc_init_notify); +/** * pci_epc_destroy() - destroy the EPC device * @epc: the EPC device that has to be destroyed
include/linux/pci-epc.h +1 -0
@@ -165,6 +165,7 @@ void devm_pci_epc_destroy(struct device *dev, struct pci_epc *epc);void pci_epc_destroy (struct pci_epc *epc);int pci_epc_add_epf (struct pci_epc *epc,struct pci_epf *epf);void pci_epc_linkup (struct pci_epc *epc); +void pci_epc_init_notify (struct pci_epc *epc);void pci_epc_remove_epf (struct pci_epc *epc,struct pci_epf *epf);int pci_epc_write_header (struct pci_epc *epc,u8 func_no,struct pci_epf_header *hdr);
include/linux/pci-epf.h +5 -0
@@ -15,6 +15,11 @@struct pci_epf ; +enum pci_notify_event { +CORE_INIT , +LINK_UP , +}; +enum pci_barno {BAR_0 ,BAR_1 ,
Signature · 1 line
2.17.1
PATCH v3 4/5 PCI: dwc: Add API to notify core initialization completion
In reply to Vidya SagarAdd a new API dw_pcie_ep_init_notify() to let platform drivers call it when the core is available for initialization.
---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>
V2:
* None
drivers/pci/controller/dwc/pcie-designware-ep.c | 7 +++++++ drivers/pci/controller/dwc/pcie-designware.h | 5 +++++ 2 files changed, 12 insertions(+)
drivers/pci/controller/dwc/pcie-designware-ep.c +7 -0
@@ -19,6 +19,13 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)pci_epc_linkup (epc); } +void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep) +{ +struct pci_epc *epc = ep->epc; + +pci_epc_init_notify (epc); +} +static void __dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar,int flags) {
drivers/pci/controller/dwc/pcie-designware.h +5 -0
@@ -412,6 +412,7 @@ static inline int dw_pcie_allocate_domains(struct pcie_port *pp)void dw_pcie_ep_linkup (struct dw_pcie_ep *ep);int dw_pcie_ep_init (struct dw_pcie_ep *ep);int dw_pcie_ep_init_complete (struct dw_pcie_ep *ep); +void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep);void dw_pcie_ep_exit (struct dw_pcie_ep *ep);int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no); int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
@@ -434,6 +435,10 @@ static inline int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)return 0 ; } +static inline void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep) +{ +} +static inline void dw_pcie_ep_exit (struct dw_pcie_ep *ep) { }
Signature · 1 line
2.17.1
Re: [PATCH V3 4/5] PCI: dwc: Add API to notify core initialization completion
Quoted 21 lines · Vidya Sagar
Add a new API
dw_pcie_ep_init_notify()to let platform drivers call it when the core is available for initialization.Signed-off-by Vidya Sagar <[email protected]>---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>V2:
* Nonedrivers/pci/controller/dwc/pcie-designware-ep.c | 7 +++++++ drivers/pci/controller/dwc/pcie-designware.h | 5 +++++ 2 files changed, 12 insertions(+)drivers/pci/controller/dwc/pcie-designware-ep.c +0
-0
drivers/pci/controller/dwc/pcie-designware-ep.c void dw_pcie_ep_linkup(struct dw_pcie_ep *ep) · line 27
Quoted 9 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +6
-0@@ -19,6 +19,13 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)pci_epc_linkup (epc); } +void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep) +{ +struct pci_epc *epc = ep->epc; + +pci_epc_init_notify (epc); +}
Do we really need this wrapper ? I would drop this code and I would appreciate if you could post tegra changes benefiting from this series, at the moment I don't see any user of this newly added infrastructure.
Thanks,
Lorenzo
Quoted 29 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +0
-0static void __dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar,int flags) {drivers/pci/controller/dwc/pcie-designware.h +5
-0@@ -412,6 +412,7 @@ static inline int dw_pcie_allocate_domains(struct pcie_port *pp)void dw_pcie_ep_linkup (struct dw_pcie_ep *ep);int dw_pcie_ep_init (struct dw_pcie_ep *ep);int dw_pcie_ep_init_complete (struct dw_pcie_ep *ep); +void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep);void dw_pcie_ep_exit (struct dw_pcie_ep *ep);int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no); int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,@@ -434,6 +435,10 @@ static inline int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)return 0 ; } +static inline void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep) +{ +} +static inline void dw_pcie_ep_exit (struct dw_pcie_ep *ep) { }Signature · 1 line
2.17.1
Re: [PATCH V3 4/5] PCI: dwc: Add API to notify core initialization completion
Quoted 28 lines · Lorenzo Pieralisi
External email: Use caution opening links or attachments
Quoted 24 lines · Vidya Sagar
Add a new API
dw_pcie_ep_init_notify()to let platform drivers call it when the core is available for initialization.Signed-off-by Vidya Sagar <[email protected]>---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>V2:
* Nonedrivers/pci/controller/dwc/pcie-designware-ep.c | 7 +++++++ drivers/pci/controller/dwc/pcie-designware.h | 5 +++++ 2 files changed, 12 insertions(+)drivers/pci/controller/dwc/pcie-designware-ep.c +0
-0@@ -19,6 +19,13 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)pci_epc_linkup (epc); }
Quoted 11 lines
drivers/pci/controller/dwc/pcie-designware-ep.c void dw_pcie_ep_linkup(struct dw_pcie_ep *ep) · line 27
Quoted 6 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +6
-0+void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep) +{ +struct pci_epc *epc = ep->epc; + +pci_epc_init_notify (epc); +}Do we really need this wrapper ? I would drop this code and I would appreciate if you could post tegra changes benefiting from this series, at the moment I don't see any user of this newly added infrastructure.
I've posted that series also for review
@ http://patchwork.ozlabs.org/project/linux-pci/list/?series=152889
Sorry if I have to create explicit dependency by some means. I'm not
aware of that and would like to know if that exists. All that I did was to mention this as a dependency for the other (Tegra change) series.
Thanks,
Vidya Sagar
Quoted 33 lines
Thanks,
LorenzoQuoted 29 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +0
-0static void __dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar,int flags) {drivers/pci/controller/dwc/pcie-designware.h +5
-1@@ -412,6 +412,7 @@ static inline int dw_pcie_allocate_domains(struct pcie_port *pp)void dw_pcie_ep_linkup (struct dw_pcie_ep *ep);int dw_pcie_ep_init (struct dw_pcie_ep *ep);int dw_pcie_ep_init_complete (struct dw_pcie_ep *ep); +void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep);void dw_pcie_ep_exit (struct dw_pcie_ep *ep);int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no); int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,@@ -434,6 +435,10 @@ static inline int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)return 0 ; } +static inline void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep) +{ +} +static inline void dw_pcie_ep_exit (struct dw_pcie_ep *ep) { } --2.17.1
Re: [PATCH V3 4/5] PCI: dwc: Add API to notify core initialization completion
Quoted 42 lines · Vidya Sagar
Quoted 28 lines · Lorenzo Pieralisi
External email: Use caution opening links or attachments
Quoted 24 lines · Vidya Sagar
Add a new API
dw_pcie_ep_init_notify()to let platform drivers call it when the core is available for initialization.Signed-off-by Vidya Sagar <[email protected]>---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>V2:
* Nonedrivers/pci/controller/dwc/pcie-designware-ep.c | 7 +++++++ drivers/pci/controller/dwc/pcie-designware.h | 5 +++++ 2 files changed, 12 insertions(+)drivers/pci/controller/dwc/pcie-designware-ep.c +0
-0@@ -19,6 +19,13 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)pci_epc_linkup (epc); }Quoted 11 lines
drivers/pci/controller/dwc/pcie-designware-ep.c void dw_pcie_ep_linkup(struct dw_pcie_ep *ep) · line 27
Quoted 6 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +6
-0+void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep) +{ +struct pci_epc *epc = ep->epc; + +pci_epc_init_notify (epc); +}Do we really need this wrapper ? I would drop this code and I would appreciate if you could post tegra changes benefiting from this series, at the moment I don't see any user of this newly added infrastructure.
Quoted 5 lines
I've posted that series also for review
@ http://patchwork.ozlabs.org/project/linux-pci/list/?series=152889
Sorry if I have to create explicit dependency by some means. I'm not aware of that and would like to know if that exists. All that I did was to mention this as a dependency for the other (Tegra change) series.
No worries - I just want to merge code that is actually used, I assume the series above should be reposted right ? You need an ACK from Thierry for it and we can merge the whole thing on top of Kishon's patches.
I was just referring to the wrapper above, it does not seem very useful given that we can call pci_epc_init_notify() directly, please correct me if I am wrong, there does not seem to be anything DWC specific (at least for the time being) in the _notify() hook.
Thanks,
Lorenzo
Quoted 37 lines
Thanks,
Vidya SagarQuoted 33 lines
Thanks,
LorenzoQuoted 29 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +0
-0static void __dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar,int flags) {drivers/pci/controller/dwc/pcie-designware.h +5
-1@@ -412,6 +412,7 @@ static inline int dw_pcie_allocate_domains(struct pcie_port *pp)void dw_pcie_ep_linkup (struct dw_pcie_ep *ep);int dw_pcie_ep_init (struct dw_pcie_ep *ep);int dw_pcie_ep_init_complete (struct dw_pcie_ep *ep); +void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep);void dw_pcie_ep_exit (struct dw_pcie_ep *ep);int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no); int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,@@ -434,6 +435,10 @@ static inline int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)return 0 ; } +static inline void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep) +{ +} +static inline void dw_pcie_ep_exit (struct dw_pcie_ep *ep) { } --2.17.1
Re: [PATCH V3 4/5] PCI: dwc: Add API to notify core initialization completion
Quoted 52 lines · Lorenzo Pieralisi
External email: Use caution opening links or attachments
Quoted 42 lines · Vidya Sagar
Quoted 28 lines · Lorenzo Pieralisi
External email: Use caution opening links or attachments
Quoted 24 lines · Vidya Sagar
Add a new API
dw_pcie_ep_init_notify()to let platform drivers call it when the core is available for initialization.Signed-off-by Vidya Sagar <[email protected]>---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>V2:
* Nonedrivers/pci/controller/dwc/pcie-designware-ep.c | 7 +++++++ drivers/pci/controller/dwc/pcie-designware.h | 5 +++++ 2 files changed, 12 insertions(+)drivers/pci/controller/dwc/pcie-designware-ep.c +0
-0@@ -19,6 +19,13 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)pci_epc_linkup (epc); }Quoted 11 lines
drivers/pci/controller/dwc/pcie-designware-ep.c void dw_pcie_ep_linkup(struct dw_pcie_ep *ep) · line 27
Quoted 6 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +6
-0+void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep) +{ +struct pci_epc *epc = ep->epc; + +pci_epc_init_notify (epc); +}Do we really need this wrapper ? I would drop this code and I would appreciate if you could post tegra changes benefiting from this series, at the moment I don't see any user of this newly added infrastructure.
Quoted 5 lines
I've posted that series also for review
@ http://patchwork.ozlabs.org/project/linux-pci/list/?series=152889
Sorry if I have to create explicit dependency by some means. I'm not aware of that and would like to know if that exists. All that I did was to mention this as a dependency for the other (Tegra change) series.
Quoted 3 lines
No worries - I just want to merge code that is actually used, I assume the series above should be reposted right ? You need an ACK from Thierry for it and we can merge the whole thing on top of Kishon's patches.
I'll get the Ack from Thierry.
BTW, my Tegra change series applies cleanly on top of this series. Do I still need to repost them?
Quoted 5 lines
I was just referring to the wrapper above, it does not seem very useful given that we can call
pci_epc_init_notify()directly, please correct me if I am wrong, there does not seem to be anything DWC specific (at least for the time being) in the_notify()hook.
This is inline with other API dw_pcie_ep_linkup() for which this notification mechanism is used.
Thanks,
Vidya Sagar
Quoted 41 lines
Thanks,
LorenzoQuoted 37 lines
Thanks,
Vidya SagarQuoted 33 lines
Thanks,
LorenzoQuoted 29 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +0
-0static void __dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar,int flags) {drivers/pci/controller/dwc/pcie-designware.h +5
-1@@ -412,6 +412,7 @@ static inline int dw_pcie_allocate_domains(struct pcie_port *pp)void dw_pcie_ep_linkup (struct dw_pcie_ep *ep);int dw_pcie_ep_init (struct dw_pcie_ep *ep);int dw_pcie_ep_init_complete (struct dw_pcie_ep *ep); +void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep);void dw_pcie_ep_exit (struct dw_pcie_ep *ep);int dw_pcie_ep_raise_legacy_irq (struct dw_pcie_ep *ep,u8 func_no); int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,@@ -434,6 +435,10 @@ static inline int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)return 0 ; } +static inline void dw_pcie_ep_init_notify (struct dw_pcie_ep *ep) +{ +} +static inline void dw_pcie_ep_exit (struct dw_pcie_ep *ep) { } --2.17.1
Re: [PATCH V3 4/5] PCI: dwc: Add API to notify core initialization completion
On Mon, Feb 24, 2020 at 10:27:12PM +0530, Vidya Sagar wrote:
[...]
Quoted 6 lines
Quoted 3 lines
No worries - I just want to merge code that is actually used, I assume the series above should be reposted right ? You need an ACK from Thierry for it and we can merge the whole thing on top of Kishon's patches.
I'll get the Ack from Thierry.
BTW, my Tegra change series applies cleanly on top of this series. Do I still need to repost them?
No, no need then, I will take a look at it shortly.
Lorenzo
PATCH v3 5/5 PCI: pci-epf-test: Add support to defer core initialization
In reply to Vidya SagarAdd support to defer core initialization and to receive a notifier when core is ready to accommodate platforms where core is not for initialization untile reference clock from host is available.
---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>
V2:
* Addressed review comments from Kishon
drivers/pci/endpoint/functions/pci-epf-test.c | 118 ++++++++++++------ 1 file changed, 77 insertions(+), 41 deletions(-)
drivers/pci/endpoint/functions/pci-epf-test.c +77 -41
@@ -360,18 +360,6 @@ static void pci_epf_test_cmd_handler(struct work_struct *work) msecs_to_jiffies(1)); } -static int pci_epf_test_notifier (struct notifier_block *nb,unsigned long val, -void *data) -{ - struct pci_epf *epf = container_of(nb, struct pci_epf, nb); -struct pci_epf_test *epf_test =epf_get_drvdata (epf); - -queue_delayed_work (kpcitest_workqueue, &epf_test->cmd_handler, -msecs_to_jiffies (1 )); - -return NOTIFY_OK ; -} -static void pci_epf_test_unbind (struct pci_epf *epf) {struct pci_epf_test *epf_test =epf_get_drvdata (epf);
@@ -428,6 +416,78 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)return 0 ; } +static int pci_epf_test_core_init (struct pci_epf *epf) +{ +struct pci_epf_header *header = epf->header; +const struct pci_epc_features *epc_features; +struct pci_epc *epc = epf->epc; +struct device *dev = &epf->dev; +bool msix_capable = false; +bool msi_capable = true; +int ret; + + epc_features =pci_epc_get_features (epc, epf->func_no); +if (epc_features) { + msix_capable = epc_features->msix_capable; + msi_capable = epc_features->msi_capable; + } + + ret =pci_epc_write_header (epc, epf->func_no, header); +if (ret) { +dev_err (dev,"Configuration header write failed\n" ); +return ret; + } + + ret =pci_epf_test_set_bar (epf); +if (ret) +return ret; + +if (msi_capable) { + ret =pci_epc_set_msi (epc, epf->func_no, epf->msi_interrupts); +if (ret) { +dev_err (dev,"MSI configuration failed\n" ); +return ret; + } + } + +if (msix_capable) { + ret =pci_epc_set_msix (epc, epf->func_no, epf->msix_interrupts); +if (ret) { +dev_err (dev,"MSI-X configuration failed\n" ); +return ret; + } + } + +return 0 ; +} + +static int pci_epf_test_notifier (struct notifier_block *nb,unsigned long val, +void *data) +{ + struct pci_epf *epf = container_of(nb, struct pci_epf, nb); +struct pci_epf_test *epf_test =epf_get_drvdata (epf); +int ret; + +switch (val) { +case CORE_INIT : + ret =pci_epf_test_core_init (epf); +if (ret) +return NOTIFY_BAD ; +break ; + +case LINK_UP : +queue_delayed_work (kpcitest_workqueue, &epf_test->cmd_handler, +msecs_to_jiffies (1 )); +break ; + +default : +dev_err (&epf->dev,"Invalid EPF test notifier event\n" ); +return NOTIFY_BAD ; + } + +return NOTIFY_OK ; +} +static int pci_epf_test_alloc_space (struct pci_epf *epf) {struct pci_epf_test *epf_test =epf_get_drvdata (epf);
@@ -496,14 +556,11 @@ static int pci_epf_test_bind(struct pci_epf *epf) {int ret;struct pci_epf_test *epf_test =epf_get_drvdata (epf); -struct pci_epf_header *header = epf->header;const struct pci_epc_features *epc_features;enum pci_barno test_reg_bar =BAR_0 ;struct pci_epc *epc = epf->epc; -struct device *dev = &epf->dev;bool linkup_notifier = false; -bool msix_capable = false; -bool msi_capable = true; +bool core_init_notifier = false;if (WARN_ON_ONCE (!epc))return -EINVAL ;
@@ -511,8 +568,7 @@ static int pci_epf_test_bind(struct pci_epf *epf) epc_features =pci_epc_get_features (epc, epf->func_no);if (epc_features) { linkup_notifier = epc_features->linkup_notifier; - msix_capable = epc_features->msix_capable; - msi_capable = epc_features->msi_capable; + core_init_notifier = epc_features->core_init_notifier; test_reg_bar =pci_epc_get_first_free_bar (epc_features);pci_epf_configure_bar (epf, epc_features); }
@@ -520,34 +576,14 @@ static int pci_epf_test_bind(struct pci_epf *epf) epf_test->test_reg_bar = test_reg_bar; epf_test->epc_features = epc_features; - ret =pci_epc_write_header (epc, epf->func_no, header); -if (ret) { -dev_err (dev,"Configuration header write failed\n" ); -return ret; - } - ret =pci_epf_test_alloc_space (epf);if (ret)return ret; - ret =pci_epf_test_set_bar (epf); -if (ret) -return ret; - -if (msi_capable) { - ret =pci_epc_set_msi (epc, epf->func_no, epf->msi_interrupts); -if (ret) { -dev_err (dev,"MSI configuration failed\n" ); -return ret; - } - } - -if (msix_capable) { - ret =pci_epc_set_msix (epc, epf->func_no, epf->msix_interrupts); -if (ret) { -dev_err (dev,"MSI-X configuration failed\n" ); +if (!core_init_notifier) { + ret =pci_epf_test_core_init (epf); +if (ret)return ret; - } }if (linkup_notifier) {
Signature · 1 line
2.17.1
Re: [PATCH V3 5/5] PCI: pci-epf-test: Add support to defer core initialization
Quoted 3 lines · Vidya Sagar
Add support to defer core initialization and to receive a notifier when core is ready to accommodate platforms where core is not for initialization untile reference clock from host is available.
I don't understand this commit log, please reword it and fix the typos, I would merge it then, thanks.
Lorenzo
Quoted 181 lines
Signed-off-by Vidya Sagar <[email protected]>---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>V2:
* Addressed review comments from Kishondrivers/pci/endpoint/functions/pci-epf-test.c | 118 ++++++++++++------ 1 file changed, 77 insertions(+), 41 deletions(-)drivers/pci/endpoint/functions/pci-epf-test.c +77
-41@@ -360,18 +360,6 @@ static void pci_epf_test_cmd_handler(struct work_struct *work) msecs_to_jiffies(1)); } -static int pci_epf_test_notifier (struct notifier_block *nb,unsigned long val, -void *data) -{ - struct pci_epf *epf = container_of(nb, struct pci_epf, nb); -struct pci_epf_test *epf_test =epf_get_drvdata (epf); - -queue_delayed_work (kpcitest_workqueue, &epf_test->cmd_handler, -msecs_to_jiffies (1 )); - -return NOTIFY_OK ; -} -static void pci_epf_test_unbind (struct pci_epf *epf) {struct pci_epf_test *epf_test =epf_get_drvdata (epf);@@ -428,6 +416,78 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)return 0 ; } +static int pci_epf_test_core_init (struct pci_epf *epf) +{ +struct pci_epf_header *header = epf->header; +const struct pci_epc_features *epc_features; +struct pci_epc *epc = epf->epc; +struct device *dev = &epf->dev; +bool msix_capable = false; +bool msi_capable = true; +int ret; + + epc_features =pci_epc_get_features (epc, epf->func_no); +if (epc_features) { + msix_capable = epc_features->msix_capable; + msi_capable = epc_features->msi_capable; + } + + ret =pci_epc_write_header (epc, epf->func_no, header); +if (ret) { +dev_err (dev,"Configuration header write failed\n" ); +return ret; + } + + ret =pci_epf_test_set_bar (epf); +if (ret) +return ret; + +if (msi_capable) { + ret =pci_epc_set_msi (epc, epf->func_no, epf->msi_interrupts); +if (ret) { +dev_err (dev,"MSI configuration failed\n" ); +return ret; + } + } + +if (msix_capable) { + ret =pci_epc_set_msix (epc, epf->func_no, epf->msix_interrupts); +if (ret) { +dev_err (dev,"MSI-X configuration failed\n" ); +return ret; + } + } + +return 0 ; +} + +static int pci_epf_test_notifier (struct notifier_block *nb,unsigned long val, +void *data) +{ + struct pci_epf *epf = container_of(nb, struct pci_epf, nb); +struct pci_epf_test *epf_test =epf_get_drvdata (epf); +int ret; + +switch (val) { +case CORE_INIT : + ret =pci_epf_test_core_init (epf); +if (ret) +return NOTIFY_BAD ; +break ; + +case LINK_UP : +queue_delayed_work (kpcitest_workqueue, &epf_test->cmd_handler, +msecs_to_jiffies (1 )); +break ; + +default : +dev_err (&epf->dev,"Invalid EPF test notifier event\n" ); +return NOTIFY_BAD ; + } + +return NOTIFY_OK ; +} +static int pci_epf_test_alloc_space (struct pci_epf *epf) {struct pci_epf_test *epf_test =epf_get_drvdata (epf);@@ -496,14 +556,11 @@ static int pci_epf_test_bind(struct pci_epf *epf) {int ret;struct pci_epf_test *epf_test =epf_get_drvdata (epf); -struct pci_epf_header *header = epf->header;const struct pci_epc_features *epc_features;enum pci_barno test_reg_bar =BAR_0 ;struct pci_epc *epc = epf->epc; -struct device *dev = &epf->dev;bool linkup_notifier = false; -bool msix_capable = false; -bool msi_capable = true; +bool core_init_notifier = false;if (WARN_ON_ONCE (!epc))return -EINVAL ;@@ -511,8 +568,7 @@ static int pci_epf_test_bind(struct pci_epf *epf) epc_features =pci_epc_get_features (epc, epf->func_no);if (epc_features) { linkup_notifier = epc_features->linkup_notifier; - msix_capable = epc_features->msix_capable; - msi_capable = epc_features->msi_capable; + core_init_notifier = epc_features->core_init_notifier; test_reg_bar =pci_epc_get_first_free_bar (epc_features);pci_epf_configure_bar (epf, epc_features); }@@ -520,34 +576,14 @@ static int pci_epf_test_bind(struct pci_epf *epf) epf_test->test_reg_bar = test_reg_bar; epf_test->epc_features = epc_features; - ret =pci_epc_write_header (epc, epf->func_no, header); -if (ret) { -dev_err (dev,"Configuration header write failed\n" ); -return ret; - } - ret =pci_epf_test_alloc_space (epf);if (ret)return ret; - ret =pci_epf_test_set_bar (epf); -if (ret) -return ret; - -if (msi_capable) { - ret =pci_epc_set_msi (epc, epf->func_no, epf->msi_interrupts); -if (ret) { -dev_err (dev,"MSI configuration failed\n" ); -return ret; - } - } - -if (msix_capable) { - ret =pci_epc_set_msix (epc, epf->func_no, epf->msix_interrupts); -if (ret) { -dev_err (dev,"MSI-X configuration failed\n" ); +if (!core_init_notifier) { + ret =pci_epf_test_core_init (epf); +if (ret)return ret; - } }if (linkup_notifier) {Signature · 1 line
2.17.1
Re: [PATCH V3 5/5] PCI: pci-epf-test: Add support to defer core initialization
Quoted 10 lines · Lorenzo Pieralisi
External email: Use caution opening links or attachments
Quoted 3 lines · Vidya Sagar
Add support to defer core initialization and to receive a notifier when core is ready to accommodate platforms where core is not for initialization untile reference clock from host is available.
I don't understand this commit log, please reword it and fix the typos, I would merge it then, thanks.
Would the following be ok?
Add support to defer DWC core initialization for the endpoint mode of operation. Initialization would resume based on the notifier mechanism. This would enable support for implementations like Tegra194 for endpoint mode operation, where the core initialization needs to be deferred until the PCIe reference clock is available from the host system.
If it is ok, I'll send new patch series with this commit log.
Thanks,
Vidya Sagar
Quoted 184 lines
Lorenzo
Quoted 181 lines
Signed-off-by Vidya Sagar <[email protected]>---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>V2:
* Addressed review comments from Kishondrivers/pci/endpoint/functions/pci-epf-test.c | 118 ++++++++++++------ 1 file changed, 77 insertions(+), 41 deletions(-)drivers/pci/endpoint/functions/pci-epf-test.c +77
-42@@ -360,18 +360,6 @@ static void pci_epf_test_cmd_handler(struct work_struct *work) msecs_to_jiffies(1)); } -static int pci_epf_test_notifier (struct notifier_block *nb,unsigned long val, -void *data) -{ - struct pci_epf *epf = container_of(nb, struct pci_epf, nb); -struct pci_epf_test *epf_test =epf_get_drvdata (epf); - -queue_delayed_work (kpcitest_workqueue, &epf_test->cmd_handler, -msecs_to_jiffies (1 )); - -return NOTIFY_OK ; -} -static void pci_epf_test_unbind (struct pci_epf *epf) {struct pci_epf_test *epf_test =epf_get_drvdata (epf);@@ -428,6 +416,78 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)return 0 ; } +static int pci_epf_test_core_init (struct pci_epf *epf) +{ +struct pci_epf_header *header = epf->header; +const struct pci_epc_features *epc_features; +struct pci_epc *epc = epf->epc; +struct device *dev = &epf->dev; +bool msix_capable = false; +bool msi_capable = true; +int ret; + + epc_features =pci_epc_get_features (epc, epf->func_no); +if (epc_features) { + msix_capable = epc_features->msix_capable; + msi_capable = epc_features->msi_capable; + } + + ret =pci_epc_write_header (epc, epf->func_no, header); +if (ret) { +dev_err (dev,"Configuration header write failed\n" ); +return ret; + } + + ret =pci_epf_test_set_bar (epf); +if (ret) +return ret; + +if (msi_capable) { + ret =pci_epc_set_msi (epc, epf->func_no, epf->msi_interrupts); +if (ret) { +dev_err (dev,"MSI configuration failed\n" ); +return ret; + } + } + +if (msix_capable) { + ret =pci_epc_set_msix (epc, epf->func_no, epf->msix_interrupts); +if (ret) { +dev_err (dev,"MSI-X configuration failed\n" ); +return ret; + } + } + +return 0 ; +} + +static int pci_epf_test_notifier (struct notifier_block *nb,unsigned long val, +void *data) +{ + struct pci_epf *epf = container_of(nb, struct pci_epf, nb); +struct pci_epf_test *epf_test =epf_get_drvdata (epf); +int ret; + +switch (val) { +case CORE_INIT : + ret =pci_epf_test_core_init (epf); +if (ret) +return NOTIFY_BAD ; +break ; + +case LINK_UP : +queue_delayed_work (kpcitest_workqueue, &epf_test->cmd_handler, +msecs_to_jiffies (1 )); +break ; + +default : +dev_err (&epf->dev,"Invalid EPF test notifier event\n" ); +return NOTIFY_BAD ; + } + +return NOTIFY_OK ; +} +static int pci_epf_test_alloc_space (struct pci_epf *epf) {struct pci_epf_test *epf_test =epf_get_drvdata (epf);@@ -496,14 +556,11 @@ static int pci_epf_test_bind(struct pci_epf *epf) {int ret;struct pci_epf_test *epf_test =epf_get_drvdata (epf); -struct pci_epf_header *header = epf->header;const struct pci_epc_features *epc_features;enum pci_barno test_reg_bar =BAR_0 ;struct pci_epc *epc = epf->epc; -struct device *dev = &epf->dev;bool linkup_notifier = false; -bool msix_capable = false; -bool msi_capable = true; +bool core_init_notifier = false;if (WARN_ON_ONCE (!epc))return -EINVAL ;@@ -511,8 +568,7 @@ static int pci_epf_test_bind(struct pci_epf *epf) epc_features =pci_epc_get_features (epc, epf->func_no);if (epc_features) { linkup_notifier = epc_features->linkup_notifier; - msix_capable = epc_features->msix_capable; - msi_capable = epc_features->msi_capable; + core_init_notifier = epc_features->core_init_notifier; test_reg_bar =pci_epc_get_first_free_bar (epc_features);pci_epf_configure_bar (epf, epc_features); }@@ -520,34 +576,14 @@ static int pci_epf_test_bind(struct pci_epf *epf) epf_test->test_reg_bar = test_reg_bar; epf_test->epc_features = epc_features; - ret =pci_epc_write_header (epc, epf->func_no, header); -if (ret) { -dev_err (dev,"Configuration header write failed\n" ); -return ret; - } - ret =pci_epf_test_alloc_space (epf);if (ret)return ret; - ret =pci_epf_test_set_bar (epf); -if (ret) -return ret; - -if (msi_capable) { - ret =pci_epc_set_msi (epc, epf->func_no, epf->msi_interrupts); -if (ret) { -dev_err (dev,"MSI configuration failed\n" ); -return ret; - } - } - -if (msix_capable) { - ret =pci_epc_set_msix (epc, epf->func_no, epf->msix_interrupts); -if (ret) { -dev_err (dev,"MSI-X configuration failed\n" ); +if (!core_init_notifier) { + ret =pci_epf_test_core_init (epf); +if (ret)return ret; - } }if (linkup_notifier) { --2.17.1
Re: [PATCH V3 5/5] PCI: pci-epf-test: Add support to defer core initialization
Quoted 11 lines · Vidya Sagar
Quoted 8 lines · Lorenzo Pieralisi
External email: Use caution opening links or attachments
Quoted 3 lines · Vidya Sagar
Add support to defer core initialization and to receive a notifier when core is ready to accommodate platforms where core is not for initialization untile reference clock from host is available.
Quoted 5 lines
Quoted 2 lines
I don't understand this commit log, please reword it and fix the typos, I would merge it then, thanks.
Would the following be ok?
Add support to defer DWC core initialization for the endpoint mode of
I removed "DWC" since this is not what this patch is actually doing.
Quoted 7 lines
operation. Initialization would resume based on the notifier mechanism. This would enable support for implementations like Tegra194 for endpoint mode operation, where the core initialization needs to be deferred until the PCIe reference clock is available from the host system.
If it is ok, I'll send new patch series with this commit log.
No need, merged in pci/endpoint for v5.7, thanks.
Lorenzo
Quoted 186 lines
Thanks,
Vidya SagarQuoted 184 lines
Lorenzo
Quoted 181 lines
Signed-off-by Vidya Sagar <[email protected]>---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>V2:
* Addressed review comments from Kishondrivers/pci/endpoint/functions/pci-epf-test.c | 118 ++++++++++++------ 1 file changed, 77 insertions(+), 41 deletions(-)drivers/pci/endpoint/functions/pci-epf-test.c +77
-42@@ -360,18 +360,6 @@ static void pci_epf_test_cmd_handler(struct work_struct *work) msecs_to_jiffies(1)); } -static int pci_epf_test_notifier (struct notifier_block *nb,unsigned long val, -void *data) -{ - struct pci_epf *epf = container_of(nb, struct pci_epf, nb); -struct pci_epf_test *epf_test =epf_get_drvdata (epf); - -queue_delayed_work (kpcitest_workqueue, &epf_test->cmd_handler, -msecs_to_jiffies (1 )); - -return NOTIFY_OK ; -} -static void pci_epf_test_unbind (struct pci_epf *epf) {struct pci_epf_test *epf_test =epf_get_drvdata (epf);@@ -428,6 +416,78 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)return 0 ; } +static int pci_epf_test_core_init (struct pci_epf *epf) +{ +struct pci_epf_header *header = epf->header; +const struct pci_epc_features *epc_features; +struct pci_epc *epc = epf->epc; +struct device *dev = &epf->dev; +bool msix_capable = false; +bool msi_capable = true; +int ret; + + epc_features =pci_epc_get_features (epc, epf->func_no); +if (epc_features) { + msix_capable = epc_features->msix_capable; + msi_capable = epc_features->msi_capable; + } + + ret =pci_epc_write_header (epc, epf->func_no, header); +if (ret) { +dev_err (dev,"Configuration header write failed\n" ); +return ret; + } + + ret =pci_epf_test_set_bar (epf); +if (ret) +return ret; + +if (msi_capable) { + ret =pci_epc_set_msi (epc, epf->func_no, epf->msi_interrupts); +if (ret) { +dev_err (dev,"MSI configuration failed\n" ); +return ret; + } + } + +if (msix_capable) { + ret =pci_epc_set_msix (epc, epf->func_no, epf->msix_interrupts); +if (ret) { +dev_err (dev,"MSI-X configuration failed\n" ); +return ret; + } + } + +return 0 ; +} + +static int pci_epf_test_notifier (struct notifier_block *nb,unsigned long val, +void *data) +{ + struct pci_epf *epf = container_of(nb, struct pci_epf, nb); +struct pci_epf_test *epf_test =epf_get_drvdata (epf); +int ret; + +switch (val) { +case CORE_INIT : + ret =pci_epf_test_core_init (epf); +if (ret) +return NOTIFY_BAD ; +break ; + +case LINK_UP : +queue_delayed_work (kpcitest_workqueue, &epf_test->cmd_handler, +msecs_to_jiffies (1 )); +break ; + +default : +dev_err (&epf->dev,"Invalid EPF test notifier event\n" ); +return NOTIFY_BAD ; + } + +return NOTIFY_OK ; +} +static int pci_epf_test_alloc_space (struct pci_epf *epf) {struct pci_epf_test *epf_test =epf_get_drvdata (epf);@@ -496,14 +556,11 @@ static int pci_epf_test_bind(struct pci_epf *epf) {int ret;struct pci_epf_test *epf_test =epf_get_drvdata (epf); -struct pci_epf_header *header = epf->header;const struct pci_epc_features *epc_features;enum pci_barno test_reg_bar =BAR_0 ;struct pci_epc *epc = epf->epc; -struct device *dev = &epf->dev;bool linkup_notifier = false; -bool msix_capable = false; -bool msi_capable = true; +bool core_init_notifier = false;if (WARN_ON_ONCE (!epc))return -EINVAL ;@@ -511,8 +568,7 @@ static int pci_epf_test_bind(struct pci_epf *epf) epc_features =pci_epc_get_features (epc, epf->func_no);if (epc_features) { linkup_notifier = epc_features->linkup_notifier; - msix_capable = epc_features->msix_capable; - msi_capable = epc_features->msi_capable; + core_init_notifier = epc_features->core_init_notifier; test_reg_bar =pci_epc_get_first_free_bar (epc_features);pci_epf_configure_bar (epf, epc_features); }@@ -520,34 +576,14 @@ static int pci_epf_test_bind(struct pci_epf *epf) epf_test->test_reg_bar = test_reg_bar; epf_test->epc_features = epc_features; - ret =pci_epc_write_header (epc, epf->func_no, header); -if (ret) { -dev_err (dev,"Configuration header write failed\n" ); -return ret; - } - ret =pci_epf_test_alloc_space (epf);if (ret)return ret; - ret =pci_epf_test_set_bar (epf); -if (ret) -return ret; - -if (msi_capable) { - ret =pci_epc_set_msi (epc, epf->func_no, epf->msi_interrupts); -if (ret) { -dev_err (dev,"MSI configuration failed\n" ); -return ret; - } - } - -if (msix_capable) { - ret =pci_epc_set_msix (epc, epf->func_no, epf->msix_interrupts); -if (ret) { -dev_err (dev,"MSI-X configuration failed\n" ); +if (!core_init_notifier) { + ret =pci_epf_test_core_init (epf); +if (ret)return ret; - } }if (linkup_notifier) { --2.17.1
Re: [PATCH V3 5/5] PCI: pci-epf-test: Add support to defer core initialization
Quoted 29 lines · Lorenzo Pieralisi
External email: Use caution opening links or attachments
Quoted 11 lines · Vidya Sagar
Quoted 8 lines · Lorenzo Pieralisi
External email: Use caution opening links or attachments
Quoted 3 lines · Vidya Sagar
Add support to defer core initialization and to receive a notifier when core is ready to accommodate platforms where core is not for initialization untile reference clock from host is available.
Quoted 5 lines
Quoted 2 lines
I don't understand this commit log, please reword it and fix the typos, I would merge it then, thanks.
Would the following be ok?
Add support to defer DWC core initialization for the endpoint mode of
I removed "DWC" since this is not what this patch is actually doing.
Quoted 6 lines
operation. Initialization would resume based on the notifier mechanism. This would enable support for implementations like Tegra194 for endpoint mode operation, where the core initialization needs to be deferred until the PCIe reference clock is available from the host system.
Quoted 3 lines
Quoted 1 line
If it is ok, I'll send new patch series with this commit log.
No need, merged in pci/endpoint for v5.7, thanks.
Thanks,
Vidya Sagar
Quoted 189 lines
Lorenzo
Quoted 186 lines
Thanks,
Vidya SagarQuoted 184 lines
Lorenzo
Quoted 181 lines
Signed-off-by Vidya Sagar <[email protected]>---
V3:
* Added Acked-by: Kishon Vijay Abraham I <[email protected]>V2:
* Addressed review comments from Kishondrivers/pci/endpoint/functions/pci-epf-test.c | 118 ++++++++++++------ 1 file changed, 77 insertions(+), 41 deletions(-)drivers/pci/endpoint/functions/pci-epf-test.c +77
-42@@ -360,18 +360,6 @@ static void pci_epf_test_cmd_handler(struct work_struct *work) msecs_to_jiffies(1)); } -static int pci_epf_test_notifier (struct notifier_block *nb,unsigned long val, -void *data) -{ - struct pci_epf *epf = container_of(nb, struct pci_epf, nb); -struct pci_epf_test *epf_test =epf_get_drvdata (epf); - -queue_delayed_work (kpcitest_workqueue, &epf_test->cmd_handler, -msecs_to_jiffies (1 )); - -return NOTIFY_OK ; -} -static void pci_epf_test_unbind (struct pci_epf *epf) {struct pci_epf_test *epf_test =epf_get_drvdata (epf);@@ -428,6 +416,78 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)return 0 ; } +static int pci_epf_test_core_init (struct pci_epf *epf) +{ +struct pci_epf_header *header = epf->header; +const struct pci_epc_features *epc_features; +struct pci_epc *epc = epf->epc; +struct device *dev = &epf->dev; +bool msix_capable = false; +bool msi_capable = true; +int ret; + + epc_features =pci_epc_get_features (epc, epf->func_no); +if (epc_features) { + msix_capable = epc_features->msix_capable; + msi_capable = epc_features->msi_capable; + } + + ret =pci_epc_write_header (epc, epf->func_no, header); +if (ret) { +dev_err (dev,"Configuration header write failed\n" ); +return ret; + } + + ret =pci_epf_test_set_bar (epf); +if (ret) +return ret; + +if (msi_capable) { + ret =pci_epc_set_msi (epc, epf->func_no, epf->msi_interrupts); +if (ret) { +dev_err (dev,"MSI configuration failed\n" ); +return ret; + } + } + +if (msix_capable) { + ret =pci_epc_set_msix (epc, epf->func_no, epf->msix_interrupts); +if (ret) { +dev_err (dev,"MSI-X configuration failed\n" ); +return ret; + } + } + +return 0 ; +} + +static int pci_epf_test_notifier (struct notifier_block *nb,unsigned long val, +void *data) +{ + struct pci_epf *epf = container_of(nb, struct pci_epf, nb); +struct pci_epf_test *epf_test =epf_get_drvdata (epf); +int ret; + +switch (val) { +case CORE_INIT : + ret =pci_epf_test_core_init (epf); +if (ret) +return NOTIFY_BAD ; +break ; + +case LINK_UP : +queue_delayed_work (kpcitest_workqueue, &epf_test->cmd_handler, +msecs_to_jiffies (1 )); +break ; + +default : +dev_err (&epf->dev,"Invalid EPF test notifier event\n" ); +return NOTIFY_BAD ; + } + +return NOTIFY_OK ; +} +static int pci_epf_test_alloc_space (struct pci_epf *epf) {struct pci_epf_test *epf_test =epf_get_drvdata (epf);@@ -496,14 +556,11 @@ static int pci_epf_test_bind(struct pci_epf *epf) {int ret;struct pci_epf_test *epf_test =epf_get_drvdata (epf); -struct pci_epf_header *header = epf->header;const struct pci_epc_features *epc_features;enum pci_barno test_reg_bar =BAR_0 ;struct pci_epc *epc = epf->epc; -struct device *dev = &epf->dev;bool linkup_notifier = false; -bool msix_capable = false; -bool msi_capable = true; +bool core_init_notifier = false;if (WARN_ON_ONCE (!epc))return -EINVAL ;@@ -511,8 +568,7 @@ static int pci_epf_test_bind(struct pci_epf *epf) epc_features =pci_epc_get_features (epc, epf->func_no);if (epc_features) { linkup_notifier = epc_features->linkup_notifier; - msix_capable = epc_features->msix_capable; - msi_capable = epc_features->msi_capable; + core_init_notifier = epc_features->core_init_notifier; test_reg_bar =pci_epc_get_first_free_bar (epc_features);pci_epf_configure_bar (epf, epc_features); }@@ -520,34 +576,14 @@ static int pci_epf_test_bind(struct pci_epf *epf) epf_test->test_reg_bar = test_reg_bar; epf_test->epc_features = epc_features; - ret =pci_epc_write_header (epc, epf->func_no, header); -if (ret) { -dev_err (dev,"Configuration header write failed\n" ); -return ret; - } - ret =pci_epf_test_alloc_space (epf);if (ret)return ret; - ret =pci_epf_test_set_bar (epf); -if (ret) -return ret; - -if (msi_capable) { - ret =pci_epc_set_msi (epc, epf->func_no, epf->msi_interrupts); -if (ret) { -dev_err (dev,"MSI configuration failed\n" ); -return ret; - } - } - -if (msix_capable) { - ret =pci_epc_set_msix (epc, epf->func_no, epf->msix_interrupts); -if (ret) { -dev_err (dev,"MSI-X configuration failed\n" ); +if (!core_init_notifier) { + ret =pci_epf_test_core_init (epf); +if (ret)return ret; - } }if (linkup_notifier) { --2.17.1