| Message ID | 20240401-pci-epf-rework-v2-3-970dbe90b99d@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Krzysztof Wilczyński |
| Headers | show |
| Series | PCI: endpoint: Make host reboot handling more robust | expand |
On Mon, Apr 01, 2024 at 09:20:29PM +0530, Manivannan Sadhasivam wrote: > core_init() callback is used to notify the EPC initialization event to the > EPF drivers. The 'core' prefix was used indicate that the controller IP > core has completed initialization. But it serves no purpose as the EPF > driver will only care about the EPC initialization as a whole and there is > no real benefit to distinguish the IP core part. > > So let's rename the core_init() callback in 'struct pci_epc_event_ops' to > just init() to make it more clear. > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- > drivers/pci/endpoint/functions/pci-epf-mhi.c | 4 ++-- > drivers/pci/endpoint/functions/pci-epf-test.c | 4 ++-- > drivers/pci/endpoint/pci-epc-core.c | 16 ++++++++-------- > include/linux/pci-epf.h | 4 ++-- > 4 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/pci/endpoint/functions/pci-epf-mhi.c b/drivers/pci/endpoint/functions/pci-epf-mhi.c > index 280863c0eeb9..b3c26ffd29a5 100644 > --- a/drivers/pci/endpoint/functions/pci-epf-mhi.c > +++ b/drivers/pci/endpoint/functions/pci-epf-mhi.c > @@ -716,7 +716,7 @@ static void pci_epf_mhi_dma_deinit(struct pci_epf_mhi *epf_mhi) > epf_mhi->dma_chan_rx = NULL; > } > > -static int pci_epf_mhi_core_init(struct pci_epf *epf) > +static int pci_epf_mhi_epc_init(struct pci_epf *epf) > { > struct pci_epf_mhi *epf_mhi = epf_get_drvdata(epf); > const struct pci_epf_mhi_ep_info *info = epf_mhi->info; > @@ -897,7 +897,7 @@ static void pci_epf_mhi_unbind(struct pci_epf *epf) > } > > static const struct pci_epc_event_ops pci_epf_mhi_epc_event_ops = { > - .core_init = pci_epf_mhi_core_init, > + .init = pci_epf_mhi_epc_init, > }; > > static const struct pci_epc_bus_event_ops pci_epf_mhi_bus_event_ops = { > diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c > index 973db0b1bde2..abcb6ca61c4e 100644 > --- a/drivers/pci/endpoint/functions/pci-epf-test.c > +++ b/drivers/pci/endpoint/functions/pci-epf-test.c > @@ -731,7 +731,7 @@ static int pci_epf_test_set_bar(struct pci_epf *epf) > return 0; > } > > -static int pci_epf_test_core_init(struct pci_epf *epf) > +static int pci_epf_test_epc_init(struct pci_epf *epf) On V1 you agreed that it is better to remove 'epc' from the naming. (For both pci-epf-test and pci-epf-mhi). You seem to have forgotten to address this for V2. Kind regards, Niklas
On Tue, Apr 02, 2024 at 12:52:10PM +0200, Niklas Cassel wrote: > On Mon, Apr 01, 2024 at 09:20:29PM +0530, Manivannan Sadhasivam wrote: > > core_init() callback is used to notify the EPC initialization event to the > > EPF drivers. The 'core' prefix was used indicate that the controller IP > > core has completed initialization. But it serves no purpose as the EPF > > driver will only care about the EPC initialization as a whole and there is > > no real benefit to distinguish the IP core part. > > > > So let's rename the core_init() callback in 'struct pci_epc_event_ops' to > > just init() to make it more clear. > > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > --- > > drivers/pci/endpoint/functions/pci-epf-mhi.c | 4 ++-- > > drivers/pci/endpoint/functions/pci-epf-test.c | 4 ++-- > > drivers/pci/endpoint/pci-epc-core.c | 16 ++++++++-------- > > include/linux/pci-epf.h | 4 ++-- > > 4 files changed, 14 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/pci/endpoint/functions/pci-epf-mhi.c b/drivers/pci/endpoint/functions/pci-epf-mhi.c > > index 280863c0eeb9..b3c26ffd29a5 100644 > > --- a/drivers/pci/endpoint/functions/pci-epf-mhi.c > > +++ b/drivers/pci/endpoint/functions/pci-epf-mhi.c > > @@ -716,7 +716,7 @@ static void pci_epf_mhi_dma_deinit(struct pci_epf_mhi *epf_mhi) > > epf_mhi->dma_chan_rx = NULL; > > } > > > > -static int pci_epf_mhi_core_init(struct pci_epf *epf) > > +static int pci_epf_mhi_epc_init(struct pci_epf *epf) > > { > > struct pci_epf_mhi *epf_mhi = epf_get_drvdata(epf); > > const struct pci_epf_mhi_ep_info *info = epf_mhi->info; > > @@ -897,7 +897,7 @@ static void pci_epf_mhi_unbind(struct pci_epf *epf) > > } > > > > static const struct pci_epc_event_ops pci_epf_mhi_epc_event_ops = { > > - .core_init = pci_epf_mhi_core_init, > > + .init = pci_epf_mhi_epc_init, > > }; > > > > static const struct pci_epc_bus_event_ops pci_epf_mhi_bus_event_ops = { > > diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c > > index 973db0b1bde2..abcb6ca61c4e 100644 > > --- a/drivers/pci/endpoint/functions/pci-epf-test.c > > +++ b/drivers/pci/endpoint/functions/pci-epf-test.c > > @@ -731,7 +731,7 @@ static int pci_epf_test_set_bar(struct pci_epf *epf) > > return 0; > > } > > > > -static int pci_epf_test_core_init(struct pci_epf *epf) > > +static int pci_epf_test_epc_init(struct pci_epf *epf) > > On V1 you agreed that it is better to remove 'epc' from the naming. > (For both pci-epf-test and pci-epf-mhi). > You seem to have forgotten to address this for V2. > Oh yeah, sorry about that. I tried to address comments for both series and apparently this one got missed. - Mani
On Wed, Apr 03, 2024 at 07:16:05PM +0530, Manivannan Sadhasivam wrote: > On Tue, Apr 02, 2024 at 12:52:10PM +0200, Niklas Cassel wrote: > > On Mon, Apr 01, 2024 at 09:20:29PM +0530, Manivannan Sadhasivam wrote: > > > core_init() callback is used to notify the EPC initialization event to the > > > EPF drivers. The 'core' prefix was used indicate that the controller IP > > > core has completed initialization. But it serves no purpose as the EPF > > > driver will only care about the EPC initialization as a whole and there is > > > no real benefit to distinguish the IP core part. > > > > > > So let's rename the core_init() callback in 'struct pci_epc_event_ops' to > > > just init() to make it more clear. > > > > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > > --- > > > drivers/pci/endpoint/functions/pci-epf-mhi.c | 4 ++-- > > > drivers/pci/endpoint/functions/pci-epf-test.c | 4 ++-- > > > drivers/pci/endpoint/pci-epc-core.c | 16 ++++++++-------- > > > include/linux/pci-epf.h | 4 ++-- > > > 4 files changed, 14 insertions(+), 14 deletions(-) > > > > > > diff --git a/drivers/pci/endpoint/functions/pci-epf-mhi.c b/drivers/pci/endpoint/functions/pci-epf-mhi.c > > > index 280863c0eeb9..b3c26ffd29a5 100644 > > > --- a/drivers/pci/endpoint/functions/pci-epf-mhi.c > > > +++ b/drivers/pci/endpoint/functions/pci-epf-mhi.c > > > @@ -716,7 +716,7 @@ static void pci_epf_mhi_dma_deinit(struct pci_epf_mhi *epf_mhi) > > > epf_mhi->dma_chan_rx = NULL; > > > } > > > > > > -static int pci_epf_mhi_core_init(struct pci_epf *epf) > > > +static int pci_epf_mhi_epc_init(struct pci_epf *epf) > > > { > > > struct pci_epf_mhi *epf_mhi = epf_get_drvdata(epf); > > > const struct pci_epf_mhi_ep_info *info = epf_mhi->info; > > > @@ -897,7 +897,7 @@ static void pci_epf_mhi_unbind(struct pci_epf *epf) > > > } > > > > > > static const struct pci_epc_event_ops pci_epf_mhi_epc_event_ops = { > > > - .core_init = pci_epf_mhi_core_init, > > > + .init = pci_epf_mhi_epc_init, > > > }; > > > > > > static const struct pci_epc_bus_event_ops pci_epf_mhi_bus_event_ops = { > > > diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c > > > index 973db0b1bde2..abcb6ca61c4e 100644 > > > --- a/drivers/pci/endpoint/functions/pci-epf-test.c > > > +++ b/drivers/pci/endpoint/functions/pci-epf-test.c > > > @@ -731,7 +731,7 @@ static int pci_epf_test_set_bar(struct pci_epf *epf) > > > return 0; > > > } > > > > > > -static int pci_epf_test_core_init(struct pci_epf *epf) > > > +static int pci_epf_test_epc_init(struct pci_epf *epf) > > > > On V1 you agreed that it is better to remove 'epc' from the naming. > > (For both pci-epf-test and pci-epf-mhi). > > You seem to have forgotten to address this for V2. > > > > Oh yeah, sorry about that. I tried to address comments for both series and > apparently this one got missed. > Ok, now I remember that I kept the prefix intentionally. The module init functions are already named as pci_epf_{test/mhi}_init(), so cannot use the same name for the callback also. And using some other name didn't fit, so I kept 'epc' as the prefix since the callback acts on the EPC initialization event anyway. - Mani
diff --git a/drivers/pci/endpoint/functions/pci-epf-mhi.c b/drivers/pci/endpoint/functions/pci-epf-mhi.c index 280863c0eeb9..b3c26ffd29a5 100644 --- a/drivers/pci/endpoint/functions/pci-epf-mhi.c +++ b/drivers/pci/endpoint/functions/pci-epf-mhi.c @@ -716,7 +716,7 @@ static void pci_epf_mhi_dma_deinit(struct pci_epf_mhi *epf_mhi) epf_mhi->dma_chan_rx = NULL; } -static int pci_epf_mhi_core_init(struct pci_epf *epf) +static int pci_epf_mhi_epc_init(struct pci_epf *epf) { struct pci_epf_mhi *epf_mhi = epf_get_drvdata(epf); const struct pci_epf_mhi_ep_info *info = epf_mhi->info; @@ -897,7 +897,7 @@ static void pci_epf_mhi_unbind(struct pci_epf *epf) } static const struct pci_epc_event_ops pci_epf_mhi_epc_event_ops = { - .core_init = pci_epf_mhi_core_init, + .init = pci_epf_mhi_epc_init, }; static const struct pci_epc_bus_event_ops pci_epf_mhi_bus_event_ops = { diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c index 973db0b1bde2..abcb6ca61c4e 100644 --- a/drivers/pci/endpoint/functions/pci-epf-test.c +++ b/drivers/pci/endpoint/functions/pci-epf-test.c @@ -731,7 +731,7 @@ static int pci_epf_test_set_bar(struct pci_epf *epf) return 0; } -static int pci_epf_test_core_init(struct pci_epf *epf) +static int pci_epf_test_epc_init(struct pci_epf *epf) { struct pci_epf_test *epf_test = epf_get_drvdata(epf); struct pci_epf_header *header = epf->header; @@ -799,7 +799,7 @@ static int pci_epf_test_link_up(struct pci_epf *epf) } static const struct pci_epc_event_ops pci_epf_test_epc_event_ops = { - .core_init = pci_epf_test_core_init, + .init = pci_epf_test_epc_init, }; static const struct pci_epc_bus_event_ops pci_epf_test_bus_event_ops = { diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c index f202ae07ffa9..fe3cb62dd866 100644 --- a/drivers/pci/endpoint/pci-epc-core.c +++ b/drivers/pci/endpoint/pci-epc-core.c @@ -727,9 +727,9 @@ void pci_epc_linkdown(struct pci_epc *epc) EXPORT_SYMBOL_GPL(pci_epc_linkdown); /** - * pci_epc_init_notify() - Notify the EPF device that EPC device's core - * initialization is completed. - * @epc: the EPC device whose core initialization is completed + * pci_epc_init_notify() - Notify the EPF device that EPC device initialization + * is completed. + * @epc: the EPC device whose initialization is completed * * Invoke to Notify the EPF device that the EPC device's initialization * is completed. @@ -744,8 +744,8 @@ void pci_epc_init_notify(struct pci_epc *epc) mutex_lock(&epc->list_lock); list_for_each_entry(epf, &epc->pci_epf, list) { mutex_lock(&epf->lock); - if (epf->epc_event_ops && epf->epc_event_ops->core_init) - epf->epc_event_ops->core_init(epf); + if (epf->epc_event_ops && epf->epc_event_ops->init) + epf->epc_event_ops->init(epf); mutex_unlock(&epf->lock); } epc->init_complete = true; @@ -756,7 +756,7 @@ EXPORT_SYMBOL_GPL(pci_epc_init_notify); /** * pci_epc_notify_pending_init() - Notify the pending EPC device initialization * complete to the EPF device - * @epc: the EPC device whose core initialization is pending to be notified + * @epc: the EPC device whose initialization is pending to be notified * @epf: the EPF device to be notified * * Invoke to notify the pending EPC device initialization complete to the EPF @@ -767,8 +767,8 @@ void pci_epc_notify_pending_init(struct pci_epc *epc, struct pci_epf *epf) { if (epc->init_complete) { mutex_lock(&epf->lock); - if (epf->epc_event_ops && epf->epc_event_ops->core_init) - epf->epc_event_ops->core_init(epf); + if (epf->epc_event_ops && epf->epc_event_ops->init) + epf->epc_event_ops->init(epf); mutex_unlock(&epf->lock); } } diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h index 77399fecaeb5..f4c2aaa6674c 100644 --- a/include/linux/pci-epf.h +++ b/include/linux/pci-epf.h @@ -70,10 +70,10 @@ struct pci_epf_ops { /** * struct pci_epc_event_ops - Callbacks for capturing the EPC specific events - * @core_init: Callback for the EPC initialization event + * @init: Callback for the EPC initialization event */ struct pci_epc_event_ops { - int (*core_init)(struct pci_epf *epf); + int (*init)(struct pci_epf *epf); }; /**
core_init() callback is used to notify the EPC initialization event to the EPF drivers. The 'core' prefix was used indicate that the controller IP core has completed initialization. But it serves no purpose as the EPF driver will only care about the EPC initialization as a whole and there is no real benefit to distinguish the IP core part. So let's rename the core_init() callback in 'struct pci_epc_event_ops' to just init() to make it more clear. Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> --- drivers/pci/endpoint/functions/pci-epf-mhi.c | 4 ++-- drivers/pci/endpoint/functions/pci-epf-test.c | 4 ++-- drivers/pci/endpoint/pci-epc-core.c | 16 ++++++++-------- include/linux/pci-epf.h | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-)