[4/5] remoteproc: rename subdev probe and remove functions

Message ID 20180515205345.8090-5-elder@linaro.org
State Superseded
Headers show
Series
  • remoteproc: updates for new events
Related show

Commit Message

Alex Elder May 15, 2018, 8:53 p.m.
Rename functions used when subdevices are started and stopped to
reflect the new naming scheme.

Signed-off-by: Alex Elder <elder@linaro.org>

---
 drivers/remoteproc/qcom_common.c     | 16 ++++++++--------
 drivers/remoteproc/remoteproc_core.c |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

-- 
2.17.0

Comments

Arnaud Pouliquen May 29, 2018, 9:12 a.m. | #1
Hello Alex


We have the same needs (prepare unprepare steps) on our platform. We
tested you core patches and they answers to our need.

Just a remark below

On 05/15/2018 10:53 PM, Alex Elder wrote:
> Rename functions used when subdevices are started and stopped to

> reflect the new naming scheme.

> 

> Signed-off-by: Alex Elder <elder@linaro.org>

> ---

>  drivers/remoteproc/qcom_common.c     | 16 ++++++++--------

>  drivers/remoteproc/remoteproc_core.c |  8 ++++----

>  2 files changed, 12 insertions(+), 12 deletions(-)

> 

> diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c

> index 4ae87c5b8793..6f77840140bf 100644

> --- a/drivers/remoteproc/qcom_common.c

> +++ b/drivers/remoteproc/qcom_common.c

> @@ -33,7 +33,7 @@

>  

>  static BLOCKING_NOTIFIER_HEAD(ssr_notifiers);

>  

> -static int glink_subdev_probe(struct rproc_subdev *subdev)

> +static int glink_subdev_start(struct rproc_subdev *subdev)

>  {

>  	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);

>  

> @@ -42,7 +42,7 @@ static int glink_subdev_probe(struct rproc_subdev *subdev)

>  	return PTR_ERR_OR_ZERO(glink->edge);

>  }

>  

> -static void glink_subdev_remove(struct rproc_subdev *subdev, bool crashed)

> +static void glink_subdev_stop(struct rproc_subdev *subdev, bool crashed)

>  {

>  	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);

>  

> @@ -64,8 +64,8 @@ void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink)

>  		return;

>  

>  	glink->dev = dev;

> -	glink->subdev.start = glink_subdev_probe;

> -	glink->subdev.stop = glink_subdev_remove;

> +	glink->subdev.start = glink_subdev_start;

> +	glink->subdev.stop = glink_subdev_stop;

>  

>  	rproc_add_subdev(rproc, &glink->subdev);

>  }

> @@ -129,7 +129,7 @@ int qcom_register_dump_segments(struct rproc *rproc,

>  }

>  EXPORT_SYMBOL_GPL(qcom_register_dump_segments);

>  

> -static int smd_subdev_probe(struct rproc_subdev *subdev)

> +static int smd_subdev_start(struct rproc_subdev *subdev)

>  {

>  	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);

>  

> @@ -138,7 +138,7 @@ static int smd_subdev_probe(struct rproc_subdev *subdev)

>  	return PTR_ERR_OR_ZERO(smd->edge);

>  }

>  

> -static void smd_subdev_remove(struct rproc_subdev *subdev, bool crashed)

> +static void smd_subdev_stop(struct rproc_subdev *subdev, bool crashed)

>  {

>  	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);

>  

> @@ -160,8 +160,8 @@ void qcom_add_smd_subdev(struct rproc *rproc, struct qcom_rproc_subdev *smd)

>  		return;

>  

>  	smd->dev = dev;

> -	smd->subdev.start = smd_subdev_probe;

> -	smd->subdev.stop = smd_subdev_remove;

> +	smd->subdev.start = smd_subdev_start;

> +	smd->subdev.stop = smd_subdev_stop;

>  

>  	rproc_add_subdev(rproc, &smd->subdev);

>  }

> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c

> index ca39fad175f2..2ede7ae6f5bc 100644

> --- a/drivers/remoteproc/remoteproc_core.c

> +++ b/drivers/remoteproc/remoteproc_core.c

> @@ -301,14 +301,14 @@ void rproc_free_vring(struct rproc_vring *rvring)

>  	rsc->vring[idx].notifyid = -1;

>  }

>  

> -static int rproc_vdev_do_probe(struct rproc_subdev *subdev)

> +static int rproc_vdev_do_start(struct rproc_subdev *subdev)

>  {

>  	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);

>  

>  	return rproc_add_virtio_dev(rvdev, rvdev->id);

>  }

>  

> -static void rproc_vdev_do_remove(struct rproc_subdev *subdev, bool crashed)

> +static void rproc_vdev_do_stop(struct rproc_subdev *subdev, bool crashed)

>  {

>  	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);

>  

> @@ -399,8 +399,8 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,

>  

>  	list_add_tail(&rvdev->node, &rproc->rvdevs);

>  

> -	rvdev->subdev.start = rproc_vdev_do_probe;

> -	rvdev->subdev.stop = rproc_vdev_do_remove;

> +	rvdev->subdev.start = rproc_vdev_do_start;

> +	rvdev->subdev.stop = rproc_vdev_do_stop;

>  

>  	rproc_add_subdev(rproc, &rvdev->subdev);


Could you split in 2 patches one for the core another, the other for the
glink driver?

Regards
Arnaud
Alex Elder May 29, 2018, 11:53 a.m. | #2
On 05/29/2018 04:12 AM, Arnaud Pouliquen wrote:
> Hello Alex

> 

> 

> We have the same needs (prepare unprepare steps) on our platform. We

> tested you core patches and they answers to our need.


I'm very glad to hear that.  Would you offer your "Tested-by" on these?

On your comment below, yes, I will re-send v2 and will separate the
core from the glink code.

Thanks.

					-Alex

> Just a remark below

> 

> On 05/15/2018 10:53 PM, Alex Elder wrote:

>> Rename functions used when subdevices are started and stopped to

>> reflect the new naming scheme.

>>

>> Signed-off-by: Alex Elder <elder@linaro.org>

>> ---

>>  drivers/remoteproc/qcom_common.c     | 16 ++++++++--------

>>  drivers/remoteproc/remoteproc_core.c |  8 ++++----

>>  2 files changed, 12 insertions(+), 12 deletions(-)

>>

>> diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c

>> index 4ae87c5b8793..6f77840140bf 100644

>> --- a/drivers/remoteproc/qcom_common.c

>> +++ b/drivers/remoteproc/qcom_common.c

>> @@ -33,7 +33,7 @@

>>  

>>  static BLOCKING_NOTIFIER_HEAD(ssr_notifiers);

>>  

>> -static int glink_subdev_probe(struct rproc_subdev *subdev)

>> +static int glink_subdev_start(struct rproc_subdev *subdev)

>>  {

>>  	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);

>>  

>> @@ -42,7 +42,7 @@ static int glink_subdev_probe(struct rproc_subdev *subdev)

>>  	return PTR_ERR_OR_ZERO(glink->edge);

>>  }

>>  

>> -static void glink_subdev_remove(struct rproc_subdev *subdev, bool crashed)

>> +static void glink_subdev_stop(struct rproc_subdev *subdev, bool crashed)

>>  {

>>  	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);

>>  

>> @@ -64,8 +64,8 @@ void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink)

>>  		return;

>>  

>>  	glink->dev = dev;

>> -	glink->subdev.start = glink_subdev_probe;

>> -	glink->subdev.stop = glink_subdev_remove;

>> +	glink->subdev.start = glink_subdev_start;

>> +	glink->subdev.stop = glink_subdev_stop;

>>  

>>  	rproc_add_subdev(rproc, &glink->subdev);

>>  }

>> @@ -129,7 +129,7 @@ int qcom_register_dump_segments(struct rproc *rproc,

>>  }

>>  EXPORT_SYMBOL_GPL(qcom_register_dump_segments);

>>  

>> -static int smd_subdev_probe(struct rproc_subdev *subdev)

>> +static int smd_subdev_start(struct rproc_subdev *subdev)

>>  {

>>  	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);

>>  

>> @@ -138,7 +138,7 @@ static int smd_subdev_probe(struct rproc_subdev *subdev)

>>  	return PTR_ERR_OR_ZERO(smd->edge);

>>  }

>>  

>> -static void smd_subdev_remove(struct rproc_subdev *subdev, bool crashed)

>> +static void smd_subdev_stop(struct rproc_subdev *subdev, bool crashed)

>>  {

>>  	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);

>>  

>> @@ -160,8 +160,8 @@ void qcom_add_smd_subdev(struct rproc *rproc, struct qcom_rproc_subdev *smd)

>>  		return;

>>  

>>  	smd->dev = dev;

>> -	smd->subdev.start = smd_subdev_probe;

>> -	smd->subdev.stop = smd_subdev_remove;

>> +	smd->subdev.start = smd_subdev_start;

>> +	smd->subdev.stop = smd_subdev_stop;

>>  

>>  	rproc_add_subdev(rproc, &smd->subdev);

>>  }

>> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c

>> index ca39fad175f2..2ede7ae6f5bc 100644

>> --- a/drivers/remoteproc/remoteproc_core.c

>> +++ b/drivers/remoteproc/remoteproc_core.c

>> @@ -301,14 +301,14 @@ void rproc_free_vring(struct rproc_vring *rvring)

>>  	rsc->vring[idx].notifyid = -1;

>>  }

>>  

>> -static int rproc_vdev_do_probe(struct rproc_subdev *subdev)

>> +static int rproc_vdev_do_start(struct rproc_subdev *subdev)

>>  {

>>  	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);

>>  

>>  	return rproc_add_virtio_dev(rvdev, rvdev->id);

>>  }

>>  

>> -static void rproc_vdev_do_remove(struct rproc_subdev *subdev, bool crashed)

>> +static void rproc_vdev_do_stop(struct rproc_subdev *subdev, bool crashed)

>>  {

>>  	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);

>>  

>> @@ -399,8 +399,8 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,

>>  

>>  	list_add_tail(&rvdev->node, &rproc->rvdevs);

>>  

>> -	rvdev->subdev.start = rproc_vdev_do_probe;

>> -	rvdev->subdev.stop = rproc_vdev_do_remove;

>> +	rvdev->subdev.start = rproc_vdev_do_start;

>> +	rvdev->subdev.stop = rproc_vdev_do_stop;

>>  

>>  	rproc_add_subdev(rproc, &rvdev->subdev);

> 

> Could you split in 2 patches one for the core another, the other for the

> glink driver?

> 

> Regards

> Arnaud

>
Alex Elder June 26, 2018, 1:32 a.m. | #3
On 05/29/2018 06:53 AM, Alex Elder wrote:
> On 05/29/2018 04:12 AM, Arnaud Pouliquen wrote:

>> Hello Alex

>>

>>

>> We have the same needs (prepare unprepare steps) on our platform. We

>> tested you core patches and they answers to our need.

> 

> I'm very glad to hear that.  Would you offer your "Tested-by" on these?

> 

> On your comment below, yes, I will re-send v2 and will separate the

> core from the glink code.


Arnaud, despite what I said above, I'm about to resend the code but
will *not* be separating the core code from glink code.  It turns
out that the glink code (and smd and ssr) are really part of the
core code at the moment.  So after talking with Bjorn I agreed to
just send the code without splitting them.

Sorry.

					-Alex

> Thanks.

> 

> 					-Alex

> 

>> Just a remark below

>>

>> On 05/15/2018 10:53 PM, Alex Elder wrote:

>>> Rename functions used when subdevices are started and stopped to

>>> reflect the new naming scheme.

>>>

>>> Signed-off-by: Alex Elder <elder@linaro.org>

>>> ---

>>>  drivers/remoteproc/qcom_common.c     | 16 ++++++++--------

>>>  drivers/remoteproc/remoteproc_core.c |  8 ++++----

>>>  2 files changed, 12 insertions(+), 12 deletions(-)

>>>

>>> diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c

>>> index 4ae87c5b8793..6f77840140bf 100644

>>> --- a/drivers/remoteproc/qcom_common.c

>>> +++ b/drivers/remoteproc/qcom_common.c

>>> @@ -33,7 +33,7 @@

>>>  

>>>  static BLOCKING_NOTIFIER_HEAD(ssr_notifiers);

>>>  

>>> -static int glink_subdev_probe(struct rproc_subdev *subdev)

>>> +static int glink_subdev_start(struct rproc_subdev *subdev)

>>>  {

>>>  	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);

>>>  

>>> @@ -42,7 +42,7 @@ static int glink_subdev_probe(struct rproc_subdev *subdev)

>>>  	return PTR_ERR_OR_ZERO(glink->edge);

>>>  }

>>>  

>>> -static void glink_subdev_remove(struct rproc_subdev *subdev, bool crashed)

>>> +static void glink_subdev_stop(struct rproc_subdev *subdev, bool crashed)

>>>  {

>>>  	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);

>>>  

>>> @@ -64,8 +64,8 @@ void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink)

>>>  		return;

>>>  

>>>  	glink->dev = dev;

>>> -	glink->subdev.start = glink_subdev_probe;

>>> -	glink->subdev.stop = glink_subdev_remove;

>>> +	glink->subdev.start = glink_subdev_start;

>>> +	glink->subdev.stop = glink_subdev_stop;

>>>  

>>>  	rproc_add_subdev(rproc, &glink->subdev);

>>>  }

>>> @@ -129,7 +129,7 @@ int qcom_register_dump_segments(struct rproc *rproc,

>>>  }

>>>  EXPORT_SYMBOL_GPL(qcom_register_dump_segments);

>>>  

>>> -static int smd_subdev_probe(struct rproc_subdev *subdev)

>>> +static int smd_subdev_start(struct rproc_subdev *subdev)

>>>  {

>>>  	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);

>>>  

>>> @@ -138,7 +138,7 @@ static int smd_subdev_probe(struct rproc_subdev *subdev)

>>>  	return PTR_ERR_OR_ZERO(smd->edge);

>>>  }

>>>  

>>> -static void smd_subdev_remove(struct rproc_subdev *subdev, bool crashed)

>>> +static void smd_subdev_stop(struct rproc_subdev *subdev, bool crashed)

>>>  {

>>>  	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);

>>>  

>>> @@ -160,8 +160,8 @@ void qcom_add_smd_subdev(struct rproc *rproc, struct qcom_rproc_subdev *smd)

>>>  		return;

>>>  

>>>  	smd->dev = dev;

>>> -	smd->subdev.start = smd_subdev_probe;

>>> -	smd->subdev.stop = smd_subdev_remove;

>>> +	smd->subdev.start = smd_subdev_start;

>>> +	smd->subdev.stop = smd_subdev_stop;

>>>  

>>>  	rproc_add_subdev(rproc, &smd->subdev);

>>>  }

>>> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c

>>> index ca39fad175f2..2ede7ae6f5bc 100644

>>> --- a/drivers/remoteproc/remoteproc_core.c

>>> +++ b/drivers/remoteproc/remoteproc_core.c

>>> @@ -301,14 +301,14 @@ void rproc_free_vring(struct rproc_vring *rvring)

>>>  	rsc->vring[idx].notifyid = -1;

>>>  }

>>>  

>>> -static int rproc_vdev_do_probe(struct rproc_subdev *subdev)

>>> +static int rproc_vdev_do_start(struct rproc_subdev *subdev)

>>>  {

>>>  	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);

>>>  

>>>  	return rproc_add_virtio_dev(rvdev, rvdev->id);

>>>  }

>>>  

>>> -static void rproc_vdev_do_remove(struct rproc_subdev *subdev, bool crashed)

>>> +static void rproc_vdev_do_stop(struct rproc_subdev *subdev, bool crashed)

>>>  {

>>>  	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);

>>>  

>>> @@ -399,8 +399,8 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,

>>>  

>>>  	list_add_tail(&rvdev->node, &rproc->rvdevs);

>>>  

>>> -	rvdev->subdev.start = rproc_vdev_do_probe;

>>> -	rvdev->subdev.stop = rproc_vdev_do_remove;

>>> +	rvdev->subdev.start = rproc_vdev_do_start;

>>> +	rvdev->subdev.stop = rproc_vdev_do_stop;

>>>  

>>>  	rproc_add_subdev(rproc, &rvdev->subdev);

>>

>> Could you split in 2 patches one for the core another, the other for the

>> glink driver?

>>

>> Regards

>> Arnaud

>>

>
Bjorn Andersson June 26, 2018, 2:20 a.m. | #4
On Mon 25 Jun 18:32 PDT 2018, Alex Elder wrote:

> On 05/29/2018 06:53 AM, Alex Elder wrote:

> > On 05/29/2018 04:12 AM, Arnaud Pouliquen wrote:

> >> Hello Alex

> >>

> >>

> >> We have the same needs (prepare unprepare steps) on our platform. We

> >> tested you core patches and they answers to our need.

> > 

> > I'm very glad to hear that.  Would you offer your "Tested-by" on these?

> > 

> > On your comment below, yes, I will re-send v2 and will separate the

> > core from the glink code.

> 

> Arnaud, despite what I said above, I'm about to resend the code but

> will *not* be separating the core code from glink code.  It turns

> out that the glink code (and smd and ssr) are really part of the

> core code at the moment.  So after talking with Bjorn I agreed to

> just send the code without splitting them.

> 


I wasn't trying to say that it's part of the core, but after reading the
patches again I see that my memory failed me on how these where split.

I'm okay merging this patch even though it touches the two separate
files.

Regards,
Bjorn

Patch

diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
index 4ae87c5b8793..6f77840140bf 100644
--- a/drivers/remoteproc/qcom_common.c
+++ b/drivers/remoteproc/qcom_common.c
@@ -33,7 +33,7 @@ 
 
 static BLOCKING_NOTIFIER_HEAD(ssr_notifiers);
 
-static int glink_subdev_probe(struct rproc_subdev *subdev)
+static int glink_subdev_start(struct rproc_subdev *subdev)
 {
 	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
 
@@ -42,7 +42,7 @@  static int glink_subdev_probe(struct rproc_subdev *subdev)
 	return PTR_ERR_OR_ZERO(glink->edge);
 }
 
-static void glink_subdev_remove(struct rproc_subdev *subdev, bool crashed)
+static void glink_subdev_stop(struct rproc_subdev *subdev, bool crashed)
 {
 	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);
 
@@ -64,8 +64,8 @@  void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink)
 		return;
 
 	glink->dev = dev;
-	glink->subdev.start = glink_subdev_probe;
-	glink->subdev.stop = glink_subdev_remove;
+	glink->subdev.start = glink_subdev_start;
+	glink->subdev.stop = glink_subdev_stop;
 
 	rproc_add_subdev(rproc, &glink->subdev);
 }
@@ -129,7 +129,7 @@  int qcom_register_dump_segments(struct rproc *rproc,
 }
 EXPORT_SYMBOL_GPL(qcom_register_dump_segments);
 
-static int smd_subdev_probe(struct rproc_subdev *subdev)
+static int smd_subdev_start(struct rproc_subdev *subdev)
 {
 	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);
 
@@ -138,7 +138,7 @@  static int smd_subdev_probe(struct rproc_subdev *subdev)
 	return PTR_ERR_OR_ZERO(smd->edge);
 }
 
-static void smd_subdev_remove(struct rproc_subdev *subdev, bool crashed)
+static void smd_subdev_stop(struct rproc_subdev *subdev, bool crashed)
 {
 	struct qcom_rproc_subdev *smd = to_smd_subdev(subdev);
 
@@ -160,8 +160,8 @@  void qcom_add_smd_subdev(struct rproc *rproc, struct qcom_rproc_subdev *smd)
 		return;
 
 	smd->dev = dev;
-	smd->subdev.start = smd_subdev_probe;
-	smd->subdev.stop = smd_subdev_remove;
+	smd->subdev.start = smd_subdev_start;
+	smd->subdev.stop = smd_subdev_stop;
 
 	rproc_add_subdev(rproc, &smd->subdev);
 }
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index ca39fad175f2..2ede7ae6f5bc 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -301,14 +301,14 @@  void rproc_free_vring(struct rproc_vring *rvring)
 	rsc->vring[idx].notifyid = -1;
 }
 
-static int rproc_vdev_do_probe(struct rproc_subdev *subdev)
+static int rproc_vdev_do_start(struct rproc_subdev *subdev)
 {
 	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);
 
 	return rproc_add_virtio_dev(rvdev, rvdev->id);
 }
 
-static void rproc_vdev_do_remove(struct rproc_subdev *subdev, bool crashed)
+static void rproc_vdev_do_stop(struct rproc_subdev *subdev, bool crashed)
 {
 	struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);
 
@@ -399,8 +399,8 @@  static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,
 
 	list_add_tail(&rvdev->node, &rproc->rvdevs);
 
-	rvdev->subdev.start = rproc_vdev_do_probe;
-	rvdev->subdev.stop = rproc_vdev_do_remove;
+	rvdev->subdev.start = rproc_vdev_do_start;
+	rvdev->subdev.stop = rproc_vdev_do_stop;
 
 	rproc_add_subdev(rproc, &rvdev->subdev);