| Message ID | 20221013181815.2133-2-vidyas@nvidia.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | Add DeInit support in the PCIe Endpoint framework | expand |
On Thu, Oct 13, 2022 at 11:48:12PM +0530, Vidya Sagar wrote: > The endpoint function driver should undo the things done in core_init() > and stop hardware access before deinitializing the controller. Add > core_deinit() callback support for function driver to do this cleanup. > This core_deinit() callback should be invoked by the controller driver > before deinitializing the controller. > > Signed-off-by: Vidya Sagar <vidyas@nvidia.com> > --- > V2: > * Reworded the commit message > > drivers/pci/endpoint/pci-epc-core.c | 26 ++++++++++++++++++++++++++ > include/linux/pci-epc.h | 1 + > include/linux/pci-epf.h | 2 ++ > 3 files changed, 29 insertions(+) > > diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c > index 5dac1496cf16..689450f01f75 100644 > --- a/drivers/pci/endpoint/pci-epc-core.c > +++ b/drivers/pci/endpoint/pci-epc-core.c > @@ -732,6 +732,32 @@ void pci_epc_init_notify(struct pci_epc *epc) > } > EXPORT_SYMBOL_GPL(pci_epc_init_notify); > > +/** > + * pci_epc_deinit_notify() - Notify the EPF device that EPC device's core > + * deinitialization is scheduled. > + * @epc: the EPC device whose core deinitialization is scheduled > + * > + * Invoke to Notify the EPF device that the EPC device's deinitialization > + * is scheduled. > + */ > +void pci_epc_deinit_notify(struct pci_epc *epc) > +{ > + struct pci_epf *epf; > + > + if (!epc || IS_ERR(epc)) > + return; > + > + mutex_lock(&epc->list_lock); > + list_for_each_entry(epf, &epc->pci_epf, list) { > + mutex_lock(&epf->lock); > + if (epf->event_ops->core_deinit) I've added a check for the existence of the "event_ops" in latest series. Please rebase on top of that and add the check here too. Thanks, Mani > + epf->event_ops->core_deinit(epf); > + mutex_unlock(&epf->lock); > + } > + mutex_unlock(&epc->list_lock); > +} > +EXPORT_SYMBOL_GPL(pci_epc_deinit_notify); > + > /** > * pci_epc_destroy() - destroy the EPC device > * @epc: the EPC device that has to be destroyed > diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h > index 301bb0e53707..b95dc4b3e302 100644 > --- a/include/linux/pci-epc.h > +++ b/include/linux/pci-epc.h > @@ -204,6 +204,7 @@ int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf, > enum pci_epc_interface_type type); > void pci_epc_linkup(struct pci_epc *epc); > void pci_epc_init_notify(struct pci_epc *epc); > +void pci_epc_deinit_notify(struct pci_epc *epc); > void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf, > enum pci_epc_interface_type type); > int pci_epc_write_header(struct pci_epc *epc, u8 func_no, u8 vfunc_no, > diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h > index a215dc8ce693..fa51579951db 100644 > --- a/include/linux/pci-epf.h > +++ b/include/linux/pci-epf.h > @@ -70,10 +70,12 @@ struct pci_epf_ops { > /** > * struct pci_epf_event_ops - Callbacks for capturing the EPC events > * @core_init: Callback for the EPC initialization complete event > + * @core_deinit: Callback for the EPC deinitialization schedule event > * @link_up: Callback for the EPC link up event > */ > struct pci_epc_event_ops { > int (*core_init)(struct pci_epf *epf); > + int (*core_deinit)(struct pci_epf *epf); > int (*link_up)(struct pci_epf *epf); > }; > > -- > 2.17.1 >
diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c index 5dac1496cf16..689450f01f75 100644 --- a/drivers/pci/endpoint/pci-epc-core.c +++ b/drivers/pci/endpoint/pci-epc-core.c @@ -732,6 +732,32 @@ void pci_epc_init_notify(struct pci_epc *epc) } EXPORT_SYMBOL_GPL(pci_epc_init_notify); +/** + * pci_epc_deinit_notify() - Notify the EPF device that EPC device's core + * deinitialization is scheduled. + * @epc: the EPC device whose core deinitialization is scheduled + * + * Invoke to Notify the EPF device that the EPC device's deinitialization + * is scheduled. + */ +void pci_epc_deinit_notify(struct pci_epc *epc) +{ + struct pci_epf *epf; + + if (!epc || IS_ERR(epc)) + return; + + mutex_lock(&epc->list_lock); + list_for_each_entry(epf, &epc->pci_epf, list) { + mutex_lock(&epf->lock); + if (epf->event_ops->core_deinit) + epf->event_ops->core_deinit(epf); + mutex_unlock(&epf->lock); + } + mutex_unlock(&epc->list_lock); +} +EXPORT_SYMBOL_GPL(pci_epc_deinit_notify); + /** * pci_epc_destroy() - destroy the EPC device * @epc: the EPC device that has to be destroyed diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h index 301bb0e53707..b95dc4b3e302 100644 --- a/include/linux/pci-epc.h +++ b/include/linux/pci-epc.h @@ -204,6 +204,7 @@ int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf, enum pci_epc_interface_type type); void pci_epc_linkup(struct pci_epc *epc); void pci_epc_init_notify(struct pci_epc *epc); +void pci_epc_deinit_notify(struct pci_epc *epc); void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf, enum pci_epc_interface_type type); int pci_epc_write_header(struct pci_epc *epc, u8 func_no, u8 vfunc_no, diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h index a215dc8ce693..fa51579951db 100644 --- a/include/linux/pci-epf.h +++ b/include/linux/pci-epf.h @@ -70,10 +70,12 @@ struct pci_epf_ops { /** * struct pci_epf_event_ops - Callbacks for capturing the EPC events * @core_init: Callback for the EPC initialization complete event + * @core_deinit: Callback for the EPC deinitialization schedule event * @link_up: Callback for the EPC link up event */ struct pci_epc_event_ops { int (*core_init)(struct pci_epf *epf); + int (*core_deinit)(struct pci_epf *epf); int (*link_up)(struct pci_epf *epf); };
The endpoint function driver should undo the things done in core_init() and stop hardware access before deinitializing the controller. Add core_deinit() callback support for function driver to do this cleanup. This core_deinit() callback should be invoked by the controller driver before deinitializing the controller. Signed-off-by: Vidya Sagar <vidyas@nvidia.com> --- V2: * Reworded the commit message drivers/pci/endpoint/pci-epc-core.c | 26 ++++++++++++++++++++++++++ include/linux/pci-epc.h | 1 + include/linux/pci-epf.h | 2 ++ 3 files changed, 29 insertions(+)