* [PATCH] HID: Recognize sensors with application collections too.
@ 2022-12-17 7:26 Aditya Garg
2023-01-10 8:55 ` [PATCH RESEND] " Aditya Garg
0 siblings, 1 reply; 8+ messages in thread
From: Aditya Garg @ 2022-12-17 7:26 UTC (permalink / raw)
To: Jiri Kosina, jkosina@suse.cz, benjamin.tissoires@redhat.com,
jic23@kernel.org, srinivas.pandruvada@linux.intel.com,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-iio@vger.kernel.org
Cc: Orlando Chamberlain
From: Ronald Tschalär <ronald@innovation.ch>
According to HUTRR39 logical sensor devices may be nested inside
physical collections or may be specified in multiple top-level
application collections (see page 59, strategies 1 and 2). However,
the current code was only recognizing those with physical collections.
This issue turned up in recent MacBook Pro's which define the ALS in
a top-level application collection.
Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
Signed-off-by: Aditya Garg <gargaditya08@live.com>
---
drivers/hid/hid-core.c | 3 ++-
drivers/hid/hid-sensor-hub.c | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b7f5566e338d..8fcd663b10e2 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -804,7 +804,8 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
int i;
if (((parser->global.usage_page << 16) == HID_UP_SENSOR) &&
- type == HID_COLLECTION_PHYSICAL)
+ (type == HID_COLLECTION_PHYSICAL ||
+ type == HID_COLLECTION_APPLICATION))
hid->group = HID_GROUP_SENSOR_HUB;
if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 6abd3e2a9094..d03dc4ca095f 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -397,7 +397,8 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
for (i = 0; i < report->maxfield; ++i) {
field = report->field[i];
if (field->maxusage) {
- if (field->physical == usage_id &&
+ if ((field->physical == usage_id ||
+ field->application == usage_id) &&
(field->logical == attr_usage_id ||
field->usage[0].hid ==
attr_usage_id) &&
@@ -506,7 +507,8 @@ static int sensor_hub_raw_event(struct hid_device *hdev,
collection->usage);
callback = sensor_hub_get_callback(hdev,
- report->field[i]->physical,
+ report->field[i]->physical ?:
+ report->field[i]->application,
report->field[i]->usage[0].collection_index,
&hsdev, &priv);
if (!callback) {
--
2.38.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH RESEND] HID: Recognize sensors with application collections too.
2022-12-17 7:26 [PATCH] HID: Recognize sensors with application collections too Aditya Garg
@ 2023-01-10 8:55 ` Aditya Garg
2023-01-10 8:57 ` [PATCH v2] " Aditya Garg
0 siblings, 1 reply; 8+ messages in thread
From: Aditya Garg @ 2023-01-10 8:55 UTC (permalink / raw)
To: Jiri Kosina, jkosina@suse.cz, benjamin.tissoires@redhat.com,
jic23@kernel.org, srinivas.pandruvada@linux.intel.com,
linux-input@vger.kernel.org, LKML, linux-iio@vger.kernel.org
Cc: orlandoch.dev@gmail.com, ronald@innovation.ch
From: Ronald Tschalär <ronald@innovation.ch>
According to HUTRR39 logical sensor devices may be nested inside
physical collections or may be specified in multiple top-level
application collections (see page 59, strategies 1 and 2). However,
the current code was only recognizing those with physical collections.
This issue turned up in the T2 MacBook Pro's which define the ALS in
a top-level application collection.
Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
---
drivers/hid/hid-core.c | 3 ++-
drivers/hid/hid-sensor-hub.c | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b7f5566e338d..8fcd663b10e2 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -804,7 +804,8 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
int i;
if (((parser->global.usage_page << 16) == HID_UP_SENSOR) &&
- type == HID_COLLECTION_PHYSICAL)
+ (type == HID_COLLECTION_PHYSICAL ||
+ type == HID_COLLECTION_APPLICATION))
hid->group = HID_GROUP_SENSOR_HUB;
if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 6abd3e2a9094..d03dc4ca095f 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -397,7 +397,8 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
for (i = 0; i < report->maxfield; ++i) {
field = report->field[i];
if (field->maxusage) {
- if (field->physical == usage_id &&
+ if ((field->physical == usage_id ||
+ field->application == usage_id) &&
(field->logical == attr_usage_id ||
field->usage[0].hid ==
attr_usage_id) &&
@@ -506,7 +507,8 @@ static int sensor_hub_raw_event(struct hid_device *hdev,
collection->usage);
callback = sensor_hub_get_callback(hdev,
- report->field[i]->physical,
+ report->field[i]->physical ?:
+ report->field[i]->application,
report->field[i]->usage[0].collection_index,
&hsdev, &priv);
if (!callback) {
--
2.38.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2] HID: Recognize sensors with application collections too.
2023-01-10 8:55 ` [PATCH RESEND] " Aditya Garg
@ 2023-01-10 8:57 ` Aditya Garg
2023-01-10 22:16 ` srinivas pandruvada
2023-01-11 10:07 ` [PATCH v3] HID: Recognize sensors with application collections Aditya Garg
0 siblings, 2 replies; 8+ messages in thread
From: Aditya Garg @ 2023-01-10 8:57 UTC (permalink / raw)
To: Jiri Kosina, jkosina@suse.cz, benjamin.tissoires@redhat.com,
jic23@kernel.org, srinivas.pandruvada@linux.intel.com,
linux-input@vger.kernel.org, LKML, linux-iio@vger.kernel.org
Cc: orlandoch.dev@gmail.com, ronald@innovation.ch
From: Ronald Tschalär <ronald@innovation.ch>
According to HUTRR39 logical sensor devices may be nested inside
physical collections or may be specified in multiple top-level
application collections (see page 59, strategies 1 and 2). However,
the current code was only recognizing those with physical collections.
This issue turned up in the T2 MacBook Pro's which define the ALS in
a top-level application collection.
Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
Signed-off-by: Aditya Garg <gargaditya08@live.com>
—
V2 :- Add missing signed-off-by
drivers/hid/hid-core.c | 3 ++-
drivers/hid/hid-sensor-hub.c | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b7f5566e338d..8fcd663b10e2 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -804,7 +804,8 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
int i;
if (((parser->global.usage_page << 16) == HID_UP_SENSOR) &&
- type == HID_COLLECTION_PHYSICAL)
+ (type == HID_COLLECTION_PHYSICAL ||
+ type == HID_COLLECTION_APPLICATION))
hid->group = HID_GROUP_SENSOR_HUB;
if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 6abd3e2a9094..d03dc4ca095f 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -397,7 +397,8 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
for (i = 0; i < report->maxfield; ++i) {
field = report->field[i];
if (field->maxusage) {
- if (field->physical == usage_id &&
+ if ((field->physical == usage_id ||
+ field->application == usage_id) &&
(field->logical == attr_usage_id ||
field->usage[0].hid ==
attr_usage_id) &&
@@ -506,7 +507,8 @@ static int sensor_hub_raw_event(struct hid_device *hdev,
collection->usage);
callback = sensor_hub_get_callback(hdev,
- report->field[i]->physical,
+ report->field[i]->physical ?:
+ report->field[i]->application,
report->field[i]->usage[0].collection_index,
&hsdev, &priv);
if (!callback) {
--
2.38.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2] HID: Recognize sensors with application collections too.
2023-01-10 8:57 ` [PATCH v2] " Aditya Garg
@ 2023-01-10 22:16 ` srinivas pandruvada
2023-01-11 10:06 ` Aditya Garg
2023-01-11 10:07 ` [PATCH v3] HID: Recognize sensors with application collections Aditya Garg
1 sibling, 1 reply; 8+ messages in thread
From: srinivas pandruvada @ 2023-01-10 22:16 UTC (permalink / raw)
To: Aditya Garg, Jiri Kosina, jkosina@suse.cz,
benjamin.tissoires@redhat.com, jic23@kernel.org,
linux-input@vger.kernel.org, LKML, linux-iio@vger.kernel.org
Cc: orlandoch.dev@gmail.com, ronald@innovation.ch
Don't add full stop at the end.
HID: Recognize sensors with application collection
On Tue, 2023-01-10 at 08:57 +0000, Aditya Garg wrote:
> From: Ronald Tschalär <ronald@innovation.ch>
>
> According to HUTRR39 logical sensor devices may be nested inside
> physical collections or may be specified in multiple top-level
> application collections (see page 59, strategies 1 and 2). However,
> the current code was only recognizing those with physical
> collections.
>
> This issue turned up in the T2 MacBook Pro's which define the ALS in
> a top-level application collection.
>
> Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
> Signed-off-by: Aditya Garg <gargaditya08@live.com>
> —
> V2 :- Add missing signed-off-by
> drivers/hid/hid-core.c | 3 ++-
> drivers/hid/hid-sensor-hub.c | 6 ++++--
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index b7f5566e338d..8fcd663b10e2 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -804,7 +804,8 @@ static void hid_scan_collection(struct hid_parser
> *parser, unsigned type)
> int i;
>
> if (((parser->global.usage_page << 16) == HID_UP_SENSOR) &&
> - type == HID_COLLECTION_PHYSICAL)
> + (type == HID_COLLECTION_PHYSICAL ||
> + type == HID_COLLECTION_APPLICATION))
> hid->group = HID_GROUP_SENSOR_HUB;
>
> if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
> diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-
> hub.c
> index 6abd3e2a9094..d03dc4ca095f 100644
> --- a/drivers/hid/hid-sensor-hub.c
> +++ b/drivers/hid/hid-sensor-hub.c
> @@ -397,7 +397,8 @@ int sensor_hub_input_get_attribute_info(struct
> hid_sensor_hub_device *hsdev,
> for (i = 0; i < report->maxfield; ++i) {
> field = report->field[i];
> if (field->maxusage) {
> - if (field->physical == usage_id &&
> + if ((field->physical == usage_id ||
> + field->application == usage_id)
> &&
> (field->logical ==
> attr_usage_id ||
> field->usage[0].hid ==
> attr_usage_id
> ) &&
> @@ -506,7 +507,8 @@ static int sensor_hub_raw_event(struct hid_device
> *hdev,
> collection->usage);
>
> callback = sensor_hub_get_callback(hdev,
> - report->field[i]->physical,
> + report->field[i]->physical ?:
> + report->field[i]->application
Better not use language extensions. Simple to use
report->field[i]->physical ? report->field[i]->physical : report-
>field[i]->application
Otherwise patch is fine.
Thanks,
Srinivas
> ,
> report->field[i]-
> >usage[0].collection_index,
> &hsdev, &priv);
> if (!callback) {
> --
> 2.38.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v2] HID: Recognize sensors with application collections too.
2023-01-10 22:16 ` srinivas pandruvada
@ 2023-01-11 10:06 ` Aditya Garg
0 siblings, 0 replies; 8+ messages in thread
From: Aditya Garg @ 2023-01-11 10:06 UTC (permalink / raw)
To: srinivas pandruvada
Cc: Jiri Kosina, jkosina@suse.cz, benjamin.tissoires@redhat.com,
jic23@kernel.org, linux-input@vger.kernel.org, LKML,
linux-iio@vger.kernel.org, orlandoch.dev@gmail.com,
ronald@innovation.ch
> On 11-Jan-2023, at 3:46 AM, srinivas pandruvada <srinivas.pandruvada@linux.intel.com> wrote:
>
>
> Don't add full stop at the end.
>
> HID: Recognize sensors with application collection
>
> Better not use language extensions. Simple to use
>
> report->field[i]->physical ? report->field[i]->physical : report-
>> field[i]->application
>
>
Sending a v3 with the changes.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3] HID: Recognize sensors with application collections
2023-01-10 8:57 ` [PATCH v2] " Aditya Garg
2023-01-10 22:16 ` srinivas pandruvada
@ 2023-01-11 10:07 ` Aditya Garg
2023-01-11 16:59 ` srinivas pandruvada
2023-01-18 8:54 ` Jiri Kosina
1 sibling, 2 replies; 8+ messages in thread
From: Aditya Garg @ 2023-01-11 10:07 UTC (permalink / raw)
To: Jiri Kosina, jkosina@suse.cz, benjamin.tissoires@redhat.com,
jic23@kernel.org, srinivas.pandruvada@linux.intel.com,
linux-input@vger.kernel.org, LKML, linux-iio@vger.kernel.org
Cc: orlandoch.dev@gmail.com, ronald@innovation.ch
From: Ronald Tschalär <ronald@innovation.ch>
According to HUTRR39 logical sensor devices may be nested inside
physical collections or may be specified in multiple top-level
application collections (see page 59, strategies 1 and 2). However,
the current code was only recognizing those with physical collections.
This issue turned up in the T2 MacBook Pros which define the ALS in
a top-level application collection.
Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
Signed-off-by: Aditya Garg <gargaditya08@live.com>
---
V2 :- Add missing signed-off-by
V3 :- Avoid using language extensions
drivers/hid/hid-core.c | 3 ++-
drivers/hid/hid-sensor-hub.c | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index bd47628da..8ff08e6c2 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -804,7 +804,8 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
int i;
if (((parser->global.usage_page << 16) == HID_UP_SENSOR) &&
- type == HID_COLLECTION_PHYSICAL)
+ (type == HID_COLLECTION_PHYSICAL ||
+ type == HID_COLLECTION_APPLICATION))
hid->group = HID_GROUP_SENSOR_HUB;
if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 6abd3e2a9..83237b86c 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -397,7 +397,8 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
for (i = 0; i < report->maxfield; ++i) {
field = report->field[i];
if (field->maxusage) {
- if (field->physical == usage_id &&
+ if ((field->physical == usage_id ||
+ field->application == usage_id) &&
(field->logical == attr_usage_id ||
field->usage[0].hid ==
attr_usage_id) &&
@@ -506,7 +507,8 @@ static int sensor_hub_raw_event(struct hid_device *hdev,
collection->usage);
callback = sensor_hub_get_callback(hdev,
- report->field[i]->physical,
+ report->field[i]->physical ? report->field[i]->physical :
+ report->field[i]->application,
report->field[i]->usage[0].collection_index,
&hsdev, &priv);
if (!callback) {
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v3] HID: Recognize sensors with application collections
2023-01-11 10:07 ` [PATCH v3] HID: Recognize sensors with application collections Aditya Garg
@ 2023-01-11 16:59 ` srinivas pandruvada
2023-01-18 8:54 ` Jiri Kosina
1 sibling, 0 replies; 8+ messages in thread
From: srinivas pandruvada @ 2023-01-11 16:59 UTC (permalink / raw)
To: Aditya Garg, Jiri Kosina, jkosina@suse.cz,
benjamin.tissoires@redhat.com, jic23@kernel.org,
linux-input@vger.kernel.org, LKML, linux-iio@vger.kernel.org
Cc: orlandoch.dev@gmail.com, ronald@innovation.ch
On Wed, 2023-01-11 at 10:07 +0000, Aditya Garg wrote:
> From: Ronald Tschalär <ronald@innovation.ch>
>
> According to HUTRR39 logical sensor devices may be nested inside
> physical collections or may be specified in multiple top-level
> application collections (see page 59, strategies 1 and 2). However,
> the current code was only recognizing those with physical
> collections.
>
> This issue turned up in the T2 MacBook Pros which define the ALS in
> a top-level application collection.
>
> Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
> Signed-off-by: Aditya Garg <gargaditya08@live.com>
Since there are some hid core change, Jiri needs to check. If Jiri is
fine with hid core changes:
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> V2 :- Add missing signed-off-by
> V3 :- Avoid using language extensions
> drivers/hid/hid-core.c | 3 ++-
> drivers/hid/hid-sensor-hub.c | 6 ++++--
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index bd47628da..8ff08e6c2 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -804,7 +804,8 @@ static void hid_scan_collection(struct hid_parser
> *parser, unsigned type)
> int i;
>
> if (((parser->global.usage_page << 16) == HID_UP_SENSOR) &&
> - type == HID_COLLECTION_PHYSICAL)
> + (type == HID_COLLECTION_PHYSICAL ||
> + type == HID_COLLECTION_APPLICATION))
> hid->group = HID_GROUP_SENSOR_HUB;
>
> if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
> diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-
> hub.c
> index 6abd3e2a9..83237b86c 100644
> --- a/drivers/hid/hid-sensor-hub.c
> +++ b/drivers/hid/hid-sensor-hub.c
> @@ -397,7 +397,8 @@ int sensor_hub_input_get_attribute_info(struct
> hid_sensor_hub_device *hsdev,
> for (i = 0; i < report->maxfield; ++i) {
> field = report->field[i];
> if (field->maxusage) {
> - if (field->physical == usage_id &&
> + if ((field->physical == usage_id ||
> + field->application == usage_id) &&
> (field->logical ==
> attr_usage_id ||
> field->usage[0].hid ==
> attr_usage_id)
> &&
> @@ -506,7 +507,8 @@ static int sensor_hub_raw_event(struct hid_device
> *hdev,
> collection->usage);
>
> callback = sensor_hub_get_callback(hdev,
> - report->field[i]->physical,
> + report->field[i]->physical ? report-
> >field[i]->physical :
> + report-
> >field[i]->application,
> report->field[i]-
> >usage[0].collection_index,
> &hsdev, &priv);
> if (!callback) {
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v3] HID: Recognize sensors with application collections
2023-01-11 10:07 ` [PATCH v3] HID: Recognize sensors with application collections Aditya Garg
2023-01-11 16:59 ` srinivas pandruvada
@ 2023-01-18 8:54 ` Jiri Kosina
1 sibling, 0 replies; 8+ messages in thread
From: Jiri Kosina @ 2023-01-18 8:54 UTC (permalink / raw)
To: Aditya Garg
Cc: benjamin.tissoires@redhat.com, jic23@kernel.org,
srinivas.pandruvada@linux.intel.com, linux-input@vger.kernel.org,
LKML, linux-iio@vger.kernel.org, orlandoch.dev@gmail.com,
ronald@innovation.ch
On Wed, 11 Jan 2023, Aditya Garg wrote:
> From: Ronald Tschalär <ronald@innovation.ch>
>
> According to HUTRR39 logical sensor devices may be nested inside
> physical collections or may be specified in multiple top-level
> application collections (see page 59, strategies 1 and 2). However,
> the current code was only recognizing those with physical collections.
>
> This issue turned up in the T2 MacBook Pros which define the ALS in
> a top-level application collection.
>
> Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
> Signed-off-by: Aditya Garg <gargaditya08@live.com>
Makes sense. Queued in for-6.3/hid-core. Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-01-18 9:37 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-17 7:26 [PATCH] HID: Recognize sensors with application collections too Aditya Garg
2023-01-10 8:55 ` [PATCH RESEND] " Aditya Garg
2023-01-10 8:57 ` [PATCH v2] " Aditya Garg
2023-01-10 22:16 ` srinivas pandruvada
2023-01-11 10:06 ` Aditya Garg
2023-01-11 10:07 ` [PATCH v3] HID: Recognize sensors with application collections Aditya Garg
2023-01-11 16:59 ` srinivas pandruvada
2023-01-18 8:54 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).