On Mon, Jun 05, 2023 at 05:27:46PM +0530, Manivannan Sadhasivam wrote:
> On Mon, Jun 05, 2023 at 11:27:09AM +0200, Lorenzo Pieralisi wrote:
> > On Fri, Jun 02, 2023 at 05:17:49PM +0530, Manivannan Sadhasivam wrote:
> > > Currently, the EPF probe function doesn't get the device ID argument needed
> > > to correctly identify the device table ID of the EPF device.
> > >
> > > When multiple entries are added to the "struct pci_epf_device_id" table,
> > > the probe function needs to identify the correct one. This is achieved by
> > > modifying the pci_epf_match_id() function to return the match ID pointer
> > > and passing it to the driver's probe function.
> > >
> > > pci_epf_device_match() function can return bool based on the return value
> > > of pci_epf_match_id().
> > >
> > > Reviewed-by: Kishon Vijay Abraham I <kishon@xxxxxxxxxx>
> > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
> > > ---
> > > drivers/pci/endpoint/functions/pci-epf-ntb.c | 3 ++-
> > > drivers/pci/endpoint/functions/pci-epf-test.c | 2 +-
> > > drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +-
> > > drivers/pci/endpoint/pci-epf-core.c | 18 +++++++++++-------
> > > include/linux/pci-epf.h | 4 +++-
> > > 5 files changed, 18 insertions(+), 11 deletions(-)
> > >
> > > diff --git a/drivers/pci/endpoint/functions/pci-epf-ntb.c b/drivers/pci/endpoint/functions/pci-epf-ntb.c
> > > index 9a00448c7e61..980b4ecf19a2 100644
> > > --- a/drivers/pci/endpoint/functions/pci-epf-ntb.c
> > > +++ b/drivers/pci/endpoint/functions/pci-epf-ntb.c
> > > @@ -2075,11 +2075,12 @@ static struct config_group *epf_ntb_add_cfs(struct pci_epf *epf,
> > > /**
> > > * epf_ntb_probe() - Probe NTB function driver
> > > * @epf: NTB endpoint function device
> > > + * @id: NTB endpoint function device ID
> > > *
> > > * Probe NTB function driver when endpoint function bus detects a NTB
> > > * endpoint function.
> > > */
> > > -static int epf_ntb_probe(struct pci_epf *epf)
> > > +static int epf_ntb_probe(struct pci_epf *epf, const struct pci_epf_device_id *id)
> > > {
> > > struct epf_ntb *ntb;
> > > struct device *dev;
> > > diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
> > > index 0f9d2ec822ac..d5fcc78a5b73 100644
> > > --- a/drivers/pci/endpoint/functions/pci-epf-test.c
> > > +++ b/drivers/pci/endpoint/functions/pci-epf-test.c
> > > @@ -980,7 +980,7 @@ static const struct pci_epf_device_id pci_epf_test_ids[] = {
> > > {},
> > > };
> > >
> > > -static int pci_epf_test_probe(struct pci_epf *epf)
> > > +static int pci_epf_test_probe(struct pci_epf *epf, const struct pci_epf_device_id *id)
> > > {
> > > struct pci_epf_test *epf_test;
> > > struct device *dev = &epf->dev;
> > > diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> > > index b7c7a8af99f4..122eb7a12028 100644
> > > --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
> > > +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
> > > @@ -1401,7 +1401,7 @@ static struct pci_epf_ops epf_ntb_ops = {
> > > *
> > > * Returns: Zero for success, or an error code in case of failure
> > > */
> > > -static int epf_ntb_probe(struct pci_epf *epf)
> > > +static int epf_ntb_probe(struct pci_epf *epf, const struct pci_epf_device_id *id)
> > > {
> > > struct epf_ntb *ntb;
> > > struct device *dev;
> > > diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c
> > > index 2036e38be093..ea6e0aef0bb3 100644
> > > --- a/drivers/pci/endpoint/pci-epf-core.c
> > > +++ b/drivers/pci/endpoint/pci-epf-core.c
> > > @@ -493,16 +493,16 @@ static const struct device_type pci_epf_type = {
> > > .release = pci_epf_dev_release,
> > > };
> > >
> > > -static int
> > > -pci_epf_match_id(const struct pci_epf_device_id *id, const struct pci_epf *epf)
> > > +static const struct pci_epf_device_id
> > > +*pci_epf_match_id(const struct pci_epf_device_id *id, const struct pci_epf *epf)
> > > {
> > > while (id->name[0]) {
> > > if (strcmp(epf->name, id->name) == 0)
> > > - return true;
> > > + return id;
> > > id++;
> > > }
> > >
> > > - return false;
> > > + return NULL;
> > > }
> > >
> > > static int pci_epf_device_match(struct device *dev, struct device_driver *drv)
> > > @@ -510,8 +510,12 @@ static int pci_epf_device_match(struct device *dev, struct device_driver *drv)
> > > struct pci_epf *epf = to_pci_epf(dev);
> > > struct pci_epf_driver *driver = to_pci_epf_driver(drv);
> > >
> > > - if (driver->id_table)
> > > - return pci_epf_match_id(driver->id_table, epf);
> > > + if (driver->id_table) {
> > > + if (pci_epf_match_id(driver->id_table, epf))
> > > + return true;
> > > + else
> > > + return false;
> > > + }
> > >
> > > return !strcmp(epf->name, drv->name);
> > > }
> > > @@ -526,7 +530,7 @@ static int pci_epf_device_probe(struct device *dev)
> > >
> > > epf->driver = driver;
> > >
> > > - return driver->probe(epf);
> > > + return driver->probe(epf, pci_epf_match_id(driver->id_table, epf));
> >
> > I don't think we should do it this way. If we are probing a driver that
> > means that we have got a driver that matches a device id. The device id
> > is a property of the device, there is no reason why we should pass it
> > to the probe function, it has got to be stored somewhere at device
> > creation stage (well, not in the match function - since that's what
> > we changed), probe() should retrieve it from the device structure.
> >
>
> Device id defined by the drivers will only be known during the match() stage as
> that's when the drivers are queried for match of the device. During device
> creation stage, there is no way for the EPF core to fetch the ids.
>
> And, passing id during probe() is not new. For most of the non-platform devices,
> the bus driver will pass the id. The PCI core itself is doing the same for the
> client drivers as well and I'd like to keep it same for EPF also:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/linux/pci.h#n921
Right - I mixed things up (driver->probe() vs bus->probe), apologies,
it makes sense.
Lorenzo
>
> - Mani
>
> > Thanks,
> > Lorenzo
> >
> > > }
> > >
> > > static void pci_epf_device_remove(struct device *dev)
> > > diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h
> > > index a215dc8ce693..bc613f0df7e3 100644
> > > --- a/include/linux/pci-epf.h
> > > +++ b/include/linux/pci-epf.h
> > > @@ -89,7 +89,7 @@ struct pci_epc_event_ops {
> > > * @id_table: identifies EPF devices for probing
> > > */
> > > struct pci_epf_driver {
> > > - int (*probe)(struct pci_epf *epf);
> > > + int (*probe)(struct pci_epf *epf, const struct pci_epf_device_id *id);
> > > void (*remove)(struct pci_epf *epf);
> > >
> > > struct device_driver driver;
> > > @@ -131,6 +131,7 @@ struct pci_epf_bar {
> > > * @epc: the EPC device to which this EPF device is bound
> > > * @epf_pf: the physical EPF device to which this virtual EPF device is bound
> > > * @driver: the EPF driver to which this EPF device is bound
> > > + * @id: Pointer to the EPF device ID
> > > * @list: to add pci_epf as a list of PCI endpoint functions to pci_epc
> > > * @lock: mutex to protect pci_epf_ops
> > > * @sec_epc: the secondary EPC device to which this EPF device is bound
> > > @@ -158,6 +159,7 @@ struct pci_epf {
> > > struct pci_epc *epc;
> > > struct pci_epf *epf_pf;
> > > struct pci_epf_driver *driver;
> > > + const struct pci_epf_device_id *id;
> > > struct list_head list;
> > > /* mutex to protect against concurrent access of pci_epf_ops */
> > > struct mutex lock;
> > > --
> > > 2.25.1
> > >
>
> --
> மணிவண்ணன் சதாசிவம்
