Commit 65f936f3 authored by Bedant Patnaik's avatar Bedant Patnaik Committed by Hans de Goede

platform/x86: hp-wmi: Use zero insize parameter only when supported

commit be9d73e6 ("platform/x86: hp-wmi: Fix 0x05 error code reported by
several WMI calls") and commit 12b19f14 ("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: be9d73e6 ("platform/x86: hp-wmi: Fix 0x05 error code reported by several WMI calls")
Signed-off-by: default avatarBedant Patnaik <bedant.patnaik@gmail.com>
Tested-by: default avatarJorge Lopez <jorge.lopez2@hp.com>
Link: https://lore.kernel.org/r/41be46743d21c78741232a47bbb5f1cdbcc3d21e.camel@gmail.comReviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent dc6a6ab5
...@@ -38,6 +38,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4"); ...@@ -38,6 +38,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4");
#define HPWMI_EVENT_GUID "95F24279-4D7B-4334-9387-ACCDC67EF61C" #define HPWMI_EVENT_GUID "95F24279-4D7B-4334-9387-ACCDC67EF61C"
#define HPWMI_BIOS_GUID "5FB7F034-2C63-45e9-BE91-3D44E2C707E4" #define HPWMI_BIOS_GUID "5FB7F034-2C63-45e9-BE91-3D44E2C707E4"
#define HP_OMEN_EC_THERMAL_PROFILE_OFFSET 0x95 #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 /* DMI board names of devices that should use the omen specific path for
* thermal profiles. * thermal profiles.
...@@ -220,6 +221,7 @@ static struct input_dev *hp_wmi_input_dev; ...@@ -220,6 +221,7 @@ static struct input_dev *hp_wmi_input_dev;
static struct platform_device *hp_wmi_platform_dev; static struct platform_device *hp_wmi_platform_dev;
static struct platform_profile_handler platform_profile_handler; static struct platform_profile_handler platform_profile_handler;
static bool platform_profile_support; static bool platform_profile_support;
static bool zero_insize_support;
static struct rfkill *wifi_rfkill; static struct rfkill *wifi_rfkill;
static struct rfkill *bluetooth_rfkill; static struct rfkill *bluetooth_rfkill;
...@@ -376,7 +378,7 @@ static int hp_wmi_read_int(int query) ...@@ -376,7 +378,7 @@ static int hp_wmi_read_int(int query)
int val = 0, ret; int val = 0, ret;
ret = hp_wmi_perform_query(query, HPWMI_READ, &val, ret = hp_wmi_perform_query(query, HPWMI_READ, &val,
0, sizeof(val)); zero_if_sup(val), sizeof(val));
if (ret) if (ret)
return ret < 0 ? ret : -EINVAL; return ret < 0 ? ret : -EINVAL;
...@@ -412,7 +414,8 @@ static int hp_wmi_get_tablet_mode(void) ...@@ -412,7 +414,8 @@ static int hp_wmi_get_tablet_mode(void)
return -ENODEV; return -ENODEV;
ret = hp_wmi_perform_query(HPWMI_SYSTEM_DEVICE_MODE, HPWMI_READ, 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) if (ret < 0)
return ret; return ret;
...@@ -499,7 +502,7 @@ static int hp_wmi_fan_speed_max_get(void) ...@@ -499,7 +502,7 @@ static int hp_wmi_fan_speed_max_get(void)
int val = 0, ret; int val = 0, ret;
ret = hp_wmi_perform_query(HPWMI_FAN_SPEED_MAX_GET_QUERY, HPWMI_GM, 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) if (ret)
return ret < 0 ? ret : -EINVAL; return ret < 0 ? ret : -EINVAL;
...@@ -511,7 +514,7 @@ static int __init hp_wmi_bios_2008_later(void) ...@@ -511,7 +514,7 @@ static int __init hp_wmi_bios_2008_later(void)
{ {
int state = 0; int state = 0;
int ret = hp_wmi_perform_query(HPWMI_FEATURE_QUERY, HPWMI_READ, &state, int ret = hp_wmi_perform_query(HPWMI_FEATURE_QUERY, HPWMI_READ, &state,
0, sizeof(state)); zero_if_sup(state), sizeof(state));
if (!ret) if (!ret)
return 1; return 1;
...@@ -522,7 +525,7 @@ static int __init hp_wmi_bios_2009_later(void) ...@@ -522,7 +525,7 @@ static int __init hp_wmi_bios_2009_later(void)
{ {
u8 state[128]; u8 state[128];
int ret = hp_wmi_perform_query(HPWMI_FEATURE2_QUERY, HPWMI_READ, &state, int ret = hp_wmi_perform_query(HPWMI_FEATURE2_QUERY, HPWMI_READ, &state,
0, sizeof(state)); zero_if_sup(state), sizeof(state));
if (!ret) if (!ret)
return 1; return 1;
...@@ -600,7 +603,7 @@ static int hp_wmi_rfkill2_refresh(void) ...@@ -600,7 +603,7 @@ static int hp_wmi_rfkill2_refresh(void)
int err, i; int err, i;
err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, HPWMI_READ, &state, err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, HPWMI_READ, &state,
0, sizeof(state)); zero_if_sup(state), sizeof(state));
if (err) if (err)
return err; return err;
...@@ -1009,7 +1012,7 @@ static int __init hp_wmi_rfkill2_setup(struct platform_device *device) ...@@ -1009,7 +1012,7 @@ static int __init hp_wmi_rfkill2_setup(struct platform_device *device)
int err, i; int err, i;
err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, HPWMI_READ, &state, err = hp_wmi_perform_query(HPWMI_WIRELESS2_QUERY, HPWMI_READ, &state,
0, sizeof(state)); zero_if_sup(state), sizeof(state));
if (err) if (err)
return err < 0 ? err : -EINVAL; return err < 0 ? err : -EINVAL;
...@@ -1485,11 +1488,15 @@ static int __init hp_wmi_init(void) ...@@ -1485,11 +1488,15 @@ static int __init hp_wmi_init(void)
{ {
int event_capable = wmi_has_guid(HPWMI_EVENT_GUID); int event_capable = wmi_has_guid(HPWMI_EVENT_GUID);
int bios_capable = wmi_has_guid(HPWMI_BIOS_GUID); int bios_capable = wmi_has_guid(HPWMI_BIOS_GUID);
int err; int err, tmp = 0;
if (!bios_capable && !event_capable) if (!bios_capable && !event_capable)
return -ENODEV; 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) { if (event_capable) {
err = hp_wmi_input_setup(); err = hp_wmi_input_setup();
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment