Commit 99795285 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v5.19-2' of... 

Merge tag 'platform-drivers-x86-v5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Hans de Goede:
 "Highlights:

   - Fix hp-wmi regression on HP Omen laptops introduced in 5.18

   - Several hardware-id additions

   - A couple of other tiny fixes"

* tag 'platform-drivers-x86-v5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86/intel: hid: Add Surface Go to VGBS allow list
  platform/x86: hp-wmi: Use zero insize parameter only when supported
  platform/x86: hp-wmi: Resolve WMI query failures on some devices
  platform/x86: gigabyte-wmi: Add support for B450M DS3H-CF
  platform/x86: gigabyte-wmi: Add Z690M AORUS ELITE AX DDR4 support
  platform/x86: barco-p50-gpio: Add check for platform_driver_register
  platform/x86/intel: pmc: Support Intel Raptorlake P
  platform/x86/intel: Fix pmt_crashlog array reference
  platform/mellanox: Add static in struct declaration.
  platform/mellanox: Spelling s/platfom/platform/
parents b0cb8db3 d4fe9cc4

drivers/platform/mellanox/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ config NVSW_SN2201 
	depends on I2C

	depends on REGMAP_I2C

	help

	  This driver provides support for the Nvidia SN2201 platfom.

	  This driver provides support for the Nvidia SN2201 platform.

	  The SN2201 is a highly integrated for one rack unit system with

	  L3 management switches. It has 48 x 1Gbps RJ45 + 4 x 100G QSFP28

	  ports in a compact 1RU form factor. The system also including a

drivers/platform/mellanox/nvsw-sn2201.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static struct resource nvsw_sn2201_lpc_res[] = { 
};



/* SN2201 I2C platform data. */

struct mlxreg_core_hotplug_platform_data nvsw_sn2201_i2c_data = {

static struct mlxreg_core_hotplug_platform_data nvsw_sn2201_i2c_data = {

	.irq = NVSW_SN2201_CPLD_SYSIRQ,

};

drivers/platform/x86/barco-p50-gpio.c

+4 −1
Original line number Diff line number Diff line
@@ -405,11 +405,14 @@ MODULE_DEVICE_TABLE(dmi, dmi_ids); 
static int __init p50_module_init(void)

{

	struct resource res = DEFINE_RES_IO(P50_GPIO_IO_PORT_BASE, P50_PORT_CMD + 1);

	int ret;



	if (!dmi_first_match(dmi_ids))

		return -ENODEV;



	platform_driver_register(&p50_gpio_driver);

	ret = platform_driver_register(&p50_gpio_driver);

	if (ret)

		return ret;



	gpio_pdev = platform_device_register_simple(DRIVER_NAME, PLATFORM_DEVID_NONE, &res, 1);

	if (IS_ERR(gpio_pdev)) {

drivers/platform/x86/gigabyte-wmi.c

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ static u8 gigabyte_wmi_detect_sensor_usability(struct wmi_device *wdev) 
	}}



static const struct dmi_system_id gigabyte_wmi_known_working_platforms[] = {

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B450M DS3H-CF"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B450M S2H V2"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 AORUS ELITE AX V2"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 AORUS ELITE"),
@@ -156,6 +157,7 @@ static const struct dmi_system_id gigabyte_wmi_known_working_platforms[] = { 
	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("X570 GAMING X"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("X570 I AORUS PRO WIFI"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("X570 UD"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("Z690M AORUS ELITE AX DDR4"),

	{ }

};

drivers/platform/x86/hp-wmi.c

+19 −10
Original line number Diff line number Diff line
@@ -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.
@@ -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;
@@ -290,14 +292,16 @@ static int hp_wmi_perform_query(int query, enum hp_wmi_command command, 
	struct bios_return *bios_return;

	union acpi_object *obj = NULL;

	struct bios_args *args = NULL;

	int mid, actual_outsize, ret;

	int mid, actual_insize, actual_outsize;

	size_t bios_args_size;

	int ret;



	mid = encode_outsize_for_pvsz(outsize);

	if (WARN_ON(mid < 0))

		return mid;



	bios_args_size = struct_size(args, data, insize);

	actual_insize = max(insize, 128);

	bios_args_size = struct_size(args, data, actual_insize);

	args = kmalloc(bios_args_size, GFP_KERNEL);

	if (!args)

		return -ENOMEM;
@@ -374,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;
@@ -410,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;
@@ -497,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;
@@ -509,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;
@@ -520,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;
@@ -598,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;
@@ -1007,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;
@@ -1483,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)