Skip to content

Commit

Permalink
platform/x86: hp-wmi: Use zero insize parameter only when supported
Browse files Browse the repository at this point in the history 
commit be9d73e ("platform/x86: hp-wmi: Fix 0x05 error code reported by
several WMI calls") and commit 12b19f1 ("platform/x86: hp-wmi: Fix
hp_wmi_read_int() reporting error (0x05)") cause ACPI BIOS Error (bug):
Attempt to CreateField of length zero (20211217/dsopcode-133) because of
the ACPI method HWMC, which unconditionally creates a Field of
size (insize*8) bits:
	CreateField (Arg1, 0x80, (Local5 * 0x08), DAIN)
In cases where args->insize = 0, the Field size is 0, resulting in
an error.

Fix this by using zero insize only if 0x5 error code is returned

Tested on Omen 15 AMD (2020) board ID: 8786.

Fixes: be9d73e ("platform/x86: hp-wmi: Fix 0x05 error code reported by several WMI calls")
Signed-off-by: Bedant Patnaik <bedant.patnaik@gmail.com>
Tested-by: Jorge Lopez <jorge.lopez2@hp.com>
Link: https://lore.kernel.org/r/41be46743d21c78741232a47bbb5f1cdbcc3d21e.camel@gmail.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  • Loading branch information
@whyfu @jwrdegoede
whyfu authored and jwrdegoede committed Jun 12, 2022
1 parent dc6a6ab commit 65f936f
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions drivers/platform/x86/hp-wmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4");
#define HPWMI_EVENT_GUID "95F24279-4D7B-4334-9387-ACCDC67EF61C"
#define HPWMI_BIOS_GUID "5FB7F034-2C63-45e9-BE91-3D44E2C707E4"
#define HP_OMEN_EC_THERMAL_PROFILE_OFFSET 0x95
#define zero_if_sup(tmp) (zero_insize_support?0:sizeof(tmp)) // use when zero insize is required

/* DMI board names of devices that should use the omen specific path for
* thermal profiles.
Expand Down Expand Up @@ -220,6 +221,7 @@ static struct input_dev *hp_wmi_input_dev;
static struct platform_device *hp_wmi_platform_dev;
static struct platform_profile_handler platform_profile_handler;
static bool platform_profile_support;
static bool zero_insize_support;

static struct rfkill *wifi_rfkill;
static struct rfkill *bluetooth_rfkill;
Expand Down Expand Up @@ -376,7 +378,7 @@ static int hp_wmi_read_int(int query)
int val = 0, ret;

ret = hp_wmi_perform_query(query, HPWMI_READ, &val,
0, sizeof(val));
zero_if_sup(val), sizeof(val));

if (ret)
return ret < 0 ? ret : -EINVAL;
Expand Down Expand Up @@ -412,7 +414,8 @@ static int hp_wmi_get_tablet_mode(void)
return -ENODEV;

ret = hp_wmi_perform_query(HPWMI_SYSTEM_DEVICE_MODE, HPWMI_READ,
system_device_mode, 0, sizeof(system_device_mode));
system_device_mode, zero_if_sup(system_device_mode),
sizeof(system_device_mode));
if (ret < 0)
return ret;

Expand Down Expand Up @@ -499,7 +502,7 @@ static int hp_wmi_fan_speed_max_get(void)
int val = 0, ret;

ret = hp_wmi_perform_query(HPWMI_FAN_SPEED_MAX_GET_QUERY, HPWMI_GM,
&val, 0, sizeof(val));
&val, zero_if_sup(val), sizeof(val));

if (ret)
return ret < 0 ? ret : -EINVAL;
Expand All @@ -511,7 +514,7 @@ static int __init hp_wmi_bios_2008_later(void)
{
int state = 0;
int ret = hp_wmi_perform_query(HPWMI_FEATURE_QUERY, HPWMI_READ, &state,
0, sizeof(state));
zero_if_sup(state), sizeof(state));
if (!ret)
return 1;

Expand All @@ -522,7 +525,7 @@ static int __init hp_wmi_bios_2009_later(void)
{
u8 state[128];
int ret = hp_wmi_perform_query(HPWMI_FEATURE2_QUERY, HPWMI_READ, &state,
0, sizeof(state));
zero_if_sup(state), sizeof(state));
if (!ret)
return 1;

Expand Down Expand Up @@ -600,7 +603,7 @@ static int hp_wmi_rfkill2_refresh(void)
int err, i;

err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, HPWMI_READ, &state,
0, sizeof(state));
zero_if_sup(state), sizeof(state));
if (err)
return err;

Expand Down Expand Up @@ -1009,7 +1012,7 @@ static int __init hp_wmi_rfkill2_setup(struct platform_device *device)
int err, i;

err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, HPWMI_READ, &state,
0, sizeof(state));
zero_if_sup(state), sizeof(state));
if (err)
return err < 0 ? err : -EINVAL;

Expand Down Expand Up @@ -1485,11 +1488,15 @@ static int __init hp_wmi_init(void)
{
int event_capable = wmi_has_guid(HPWMI_EVENT_GUID);
int bios_capable = wmi_has_guid(HPWMI_BIOS_GUID);
int err;
int err, tmp = 0;

if (!bios_capable && !event_capable)
return -ENODEV;

if (hp_wmi_perform_query(HPWMI_HARDWARE_QUERY, HPWMI_READ, &tmp,
sizeof(tmp), sizeof(tmp)) == HPWMI_RET_INVALID_PARAMETERS)
zero_insize_support = true;

if (event_capable) {
err = hp_wmi_input_setup();
if (err)
Expand Down

0 comments on commit 65f936f

Please sign in to comment.