RE: [PATCH v4 2/3] i3c: move i3c_device_match_id to device.c and export it

[Vitor Soares]

Hi Boris,

From: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx>
Date: Fri, Jul 12, 2019 at 17:03:38

> On Fri, 12 Jul 2019 13:53:29 +0200
> Vitor Soares <Vitor.Soares@xxxxxxxxxxxx> wrote:
> 
> > The i3c device driver needs the i3c_device_id table.
> 
> "Some I3C device drivers need to know which entry matches the
> i3c_device object passed to the probe function" 
> 
> > Lets move  to device.c and export it to be used.
> 
> "Let's move i3c_device_match_id() to device.c and export it so it can be
> used by drivers."
> 

Fix in next drop.

> > 
> > Signed-off-by: Vitor Soares <vitor.soares@xxxxxxxxxxxx>
> > ---
> > Changes in v4:
> >   None
> > 
> > Changes in v3:
> >   Remove i3c_get_device_id
> >   Move i3c_device_match_id from drivers/i3c/master.c to drivers/i3c/device.c
> >   Export i3c_device_match_id
> > 
> > Changes in v2:
> >   move this function to drivers/i3c/device.c
> > 
> >  drivers/i3c/device.c       | 46 ++++++++++++++++++++++++++++++++++++++++++++++
> >  drivers/i3c/master.c       | 45 ---------------------------------------------
> >  include/linux/i3c/device.h |  4 ++++
> >  3 files changed, 50 insertions(+), 45 deletions(-)
> > 
> > diff --git a/drivers/i3c/device.c b/drivers/i3c/device.c
> > index 69cc040..383df3b 100644
> > --- a/drivers/i3c/device.c
> > +++ b/drivers/i3c/device.c
> > @@ -200,6 +200,52 @@ struct i3c_device *dev_to_i3cdev(struct device *dev)
> >  }
> >  EXPORT_SYMBOL_GPL(dev_to_i3cdev);
> >  
> 
> You're missing a kerneldoc here.

I will do that. Can you clarify why we need that?

> 
> > +const struct i3c_device_id *
> > +i3c_device_match_id(struct i3c_device *i3cdev,
> > +		    const struct i3c_device_id *id_table)
> > +{
> > +	struct i3c_device_info devinfo;
> > +	const struct i3c_device_id *id;
> > +
> > +	i3c_device_get_info(i3cdev, &devinfo);
> > +
> > +	/*
> > +	 * The lower 32bits of the provisional ID is just filled with a random
> > +	 * value, try to match using DCR info.
> > +	 */
> > +	if (!I3C_PID_RND_LOWER_32BITS(devinfo.pid)) {
> > +		u16 manuf = I3C_PID_MANUF_ID(devinfo.pid);
> > +		u16 part = I3C_PID_PART_ID(devinfo.pid);
> > +		u16 ext_info = I3C_PID_EXTRA_INFO(devinfo.pid);
> > +
> > +		/* First try to match by manufacturer/part ID. */
> > +		for (id = id_table; id->match_flags != 0; id++) {
> > +			if ((id->match_flags & I3C_MATCH_MANUF_AND_PART) !=
> > +			    I3C_MATCH_MANUF_AND_PART)
> > +				continue;
> > +
> > +			if (manuf != id->manuf_id || part != id->part_id)
> > +				continue;
> > +
> > +			if ((id->match_flags & I3C_MATCH_EXTRA_INFO) &&
> > +			    ext_info != id->extra_info)
> > +				continue;
> > +
> > +			return id;
> > +		}
> > +	}
> > +
> > +	/* Fallback to DCR match. */
> > +	for (id = id_table; id->match_flags != 0; id++) {
> > +		if ((id->match_flags & I3C_MATCH_DCR) &&
> > +		    id->dcr == devinfo.dcr)
> > +			return id;
> > +	}
> > +
> > +	return NULL;
> > +}
> > +EXPORT_SYMBOL_GPL(i3c_device_match_id);
> > +
> >  /**
> >   * i3c_driver_register_with_owner() - register an I3C device driver
> >   *
> > diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
> > index 5f4bd52..7667f84 100644
> > --- a/drivers/i3c/master.c
> > +++ b/drivers/i3c/master.c
> > @@ -270,51 +270,6 @@ static const struct device_type i3c_device_type = {
> >  	.uevent = i3c_device_uevent,
> >  };
> >  
> > -static const struct i3c_device_id *
> > -i3c_device_match_id(struct i3c_device *i3cdev,
> > -		    const struct i3c_device_id *id_table)
> > -{
> > -	struct i3c_device_info devinfo;
> > -	const struct i3c_device_id *id;
> > -
> > -	i3c_device_get_info(i3cdev, &devinfo);
> > -
> > -	/*
> > -	 * The lower 32bits of the provisional ID is just filled with a random
> > -	 * value, try to match using DCR info.
> > -	 */
> > -	if (!I3C_PID_RND_LOWER_32BITS(devinfo.pid)) {
> > -		u16 manuf = I3C_PID_MANUF_ID(devinfo.pid);
> > -		u16 part = I3C_PID_PART_ID(devinfo.pid);
> > -		u16 ext_info = I3C_PID_EXTRA_INFO(devinfo.pid);
> > -
> > -		/* First try to match by manufacturer/part ID. */
> > -		for (id = id_table; id->match_flags != 0; id++) {
> > -			if ((id->match_flags & I3C_MATCH_MANUF_AND_PART) !=
> > -			    I3C_MATCH_MANUF_AND_PART)
> > -				continue;
> > -
> > -			if (manuf != id->manuf_id || part != id->part_id)
> > -				continue;
> > -
> > -			if ((id->match_flags & I3C_MATCH_EXTRA_INFO) &&
> > -			    ext_info != id->extra_info)
> > -				continue;
> > -
> > -			return id;
> > -		}
> > -	}
> > -
> > -	/* Fallback to DCR match. */
> > -	for (id = id_table; id->match_flags != 0; id++) {
> > -		if ((id->match_flags & I3C_MATCH_DCR) &&
> > -		    id->dcr == devinfo.dcr)
> > -			return id;
> > -	}
> > -
> > -	return NULL;
> > -}
> > -
> >  static int i3c_device_match(struct device *dev, struct device_driver *drv)
> >  {
> >  	struct i3c_device *i3cdev;
> > diff --git a/include/linux/i3c/device.h b/include/linux/i3c/device.h
> > index 5ecb055..de102e4 100644
> > --- a/include/linux/i3c/device.h
> > +++ b/include/linux/i3c/device.h
> > @@ -188,6 +188,10 @@ static inline struct i3c_driver *drv_to_i3cdrv(struct device_driver *drv)
> >  struct device *i3cdev_to_dev(struct i3c_device *i3cdev);
> >  struct i3c_device *dev_to_i3cdev(struct device *dev);
> >  
> > +const struct i3c_device_id *
> > +i3c_device_match_id(struct i3c_device *i3cdev,
> > +		    const struct i3c_device_id *id_table);
> > +
> >  static inline void i3cdev_set_drvdata(struct i3c_device *i3cdev,
> >  				      void *data)
> >  {
> 
> 
> _______________________________________________
> linux-i3c mailing list
> linux-i3c@xxxxxxxxxxxxxxxxxxx
> https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.infradead.org_mailman_listinfo_linux-2Di3c&d=DwICAg&c=DPL6_X_6JkXFx7AXWqB0tg&r=qVuU64u9x77Y0Kd0PhDK_lpxFgg6PK9PateHwjb_DY0&m=3BEF5uxfJXeA-aip7adilYENAWYp6xNoJXvidZZZpY4&s=JcBzwEcWAIoOCufxAYFd4YjCZppBQDA2-nVqfV1Cj5g&e= 

Thanks for your comments.

Best regards,
Vitor Soares