Re: [PATCH v3 5/9] drivers: thermal: tsens: Add critical interrupt support

[Bjorn Andersson <bjorn.andersson@linaro.org>]

On Thu 02 Jan 06:54 PST 2020, Amit Kucheria wrote:
[..]
> @@ -189,6 +197,9 @@ static void tsens_set_interrupt_v1(struct tsens_priv *priv, u32 hw_id,
>  	case LOWER:
>  		index = LOW_INT_CLEAR_0 + hw_id;
>  		break;
> +	case CRITICAL:
> +		/* No critical interrupts before v2 */
> +		break;

You need to break harder, right now you're just attempting to write
"enable" to VER_MAJOR in this case.

>  	}
>  	regmap_field_write(priv->rf[index], enable ? 0 : 1);
>  }
[..]
> @@ -321,6 +357,64 @@ static inline u32 masked_irq(u32 hw_id, u32 mask, enum tsens_ver ver)
>  	return 0;
>  }
>  
> +/**
> + * tsens_critical_irq_thread - Threaded interrupt handler for critical interrupts

() on the function name to denote it being a function.

> + * @irq: irq number
> + * @data: tsens controller private data
> + *
> + * Check all sensors to find ones that violated their critical threshold limits.
> + * Clear and then re-enable the interrupt.
> + *
> + * The level-triggered interrupt might deassert if the temperature returned to
> + * within the threshold limits by the time the handler got scheduled. We
> + * consider the irq to have been handled in that case.
> + *
> + * Return: IRQ_HANDLED
> + */
> +irqreturn_t tsens_critical_irq_thread(int irq, void *data)
> +{
> +	struct tsens_priv *priv = data;
> +	struct tsens_irq_data d;
> +	unsigned long flags;
> +	int temp, ret, i;
> +
> +	for (i = 0; i < priv->num_sensors; i++) {
> +		const struct tsens_sensor *s = &priv->sensor[i];
> +		u32 hw_id = s->hw_id;
> +
> +		if (IS_ERR(s->tzd))
> +			continue;
> +		if (!tsens_threshold_violated(priv, hw_id, &d))
> +			continue;
> +		ret = get_temp_tsens_valid(s, &temp);
> +		if (ret) {
> +			dev_err(priv->dev, "[%u] %s: error reading sensor\n", hw_id, __func__);
> +			continue;
> +		}
> +
> +		spin_lock_irqsave(&priv->ul_lock, flags);

You meant crit_lock here?

But perhaps more importantly, why do you need a lock here?

> +
> +		tsens_read_irq_state(priv, hw_id, s, &d);
> +
> +		if (d.crit_viol &&
> +		    !masked_irq(hw_id, d.crit_irq_mask, tsens_version(priv))) {
> +			tsens_set_interrupt(priv, hw_id, CRITICAL, false);
> +			if (d.crit_thresh > temp) {
> +				dev_dbg(priv->dev, "[%u] %s: re-arm upper\n",
> +					hw_id, __func__);
> +			} else {
> +				dev_dbg(priv->dev, "[%u] %s: TZ update trigger (%d mC)\n",
> +					hw_id, __func__, temp);
> +			}
> +			tsens_set_interrupt(priv, hw_id, CRITICAL, true);
> +		}
> +
> +		spin_unlock_irqrestore(&priv->crit_lock, flags);
> +	}
> +
> +	return IRQ_HANDLED;
> +}
[..]
> @@ -125,6 +125,28 @@ static int tsens_register(struct tsens_priv *priv)
>  		goto err_put_device;
>  	}
>  
> +	if (priv->feat->crit_int) {
> +		irq_crit = platform_get_irq_byname(pdev, "critical");
> +		if (irq_crit < 0) {
> +			ret = irq_crit;
> +			/* For old DTs with no IRQ defined */
> +			if (irq_crit == -ENXIO)
> +				ret = 0;
> +			goto err_crit_int;
> +		}
> +		ret = devm_request_threaded_irq(&pdev->dev, irq_crit,
> +						NULL, tsens_critical_irq_thread,
> +						IRQF_TRIGGER_HIGH | IRQF_ONESHOT,

You should omit the IRQF_TRIGGER_HIGH here, it will be provided by the
system configuration (DT).

> +						dev_name(&pdev->dev), priv);
> +		if (ret) {
> +			dev_err(&pdev->dev, "%s: failed to get critical irq\n", __func__);
> +			goto err_crit_int;
> +		}
> +
> +		enable_irq_wake(irq_crit);
> +	}
> +
> +err_crit_int:
>  	enable_irq_wake(irq);
>  
>  err_put_device:
> diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
[..]
> @@ -460,6 +526,8 @@ struct tsens_context {
>   * @srot_map: pointer to SROT register address space
>   * @tm_offset: deal with old device trees that don't address TM and SROT
>   *             address space separately
> + * @ul_lock: lock while processing upper/lower threshold interrupts

This looks like an unrelated fixup to a previous patch? Please keep it
separate.

> + * @crit_lock: lock while processing critical threshold interrupts
>   * @rf: array of regmap_fields used to store value of the field
>   * @ctx: registers to be saved and restored during suspend/resume
>   * @feat: features of the IP
> @@ -479,6 +547,9 @@ struct tsens_priv {
>  	/* lock for upper/lower threshold interrupts */
>  	spinlock_t			ul_lock;
>  
> +	/* lock for critical threshold interrupts */
> +	spinlock_t			crit_lock;

You're lacking a spin_lock_init() of this.

> +
>  	struct regmap_field		*rf[MAX_REGFIELDS];
>  	struct tsens_context		ctx;
>  	struct tsens_features		*feat;
> @@ -500,6 +571,7 @@ int tsens_enable_irq(struct tsens_priv *priv);
>  void tsens_disable_irq(struct tsens_priv *priv);
>  int tsens_set_trips(void *_sensor, int low, int high);
>  irqreturn_t tsens_irq_thread(int irq, void *data);
> +irqreturn_t tsens_critical_irq_thread(int irq, void *data);

I think you should squash tsens.c and tsens-common.c into one file, so
you don't need to keep adding these extern declarations for every
function - separate of this series of course.

Regards,
Bjorn

>  
>  /* TSENS target */
>  extern struct tsens_plat_data data_8960;
> -- 
> 2.20.1
>