HID: amd_sfh: Add initial support for HPD sensor

Add Human Presence Detection (HPD) sensors support
on AMD next generation HPD supported platforms.

Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Reviewed-by: Nehal Shah <nehal-bakulchandra.shah@amd.com>
Reviewed-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_hid.h b/drivers/hid/amd-sfh-hid/amd_sfh_hid.h
index 359c5de96af84005a53f1bbefc74e9c78039d74f..ae2ac9191ba77cfbf48e79baaccc101ee2d25aee 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_hid.h
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_hid.h
@@ -9,7 +9,7 @@
 #ifndef AMDSFH_HID_H
 #define AMDSFH_HID_H
 
-#define MAX_HID_DEVICES                4
+#define MAX_HID_DEVICES                5
 #define BUS_AMD_AMDTP          0x20
 #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 ff131f450bdcc7a5c2aaa32d99a723d072a510d3..96e2577fa37eaa958ffbc3a732010fc870e3aac7 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -24,6 +24,7 @@
 #define ACEL_EN                BIT(0)
 #define GYRO_EN                BIT(1)
 #define MAGNO_EN       BIT(2)
+#define HPD_EN         BIT(16)
 #define ALS_EN         BIT(19)
 
 static int sensor_mask_override = -1;
@@ -165,6 +166,9 @@ int amd_mp2_get_sensor_num(struct amd_mp2_dev *privdata, u8 *sensor_id)
        if (ALS_EN & activestatus)
                sensor_id[num_of_sensors++] = als_idx;
 
+       if (HPD_EN & activestatus)
+               sensor_id[num_of_sensors++] = HPD_IDX;
+
        return num_of_sensors;
 }
 

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
index 0886b2ad033e8a14a745066eb39dbf459d105b39..2d5c57e3782d187b19ab598e5df7f9b391e43e3a 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
@@ -30,6 +30,8 @@
 
 #define V2_STATUS      0x2
 
+#define HPD_IDX                16
+
 /* SFH Command register */
 union sfh_cmd_base {
        u32 ul;
@@ -92,6 +94,18 @@ enum mem_use_type {
        USE_C2P_REG,
 };
 
+struct hpd_status {
+       union {
+               struct {
+                       u32 human_presence_report : 4;
+                       u32 human_presence_actual : 4;
+                       u32 probablity            : 8;
+                       u32 object_distance       : 16;
+               } shpd;
+               u32 val;
+       };
+};
+
 void amd_start_sensor(struct amd_mp2_dev *privdata, struct amd_mp2_sensor_info info);
 void amd_stop_sensor(struct amd_mp2_dev *privdata, u16 sensor_idx);
 void amd_stop_all_sensors(struct amd_mp2_dev *privdata);

diff --git a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c
index cdc0a8d32249fb2ab7a8ef4d9efde59e9fb40586..0c36972193821d1daf645751ebd917019fe68043 100644 (file)
--- a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c
+++ b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c
@@ -50,6 +50,11 @@ int get_report_descriptor(int sensor_idx, u8 *rep_desc)
                memcpy(rep_desc, als_report_descriptor,
                       sizeof(als_report_descriptor));
                break;
+       case HPD_IDX: /* HPD sensor */
+               memset(rep_desc, 0, sizeof(hpd_report_descriptor));
+               memcpy(rep_desc, hpd_report_descriptor,
+                      sizeof(hpd_report_descriptor));
+               break;
        default:
                break;
        }
@@ -99,6 +104,17 @@ u32 get_descr_sz(int sensor_idx, int descriptor_name)
                        return sizeof(struct als_feature_report);
                }
                break;
+       case HPD_IDX:
+               switch (descriptor_name) {
+               case descr_size:
+                       return sizeof(hpd_report_descriptor);
+               case input_size:
+                       return sizeof(struct hpd_input_report);
+               case feature_size:
+                       return sizeof(struct hpd_feature_report);
+               }
+               break;
+
        default:
                break;
        }
@@ -120,6 +136,7 @@ u8 get_feature_report(int sensor_idx, int report_id, u8 *feature_report)
        struct accel3_feature_report acc_feature;
        struct gyro_feature_report gyro_feature;
        struct magno_feature_report magno_feature;
+       struct hpd_feature_report hpd_feature;
        struct als_feature_report als_feature;
        u8 report_size = 0;
 
@@ -162,6 +179,12 @@ u8 get_feature_report(int sensor_idx, int report_id, u8 *feature_report)
                memcpy(feature_report, &als_feature, sizeof(als_feature));
                report_size = sizeof(als_feature);
                break;
+       case HPD_IDX:  /* human presence detection sensor */
+               get_common_features(&hpd_feature.common_property, report_id);
+               memcpy(feature_report, &hpd_feature, sizeof(hpd_feature));
+               report_size = sizeof(hpd_feature);
+               break;
+
        default:
                break;
        }
@@ -181,10 +204,12 @@ u8 get_input_report(u8 current_index, int sensor_idx, int report_id, struct amd_
        u32 *sensor_virt_addr = in_data->sensor_virt_addr[current_index];
        u8 *input_report = in_data->input_report[current_index];
        u8 supported_input = privdata->mp2_acs & GENMASK(3, 0);
+       struct magno_input_report magno_input;
        struct accel3_input_report acc_input;
        struct gyro_input_report gyro_input;
-       struct magno_input_report magno_input;
+       struct hpd_input_report hpd_input;
        struct als_input_report als_input;
+       struct hpd_status hpdstatus;
        u8 report_size = 0;
 
        if (!sensor_virt_addr || !input_report)
@@ -227,6 +252,13 @@ u8 get_input_report(u8 current_index, int sensor_idx, int report_id, struct amd_
                report_size = sizeof(als_input);
                memcpy(input_report, &als_input, sizeof(als_input));
                break;
+       case HPD_IDX: /* hpd */
+               get_common_inputs(&hpd_input.common_property, report_id);
+               hpdstatus.val = readl(privdata->mmio + AMD_C2P_MSG(4));
+               hpd_input.human_presence = hpdstatus.shpd.human_presence_actual;
+               report_size = sizeof(hpd_input);
+               memcpy(input_report, &hpd_input, sizeof(hpd_input));
+               break;
        default:
                break;
        }

diff --git a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h
index a23c1046627ff6faa2d7ecf5b3381afc4fbb3f97..16f563d1823b21fdf4412b24dd015c68d02a5dd6 100644 (file)
--- a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h
+++ b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h
@@ -100,6 +100,16 @@ struct als_input_report {
        int illuminance_value;
 } __packed;
 
+struct hpd_feature_report {
+       struct common_feature_property common_property;
+} __packed;
+
+struct hpd_input_report {
+       struct common_input_property common_property;
+        /* values specific to human presence sensor */
+       u8 human_presence;
+} __packed;
+
 int get_report_descriptor(int sensor_idx, u8 rep_desc[]);
 u32 get_descr_sz(int sensor_idx, int descriptor_name);
 u8 get_feature_report(int sensor_idx, int report_id, u8 *feature_report);

diff --git a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h
index 44271d39b322dd96813dccf69e88c722808764cb..66d6b26e470833cdad4d10cb5d228fd333df3cdb 100644 (file)
--- a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h
+++ b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_report_desc.h
@@ -642,4 +642,116 @@ const u8 als_report_descriptor[] = {
 0X81, 0x02,            /* HID Input (Data_Arr_Abs) */
 0xC0                   /* HID end collection */
 };
+
+/* BIOMETRIC PRESENCE*/
+static const u8 hpd_report_descriptor[] = {
+0x05, 0x20,          /* Usage page */
+0x09, 0x11,          /* BIOMETRIC PRESENCE  */
+0xA1, 0x00,          /* HID Collection (Physical) */
+
+//feature reports(xmit/receive)
+0x85, 5,           /* HID  Report ID */
+0x05, 0x20,       /* HID usage page sensor */
+0x0A, 0x09, 0x03,  /* Sensor property and sensor connection type */
+0x15, 0,           /* HID logical MIN_8(0) */
+0x25, 2,          /* HID logical MAX_8(2) */
+0x75, 8,          /* HID report size(8) */
+0x95, 1,          /* HID report count(1) */
+0xA1, 0x02,       /* HID collection (logical) */
+0x0A, 0x30, 0x08, /* Sensor property connection type intergated sel*/
+0x0A, 0x31, 0x08, /* Sensor property connection type attached sel */
+0x0A, 0x32, 0x08, /* Sensor property connection type external sel */
+0xB1, 0x00,       /* HID feature (Data_Arr_Abs) */
+0xC0,            /* HID end collection */
+0x0A, 0x16, 0x03, /* HID usage sensor property reporting state */
+0x15, 0,          /* HID logical Min_8(0) */
+0x25, 5,         /* HID logical Max_8(5) */
+0x75, 8,         /* HID report size(8) */
+0x95, 1,          /* HID report count(1) */
+0xA1, 0x02,      /* HID collection(logical) */
+0x0A, 0x40, 0x08, /* Sensor property report state no events sel */
+0x0A, 0x41, 0x08, /* Sensor property report state all events sel */
+0x0A, 0x42, 0x08, /* Sensor property report state threshold events sel */
+0x0A, 0x43, 0x08, /* Sensor property report state no events wake sel */
+0x0A, 0x44, 0x08, /* Sensor property report state all events wake sel */
+0x0A, 0x45, 0x08, /* Sensor property report state threshold events wake sel */
+0xB1, 0x00,      /* HID feature (Data_Arr_Abs) */
+0xC0,            /* HID end collection */
+0x0A, 0x19, 0x03, /* HID usage sensor property power state */
+0x15, 0,         /* HID logical Min_8(0) */
+0x25, 5,         /* HID logical Max_8(5) */
+0x75, 8,         /* HID report size(8) */
+0x95, 1,         /* HID report count(1) */
+0xA1, 0x02,      /* HID collection(logical) */
+0x0A, 0x50, 0x08, /* Sensor property power state undefined sel */
+0x0A, 0x51, 0x08, /* Sensor property power state D0 full power  sel */
+0x0A, 0x52, 0x08, /* Sensor property power state D1 low power sel */
+0x0A, 0x53, 0x08, /* Sensor property power state D2 standby with wake sel */
+0x0A, 0x54, 0x08, /* Sensor property power state D3 sleep with wake  sel */
+0x0A, 0x55, 0x08, /* Sensor property power state D4 power off sel */
+0xB1, 0x00,       /* HID feature (Data_Arr_Abs) */
+0xC0,            /* HID end collection */
+0x0A, 0x01, 0x02, /* HID usage sensor state */
+0x15, 0,         /* HID logical Min_8(0) */
+0x25, 6,         /* HID logical Max_8(6) */
+0x75, 8,         /* HID report size(8) */
+0x95, 1,         /* HID report count(1) */
+0xA1, 0x02,      /* HID collection(logical) */
+0x0A, 0x00, 0x08, /* HID usage sensor state unknown sel */
+0x0A, 0x01, 0x08, /* HID usage sensor state ready sel */
+0x0A, 0x02, 0x08, /* HID usage sensor state not available sel */
+0x0A, 0x03, 0x08, /* HID usage sensor state no data sel */
+0x0A, 0x04, 0x08, /* HID usage sensor state initializing sel */
+0x0A, 0x05, 0x08, /* HID usage sensor state access denied sel */
+0x0A, 0x06, 0x08, /* HID usage sensor state error sel */
+0xB1, 0x00,      /* HID feature (Data_Arr_Abs) */
+0xC0,            /* HID end collection */
+0x0A, 0x0E, 0x03, /* HID usage sensor property report interval */
+0x15, 0,         /* HID logical Min_8(0) */
+0x27, 0xFF, 0xFF, 0xFF, 0xFF, /* HID logical Max_32 */
+
+0x75, 32,        /* HID report size(32) */
+0x95, 1,         /* HID report count(1) */
+0x55, 0,         /* HID unit exponent(0) */
+0xB1, 0x02,      /* HID feature (Data_Var_Abs) */
+
+//input report (transmit)
+0x05, 0x20,             /* HID usage page sensors */
+0x0A, 0x01, 0x02,       /* HID usage sensor state */
+0x15, 0,                /* HID logical Min_8(0) */
+0x25, 6,                /* HID logical Max_8(6) */
+0x75, 8,                /* HID report size(8) */
+0x95, 1,                /* HID report count (1) */
+0xA1, 0x02,             /* HID end collection (logical) */
+0x0A, 0x00, 0x08,       /* HID usage sensor state unknown sel */
+0x0A, 0x01, 0x08,       /* HID usage sensor state ready sel */
+0x0A, 0x02, 0x08,       /* HID usage sensor state not available sel */
+0x0A, 0x03, 0x08,       /* HID usage sensor state no data sel */
+0x0A, 0x04, 0x08,       /* HID usage sensor state initializing sel */
+0x0A, 0x05, 0x08,       /* HID usage sensor state access denied sel */
+0x0A, 0x06, 0x08,       /* HID usage sensor state error sel */
+0X81, 0x00,             /* HID Input (Data_Arr_Abs) */
+0xC0,                   /* HID end collection */
+0x0A, 0x02, 0x02,       /* HID usage sensor event */
+0x15, 0,                /* HID logical Min_8(0) */
+0x25, 5,                /* HID logical Max_8(5) */
+0x75, 8,                /* HID report size(8) */
+0x95, 1,                /* HID report count (1) */
+0xA1, 0x02,             /* HID end collection (logical) */
+0x0A, 0x10, 0x08,       /* HID usage sensor event unknown sel */
+0x0A, 0x11, 0x08,       /* HID usage sensor event state changed sel */
+0x0A, 0x12, 0x08,       /* HID usage sensor event property changed sel */
+0x0A, 0x13, 0x08,       /* HID usage sensor event data updated sel */
+0x0A, 0x14, 0x08,       /* HID usage sensor event poll response sel */
+0x0A, 0x15, 0x08,       /* HID usage sensor event change sensitivity sel */
+0X81, 0x00,             /* HID Input (Data_Arr_Abs) */
+0xC0,                   /* HID end collection */
+0x0A, 0xB1, 0x04,       /* HID usage sensor data BIOMETRIC HUMAN PRESENCE */
+0x15, 0,                /* HID logical Min_8(0) */
+0x25, 1,                /* HID logical Max_8(1) */
+0x75, 8,                /* HID report size(8) */
+0x95, 1,                /* HID report count (1) */
+0X81, 0x02,             /* HID Input (Data_Var_Abs) */
+0xC0                    /* HID end collection */
+};
 #endif