Skip to content

Commit ca47ee5

Browse files
pastaq1Naim
pastaq
authored and
1Naim
committed
platform/x86: lenovo-wmi-other: Add lwmi_attr_id() function
Adds lwmi_attr_id() function. In the same vein as LWMI_ATTR_ID_FAN_RPM(), but as a generic, to de-duplicate attribute_id assignment biolerplate. Reviewed-by: Rong Zhang <i@rong.moe> Tested-by: Rong Zhang <i@rong.moe> Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca> Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
1 parent 5894859 commit ca47ee5

3 files changed

Lines changed: 43 additions & 41 deletions

File tree

‎drivers/platform/x86/lenovo/wmi-capdata.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
2828

2929
#include <linux/acpi.h>
30-
#include <linux/bitfield.h>
3130
#include <linux/bug.h>
3231
#include <linux/cleanup.h>
3332
#include <linux/component.h>
@@ -48,6 +47,7 @@
4847
#include <linux/wmi.h>
4948

5049
#include "wmi-capdata.h"
50+
#include "wmi-helpers.h"
5151

5252
#define LENOVO_CAPABILITY_DATA_00_GUID "362A3AFE-3D96-4665-8530-96DAD5BB300E"
5353
#define LENOVO_CAPABILITY_DATA_01_GUID "7A8F5407-CB67-4D6E-B547-39B3BE018154"
@@ -58,9 +58,9 @@
5858

5959
#define LWMI_FEATURE_ID_FAN_TEST 0x05
6060

61-
#define LWMI_ATTR_ID_FAN_TEST \
62-
(FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, LWMI_DEVICE_ID_FAN) | \
63-
FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, LWMI_FEATURE_ID_FAN_TEST))
61+
#define LWMI_ATTR_ID_FAN_TEST \
62+
lwmi_attr_id(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_TEST, \
63+
LWMI_GZ_THERMAL_MODE_NONE, LWMI_TYPE_ID_NONE)
6464

6565
enum lwmi_cd_type {
6666
LENOVO_CAPABILITY_DATA_00,

‎drivers/platform/x86/lenovo/wmi-capdata.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define _LENOVO_WMI_CAPDATA_H_
77

88
#include <linux/bits.h>
9+
#include <linux/bitfield.h>
910
#include <linux/types.h>
1011

1112
#define LWMI_SUPP_VALID BIT(0)
@@ -19,6 +20,8 @@
1920

2021
#define LWMI_DEVICE_ID_FAN 0x04
2122

23+
#define LWMI_TYPE_ID_NONE 0x00
24+
2225
struct component_match;
2326
struct device;
2427
struct cd_list;
@@ -57,6 +60,23 @@ struct lwmi_cd_binder {
5760
cd_list_cb_t cd_fan_list_cb;
5861
};
5962

63+
/**
64+
* lwmi_attr_id() - Formats a capability data attribute ID
65+
* @dev_id: The u8 corresponding to the device ID.
66+
* @feat_id: The u8 corresponding to the feature ID on the device.
67+
* @mode_id: The u8 corresponding to the wmi-gamezone mode for set/get.
68+
* @type_id: The u8 corresponding to the sub-device.
69+
*
70+
* Return: u32.
71+
*/
72+
static inline u32 lwmi_attr_id(u8 dev_id, u8 feat_id, u8 mode_id, u8 type_id)
73+
{
74+
return (FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, dev_id) |
75+
FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, feat_id) |
76+
FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode_id) |
77+
FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, type_id));
78+
}
79+
6080
void lwmi_cd_match_add_all(struct device *master, struct component_match **matchptr);
6181
int lwmi_cd00_get_data(struct cd_list *list, u32 attribute_id, struct capdata00 *output);
6282
int lwmi_cd01_get_data(struct cd_list *list, u32 attribute_id, struct capdata01 *output);

‎drivers/platform/x86/lenovo/wmi-other.c‎

Lines changed: 19 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
*/
2828

2929
#include <linux/acpi.h>
30-
#include <linux/bitfield.h>
3130
#include <linux/cleanup.h>
3231
#include <linux/component.h>
3332
#include <linux/container_of.h>
@@ -59,8 +58,6 @@
5958

6059
#define LWMI_FEATURE_ID_FAN_RPM 0x03
6160

62-
#define LWMI_TYPE_ID_NONE 0x00
63-
6461
#define LWMI_FEATURE_VALUE_GET 17
6562
#define LWMI_FEATURE_VALUE_SET 18
6663

@@ -70,10 +67,9 @@
7067

7168
#define LWMI_FAN_DIV 100
7269

73-
#define LWMI_ATTR_ID_FAN_RPM(x) \
74-
(FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, LWMI_DEVICE_ID_FAN) | \
75-
FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, LWMI_FEATURE_ID_FAN_RPM) | \
76-
FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, LWMI_FAN_ID(x)))
70+
#define LWMI_ATTR_ID_FAN_RPM(x) \
71+
lwmi_attr_id(LWMI_DEVICE_ID_FAN, LWMI_FEATURE_ID_FAN_RPM, \
72+
LWMI_GZ_THERMAL_MODE_NONE, LWMI_FAN_ID(x))
7773

7874
#define LWMI_OM_FW_ATTR_BASE_PATH "lenovo-wmi-other"
7975
#define LWMI_OM_HWMON_NAME "lenovo_wmi_other"
@@ -616,12 +612,8 @@ static ssize_t attr_capdata01_show(struct kobject *kobj,
616612
u32 attribute_id;
617613
int value, ret;
618614

619-
attribute_id =
620-
FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) |
621-
FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) |
622-
FIELD_PREP(LWMI_ATTR_MODE_ID_MASK,
623-
LWMI_GZ_THERMAL_MODE_CUSTOM) |
624-
FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id);
615+
attribute_id = lwmi_attr_id(tunable_attr->device_id, tunable_attr->feature_id,
616+
LWMI_GZ_THERMAL_MODE_CUSTOM, tunable_attr->type_id);
625617

626618
ret = lwmi_cd01_get_data(priv->cd01_list, attribute_id, &capdata);
627619
if (ret)
@@ -686,10 +678,8 @@ static ssize_t attr_current_value_store(struct kobject *kobj,
686678
if (mode != LWMI_GZ_THERMAL_MODE_CUSTOM)
687679
return -EBUSY;
688680

689-
args.arg0 = FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) |
690-
FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) |
691-
FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, tunable_attr->cd_mode_id) |
692-
FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id);
681+
args.arg0 = lwmi_attr_id(tunable_attr->device_id, tunable_attr->feature_id,
682+
tunable_attr->cd_mode_id, tunable_attr->type_id);
693683

694684
ret = lwmi_cd01_get_data(priv->cd01_list, args.arg0, &capdata);
695685
if (ret)
@@ -702,10 +692,8 @@ static ssize_t attr_current_value_store(struct kobject *kobj,
702692
if (value < capdata.min_value || value > capdata.max_value)
703693
return -EINVAL;
704694

705-
args.arg0 = FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) |
706-
FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) |
707-
FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, tunable_attr->cv_mode_id) |
708-
FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id);
695+
args.arg0 = lwmi_attr_id(tunable_attr->device_id, tunable_attr->feature_id,
696+
tunable_attr->cv_mode_id, tunable_attr->type_id);
709697
args.arg1 = value;
710698

711699
ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_SET,
@@ -750,10 +738,8 @@ static ssize_t attr_current_value_show(struct kobject *kobj,
750738
if (tunable_attr->cv_mode_id == LWMI_GZ_THERMAL_MODE_NONE)
751739
mode = tunable_attr->cv_mode_id;
752740

753-
args.arg0 = FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) |
754-
FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) |
755-
FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, mode) |
756-
FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id);
741+
args.arg0 = lwmi_attr_id(tunable_attr->device_id, tunable_attr->feature_id,
742+
tunable_attr->cv_mode_id, tunable_attr->type_id);
757743

758744
ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_GET,
759745
(unsigned char *)&args, sizeof(args),
@@ -794,10 +780,8 @@ static bool lwmi_attr_01_is_supported(struct tunable_attr_01 *tunable_attr)
794780

795781
/* Determine tunable_attr->cd_mode_id*/
796782
for (i = 0; i < ARRAY_SIZE(modes); i++) {
797-
args.arg0 = FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) |
798-
FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) |
799-
FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, modes[i]) |
800-
FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id);
783+
args.arg0 = lwmi_attr_id(tunable_attr->device_id, tunable_attr->feature_id,
784+
modes[i], tunable_attr->type_id);
801785

802786
ret = lwmi_cd01_get_data(priv->cd01_list, args.arg0, &capdata);
803787
if (ret || !capdata.supported)
@@ -810,15 +794,10 @@ static bool lwmi_attr_01_is_supported(struct tunable_attr_01 *tunable_attr)
810794
if (!cd_mode_found)
811795
return cd_mode_found;
812796

813-
dev_dbg(tunable_attr->dev,
814-
"cd_mode_id: %#010x\n", args.arg0);
815-
816797
/* Determine tunable_attr->cv_mode_id, returns 1 if supported*/
817798
for (i = 0; i < ARRAY_SIZE(modes); i++) {
818-
args.arg0 = FIELD_PREP(LWMI_ATTR_DEV_ID_MASK, tunable_attr->device_id) |
819-
FIELD_PREP(LWMI_ATTR_FEAT_ID_MASK, tunable_attr->feature_id) |
820-
FIELD_PREP(LWMI_ATTR_MODE_ID_MASK, modes[i]) |
821-
FIELD_PREP(LWMI_ATTR_TYPE_ID_MASK, tunable_attr->type_id);
799+
args.arg0 = lwmi_attr_id(tunable_attr->device_id, tunable_attr->feature_id,
800+
modes[i], tunable_attr->type_id);
822801

823802
ret = lwmi_dev_evaluate_int(priv->wdev, 0x0, LWMI_FEATURE_VALUE_GET,
824803
(unsigned char *)&args, sizeof(args),
@@ -833,7 +812,10 @@ static bool lwmi_attr_01_is_supported(struct tunable_attr_01 *tunable_attr)
833812
if (!cv_mode_found)
834813
return cv_mode_found;
835814

836-
dev_dbg(tunable_attr->dev, "cv_mode_id: %#010x, attribute support level: %#010x\n",
815+
dev_dbg(tunable_attr->dev,
816+
"cd_mode_id: %#010x, cv_mode_id: %#010x, attribute support level: %#010x\n",
817+
lwmi_attr_id(tunable_attr->device_id, tunable_attr->feature_id,
818+
tunable_attr->cd_mode_id, tunable_attr->type_id),
837819
args.arg0, capdata.supported);
838820

839821
return capdata.supported > 0 ? true : false;

0 commit comments

Comments
 (0)