HID: amd_sfh: Enable operating mode

Add changes to enable operating modes in the driver to allow the FW to
activate and retrieve data from relevant sensors. This enables the FW to
take necessary actions based on the operating modes.

Tested-by: Eric Naim <dnaim@cachyos.org>
Co-developed-by: Akshata MukundShetty <akshata.mukundshetty@amd.com>
Signed-off-by: Akshata MukundShetty <akshata.mukundshetty@amd.com>
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
index 3438d39..0f2cbae 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
@@ -146,6 +146,8 @@ static const char *get_sensor_name(int idx)
                return "gyroscope";
        case mag_idx:
                return "magnetometer";
+       case op_idx:
+               return "operating-mode";
        case als_idx:
        case ACS_IDX: /* ambient color sensor */
                return "ALS";
@@ -243,6 +245,20 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
                        rc = -ENOMEM;
                        goto cleanup;
                }
+
+               if (cl_data->sensor_idx[i] == op_idx) {
+                       info.period = AMD_SFH_IDLE_LOOP;
+                       info.sensor_idx = cl_data->sensor_idx[i];
+                       info.dma_address = cl_data->sensor_dma_addr[i];
+                       mp2_ops->start(privdata, info);
+                       cl_data->sensor_sts[i] = amd_sfh_wait_for_response(privdata,
+                                                                          cl_data->sensor_idx[i],
+                                                                          SENSOR_ENABLED);
+                       if (cl_data->sensor_sts[i] == SENSOR_ENABLED)
+                               cl_data->is_any_sensor_enabled = true;
+                       continue;
+               }
+
                cl_data->sensor_sts[i] = SENSOR_DISABLED;
                cl_data->sensor_requested_cnt[i] = 0;
                cl_data->cur_hid_dev = i;
@@ -303,6 +319,13 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
 
        for (i = 0; i < cl_data->num_hid_devices; i++) {
                cl_data->cur_hid_dev = i;
+               if (cl_data->sensor_idx[i] == op_idx) {
+                       dev_dbg(dev, "sid 0x%x (%s) status 0x%x\n",
+                               cl_data->sensor_idx[i], get_sensor_name(cl_data->sensor_idx[i]),
+                               cl_data->sensor_sts[i]);
+                       continue;
+               }
+
                if (cl_data->sensor_sts[i] == SENSOR_ENABLED) {
                        rc = amdtp_hid_probe(i, cl_data);
                        if (rc)

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_hid.h b/drivers/hid/amd-sfh-hid/amd_sfh_hid.h
index 1c91be8..7452b03 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_hid.h
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_hid.h
@@ -11,7 +11,7 @@
 #ifndef AMDSFH_HID_H
 #define AMDSFH_HID_H
 
-#define MAX_HID_DEVICES                6
+#define MAX_HID_DEVICES                7
 #define AMD_SFH_HID_VENDOR     0x1022
 #define AMD_SFH_HID_PRODUCT    0x0001
 

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
index 1c1fd63..2983af9 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -29,6 +29,7 @@
 #define ACEL_EN                BIT(0)
 #define GYRO_EN                BIT(1)
 #define MAGNO_EN       BIT(2)
+#define OP_EN          BIT(15)
 #define HPD_EN         BIT(16)
 #define ALS_EN         BIT(19)
 #define ACS_EN         BIT(22)
@@ -232,6 +233,9 @@ int amd_mp2_get_sensor_num(struct amd_mp2_dev *privdata, u8 *sensor_id)
        if (MAGNO_EN & activestatus)
                sensor_id[num_of_sensors++] = mag_idx;
 
+       if (OP_EN & activestatus)
+               sensor_id[num_of_sensors++] = op_idx;
+
        if (ALS_EN & activestatus)
                sensor_id[num_of_sensors++] = als_idx;
 

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
index 05e400a..2eb61f4 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
@@ -79,6 +79,7 @@ enum sensor_idx {
        accel_idx = 0,
        gyro_idx = 1,
        mag_idx = 2,
+       op_idx = 15,
        als_idx = 19
 };