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

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

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

Pull x86 platform driver fixes from Hans de Goede:
 "The first round of bug-fixes for platform-drivers-x86 for 5.15,
  highlights:

   - amd-pmc fix for some suspend/resume issues

   - intel-hid fix to avoid false-positive SW_TABLET_MODE=1 reporting

   - some build error/warning fixes

   - various DMI quirk additions"

* tag 'platform-drivers-x86-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: gigabyte-wmi: add support for B550I Aorus Pro AX
  platform/x86/intel: hid: Add DMI switches allow list
  platform/x86: dell: fix DELL_WMI_PRIVACY dependencies & build error
  platform/x86: amd-pmc: Increase the response register timeout
  platform/x86: touchscreen_dmi: Update info for the Chuwi Hi10 Plus (CWI527) tablet
  platform/x86: touchscreen_dmi: Add info for the Chuwi HiBook (CWI514) tablet
  lg-laptop: Correctly handle dmi_get_system_info() returning NULL
  platform/x86/intel: punit_ipc: Drop wrong use of ACPI_PTR()
parents 8f1b7ba5 6f6aab1c

drivers/platform/x86/amd-pmc.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
#define AMD_CPU_ID_YC			0x14B5



#define PMC_MSG_DELAY_MIN_US		100

#define RESPONSE_REGISTER_LOOP_MAX	200

#define RESPONSE_REGISTER_LOOP_MAX	20000



#define SOC_SUBSYSTEM_IP_MAX	12

#define DELAY_MIN_US		2000

drivers/platform/x86/dell/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -166,8 +166,7 @@ config DELL_WMI 


config DELL_WMI_PRIVACY

	bool "Dell WMI Hardware Privacy Support"

	depends on DELL_WMI

	depends on LEDS_TRIGGER_AUDIO

	depends on LEDS_TRIGGER_AUDIO = y || DELL_WMI = LEDS_TRIGGER_AUDIO

	help

	  This option adds integration with the "Dell Hardware Privacy"

	  feature of Dell laptops to the dell-wmi driver.

drivers/platform/x86/gigabyte-wmi.c

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ static const struct dmi_system_id gigabyte_wmi_known_working_platforms[] = { 
	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 AORUS ELITE"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 AORUS ELITE V2"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 GAMING X V2"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550I AORUS PRO AX"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550M AORUS PRO-P"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550M DS3H"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("Z390 I AORUS PRO WIFI-CF"),

drivers/platform/x86/intel/hid.c

+22 −5
Original line number Diff line number Diff line
@@ -118,12 +118,30 @@ static const struct dmi_system_id dmi_vgbs_allow_list[] = { 
	{ }

};



/*

 * Some devices, even non convertible ones, can send incorrect SW_TABLET_MODE

 * reports. Accept such reports only from devices in this list.

 */

static const struct dmi_system_id dmi_auto_add_switch[] = {

	{

		.matches = {

			DMI_EXACT_MATCH(DMI_CHASSIS_TYPE, "31" /* Convertible */),

		},

	},

	{

		.matches = {

			DMI_EXACT_MATCH(DMI_CHASSIS_TYPE, "32" /* Detachable */),

		},

	},

	{} /* Array terminator */

};



struct intel_hid_priv {

	struct input_dev *input_dev;

	struct input_dev *array;

	struct input_dev *switches;

	bool wakeup_mode;

	bool dual_accel;

	bool auto_add_switch;

};



#define HID_EVENT_FILTER_UUID	"eeec56b3-4442-408f-a792-4edd4d758054"
@@ -452,10 +470,8 @@ static void notify_handler(acpi_handle handle, u32 event, void *context) 
	 * Some convertible have unreliable VGBS return which could cause incorrect

	 * SW_TABLET_MODE report, in these cases we enable support when receiving

	 * the first event instead of during driver setup.

	 *

	 * See dual_accel_detect.h for more info on the dual_accel check.

	 */

	if (!priv->switches && !priv->dual_accel && (event == 0xcc || event == 0xcd)) {

	if (!priv->switches && priv->auto_add_switch && (event == 0xcc || event == 0xcd)) {

		dev_info(&device->dev, "switch event received, enable switches supports\n");

		err = intel_hid_switches_setup(device);

		if (err)
@@ -596,7 +612,8 @@ static int intel_hid_probe(struct platform_device *device) 
		return -ENOMEM;

	dev_set_drvdata(&device->dev, priv);



	priv->dual_accel = dual_accel_detect();

	/* See dual_accel_detect.h for more info on the dual_accel check. */

	priv->auto_add_switch = dmi_check_system(dmi_auto_add_switch) && !dual_accel_detect();



	err = intel_hid_input_setup(device);

	if (err) {

drivers/platform/x86/intel/punit_ipc.c

+1 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 * which provide mailbox interface for power management usage.

 */



#include <linux/acpi.h>

#include <linux/bitops.h>

#include <linux/delay.h>

#include <linux/device.h>
@@ -319,7 +318,7 @@ static struct platform_driver intel_punit_ipc_driver = { 
	.remove = intel_punit_ipc_remove,

	.driver = {

		.name = "intel_punit_ipc",

		.acpi_match_table = ACPI_PTR(punit_ipc_acpi_ids),

		.acpi_match_table = punit_ipc_acpi_ids,

	},

};