Commit 9f127546 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc fixes from Greg KH:
 "Some small driver fixes for 6.1-rc3.  They include:

   - iio driver bugfixes

   - counter driver bugfixes

   - coresight bugfixes, including a revert and then a second fix to get
     it right.

  All of these have been in linux-next with no reported problems"

* tag 'char-misc-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (21 commits)
  misc: sgi-gru: use explicitly signed char
  coresight: cti: Fix hang in cti_disable_hw()
  Revert "coresight: cti: Fix hang in cti_disable_hw()"
  counter: 104-quad-8: Fix race getting function mode and direction
  counter: microchip-tcb-capture: Handle Signal1 read and Synapse
  coresight: cti: Fix hang in cti_disable_hw()
  coresight: Fix possible deadlock with lock dependency
  counter: ti-ecap-capture: fix IS_ERR() vs NULL check
  counter: Reduce DEFINE_COUNTER_ARRAY_POLARITY() to defining counter_array
  iio: bmc150-accel-core: Fix unsafe buffer attributes
  iio: adxl367: Fix unsafe buffer attributes
  iio: adxl372: Fix unsafe buffer attributes
  iio: at91-sama5d2_adc: Fix unsafe buffer attributes
  iio: temperature: ltc2983: allocate iio channels once
  tools: iio: iio_utils: fix digit calculation
  iio: adc: stm32-adc: fix channel sampling time init
  iio: adc: mcp3911: mask out device ID in debug prints
  iio: adc: mcp3911: use correct id bits
  iio: adc: mcp3911: return proper error code on failure to allocate trigger
  iio: adc: mcp3911: fix sizeof() vs ARRAY_SIZE() bug
  ...
parents c4d25ce6 67704738

drivers/counter/104-quad-8.c

+42 −22
Original line number Diff line number Diff line
@@ -232,34 +232,45 @@ static const enum counter_function quad8_count_functions_list[] = { 
	COUNTER_FUNCTION_QUADRATURE_X4,

};



static int quad8_function_read(struct counter_device *counter,

			       struct counter_count *count,

			       enum counter_function *function)

static int quad8_function_get(const struct quad8 *const priv, const size_t id,

			      enum counter_function *const function)

{

	struct quad8 *const priv = counter_priv(counter);

	const int id = count->id;

	unsigned long irqflags;



	spin_lock_irqsave(&priv->lock, irqflags);

	if (!priv->quadrature_mode[id]) {

		*function = COUNTER_FUNCTION_PULSE_DIRECTION;

		return 0;

	}



	if (priv->quadrature_mode[id])

	switch (priv->quadrature_scale[id]) {

	case 0:

		*function = COUNTER_FUNCTION_QUADRATURE_X1_A;

			break;

		return 0;

	case 1:

		*function = COUNTER_FUNCTION_QUADRATURE_X2_A;

			break;

		return 0;

	case 2:

		*function = COUNTER_FUNCTION_QUADRATURE_X4;

			break;

		return 0;

	default:

		/* should never reach this path */

		return -EINVAL;

	}

	else

		*function = COUNTER_FUNCTION_PULSE_DIRECTION;

}



static int quad8_function_read(struct counter_device *counter,

			       struct counter_count *count,

			       enum counter_function *function)

{

	struct quad8 *const priv = counter_priv(counter);

	unsigned long irqflags;

	int retval;



	spin_lock_irqsave(&priv->lock, irqflags);



	retval = quad8_function_get(priv, count->id, function);



	spin_unlock_irqrestore(&priv->lock, irqflags);



	return 0;

	return retval;

}



static int quad8_function_write(struct counter_device *counter,
@@ -359,6 +370,7 @@ static int quad8_action_read(struct counter_device *counter, 
			     enum counter_synapse_action *action)

{

	struct quad8 *const priv = counter_priv(counter);

	unsigned long irqflags;

	int err;

	enum counter_function function;

	const size_t signal_a_id = count->synapses[0].signal->id;
@@ -374,9 +386,21 @@ static int quad8_action_read(struct counter_device *counter, 
		return 0;

	}



	err = quad8_function_read(counter, count, &function);

	if (err)

	spin_lock_irqsave(&priv->lock, irqflags);



	/* Get Count function and direction atomically */

	err = quad8_function_get(priv, count->id, &function);

	if (err) {

		spin_unlock_irqrestore(&priv->lock, irqflags);

		return err;

	}

	err = quad8_direction_read(counter, count, &direction);

	if (err) {

		spin_unlock_irqrestore(&priv->lock, irqflags);

		return err;

	}



	spin_unlock_irqrestore(&priv->lock, irqflags);



	/* Default action mode */

	*action = COUNTER_SYNAPSE_ACTION_NONE;
@@ -389,10 +413,6 @@ static int quad8_action_read(struct counter_device *counter, 
		return 0;

	case COUNTER_FUNCTION_QUADRATURE_X1_A:

		if (synapse->signal->id == signal_a_id) {

			err = quad8_direction_read(counter, count, &direction);

			if (err)

				return err;



			if (direction == COUNTER_COUNT_DIRECTION_FORWARD)

				*action = COUNTER_SYNAPSE_ACTION_RISING_EDGE;

			else

drivers/counter/microchip-tcb-capture.c

+14 −4
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct mchp_tc_data { 
	int qdec_mode;

	int num_channels;

	int channel[2];

	bool trig_inverted;

};



static const enum counter_function mchp_tc_count_functions[] = {
@@ -153,7 +152,7 @@ static int mchp_tc_count_signal_read(struct counter_device *counter, 


	regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], SR), &sr);



	if (priv->trig_inverted)

	if (signal->id == 1)

		sigstatus = (sr & ATMEL_TC_MTIOB);

	else

		sigstatus = (sr & ATMEL_TC_MTIOA);
@@ -171,6 +170,17 @@ static int mchp_tc_count_action_read(struct counter_device *counter, 
	struct mchp_tc_data *const priv = counter_priv(counter);

	u32 cmr;



	if (priv->qdec_mode) {

		*action = COUNTER_SYNAPSE_ACTION_BOTH_EDGES;

		return 0;

	}



	/* Only TIOA signal is evaluated in non-QDEC mode */

	if (synapse->signal->id != 0) {

		*action = COUNTER_SYNAPSE_ACTION_NONE;

		return 0;

	}



	regmap_read(priv->regmap, ATMEL_TC_REG(priv->channel[0], CMR), &cmr);



	switch (cmr & ATMEL_TC_ETRGEDG) {
@@ -199,8 +209,8 @@ static int mchp_tc_count_action_write(struct counter_device *counter, 
	struct mchp_tc_data *const priv = counter_priv(counter);

	u32 edge = ATMEL_TC_ETRGEDG_NONE;



	/* QDEC mode is rising edge only */

	if (priv->qdec_mode)

	/* QDEC mode is rising edge only; only TIOA handled in non-QDEC mode */

	if (priv->qdec_mode || synapse->signal->id != 0)

		return -EINVAL;



	switch (action) {

drivers/counter/ti-ecap-capture.c

+4 −3
Original line number Diff line number Diff line
@@ -377,7 +377,8 @@ static const enum counter_signal_polarity ecap_cnt_pol_avail[] = { 
	COUNTER_SIGNAL_POLARITY_NEGATIVE,

};



static DEFINE_COUNTER_ARRAY_POLARITY(ecap_cnt_pol_array, ecap_cnt_pol_avail, ECAP_NB_CEVT);

static DEFINE_COUNTER_AVAILABLE(ecap_cnt_pol_available, ecap_cnt_pol_avail);

static DEFINE_COUNTER_ARRAY_POLARITY(ecap_cnt_pol_array, ecap_cnt_pol_available, ECAP_NB_CEVT);



static struct counter_comp ecap_cnt_signal_ext[] = {

	COUNTER_COMP_ARRAY_POLARITY(ecap_cnt_pol_read, ecap_cnt_pol_write, ecap_cnt_pol_array),
@@ -479,8 +480,8 @@ static int ecap_cnt_probe(struct platform_device *pdev) 
	int ret;



	counter_dev = devm_counter_alloc(dev, sizeof(*ecap_dev));

	if (IS_ERR(counter_dev))

		return PTR_ERR(counter_dev);

	if (!counter_dev)

		return -ENOMEM;



	counter_dev->name = ECAP_DRV_NAME;

	counter_dev->parent = dev;

drivers/hwtracing/coresight/coresight-core.c

+4 −3
Original line number Diff line number Diff line
@@ -1687,14 +1687,15 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) 
		ret = coresight_fixup_device_conns(csdev);

	if (!ret)

		ret = coresight_fixup_orphan_conns(csdev);

	if (!ret && cti_assoc_ops && cti_assoc_ops->add)

		cti_assoc_ops->add(csdev);



out_unlock:

	mutex_unlock(&coresight_mutex);

	/* Success */

	if (!ret)

	if (!ret) {

		if (cti_assoc_ops && cti_assoc_ops->add)

			cti_assoc_ops->add(csdev);

		return csdev;

	}



	/* Unregister the device if needed */

	if (registered) {

drivers/hwtracing/coresight/coresight-cti-core.c

+3 −7
Original line number Diff line number Diff line
@@ -90,11 +90,9 @@ void cti_write_all_hw_regs(struct cti_drvdata *drvdata) 
static int cti_enable_hw(struct cti_drvdata *drvdata)

{

	struct cti_config *config = &drvdata->config;

	struct device *dev = &drvdata->csdev->dev;

	unsigned long flags;

	int rc = 0;



	pm_runtime_get_sync(dev->parent);

	spin_lock_irqsave(&drvdata->spinlock, flags);



	/* no need to do anything if enabled or unpowered*/
@@ -119,7 +117,6 @@ static int cti_enable_hw(struct cti_drvdata *drvdata) 
	/* cannot enable due to error */

cti_err_not_enabled:

	spin_unlock_irqrestore(&drvdata->spinlock, flags);

	pm_runtime_put(dev->parent);

	return rc;

}
@@ -153,7 +150,6 @@ static void cti_cpuhp_enable_hw(struct cti_drvdata *drvdata) 
static int cti_disable_hw(struct cti_drvdata *drvdata)

{

	struct cti_config *config = &drvdata->config;

	struct device *dev = &drvdata->csdev->dev;

	struct coresight_device *csdev = drvdata->csdev;



	spin_lock(&drvdata->spinlock);
@@ -175,7 +171,6 @@ static int cti_disable_hw(struct cti_drvdata *drvdata) 
	coresight_disclaim_device_unlocked(csdev);

	CS_LOCK(drvdata->base);

	spin_unlock(&drvdata->spinlock);

	pm_runtime_put(dev->parent);

	return 0;



	/* not disabled this call */
@@ -541,7 +536,7 @@ cti_match_fixup_csdev(struct cti_device *ctidev, const char *node_name, 
/*

 * Search the cti list to add an associated CTI into the supplied CS device

 * This will set the association if CTI declared before the CS device.

 * (called from coresight_register() with coresight_mutex locked).

 * (called from coresight_register() without coresight_mutex locked).

 */

static void cti_add_assoc_to_csdev(struct coresight_device *csdev)

{
@@ -569,7 +564,8 @@ static void cti_add_assoc_to_csdev(struct coresight_device *csdev) 
			 * if we found a matching csdev then update the ECT

			 * association pointer for the device with this CTI.

			 */

			csdev->ect_dev = ect_item->csdev;

			coresight_set_assoc_ectdev_mutex(csdev->ect_dev,

							 ect_item->csdev);

			break;

		}

	}