Commit 23e65246 authored by Hans de Goede's avatar Hans de Goede
Browse files

Merge tag 'platform-drivers-x86-v6.7-3' into pdx86/for-next 

Back merge pdx86 fixes into pdx86/for-next for further WMI work
depending on some of the fixes.

platform-drivers-x86 for v6.7-3

Highlights:
- asus-wmi:	    Solve i8042 filter resource handling, input, and
		    suspend issues
- wmi:		    Skip zero instance WMI blocks to avoid issues with
		    some laptops
- mlxbf-bootctl:    Differentiate dev/production keys
- platform/surface: Correct serdev related return value to avoid
		    leaking errno into userspace
- Error checking fixes

The following is an automated shortlog grouped by driver:

asus-wmi:
 -  Change q500a_i8042_filter() into a generic i8042-filter
 -  disable USB0 hub on ROG Ally before suspend
 -  Filter Volume key presses if also reported via atkbd
 -  Move i8042 filter install to shared asus-wmi code

mellanox:
 -  Add null pointer checks for devm_kasprintf()
 -  Check devm_hwmon_device_register_with_groups() return value

mlxbf-bootctl:
 -  correctly identify secure boot with development keys

surface: aggregator:
 -  fix recv_buf() return value

wmi:
 -  Skip blocks with zero instances
parents 682b43a0 3494a594

MAINTAINERS

+0 −4
Original line number Diff line number Diff line
@@ -11025,7 +11025,6 @@ F: drivers/net/wireless/intel/iwlwifi/ 








INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER









M:	Jithu Joseph <jithu.joseph@intel.com>









R:	Maurice Ma <maurice.ma@intel.com>









S:	Maintained









W:	https://slimbootloader.github.io/security/firmware-update.html









F:	drivers/platform/x86/intel/wmi/sbl-fw-update.c








@@ -13779,7 +13778,6 @@ F:	drivers/net/ethernet/mellanox/mlxfw/







MELLANOX HARDWARE PLATFORM SUPPORT









M:	Hans de Goede <hdegoede@redhat.com>









M:	Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>









M:	Mark Gross <markgross@kernel.org>









M:	Vadim Pasternak <vadimp@nvidia.com>









L:	platform-driver-x86@vger.kernel.org









S:	Supported








@@ -14388,7 +14386,6 @@ F:	drivers/platform/surface/surface_gpe.c







MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT









M:	Hans de Goede <hdegoede@redhat.com>









M:	Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>









M:	Mark Gross <markgross@kernel.org>









M:	Maximilian Luz <luzmaximilian@gmail.com>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained








@@ -23654,7 +23651,6 @@ F:	drivers/platform/x86/x86-android-tablets/







X86 PLATFORM DRIVERS









M:	Hans de Goede <hdegoede@redhat.com>









M:	Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>









M:	Mark Gross <markgross@kernel.org>









L:	platform-driver-x86@vger.kernel.org









S:	Maintained









Q:	https://patchwork.kernel.org/project/platform-driver-x86/list/

























drivers/platform/mellanox/mlxbf-bootctl.c



+26
−13






























Original line number
Diff line number
Diff line







@@ -20,6 +20,7 @@

















#define MLXBF_BOOTCTL_SB_SECURE_MASK		0x03









#define MLXBF_BOOTCTL_SB_TEST_MASK		0x0c









#define MLXBF_BOOTCTL_SB_DEV_MASK		BIT(4)



















#define MLXBF_SB_KEY_NUM			4


















@@ -40,11 +41,18 @@ static struct mlxbf_bootctl_name boot_names[] = {







	{ MLXBF_BOOTCTL_NONE, "none" },









};



















enum {









	MLXBF_BOOTCTL_SB_LIFECYCLE_PRODUCTION = 0,









	MLXBF_BOOTCTL_SB_LIFECYCLE_GA_SECURE = 1,









	MLXBF_BOOTCTL_SB_LIFECYCLE_GA_NON_SECURE = 2,









	MLXBF_BOOTCTL_SB_LIFECYCLE_RMA = 3









};



















static const char * const mlxbf_bootctl_lifecycle_states[] = {









	[0] = "Production",









	[1] = "GA Secured",









	[2] = "GA Non-Secured",









	[3] = "RMA",









	[MLXBF_BOOTCTL_SB_LIFECYCLE_PRODUCTION] = "Production",









	[MLXBF_BOOTCTL_SB_LIFECYCLE_GA_SECURE] = "GA Secured",









	[MLXBF_BOOTCTL_SB_LIFECYCLE_GA_NON_SECURE] = "GA Non-Secured",









	[MLXBF_BOOTCTL_SB_LIFECYCLE_RMA] = "RMA",









};



















/* Log header format. */








@@ -247,25 +255,30 @@ static ssize_t second_reset_action_store(struct device *dev,







static ssize_t lifecycle_state_show(struct device *dev,









				    struct device_attribute *attr, char *buf)









{









	int status_bits;









	int use_dev_key;









	int test_state;









	int lc_state;



















	lc_state = mlxbf_bootctl_smc(MLXBF_BOOTCTL_GET_TBB_FUSE_STATUS,









	status_bits = mlxbf_bootctl_smc(MLXBF_BOOTCTL_GET_TBB_FUSE_STATUS,









					MLXBF_BOOTCTL_FUSE_STATUS_LIFECYCLE);









	if (lc_state < 0)









		return lc_state;









	if (status_bits < 0)









		return status_bits;



















	lc_state &=









		MLXBF_BOOTCTL_SB_TEST_MASK | MLXBF_BOOTCTL_SB_SECURE_MASK;









	use_dev_key = status_bits & MLXBF_BOOTCTL_SB_DEV_MASK;









	test_state = status_bits & MLXBF_BOOTCTL_SB_TEST_MASK;









	lc_state = status_bits & MLXBF_BOOTCTL_SB_SECURE_MASK;



















	/*









	 * If the test bits are set, we specify that the current state may be









	 * due to using the test bits.









	 */









	if (lc_state & MLXBF_BOOTCTL_SB_TEST_MASK) {









		lc_state &= MLXBF_BOOTCTL_SB_SECURE_MASK;



















	if (test_state) {









		return sprintf(buf, "%s(test)\n",









			       mlxbf_bootctl_lifecycle_states[lc_state]);









	} else if (use_dev_key &&









		   (lc_state == MLXBF_BOOTCTL_SB_LIFECYCLE_GA_SECURE)) {









		return sprintf(buf, "Secured (development)\n");









	}



















	return sprintf(buf, "%s\n", mlxbf_bootctl_lifecycle_states[lc_state]);
































drivers/platform/mellanox/mlxbf-pmc.c



+14
−0






























Original line number
Diff line number
Diff line







@@ -1771,6 +1771,8 @@ static int mlxbf_pmc_init_perftype_counter(struct device *dev, int blk_num)







	attr->dev_attr.show = mlxbf_pmc_event_list_show;









	attr->nr = blk_num;









	attr->dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL, "event_list");









	if (!attr->dev_attr.attr.name)









		return -ENOMEM;









	pmc->block[blk_num].block_attr[i] = &attr->dev_attr.attr;









	attr = NULL;


















@@ -1784,6 +1786,8 @@ static int mlxbf_pmc_init_perftype_counter(struct device *dev, int blk_num)







		attr->nr = blk_num;









		attr->dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL,









							  "enable");









		if (!attr->dev_attr.attr.name)









			return -ENOMEM;









		pmc->block[blk_num].block_attr[++i] = &attr->dev_attr.attr;









		attr = NULL;









	}








@@ -1810,6 +1814,8 @@ static int mlxbf_pmc_init_perftype_counter(struct device *dev, int blk_num)







		attr->nr = blk_num;









		attr->dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL,









							  "counter%d", j);









		if (!attr->dev_attr.attr.name)









			return -ENOMEM;









		pmc->block[blk_num].block_attr[++i] = &attr->dev_attr.attr;









		attr = NULL;


















@@ -1821,6 +1827,8 @@ static int mlxbf_pmc_init_perftype_counter(struct device *dev, int blk_num)







		attr->nr = blk_num;









		attr->dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL,









							  "event%d", j);









		if (!attr->dev_attr.attr.name)









			return -ENOMEM;









		pmc->block[blk_num].block_attr[++i] = &attr->dev_attr.attr;









		attr = NULL;









	}








@@ -1853,6 +1861,8 @@ static int mlxbf_pmc_init_perftype_reg(struct device *dev, int blk_num)







		attr->nr = blk_num;









		attr->dev_attr.attr.name = devm_kasprintf(dev, GFP_KERNEL,









							  events[j].evt_name);









		if (!attr->dev_attr.attr.name)









			return -ENOMEM;









		pmc->block[blk_num].block_attr[i] = &attr->dev_attr.attr;









		attr = NULL;









		i++;








@@ -1882,6 +1892,8 @@ static int mlxbf_pmc_create_groups(struct device *dev, int blk_num)







	pmc->block[blk_num].block_attr_grp.attrs = pmc->block[blk_num].block_attr;









	pmc->block[blk_num].block_attr_grp.name = devm_kasprintf(









		dev, GFP_KERNEL, pmc->block_name[blk_num]);









	if (!pmc->block[blk_num].block_attr_grp.name)









		return -ENOMEM;









	pmc->groups[pmc->group_num] = &pmc->block[blk_num].block_attr_grp;









	pmc->group_num++;


















@@ -2063,6 +2075,8 @@ static int mlxbf_pmc_probe(struct platform_device *pdev)

















	pmc->hwmon_dev = devm_hwmon_device_register_with_groups(









		dev, "bfperf", pmc, pmc->groups);









	if (IS_ERR(pmc->hwmon_dev))









		return PTR_ERR(pmc->hwmon_dev);









	platform_set_drvdata(pdev, pmc);



















	return 0;
































drivers/platform/surface/aggregator/core.c



+4
−1






























Original line number
Diff line number
Diff line







@@ -231,9 +231,12 @@ static int ssam_receive_buf(struct serdev_device *dev, const unsigned char *buf,







			    size_t n)









{









	struct ssam_controller *ctrl;









	int ret;



















	ctrl = serdev_device_get_drvdata(dev);









	return ssam_controller_receive_buf(ctrl, buf, n);









	ret = ssam_controller_receive_buf(ctrl, buf, n);



















	return ret < 0 ? 0 : ret;









}



















static void ssam_write_wakeup(struct serdev_device *dev)
































drivers/platform/x86/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -265,6 +265,7 @@ config ASUS_WMI







	depends on RFKILL || RFKILL = n









	depends on HOTPLUG_PCI









	depends on ACPI_VIDEO || ACPI_VIDEO = n









	depends on SERIO_I8042 || SERIO_I8042 = n









	select INPUT_SPARSEKMAP









	select LEDS_CLASS









	select NEW_LEDS








@@ -281,7 +282,6 @@ config ASUS_WMI







config ASUS_NB_WMI









	tristate "Asus Notebook WMI Driver"









	depends on ASUS_WMI









	depends on SERIO_I8042 || SERIO_I8042 = n









	help









	  This is a driver for newer Asus notebooks. It adds extra features









	  like wireless radio and bluetooth control, leds, hotkeys, backlight...