HID: hid-lenovo-go-s: Add IMU and Touchpad RO Attributes

Adds attributes for reporting the touchpad manufacturer, version, and
IMU manufacturer.

Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/hid-lenovo-go-s.c b/drivers/hid/hid-lenovo-go-s.c
index 0123c4b03cf4a78f64678885fc74a92db9db5678..431fffde46958dc2203d7bc7e7d6f2213197aa29 100644 (file)
--- a/drivers/hid/hid-lenovo-go-s.c
+++ b/drivers/hid/hid-lenovo-go-s.c
@@ -43,6 +43,7 @@ static struct hid_gos_cfg {
        u8 gp_mode;
        u8 gp_poll_rate;
        u8 imu_bypass_en;
+       u8 imu_manufacturer;
        u8 imu_sensor_en;
        u8 mcu_id[12];
        u8 mouse_step;
@@ -55,6 +56,8 @@ static struct hid_gos_cfg {
        u8 tp_en;
        u8 tp_linux_mode;
        u8 tp_windows_mode;
+       u8 tp_version;
+       u8 tp_manufacturer;
 } drvdata;
 
 struct gos_cfg_attr {
@@ -201,6 +204,36 @@ enum rgb_config_index {
        USR_LIGHT_PROFILE_3,
 };
 
+enum test_command_index {
+       TEST_TP_MFR = 0x02,
+       TEST_IMU_MFR,
+       TEST_TP_VER,
+};
+
+enum tp_mfr_index {
+       TP_NONE,
+       TP_BETTERLIFE,
+       TP_SIPO,
+};
+
+static const char *const touchpad_manufacturer_text[] = {
+       [TP_NONE] = "none",
+       [TP_BETTERLIFE] = "BetterLife",
+       [TP_SIPO] = "SIPO",
+};
+
+enum imu_mfr_index {
+       IMU_NONE,
+       IMU_BOSCH,
+       IMU_ST,
+};
+
+static const char *const imu_manufacturer_text[] = {
+       [IMU_NONE] = "none",
+       [IMU_BOSCH] = "Bosch",
+       [IMU_ST] = "ST",
+};
+
 static int hid_gos_version_event(u8 *data)
 {
        struct version_report *ver_rep = (struct version_report *)data;
@@ -279,6 +312,30 @@ static int hid_gos_touchpad_event(struct command_report *cmd_rep)
        return ret;
 }
 
+static int hid_gos_pl_test_event(struct command_report *cmd_rep)
+{
+       int ret = 0;
+
+       switch (cmd_rep->sub_cmd) {
+       case TEST_TP_MFR:
+               drvdata.tp_manufacturer = cmd_rep->data[0];
+               ret = 0;
+               break;
+       case TEST_IMU_MFR:
+               drvdata.imu_manufacturer = cmd_rep->data[0];
+               ret = 0;
+               break;
+       case TEST_TP_VER:
+               drvdata.tp_version = cmd_rep->data[0];
+               ret = 0;
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+       return ret;
+}
+
 static int hid_gos_light_event(struct command_report *cmd_rep)
 {
        struct led_classdev_mc *mc_cdev;
@@ -362,6 +419,9 @@ static int hid_gos_raw_event(struct hid_device *hdev, struct hid_report *report,
        case GET_TP_PARAM:
                ret = hid_gos_touchpad_event(cmd_rep);
                break;
+       case GET_PL_TEST:
+               ret = hid_gos_pl_test_event(cmd_rep);
+               break;
        case GET_RGB_CFG:
                ret = hid_gos_light_event(cmd_rep);
                break;
@@ -735,6 +795,37 @@ static ssize_t touchpad_property_options(struct device *dev,
        return count;
 }
 
+static ssize_t test_property_show(struct device *dev,
+                                 struct device_attribute *attr, char *buf,
+                                 enum test_command_index index)
+{
+       size_t count = 0;
+       u8 i;
+
+       switch (index) {
+       case TEST_TP_MFR:
+               i = drvdata.tp_manufacturer;
+               if (i >= ARRAY_SIZE(touchpad_manufacturer_text))
+                       return -EINVAL;
+               count = sysfs_emit(buf, "%s\n", touchpad_manufacturer_text[i]);
+               break;
+       case TEST_IMU_MFR:
+               i = drvdata.imu_manufacturer;
+               if (i >= ARRAY_SIZE(imu_manufacturer_text))
+                       return -EINVAL;
+               count = sysfs_emit(buf, "%s\n", imu_manufacturer_text[i]);
+               break;
+       case TEST_TP_VER:
+               count = sysfs_emit(buf, "%u\n", drvdata.tp_version);
+               break;
+       default:
+               count = -EINVAL;
+               break;
+       }
+
+       return count;
+}
+
 static ssize_t mcu_id_show(struct device *dev, struct device_attribute *attr,
                           char *buf)
 {
@@ -1076,6 +1167,9 @@ static struct gos_cfg_attr imu_bypass_enabled = { FEATURE_IMU_BYPASS };
 LEGOS_DEVICE_ATTR_RW(imu_bypass_enabled, "bypass_enabled", index, gamepad);
 static DEVICE_ATTR_RO_NAMED(imu_bypass_enabled_index, "bypass_enabled_index");
 
+static struct gos_cfg_attr imu_manufacturer = { TEST_IMU_MFR };
+LEGOS_DEVICE_ATTR_RO(imu_manufacturer, "manufacturer", test);
+
 static struct gos_cfg_attr imu_sensor_enabled = { FEATURE_IMU_ENABLE };
 LEGOS_DEVICE_ATTR_RW(imu_sensor_enabled, "sensor_enabled", index, gamepad);
 static DEVICE_ATTR_RO_NAMED(imu_sensor_enabled_index, "sensor_enabled_index");
@@ -1083,6 +1177,7 @@ static DEVICE_ATTR_RO_NAMED(imu_sensor_enabled_index, "sensor_enabled_index");
 static struct attribute *legos_imu_attrs[] = {
        &dev_attr_imu_bypass_enabled.attr,
        &dev_attr_imu_bypass_enabled_index.attr,
+       &dev_attr_imu_manufacturer.attr,
        &dev_attr_imu_sensor_enabled.attr,
        &dev_attr_imu_sensor_enabled_index.attr,
        NULL,
@@ -1136,6 +1231,12 @@ static struct gos_cfg_attr touchpad_linux_mode = { CFG_LINUX_MODE };
 LEGOS_DEVICE_ATTR_RW(touchpad_linux_mode, "linux_mode", index, touchpad);
 static DEVICE_ATTR_RO_NAMED(touchpad_linux_mode_index, "linux_mode_index");
 
+static struct gos_cfg_attr touchpad_manufacturer = { TEST_TP_MFR };
+LEGOS_DEVICE_ATTR_RO(touchpad_manufacturer, "manufacturer", test);
+
+static struct gos_cfg_attr touchpad_version = { TEST_TP_VER };
+LEGOS_DEVICE_ATTR_RO(touchpad_version, "version", test);
+
 static struct gos_cfg_attr touchpad_windows_mode = { CFG_WINDOWS_MODE };
 LEGOS_DEVICE_ATTR_RW(touchpad_windows_mode, "windows_mode", index, touchpad);
 static DEVICE_ATTR_RO_NAMED(touchpad_windows_mode_index, "windows_mode_index");
@@ -1145,6 +1246,8 @@ static struct attribute *legos_touchpad_attrs[] = {
        &dev_attr_touchpad_enabled_index.attr,
        &dev_attr_touchpad_linux_mode.attr,
        &dev_attr_touchpad_linux_mode_index.attr,
+       &dev_attr_touchpad_manufacturer.attr,
+       &dev_attr_touchpad_version.attr,
        &dev_attr_touchpad_windows_mode.attr,
        &dev_attr_touchpad_windows_mode_index.attr,
        NULL,
@@ -1245,6 +1348,27 @@ static void cfg_setup(struct work_struct *work)
                dev_err(&drvdata.hdev->dev, "Failed to retrieve MCU Version: %i\n", ret);
                return;
        }
+
+       ret = mcu_property_out(drvdata.hdev, GET_PL_TEST, TEST_TP_MFR, NULL, 0);
+       if (ret) {
+               dev_err(&drvdata.hdev->dev,
+                       "Failed to retrieve Touchpad Manufacturer: %i\n", ret);
+               return;
+       }
+
+       ret = mcu_property_out(drvdata.hdev, GET_PL_TEST, TEST_TP_VER, NULL, 0);
+       if (ret) {
+               dev_err(&drvdata.hdev->dev,
+                       "Failed to retrieve Touchpad Firmware Version: %i\n", ret);
+               return;
+       }
+
+       ret = mcu_property_out(drvdata.hdev, GET_PL_TEST, TEST_IMU_MFR, NULL, 0);
+       if (ret) {
+               dev_err(&drvdata.hdev->dev,
+                       "Failed to retrieve IMU Manufacturer: %i\n", ret);
+               return;
+       }
 }
 
 static int hid_gos_cfg_probe(struct hid_device *hdev,