Commit 9ebd8118 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull x86 platform driver fixes from Hans de Goede:
 "Assorted pdx86 bug-fixes and model-specific quirks for 5.13"

* tag 'platform-drivers-x86-v5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: touchscreen_dmi: Add info for the Chuwi Hi10 Pro (CWI529) tablet
  platform/x86: touchscreen_dmi: Add info for the Mediacom Winpad 7.0 W700 tablet
  platform/x86: intel_punit_ipc: Append MODULE_DEVICE_TABLE for ACPI
  platform/x86: dell-smbios-wmi: Fix oops on rmmod dell_smbios
  platform/x86: hp-wireless: add AMD's hardware id to the supported list
  platform/x86: intel_int0002_vgpio: Only call enable_irq_wake() when using s2idle
  platform/x86: gigabyte-wmi: add support for B550 Aorus Elite
  platform/x86: gigabyte-wmi: add support for X570 UD
  platform/x86: gigabyte-wmi: streamline dmi matching
  platform/mellanox: mlxbf-tmfifo: Fix a memory barrier issue
  platform/surface: dtx: Fix poll function
  platform/surface: aggregator: Add platform-drivers-x86 list to MAINTAINERS entry
  platform/surface: aggregator: avoid clang -Wconstant-conversion warning
  platform/surface: aggregator: Do not mark interrupt as shared
  platform/x86: hp_accel: Avoid invoking _INI to speed up resume
  platform/x86: ideapad-laptop: fix method name typo
  platform/x86: ideapad-laptop: fix a NULL pointer dereference
parents 50f09a3d e68671e9

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12180,6 +12180,7 @@ F: drivers/platform/surface/surfacepro3_button.c 








MICROSOFT SURFACE SYSTEM AGGREGATOR SUBSYSTEM









M:	Maximilian Luz <luzmaximilian@gmail.com>









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









S:	Maintained









W:	https://github.com/linux-surface/surface-aggregator-module









C:	irc://chat.freenode.net/##linux-surface
































drivers/misc/lis3lv02d/lis3lv02d.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -271,6 +271,7 @@ struct lis3lv02d {







	int			regs_size;









	u8                      *reg_cache;









	bool			regs_stored;









	bool			init_required;









	u8                      odr_mask;  /* ODR bit mask */









	u8			whoami;    /* indicates measurement precision */









	s16 (*read_data) (struct lis3lv02d *lis3, int reg);
































drivers/platform/mellanox/mlxbf-tmfifo.c



+10
−1






























Original line number
Diff line number
Diff line







@@ -294,6 +294,9 @@ mlxbf_tmfifo_get_next_desc(struct mlxbf_tmfifo_vring *vring)







	if (vring->next_avail == virtio16_to_cpu(vdev, vr->avail->idx))









		return NULL;



















	/* Make sure 'avail->idx' is visible already. */









	virtio_rmb(false);



















	idx = vring->next_avail % vr->num;









	head = virtio16_to_cpu(vdev, vr->avail->ring[idx]);









	if (WARN_ON(head >= vr->num))








@@ -322,7 +325,7 @@ static void mlxbf_tmfifo_release_desc(struct mlxbf_tmfifo_vring *vring,







	 * done or not. Add a memory barrier here to make sure the update above









	 * completes before updating the idx.









	 */









	mb();









	virtio_mb(false);









	vr->used->idx = cpu_to_virtio16(vdev, vr_idx + 1);









}


















@@ -733,6 +736,12 @@ static bool mlxbf_tmfifo_rxtx_one_desc(struct mlxbf_tmfifo_vring *vring,







		desc = NULL;









		fifo->vring[is_rx] = NULL;



















		/*









		 * Make sure the load/store are in order before









		 * returning back to virtio.









		 */









		virtio_mb(false);



















		/* Notify upper layer that packet is done. */









		spin_lock_irqsave(&fifo->spin_lock[is_rx], flags);









		vring_interrupt(0, vring->vq);
































drivers/platform/surface/aggregator/controller.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -2483,8 +2483,7 @@ int ssam_irq_setup(struct ssam_controller *ctrl)







	 * interrupt, and let the SAM resume callback during the controller









	 * resume process clear it.









	 */









	const int irqf = IRQF_SHARED | IRQF_ONESHOT |









			 IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN;









	const int irqf = IRQF_ONESHOT | IRQF_TRIGGER_RISING | IRQF_NO_AUTOEN;



















	gpiod = gpiod_get(dev, "ssam_wakeup-int", GPIOD_ASIS);









	if (IS_ERR(gpiod))
































drivers/platform/surface/surface_dtx.c



+1
−7






























Original line number
Diff line number
Diff line







@@ -527,20 +527,14 @@ static __poll_t surface_dtx_poll(struct file *file, struct poll_table_struct *pt







	struct sdtx_client *client = file->private_data;









	__poll_t events = 0;



















	if (down_read_killable(&client->ddev->lock))









		return -ERESTARTSYS;



















	if (test_bit(SDTX_DEVICE_SHUTDOWN_BIT, &client->ddev->flags)) {









		up_read(&client->ddev->lock);









	if (test_bit(SDTX_DEVICE_SHUTDOWN_BIT, &client->ddev->flags))









		return EPOLLHUP | EPOLLERR;









	}



















	poll_wait(file, &client->ddev->waitq, pt);



















	if (!kfifo_is_empty(&client->buffer))









		events |= EPOLLIN | EPOLLRDNORM;



















	up_read(&client->ddev->lock);









	return events;









}