Fixes for SRA sensor handling
Subsystems (3)
v4 cover Fixes for SRA sensor handling
From: Mario Limonciello <[email protected]>
On systems with an SRA sensor there are some problems with both init and failure paths. This series accounts for both.
This is resend of V4 which ahsn't gotten any movement the past two weeks:
Mario Limonciello (2):
HID: amd_sfh: Fix SRA sensor when it's the only sensor
HID: amd_sfh: Avoid clearing reports for SRA sensor
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
Signature · 1 line
2.43.0
PATCH RESEND v4 1/2 HID: amd_sfh: Fix SRA sensor when it's the only sensor
From: Mario Limonciello <[email protected]>
On systems that only have an SRA sensor connected to SFH the sensor doesn't get enabled due to a bad optimization condition of breaking the sensor walk loop.
This optimization is unnecessary in the first place because if there is only one device then the loop only runs once. Drop the condition and explicitly mark sensor as enabled.
---
v2:
* Add tag
--- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c +3 -4
@@ -134,9 +134,6 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata)for (i =0 ; i < cl_data->num_hid_devices; i++) { cl_data->sensor_sts[i] =SENSOR_DISABLED ; -if (cl_data->num_hid_devices ==1 && cl_data->sensor_idx[0 ] ==SRA_IDX ) -break ; -if (cl_data->sensor_idx[i] ==SRA_IDX ) { info.sensor_idx = cl_data->sensor_idx[i];writel (0 , privdata->mmio +amd_get_p2c_val (privdata,0 ));
@@ -145,8 +142,10 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) (privdata, cl_data->sensor_idx[i],ENABLE_SENSOR ); cl_data->sensor_sts[i] = (status ==0 ) ?SENSOR_ENABLED :SENSOR_DISABLED ; -if (cl_data->sensor_sts[i] ==SENSOR_ENABLED ) +if (cl_data->sensor_sts[i] ==SENSOR_ENABLED ) { + cl_data->is_any_sensor_enabled = true; privdata->dev_en.is_sra_present = true; + }continue ; }
Signature · 1 line
2.43.0
PATCH RESEND v4 2/2 HID: amd_sfh: Avoid clearing reports for SRA sensor
In reply to Mario LimoncielloFrom: Mario Limonciello <[email protected]>
SRA sensor doesn't allocate any memory for reports. Skip trying to clear memory for that sensor in cleanup path.
---
v4:
* One more case for amd_sfh_hid_client_deinit()
v3:
* Less changes as amd_sfh_hid_client_deinit() covers a lot
v2:
* New patch
--- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c +5 -0
@@ -83,6 +83,9 @@ static int amd_sfh_hid_client_deinit(struct amd_mp2_dev *privdata)case ALS_IDX : privdata->dev_en.is_als_present = false;break ; +case SRA_IDX : + privdata->dev_en.is_sra_present = false; +break ; }if (cl_data->sensor_sts[i] ==SENSOR_ENABLED ) {
@@ -237,6 +240,8 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) cleanup:amd_sfh_hid_client_deinit (privdata);for (i =0 ; i < cl_data->num_hid_devices; i++) { +if (cl_data->sensor_idx[i] ==SRA_IDX ) +continue ;devm_kfree (dev, cl_data->feature_report[i]);devm_kfree (dev, in_data->input_report[i]);devm_kfree (dev, cl_data->report_descr[i]);
Signature · 1 line
2.43.0
Quoted 7 lines · Mario Limonciello
From: Mario Limonciello <[email protected]>
On systems with an SRA sensor there are some problems with both init and failure paths. This series accounts for both.
This is resend of V4 which ahsn't gotten any movement the past two weeks:
Quoted 8 lines
Mario Limonciello (2):
HID:amd_sfh: Fix SRA sensor when it's the only sensor
HID:amd_sfh: Avoid clearing reports for SRA sensordrivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
Looks good to me.
Thanks,
--
Basavaraj
Jiri Kosina
maintainerQuoted 7 lines · Mario Limonciello
From: Mario Limonciello <[email protected]>
On systems with an SRA sensor there are some problems with both init and failure paths. This series accounts for both.
This is resend of V4 which ahsn't gotten any movement the past two weeks:
Quoted 8 lines
Mario Limonciello (2):
HID:amd_sfh: Fix SRA sensor when it's the only sensor
HID:amd_sfh: Avoid clearing reports for SRA sensordrivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
Sorry, I previously reponded to v1 by mistake. v4 has been applied.
Signature · 2 lines
Jiri Kosina SUSE Labs