[v2,1/2] thermal: rcar_gen3_thermal: fix interrupt type
diff mbox series

Message ID 20190423061218.29705-2-jiada_wang@mentor.com
State Superseded
Headers show
Series
  • thermal: rcar_gen3_thermal: fix IRQ issues
Related show

Commit Message

Jiada Wang April 23, 2019, 6:12 a.m. UTC
Currently IRQF_SHARED type interrupt line is allocated, but it
is not appropriate, as the interrupt line isn't shared between
different devices, instead IRQF_ONESHOT is the proper type.

By changing interrupt type to IRQF_ONESHOT, now irq handler is
no longer needed, as clear of interrupt status can be done in
threaded interrupt context.

Because IRQF_ONESHOT type interrupt line is kept disabled until
the threaded handler has been run, so there is no need to protect
read/write of REG_GEN3_IRQSTR with lock.

Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
 drivers/thermal/rcar_gen3_thermal.c | 40 ++++++++---------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

Comments

Eugeniu Rosca April 23, 2019, 1:07 p.m. UTC | #1
Hi Jiada,

On Tue, Apr 23, 2019 at 03:12:17PM +0900, Jiada Wang wrote:
> Currently IRQF_SHARED type interrupt line is allocated, but it
> is not appropriate, as the interrupt line isn't shared between
> different devices, instead IRQF_ONESHOT is the proper type.
> 
> By changing interrupt type to IRQF_ONESHOT, now irq handler is
> no longer needed, as clear of interrupt status can be done in
> threaded interrupt context.
> 
> Because IRQF_ONESHOT type interrupt line is kept disabled until
> the threaded handler has been run, so there is no need to protect
> read/write of REG_GEN3_IRQSTR with lock.
> 
> Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
> ---
>  drivers/thermal/rcar_gen3_thermal.c | 40 ++++++++---------------------
>  1 file changed, 10 insertions(+), 30 deletions(-)
>

[..]

I might be doing something wrong, but I couldn't apply this patch on top
of v5.1-rc6-4-g7142eaa58b49. All below commands failed (git v2.21.0):
 - git am this.patch
 - git apply this.patch
 - patch -p1 < this.patch
Jiada Wang April 23, 2019, 1:09 p.m. UTC | #2
Hi Eugeniu

On 2019/04/23 22:07, Eugeniu Rosca wrote:
> Hi Jiada,
> 
> On Tue, Apr 23, 2019 at 03:12:17PM +0900, Jiada Wang wrote:
>> Currently IRQF_SHARED type interrupt line is allocated, but it
>> is not appropriate, as the interrupt line isn't shared between
>> different devices, instead IRQF_ONESHOT is the proper type.
>>
>> By changing interrupt type to IRQF_ONESHOT, now irq handler is
>> no longer needed, as clear of interrupt status can be done in
>> threaded interrupt context.
>>
>> Because IRQF_ONESHOT type interrupt line is kept disabled until
>> the threaded handler has been run, so there is no need to protect
>> read/write of REG_GEN3_IRQSTR with lock.
>>
>> Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
>> ---
>>   drivers/thermal/rcar_gen3_thermal.c | 40 ++++++++---------------------
>>   1 file changed, 10 insertions(+), 30 deletions(-)
>>
> 
> [..]
> 
> I might be doing something wrong, but I couldn't apply this patch on top
Oops, I think I used wrong code base,
I will send out v3 patch-set soon

sorry about that

Thanks,
Jiada
> of v5.1-rc6-4-g7142eaa58b49. All below commands failed (git v2.21.0):
>   - git am this.patch
>   - git apply this.patch
>   - patch -p1 < this.patch
>

Patch
diff mbox series

diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
index 64035bcec42c..a11032e42f36 100644
--- a/drivers/thermal/rcar_gen3_thermal.c
+++ b/drivers/thermal/rcar_gen3_thermal.c
@@ -236,41 +236,21 @@  static void rcar_thermal_irq_set(struct rcar_gen3_thermal_priv *priv, bool on)
 static irqreturn_t rcar_gen3_thermal_irq(int irq, void *data)
 {
 	struct rcar_gen3_thermal_priv *priv = data;
+	unsigned long flags;
+	int i;
 	u32 status;
-	int i, ret = IRQ_HANDLED;
 
-	spin_lock(&priv->lock);
 	for (i = 0; i < priv->num_tscs; i++) {
 		status = rcar_gen3_thermal_read(priv->tscs[i], REG_GEN3_IRQSTR);
 		rcar_gen3_thermal_write(priv->tscs[i], REG_GEN3_IRQSTR, 0);
-		if (status)
-			ret = IRQ_WAKE_THREAD;
-	}
-
-	if (ret == IRQ_WAKE_THREAD)
-		rcar_thermal_irq_set(priv, false);
-
-	spin_unlock(&priv->lock);
 
-	return ret;
-}
-
-static irqreturn_t rcar_gen3_thermal_irq_thread(int irq, void *data)
-{
-	struct rcar_gen3_thermal_priv *priv = data;
-	unsigned long flags;
-	int i;
-
-	for (i = 0; i < priv->num_tscs; i++) {
-		rcar_gen3_thermal_set_irq_temp(priv->tscs[i]);
-		thermal_zone_device_update(priv->tscs[i]->zone,
-					   THERMAL_EVENT_UNSPECIFIED);
+		if (status) {
+			rcar_gen3_thermal_set_irq_temp(priv->tscs[i]);
+			thermal_zone_device_update(priv->tscs[i]->zone,
+						   THERMAL_EVENT_UNSPECIFIED);
+		}
 	}
 
-	spin_lock_irqsave(&priv->lock, flags);
-	rcar_thermal_irq_set(priv, true);
-	spin_unlock_irqrestore(&priv->lock, flags);
-
 	return IRQ_HANDLED;
 }
 
@@ -397,9 +377,9 @@  static int rcar_gen3_thermal_probe(struct platform_device *pdev)
 		if (!irqname)
 			return -ENOMEM;
 
-		ret = devm_request_threaded_irq(dev, irq, rcar_gen3_thermal_irq,
-						rcar_gen3_thermal_irq_thread,
-						IRQF_SHARED, irqname, priv);
+		ret = devm_request_threaded_irq(dev, irq, NULL,
+						rcar_gen3_thermal_irq,
+						IRQF_ONESHOT, irqname, priv);
 		if (ret)
 			return ret;
 	}