github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
- conversion of intel-thc-hid to hid_safe_input_report() (Even Xu)
This commit is contained in:
Jiri Kosina 2026-10-21 21:43:14 +02:00
commit bd61ad6215
9 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
View File

@ -315,7 +315,7 @@ static int handle_input_report(struct quicki2c_device *qcdev)
if (qcdev->state != QUICKI2C_ENABLED)
continue;
quicki2c_hid_send_report(qcdev, pkt->data,
quicki2c_hid_send_report(qcdev, pkt->data, qcdev->input_len,
HIDI2C_DATA_LEN(le16_to_cpu(pkt->len)));
}
@ -611,6 +611,8 @@ static int quicki2c_alloc_report_buf(struct quicki2c_device *qcdev)
if (!qcdev->input_buf)
return -ENOMEM;
qcdev->input_len = max_report_len;
if (!le16_to_cpu(qcdev->dev_desc.max_output_len))
qcdev->dev_desc.max_output_len = cpu_to_le16(SZ_4K);

2
drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-dev.h
View File

@ -181,6 +181,7 @@ struct acpi_device;
* @low_power_ltr_val: THC low power LTR value
* @report_descriptor: Store a copy of device report descriptor
* @input_buf: Store a copy of latest input report data
* @input_len: The data size of the input report buffer
* @report_buf: Store a copy of latest input/output report packet from set/get feature
* @report_len: The length of input/output report packet
* @reset_ack_wq: Workqueue for waiting reset response from device
@ -212,6 +213,7 @@ struct quicki2c_device {
u8 *report_descriptor;
u8 *input_buf;
size_t input_len;
u8 *report_buf;
size_t report_len;

6
drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.c
View File

@ -157,16 +157,18 @@ void quicki2c_hid_remove(struct quicki2c_device *qcdev)
*
* @qcdev: point to quicki2c device
* @data: point to input report data buffer
* @buf_size: the allocated size of the input report data buffer
* @data_len: the length of input report data
*
* Return: 0 on success, non zero on error.
*/
int quicki2c_hid_send_report(struct quicki2c_device *qcdev,
void *data, size_t data_len)
void *data, size_t buf_size, size_t data_len)
{
int ret;
ret = hid_input_report(qcdev->hid_dev, HID_INPUT_REPORT, data, data_len, 1);
ret = hid_safe_input_report(qcdev->hid_dev, HID_INPUT_REPORT, data,
buf_size, data_len, 1);
if (ret)
dev_err(qcdev->dev, "Failed to send HID input report, ret = %d.\n", ret);

2
drivers/hid/intel-thc-hid/intel-quicki2c/quicki2c-hid.h
View File

@ -7,7 +7,7 @@
struct quicki2c_device;
int quicki2c_hid_send_report(struct quicki2c_device *qcdev,
void *data, size_t data_size);
void *data, size_t buf_size, size_t data_size);
int quicki2c_hid_probe(struct quicki2c_device *qcdev);
void quicki2c_hid_remove(struct quicki2c_device *qcdev);

2
drivers/hid/intel-thc-hid/intel-quickspi/pci-quickspi.c
View File

@ -557,6 +557,8 @@ static int quickspi_alloc_report_buf(struct quickspi_device *qsdev)
if (!qsdev->input_buf)
return -ENOMEM;
qsdev->input_len = max_input_len;
max_report_len = max(le16_to_cpu(qsdev->dev_desc.max_output_len),
le16_to_cpu(qsdev->dev_desc.max_input_len));

2
drivers/hid/intel-thc-hid/intel-quickspi/quickspi-dev.h
View File

@ -113,6 +113,7 @@ struct acpi_device;
* @low_power_ltr_val: THC low power LTR value
* @report_descriptor: store a copy of device report descriptor
* @input_buf: store a copy of latest input report data
* @input_len: the data size of the input report buffer
* @report_buf: store a copy of latest input/output report packet from set/get feature
* @report_len: the length of input/output report packet
* @reset_ack_wq: workqueue for waiting reset response from device
@ -159,6 +160,7 @@ struct quickspi_device {
u8 *report_descriptor;
u8 *input_buf;
u32 input_len;
u8 *report_buf;
u32 report_buf_size;
u32 report_len;

6
drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.c
View File

@ -148,16 +148,18 @@ void quickspi_hid_remove(struct quickspi_device *qsdev)
*
* @qsdev: point to quickspi device
* @data: point to input report data buffer
* @buf_size: the allocated size of the input report data buffer
* @data_len: the length of input report data
*
* Return: 0 on success, non zero on error.
*/
int quickspi_hid_send_report(struct quickspi_device *qsdev,
void *data, size_t data_len)
void *data, size_t buf_size, size_t data_len)
{
int ret;
ret = hid_input_report(qsdev->hid_dev, HID_INPUT_REPORT, data, data_len, 1);
ret = hid_safe_input_report(qsdev->hid_dev, HID_INPUT_REPORT, data,
buf_size, data_len, 1);
if (ret)
dev_err(qsdev->dev, "Failed to send HID input report, ret = %d.\n", ret);

2
drivers/hid/intel-thc-hid/intel-quickspi/quickspi-hid.h
View File

@ -7,7 +7,7 @@
struct quickspi_device;
int quickspi_hid_send_report(struct quickspi_device *qsdev,
void *data, size_t data_size);
void *data, size_t buf_size, size_t data_size);
int quickspi_hid_probe(struct quickspi_device *qsdev);
void quickspi_hid_remove(struct quickspi_device *qsdev);

2
drivers/hid/intel-thc-hid/intel-quickspi/quickspi-protocol.c
View File

@ -240,7 +240,7 @@ void quickspi_handle_input_data(struct quickspi_device *qsdev, u32 buf_len)
input_len = sizeof(body_hdr->content_id) + input_len;
input_report = input_body->content - sizeof(body_hdr->content_id);
ret = quickspi_hid_send_report(qsdev, input_report, input_len);
ret = quickspi_hid_send_report(qsdev, input_report, qsdev->input_len, input_len);
if (ret)
dev_err_once(qsdev->dev, "Failed to send HID input report: %d\n", ret);