diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:42:07 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:42:07 +0100 |
| commit | b3cc7428a32202936904b5b07cf9f135025bafd6 (patch) | |
| tree | d4a1a6180ac5939fccd92acd6f8d7d1388575c4a /include/linux/hyperv.h | |
| parent | db52926fb0be40e1d588a346df73f5ea3a34a4c6 (diff) | |
| parent | 01601fdd40ecf4467c8ae4d215dbb7d2a0599a2c (diff) | |
Merge branch 'for-6.15/amd_sfh' into for-linus
From: Mario Limonciello <mario.limonciello@amd.com>
Some platforms include a human presence detection (HPD) sensor. When
enabled and a user is detected a wake event will be emitted from the
sensor fusion hub that software can react to.
Example use cases are "wake from suspend on approach" or to "lock
when leaving".
This is currently enabled by default on supported systems, but users
can't control it. This essentially means that wake on approach is
enabled which is a really surprising behavior to users that don't
expect it.
Instead of defaulting to enabled add a sysfs knob that users can
use to enable the feature if desirable and set it to disabled by
default.
Diffstat (limited to 'include/linux/hyperv.h')
| -rw-r--r-- | include/linux/hyperv.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 02a226bcf0ed..4179add2864b 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -24,7 +24,7 @@ #include <linux/mod_devicetable.h> #include <linux/interrupt.h> #include <linux/reciprocal_div.h> -#include <asm/hyperv-tlfs.h> +#include <hyperv/hvhdk.h> #define MAX_PAGE_BUFFER_COUNT 32 #define MAX_MULTIPAGE_BUFFER_COUNT 32 /* 128K */ @@ -768,15 +768,6 @@ struct vmbus_close_msg { struct vmbus_channel_close_channel msg; }; -/* Define connection identifier type. */ -union hv_connection_id { - u32 asu32; - struct { - u32 id:24; - u32 reserved:8; - } u; -}; - enum vmbus_device_type { HV_IDE = 0, HV_SCSI, |