platform/x86: Move ideapad ACPI helpers to a new header
These functions will be used by a driver written by Gergo Koteles to detect the tablet mode switch in Lenovo Yoga laptops. These changes were discussed in review of that patch. This is the minimal set of functions needed in that driver, there are several more small functions left in the ACPI Helpers section in ideapad-laptop.c. The only change is the functions are now marked inline as requested in the review comments. Signed-off-by: Andrew Kallmeyer <kallmeyeras@gmail.com> Link: https://lore.kernel.org/r/20221004214332.35934-1-soyer@irl.hu/ Tested-by: André Apitzsch <git@apitzsch.eu> Link: https://lore.kernel.org/r/20230329014559.44494-2-kallmeyeras@gmail.com Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Andrew Kallmeyer
Hans de Goede
parent
710ddfbfda
commit
0de0ab9a65
|
|
@ -20,7 +20,6 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/input/sparse-keymap.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/module.h>
|
||||
|
|
@ -31,6 +30,7 @@
|
|||
#include <linux/sysfs.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/wmi.h>
|
||||
#include "ideapad-laptop.h"
|
||||
|
||||
#include <acpi/video.h>
|
||||
|
||||
|
|
@ -85,33 +85,6 @@ enum {
|
|||
SALS_FNLOCK_OFF = 0xf,
|
||||
};
|
||||
|
||||
enum {
|
||||
VPCCMD_R_VPC1 = 0x10,
|
||||
VPCCMD_R_BL_MAX,
|
||||
VPCCMD_R_BL,
|
||||
VPCCMD_W_BL,
|
||||
VPCCMD_R_WIFI,
|
||||
VPCCMD_W_WIFI,
|
||||
VPCCMD_R_BT,
|
||||
VPCCMD_W_BT,
|
||||
VPCCMD_R_BL_POWER,
|
||||
VPCCMD_R_NOVO,
|
||||
VPCCMD_R_VPC2,
|
||||
VPCCMD_R_TOUCHPAD,
|
||||
VPCCMD_W_TOUCHPAD,
|
||||
VPCCMD_R_CAMERA,
|
||||
VPCCMD_W_CAMERA,
|
||||
VPCCMD_R_3G,
|
||||
VPCCMD_W_3G,
|
||||
VPCCMD_R_ODD, /* 0x21 */
|
||||
VPCCMD_W_FAN,
|
||||
VPCCMD_R_RF,
|
||||
VPCCMD_W_RF,
|
||||
VPCCMD_R_FAN = 0x2B,
|
||||
VPCCMD_R_SPECIAL_BUTTONS = 0x31,
|
||||
VPCCMD_W_BL_POWER = 0x33,
|
||||
};
|
||||
|
||||
struct ideapad_dytc_priv {
|
||||
enum platform_profile_option current_profile;
|
||||
struct platform_profile_handler pprof;
|
||||
|
|
@ -227,7 +200,6 @@ static void ideapad_shared_exit(struct ideapad_private *priv)
|
|||
/*
|
||||
* ACPI Helpers
|
||||
*/
|
||||
#define IDEAPAD_EC_TIMEOUT 200 /* in ms */
|
||||
|
||||
static int eval_int(acpi_handle handle, const char *name, unsigned long *res)
|
||||
{
|
||||
|
|
@ -270,116 +242,11 @@ static int exec_sals(acpi_handle handle, unsigned long arg)
|
|||
return exec_simple_method(handle, "SALS", arg);
|
||||
}
|
||||
|
||||
static int eval_int_with_arg(acpi_handle handle, const char *name, unsigned long arg, unsigned long *res)
|
||||
{
|
||||
struct acpi_object_list params;
|
||||
unsigned long long result;
|
||||
union acpi_object in_obj;
|
||||
acpi_status status;
|
||||
|
||||
params.count = 1;
|
||||
params.pointer = &in_obj;
|
||||
in_obj.type = ACPI_TYPE_INTEGER;
|
||||
in_obj.integer.value = arg;
|
||||
|
||||
status = acpi_evaluate_integer(handle, (char *)name, ¶ms, &result);
|
||||
if (ACPI_FAILURE(status))
|
||||
return -EIO;
|
||||
|
||||
if (res)
|
||||
*res = result;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int eval_dytc(acpi_handle handle, unsigned long cmd, unsigned long *res)
|
||||
{
|
||||
return eval_int_with_arg(handle, "DYTC", cmd, res);
|
||||
}
|
||||
|
||||
static int eval_vpcr(acpi_handle handle, unsigned long cmd, unsigned long *res)
|
||||
{
|
||||
return eval_int_with_arg(handle, "VPCR", cmd, res);
|
||||
}
|
||||
|
||||
static int eval_vpcw(acpi_handle handle, unsigned long cmd, unsigned long data)
|
||||
{
|
||||
struct acpi_object_list params;
|
||||
union acpi_object in_obj[2];
|
||||
acpi_status status;
|
||||
|
||||
params.count = 2;
|
||||
params.pointer = in_obj;
|
||||
in_obj[0].type = ACPI_TYPE_INTEGER;
|
||||
in_obj[0].integer.value = cmd;
|
||||
in_obj[1].type = ACPI_TYPE_INTEGER;
|
||||
in_obj[1].integer.value = data;
|
||||
|
||||
status = acpi_evaluate_object(handle, "VPCW", ¶ms, NULL);
|
||||
if (ACPI_FAILURE(status))
|
||||
return -EIO;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int read_ec_data(acpi_handle handle, unsigned long cmd, unsigned long *data)
|
||||
{
|
||||
unsigned long end_jiffies, val;
|
||||
int err;
|
||||
|
||||
err = eval_vpcw(handle, 1, cmd);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
end_jiffies = jiffies + msecs_to_jiffies(IDEAPAD_EC_TIMEOUT) + 1;
|
||||
|
||||
while (time_before(jiffies, end_jiffies)) {
|
||||
schedule();
|
||||
|
||||
err = eval_vpcr(handle, 1, &val);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (val == 0)
|
||||
return eval_vpcr(handle, 0, data);
|
||||
}
|
||||
|
||||
acpi_handle_err(handle, "timeout in %s\n", __func__);
|
||||
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
|
||||
static int write_ec_cmd(acpi_handle handle, unsigned long cmd, unsigned long data)
|
||||
{
|
||||
unsigned long end_jiffies, val;
|
||||
int err;
|
||||
|
||||
err = eval_vpcw(handle, 0, data);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = eval_vpcw(handle, 1, cmd);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
end_jiffies = jiffies + msecs_to_jiffies(IDEAPAD_EC_TIMEOUT) + 1;
|
||||
|
||||
while (time_before(jiffies, end_jiffies)) {
|
||||
schedule();
|
||||
|
||||
err = eval_vpcr(handle, 1, &val);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (val == 0)
|
||||
return 0;
|
||||
}
|
||||
|
||||
acpi_handle_err(handle, "timeout in %s\n", __func__);
|
||||
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
|
||||
/*
|
||||
* debugfs
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,151 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
/*
|
||||
* ideapad-laptop.h - Lenovo IdeaPad ACPI Extras
|
||||
*
|
||||
* Copyright © 2010 Intel Corporation
|
||||
* Copyright © 2010 David Woodhouse <dwmw2@infradead.org>
|
||||
*/
|
||||
|
||||
#ifndef _IDEAPAD_LAPTOP_H_
|
||||
#define _IDEAPAD_LAPTOP_H_
|
||||
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/errno.h>
|
||||
|
||||
enum {
|
||||
VPCCMD_R_VPC1 = 0x10,
|
||||
VPCCMD_R_BL_MAX,
|
||||
VPCCMD_R_BL,
|
||||
VPCCMD_W_BL,
|
||||
VPCCMD_R_WIFI,
|
||||
VPCCMD_W_WIFI,
|
||||
VPCCMD_R_BT,
|
||||
VPCCMD_W_BT,
|
||||
VPCCMD_R_BL_POWER,
|
||||
VPCCMD_R_NOVO,
|
||||
VPCCMD_R_VPC2,
|
||||
VPCCMD_R_TOUCHPAD,
|
||||
VPCCMD_W_TOUCHPAD,
|
||||
VPCCMD_R_CAMERA,
|
||||
VPCCMD_W_CAMERA,
|
||||
VPCCMD_R_3G,
|
||||
VPCCMD_W_3G,
|
||||
VPCCMD_R_ODD, /* 0x21 */
|
||||
VPCCMD_W_FAN,
|
||||
VPCCMD_R_RF,
|
||||
VPCCMD_W_RF,
|
||||
VPCCMD_R_FAN = 0x2B,
|
||||
VPCCMD_R_SPECIAL_BUTTONS = 0x31,
|
||||
VPCCMD_W_BL_POWER = 0x33,
|
||||
};
|
||||
|
||||
static inline int eval_int_with_arg(acpi_handle handle, const char *name, unsigned long arg, unsigned long *res)
|
||||
{
|
||||
struct acpi_object_list params;
|
||||
unsigned long long result;
|
||||
union acpi_object in_obj;
|
||||
acpi_status status;
|
||||
|
||||
params.count = 1;
|
||||
params.pointer = &in_obj;
|
||||
in_obj.type = ACPI_TYPE_INTEGER;
|
||||
in_obj.integer.value = arg;
|
||||
|
||||
status = acpi_evaluate_integer(handle, (char *)name, ¶ms, &result);
|
||||
if (ACPI_FAILURE(status))
|
||||
return -EIO;
|
||||
|
||||
if (res)
|
||||
*res = result;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int eval_vpcr(acpi_handle handle, unsigned long cmd, unsigned long *res)
|
||||
{
|
||||
return eval_int_with_arg(handle, "VPCR", cmd, res);
|
||||
}
|
||||
|
||||
static inline int eval_vpcw(acpi_handle handle, unsigned long cmd, unsigned long data)
|
||||
{
|
||||
struct acpi_object_list params;
|
||||
union acpi_object in_obj[2];
|
||||
acpi_status status;
|
||||
|
||||
params.count = 2;
|
||||
params.pointer = in_obj;
|
||||
in_obj[0].type = ACPI_TYPE_INTEGER;
|
||||
in_obj[0].integer.value = cmd;
|
||||
in_obj[1].type = ACPI_TYPE_INTEGER;
|
||||
in_obj[1].integer.value = data;
|
||||
|
||||
status = acpi_evaluate_object(handle, "VPCW", ¶ms, NULL);
|
||||
if (ACPI_FAILURE(status))
|
||||
return -EIO;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define IDEAPAD_EC_TIMEOUT 200 /* in ms */
|
||||
|
||||
static inline int read_ec_data(acpi_handle handle, unsigned long cmd, unsigned long *data)
|
||||
{
|
||||
unsigned long end_jiffies, val;
|
||||
int err;
|
||||
|
||||
err = eval_vpcw(handle, 1, cmd);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
end_jiffies = jiffies + msecs_to_jiffies(IDEAPAD_EC_TIMEOUT) + 1;
|
||||
|
||||
while (time_before(jiffies, end_jiffies)) {
|
||||
schedule();
|
||||
|
||||
err = eval_vpcr(handle, 1, &val);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (val == 0)
|
||||
return eval_vpcr(handle, 0, data);
|
||||
}
|
||||
|
||||
acpi_handle_err(handle, "timeout in %s\n", __func__);
|
||||
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
|
||||
static inline int write_ec_cmd(acpi_handle handle, unsigned long cmd, unsigned long data)
|
||||
{
|
||||
unsigned long end_jiffies, val;
|
||||
int err;
|
||||
|
||||
err = eval_vpcw(handle, 0, data);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = eval_vpcw(handle, 1, cmd);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
end_jiffies = jiffies + msecs_to_jiffies(IDEAPAD_EC_TIMEOUT) + 1;
|
||||
|
||||
while (time_before(jiffies, end_jiffies)) {
|
||||
schedule();
|
||||
|
||||
err = eval_vpcr(handle, 1, &val);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (val == 0)
|
||||
return 0;
|
||||
}
|
||||
|
||||
acpi_handle_err(handle, "timeout in %s\n", __func__);
|
||||
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
|
||||
#undef IDEAPAD_EC_TIMEOUT
|
||||
#endif /* !_IDEAPAD_LAPTOP_H_ */
|
||||
Loading…
Reference in New Issue