Skip to content

Commit 7a76117

Browse files
torvaldstorvalds
committed
Merge tag 'platform-drivers-x86-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
Pull x86 platform driver updates from Hans de Goede: - Intel: - PMC: Add support for Meteor Lake - Intel On Demand: various updates - Ideapad-laptop: - Add support for various Fn keys on new models - Fix touchpad on/off handling in a generic way to avoid having to add more and more quirks - Android x86 tablets: - Add support for two more X86 Android tablet models - New Dell WMI DDV driver - Miscellaneous cleanups and small bugfixes * tag 'platform-drivers-x86-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (52 commits) platform/mellanox: mlxbf-pmc: Fix event typo platform/x86: intel_scu_ipc: fix possible name leak in __intel_scu_ipc_register() platform/x86: sony-laptop: Convert to use sysfs_emit_at() API platform/x86/dell: alienware-wmi: Use sysfs_emit() instead of scnprintf() platform/x86: uv_sysfs: Use sysfs_emit() instead of scnprintf() platform/x86: mxm-wmi: fix memleak in mxm_wmi_call_mx[ds|mx]() platform/x86: x86-android-tablets: Add Advantech MICA-071 extra button platform/x86: x86-android-tablets: Add Lenovo Yoga Tab 3 (YT3-X90F) charger + fuel-gauge data platform/x86: x86-android-tablets: Add Medion Lifetab S10346 data platform/x86: wireless-hotkey: use ACPI HID as phys platform/x86/intel/hid: Add module-params for 5 button array + SW_TABLET_MODE reporting platform/x86: ideapad-laptop: Make touchpad_ctrl_via_ec a module option platform/x86: ideapad-laptop: Stop writing VPCCMD_W_TOUCHPAD at probe time platform/x86: ideapad-laptop: Send KEY_TOUCHPAD_TOGGLE on some models platform/x86: ideapad-laptop: Only toggle ps2 aux port on/off on select models platform/x86: ideapad-laptop: Do not send KEY_TOUCHPAD* events on probe / resume platform/x86: ideapad-laptop: Refactor ideapad_sync_touchpad_state() tools/arch/x86: intel_sdsi: Add support for reading meter certificates tools/arch/x86: intel_sdsi: Add support for new GUID tools/arch/x86: intel_sdsi: Read more On Demand registers ...
2 parents 01f3cbb + b0b698b commit 7a76117

49 files changed

Lines changed: 3074 additions & 1452 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/ABI/testing/debugfs-dell-wmi-ddv‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/fan_sensor_information
2+
Date: September 2022
3+
KernelVersion: 6.1
4+
Contact: Armin Wolf <W_Armin@gmx.de>
5+
Description:
6+
This file contains the contents of the fan sensor information buffer,
7+
which contains fan sensor entries and a terminating character (0xFF).
8+
9+
Each fan sensor entry consists of three bytes with an unknown meaning,
10+
interested people may use this file for reverse-engineering.
11+
12+
What: /sys/kernel/debug/dell-wmi-ddv-<wmi_device_name>/thermal_sensor_information
13+
Date: September 2022
14+
KernelVersion: 6.1
15+
Contact: Armin Wolf <W_Armin@gmx.de>
16+
Description:
17+
This file contains the contents of the thermal sensor information buffer,
18+
which contains thermal sensor entries and a terminating character (0xFF).
19+
20+
Each thermal sensor entry consists of five bytes with an unknown meaning,
21+
interested people may use this file for reverse-engineering.

‎Documentation/ABI/testing/sysfs-driver-intel_sdsi‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ KernelVersion: 5.18
44
Contact: "David E. Box" <david.e.box@linux.intel.com>
55
Description:
66
This directory contains interface files for accessing Intel
7-
Software Defined Silicon (SDSi) features on a CPU. X
8-
represents the socket instance (though not the socket ID).
9-
The socket ID is determined by reading the registers file
10-
and decoding it per the specification.
7+
On Demand (formerly Software Defined Silicon or SDSi) features
8+
on a CPU. X represents the socket instance (though not the
9+
socket ID). The socket ID is determined by reading the
10+
registers file and decoding it per the specification.
1111

12-
Some files communicate with SDSi hardware through a mailbox.
13-
Should the operation fail, one of the following error codes
14-
may be returned:
12+
Some files communicate with On Demand hardware through a
13+
mailbox. Should the operation fail, one of the following error
14+
codes may be returned:
1515

1616
========== =====
1717
Error Code Cause
1818
========== =====
1919
EIO General mailbox failure. Log may indicate cause.
2020
EBUSY Mailbox is owned by another agent.
21-
EPERM SDSI capability is not enabled in hardware.
21+
EPERM On Demand capability is not enabled in hardware.
2222
EPROTO Failure in mailbox protocol detected by driver.
2323
See log for details.
2424
EOVERFLOW For provision commands, the size of the data
@@ -54,26 +54,37 @@ KernelVersion: 5.18
5454
Contact: "David E. Box" <david.e.box@linux.intel.com>
5555
Description:
5656
(WO) Used to write an Authentication Key Certificate (AKC) to
57-
the SDSi NVRAM for the CPU. The AKC is used to authenticate a
58-
Capability Activation Payload. Mailbox command.
57+
the On Demand NVRAM for the CPU. The AKC is used to authenticate
58+
a Capability Activation Payload. Mailbox command.
5959

6060
What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/provision_cap
6161
Date: Feb 2022
6262
KernelVersion: 5.18
6363
Contact: "David E. Box" <david.e.box@linux.intel.com>
6464
Description:
6565
(WO) Used to write a Capability Activation Payload (CAP) to the
66-
SDSi NVRAM for the CPU. CAPs are used to activate a given CPU
67-
feature. A CAP is validated by SDSi hardware using a previously
68-
provisioned AKC file. Upon successful authentication, the CPU
69-
configuration is updated. A cold reboot is required to fully
70-
activate the feature. Mailbox command.
66+
On Demand NVRAM for the CPU. CAPs are used to activate a given
67+
CPU feature. A CAP is validated by On Demand hardware using a
68+
previously provisioned AKC file. Upon successful authentication,
69+
the CPU configuration is updated. A cold reboot is required to
70+
fully activate the feature. Mailbox command.
71+
72+
What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/meter_certificate
73+
Date: Nov 2022
74+
KernelVersion: 6.2
75+
Contact: "David E. Box" <david.e.box@linux.intel.com>
76+
Description:
77+
(RO) Used to read back the current meter certificate for the CPU
78+
from Intel On Demand hardware. The meter certificate contains
79+
utilization metrics of On Demand enabled features. Mailbox
80+
command.
7181

7282
What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/state_certificate
7383
Date: Feb 2022
7484
KernelVersion: 5.18
7585
Contact: "David E. Box" <david.e.box@linux.intel.com>
7686
Description:
77-
(RO) Used to read back the current State Certificate for the CPU
78-
from SDSi hardware. The State Certificate contains information
79-
about the current licenses on the CPU. Mailbox command.
87+
(RO) Used to read back the current state certificate for the CPU
88+
from On Demand hardware. The state certificate contains
89+
information about the current licenses on the CPU. Mailbox
90+
command.

‎Documentation/ABI/testing/sysfs-platform-dell-wmi-ddv‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
What: /sys/class/power_supply/<battery_name>/eppid
2+
Date: September 2022
3+
KernelVersion: 6.1
4+
Contact: Armin Wolf <W_Armin@gmx.de>
5+
Description:
6+
Reports the Dell ePPID (electronic Dell Piece Part Identification)
7+
of the ACPI battery.

‎MAINTAINERS‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5867,6 +5867,13 @@ L: Dell.Client.Kernel@dell.com
58675867
S: Maintained
58685868
F: drivers/platform/x86/dell/dell-wmi-descriptor.c
58695869

5870+
DELL WMI DDV DRIVER
5871+
M: Armin Wolf <W_Armin@gmx.de>
5872+
S: Maintained
5873+
F: Documentation/ABI/testing/debugfs-dell-wmi-ddv
5874+
F: Documentation/ABI/testing/sysfs-platform-dell-wmi-ddv
5875+
F: drivers/platform/x86/dell/dell-wmi-ddv.c
5876+
58705877
DELL WMI SYSMAN DRIVER
58715878
M: Divya Bharathi <divya.bharathi@dell.com>
58725879
M: Prasanth Ksr <prasanth.ksr@dell.com>
@@ -9376,7 +9383,7 @@ F: drivers/net/wireless/intersil/hostap/
93769383
HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
93779384
L: platform-driver-x86@vger.kernel.org
93789385
S: Orphan
9379-
F: drivers/platform/x86/tc1100-wmi.c
9386+
F: drivers/platform/x86/hp/tc1100-wmi.c
93809387

93819388
HPET: High Precision Event Timers driver
93829389
M: Clemens Ladisch <clemens@ladisch.de>
@@ -11870,7 +11877,7 @@ M: Eric Piel <eric.piel@tremplin-utc.net>
1187011877
S: Maintained
1187111878
F: Documentation/misc-devices/lis3lv02d.rst
1187211879
F: drivers/misc/lis3lv02d/
11873-
F: drivers/platform/x86/hp_accel.c
11880+
F: drivers/platform/x86/hp/hp_accel.c
1187411881

1187511882
LIST KUNIT TEST
1187611883
M: David Gow <davidgow@google.com>

‎drivers/acpi/battery.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ static void __battery_hook_unregister(struct acpi_battery_hook *hook, int lock)
696696
if (lock)
697697
mutex_lock(&hook_mutex);
698698
list_for_each_entry(battery, &acpi_battery_list, list) {
699-
hook->remove_battery(battery->bat);
699+
hook->remove_battery(battery->bat, hook);
700700
}
701701
list_del(&hook->list);
702702
if (lock)
@@ -724,7 +724,7 @@ void battery_hook_register(struct acpi_battery_hook *hook)
724724
* its attributes.
725725
*/
726726
list_for_each_entry(battery, &acpi_battery_list, list) {
727-
if (hook->add_battery(battery->bat)) {
727+
if (hook->add_battery(battery->bat, hook)) {
728728
/*
729729
* If a add-battery returns non-zero,
730730
* the registration of the extension has failed,
@@ -762,7 +762,7 @@ static void battery_hook_add_battery(struct acpi_battery *battery)
762762
* during the battery module initialization.
763763
*/
764764
list_for_each_entry_safe(hook_node, tmp, &battery_hook_list, list) {
765-
if (hook_node->add_battery(battery->bat)) {
765+
if (hook_node->add_battery(battery->bat, hook_node)) {
766766
/*
767767
* The notification of the extensions has failed, to
768768
* prevent further errors we will unload the extension.
@@ -785,7 +785,7 @@ static void battery_hook_remove_battery(struct acpi_battery *battery)
785785
* custom attributes from the battery.
786786
*/
787787
list_for_each_entry(hook, &battery_hook_list, list) {
788-
hook->remove_battery(battery->bat);
788+
hook->remove_battery(battery->bat, hook);
789789
}
790790
/* Then, just remove the battery from the list */
791791
list_del(&battery->list);

‎drivers/platform/mellanox/mlxbf-pmc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ static const struct mlxbf_pmc_events mlxbf_pmc_hnfnet_events[] = {
358358
{ 0x32, "DDN_DIAG_W_INGRESS" },
359359
{ 0x33, "DDN_DIAG_C_INGRESS" },
360360
{ 0x34, "DDN_DIAG_CORE_SENT" },
361-
{ 0x35, "NDN_DIAG_S_OUT_OF_CRED" },
361+
{ 0x35, "NDN_DIAG_N_OUT_OF_CRED" },
362362
{ 0x36, "NDN_DIAG_S_OUT_OF_CRED" },
363363
{ 0x37, "NDN_DIAG_E_OUT_OF_CRED" },
364364
{ 0x38, "NDN_DIAG_W_OUT_OF_CRED" },

‎drivers/platform/mellanox/mlxbf-tmfifo-regs.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,14 @@
6060
#define MLXBF_TMFIFO_RX_CTL__MAX_ENTRIES_RMASK GENMASK_ULL(8, 0)
6161
#define MLXBF_TMFIFO_RX_CTL__MAX_ENTRIES_MASK GENMASK_ULL(40, 32)
6262

63+
/* BF3 register offsets within resource 0. */
64+
#define MLXBF_TMFIFO_RX_DATA_BF3 0x0000
65+
#define MLXBF_TMFIFO_TX_DATA_BF3 0x1000
66+
67+
/* BF3 register offsets within resource 1. */
68+
#define MLXBF_TMFIFO_RX_STS_BF3 0x0000
69+
#define MLXBF_TMFIFO_RX_CTL_BF3 0x0008
70+
#define MLXBF_TMFIFO_TX_STS_BF3 0x0100
71+
#define MLXBF_TMFIFO_TX_CTL_BF3 0x0108
72+
6373
#endif /* !defined(__MLXBF_TMFIFO_REGS_H__) */

0 commit comments

Comments
 (0)