Commit cd377067 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-6.18/intel-thc-hid' into for-linus 

- quicki2c: support ACPI config for advanced features: max input size
  and interrupt delay (Xinpeng Sun)
- some more str_true_false() conversions
parents 6a88bb25 0b1fca9d

drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c

+31 −8
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


static struct quicki2c_ddata ptl_ddata = {

	.max_detect_size = MAX_RX_DETECT_SIZE_PTL,

	.max_interrupt_delay = MAX_RX_INTERRUPT_DELAY,

};



/* THC QuickI2C ACPI method to get device properties */
@@ -200,6 +201,21 @@ static int quicki2c_get_acpi_resources(struct quicki2c_device *qcdev) 
		return -EOPNOTSUPP;

	}



	if (qcdev->ddata) {

		qcdev->i2c_max_frame_size_enable = i2c_config.FSEN;

		qcdev->i2c_int_delay_enable = i2c_config.INDE;



		if (i2c_config.FSVL <= qcdev->ddata->max_detect_size)

			qcdev->i2c_max_frame_size = i2c_config.FSVL;

		else

			qcdev->i2c_max_frame_size = qcdev->ddata->max_detect_size;



		if (i2c_config.INDV <= qcdev->ddata->max_interrupt_delay)

			qcdev->i2c_int_delay = i2c_config.INDV;

		else

			qcdev->i2c_int_delay = qcdev->ddata->max_interrupt_delay;

	}



	return 0;

}
@@ -441,17 +457,24 @@ static void quicki2c_dma_adv_enable(struct quicki2c_device *qcdev) 
	 * max input length <= THC detect capability, enable the feature with device

	 * max input length.

	 */

	if (qcdev->ddata->max_detect_size >=

	if (qcdev->i2c_max_frame_size_enable) {

		if (qcdev->i2c_max_frame_size >=

		    le16_to_cpu(qcdev->dev_desc.max_input_len)) {

			thc_i2c_set_rx_max_size(qcdev->thc_hw,

						le16_to_cpu(qcdev->dev_desc.max_input_len));

		} else {

			dev_warn(qcdev->dev,

				 "Max frame size is smaller than hid max input length!");

			thc_i2c_set_rx_max_size(qcdev->thc_hw,

						le16_to_cpu(qcdev->i2c_max_frame_size));

		}

		thc_i2c_rx_max_size_enable(qcdev->thc_hw, true);

	}



	/* If platform supports interrupt delay feature, enable it with given delay */

	if (qcdev->ddata->interrupt_delay) {

	if (qcdev->i2c_int_delay_enable) {

		thc_i2c_set_rx_int_delay(qcdev->thc_hw,

					 qcdev->ddata->interrupt_delay);

					 qcdev->i2c_int_delay * 10);

		thc_i2c_rx_int_delay_enable(qcdev->thc_hw, true);

	}

}
@@ -464,10 +487,10 @@ static void quicki2c_dma_adv_enable(struct quicki2c_device *qcdev) 
 */

static void quicki2c_dma_adv_disable(struct quicki2c_device *qcdev)

{

	if (qcdev->ddata->max_detect_size)

	if (qcdev->i2c_max_frame_size_enable)

		thc_i2c_rx_max_size_enable(qcdev->thc_hw, false);



	if (qcdev->ddata->interrupt_delay)

	if (qcdev->i2c_int_delay_enable)

		thc_i2c_rx_int_delay_enable(qcdev->thc_hw, false);

}

drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h

+22 −2
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 


/* PTL Max packet size detection capability is 255 Bytes */

#define MAX_RX_DETECT_SIZE_PTL			255

/* Max interrupt delay capability is 2.56ms */

#define MAX_RX_INTERRUPT_DELAY			256



/* Default interrupt delay is 1ms, suitable for most devices */

#define DEFAULT_INTERRUPT_DELAY_US		(1 * USEC_PER_MSEC)
@@ -103,6 +105,10 @@ struct quicki2c_subip_acpi_parameter { 
 * @HMTD: High Speed Mode Plus (3.4Mbits/sec) Serial Data Line Transmit HOLD Period

 * @HMRD: High Speed Mode Plus (3.4Mbits/sec) Serial Data Line Receive HOLD Period

 * @HMSL: Maximum length (in ic_clk_cycles) of suppressed spikes in High Speed Mode

 * @FSEN: Maximum Frame Size Feature Enable Control

 * @FSVL: Maximum Frame Size Value (unit in Bytes)

 * @INDE: Interrupt Delay Feature Enable Control

 * @INDV: Interrupt Delay Value (unit in 10 us)

 *

 * Those properties get from QUICKI2C_ACPI_METHOD_NAME_ISUB method, used for

 * I2C timing configure.
@@ -129,17 +135,22 @@ struct quicki2c_subip_acpi_config { 
	u64 HMTD;

	u64 HMRD;

	u64 HMSL;



	u64 FSEN;

	u64 FSVL;

	u64 INDE;

	u64 INDV;

	u8 reserved;

};



/**

 * struct quicki2c_ddata - Driver specific data for quicki2c device

 * @max_detect_size: Identify max packet size detect for rx

 * @interrupt_delay: Identify interrupt detect delay for rx

 * @interrupt_delay: Identify max interrupt detect delay for rx

 */

struct quicki2c_ddata {

	u32 max_detect_size;

	u32 interrupt_delay;

	u32 max_interrupt_delay;

};



struct device;
@@ -172,6 +183,10 @@ struct acpi_device; 
 * @report_len: The length of input/output report packet

 * @reset_ack_wq: Workqueue for waiting reset response from device

 * @reset_ack: Indicate reset response received or not

 * @i2c_max_frame_size_enable: Indicate max frame size feature enabled or not

 * @i2c_max_frame_size: Max RX frame size (unit in Bytes)

 * @i2c_int_delay_enable: Indicate interrupt delay feature enabled or not

 * @i2c_int_delay: Interrupt detection delay value (unit in 10 us)

 */

struct quicki2c_device {

	struct device *dev;
@@ -202,6 +217,11 @@ struct quicki2c_device { 


	wait_queue_head_t reset_ack_wq;

	bool reset_ack;



	u32 i2c_max_frame_size_enable;

	u32 i2c_max_frame_size;

	u32 i2c_int_delay_enable;

	u32 i2c_int_delay;

};



#endif /* _QUICKI2C_DEV_H_ */

drivers/hid/intel-thc-hid/intel-thc/intel-thc-dev.c

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/bitfield.h>

#include <linux/math.h>

#include <linux/regmap.h>

#include <linux/string_choices.h>



#include "intel-thc-dev.h"

#include "intel-thc-hw.h"
@@ -664,7 +665,7 @@ int thc_interrupt_quiesce(const struct thc_device *dev, bool int_quiesce) 
	if (ret) {

		dev_err_once(dev->dev,

			     "Timeout while waiting THC idle, target quiesce state = %s\n",

			     int_quiesce ? "true" : "false");

			     str_true_false(int_quiesce));

		return ret;

	}