Skip to content

Commit 7ba88a2

Browse files
committed
Merge tag 'platform-drivers-x86-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
Pull x86 platform driver updates from Hans de Goede: "Highlights: - Move all the Intel drivers into their own subdir(s) (mostly Kate's work) - New meraki-mx100 platform driver - Asus WMI driver enhancements, including support for /sys/firmware/acpi/platform_profile - New BIOS SAR driver for Intel M.2 WWAM modems - Alder Lake support for the Intel PMC driver - A whole bunch of cleanups + fixes all over the place" * tag 'platform-drivers-x86-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (65 commits) platform/x86: dell-smbios-wmi: Add missing kfree in error-exit from run_smbios_call platform/x86: dell-smbios-wmi: Avoid false-positive memcpy() warning platform/x86: ISST: use semi-colons instead of commas platform/x86: asus-wmi: Fix "unsigned 'retval' is never less than zero" smatch warning platform/x86: asus-wmi: Delete impossible condition platform/x86: hp_accel: Convert to be a platform driver platform/x86: hp_accel: Remove _INI method call platform/mellanox: mlxbf-pmc: fix kernel-doc notation platform/x86/intel: pmc/core: Add GBE Package C10 fix for Alder Lake PCH platform/x86/intel: pmc/core: Add Alder Lake low power mode support for pmc core platform/x86/intel: pmc/core: Add Latency Tolerance Reporting (LTR) support to Alder Lake platform/x86/intel: pmc/core: Add Alderlake support to pmc core driver platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory platform/x86: intel-wmi-sbl-fw-update: Move to intel sub-directory platform/x86: intel-vbtn: Move to intel sub-directory platform/x86: intel_oaktrail: Move to intel sub-directory platform/x86: intel_int0002_vgpio: Move to intel sub-directory platform/x86: intel-hid: Move to intel sub-directory platform/x86: intel_atomisp2: Move to intel sub-directory platform/x86: intel_speed_select_if: Move to intel sub-directory ...
2 parents 89b6b8c + 0487d4f commit 7ba88a2

89 files changed

Lines changed: 2429 additions & 636 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/dell-smbios-wmi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /dev/wmi/dell-smbios
22
Date: November 2017
33
KernelVersion: 4.15
4-
Contact: "Mario Limonciello" <mario.limonciello@dell.com>
4+
Contact: Dell.Client.Kernel@dell.com
55
Description:
66
Perform SMBIOS calls on supported Dell machines.
77
through the Dell ACPI-WMI interface.

Documentation/ABI/testing/sysfs-bus-thunderbolt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Description: When new NVM image is written to the non-active NVM
232232
What: /sys/bus/thunderbolt/devices/.../nvm_authenticate_on_disconnect
233233
Date: Oct 2020
234234
KernelVersion: v5.9
235-
Contact: Mario Limonciello <mario.limonciello@dell.com>
235+
Contact: Mario Limonciello <mario.limonciello@outlook.com>
236236
Description: For supported devices, automatically authenticate the new Thunderbolt
237237
image when the device is disconnected from the host system.
238238

Documentation/ABI/testing/sysfs-class-firmware-attributes

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ What: /sys/class/firmware-attributes/*/attributes/*/
22
Date: February 2021
33
KernelVersion: 5.11
44
Contact: Divya Bharathi <Divya.Bharathi@Dell.com>,
5-
Mario Limonciello <mario.limonciello@dell.com>,
65
Prasanth KSR <prasanth.ksr@dell.com>
6+
Dell.Client.Kernel@dell.com
77
Description:
88
A sysfs interface for systems management software to enable
99
configuration capability on supported systems. This directory
@@ -130,8 +130,8 @@ What: /sys/class/firmware-attributes/*/authentication/
130130
Date: February 2021
131131
KernelVersion: 5.11
132132
Contact: Divya Bharathi <Divya.Bharathi@Dell.com>,
133-
Mario Limonciello <mario.limonciello@dell.com>,
134133
Prasanth KSR <prasanth.ksr@dell.com>
134+
Dell.Client.Kernel@dell.com
135135
Description:
136136
Devices support various authentication mechanisms which can be exposed
137137
as a separate configuration object.
@@ -220,8 +220,8 @@ What: /sys/class/firmware-attributes/*/attributes/pending_reboot
220220
Date: February 2021
221221
KernelVersion: 5.11
222222
Contact: Divya Bharathi <Divya.Bharathi@Dell.com>,
223-
Mario Limonciello <mario.limonciello@dell.com>,
224223
Prasanth KSR <prasanth.ksr@dell.com>
224+
Dell.Client.Kernel@dell.com
225225
Description:
226226
A read-only attribute reads 1 if a reboot is necessary to apply
227227
pending BIOS attribute changes. Also, an uevent_KOBJ_CHANGE is
@@ -249,8 +249,8 @@ What: /sys/class/firmware-attributes/*/attributes/reset_bios
249249
Date: February 2021
250250
KernelVersion: 5.11
251251
Contact: Divya Bharathi <Divya.Bharathi@Dell.com>,
252-
Mario Limonciello <mario.limonciello@dell.com>,
253252
Prasanth KSR <prasanth.ksr@dell.com>
253+
Dell.Client.Kernel@dell.com
254254
Description:
255255
This attribute can be used to reset the BIOS Configuration.
256256
Specifically, it tells which type of reset BIOS configuration is being
@@ -272,3 +272,14 @@ Description:
272272

273273
Note that any changes to this attribute requires a reboot
274274
for changes to take effect.
275+
276+
What: /sys/class/firmware-attributes/*/attributes/debug_cmd
277+
Date: July 2021
278+
KernelVersion: 5.14
279+
Contact: Mark Pearson <markpearson@lenovo.com>
280+
Description:
281+
This write only attribute can be used to send debug commands to the BIOS.
282+
This should only be used when recommended by the BIOS vendor. Vendors may
283+
use it to enable extra debug attributes or BIOS features for testing purposes.
284+
285+
Note that any changes to this attribute requires a reboot for changes to take effect.
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
What: /sys/bus/platform/devices/INTC1092:00/intc_reg
2+
Date: August 2021
3+
KernelVersion: 5.15
4+
Contact: Shravan S <s.shravan@intel.com>,
5+
An Sudhakar <sudhakar.an@intel.com>
6+
Description:
7+
Specific Absorption Rate (SAR) regulatory mode is typically
8+
derived based on information like mcc (Mobile Country Code) and
9+
mnc (Mobile Network Code) that is available for the currently
10+
attached LTE network. A userspace application is required to set
11+
the current SAR regulatory mode on the Dynamic SAR driver using
12+
this sysfs node. Such an application can also read back using
13+
this sysfs node, the currently configured regulatory mode value
14+
from the Dynamic SAR driver.
15+
16+
Acceptable regulatory modes are:
17+
== ====
18+
0 FCC
19+
1 CE
20+
2 ISED
21+
== ====
22+
23+
- The regulatory mode value has one of the above values.
24+
- The default regulatory mode used in the driver is 0.
25+
26+
What: /sys/bus/platform/devices/INTC1092:00/intc_data
27+
Date: August 2021
28+
KernelVersion: 5.15
29+
Contact: Shravan S <s.shravan@intel.com>,
30+
An Sudhakar <sudhakar.an@intel.com>
31+
Description:
32+
This sysfs entry is used to retrieve Dynamic SAR information
33+
emitted/maintained by a BIOS that supports Dynamic SAR.
34+
35+
The retrieved information is in the order given below:
36+
- device_mode
37+
- bandtable_index
38+
- antennatable_index
39+
- sartable_index
40+
41+
The above information is sent as integer values separated
42+
by a single space. This information can then be pushed to a
43+
WWAN modem that uses this to control the transmit signal
44+
level using the Band/Antenna/SAR table index information.
45+
These parameters are derived/decided by aggregating
46+
device-mode like laptop/tablet/clamshell etc. and the
47+
proximity-sensor data available to the embedded controller on
48+
given host. The regulatory mode configured on Dynamic SAR
49+
driver also influences these values.
50+
51+
The userspace applications can poll for changes to this file
52+
using POLLPRI event on file-descriptor (fd) obtained by opening
53+
this sysfs entry. Application can then read this information from
54+
the sysfs node and consume the given information.

Documentation/ABI/testing/sysfs-platform-dell-smbios

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/devices/platform/<platform>/tokens/*
22
Date: November 2017
33
KernelVersion: 4.15
4-
Contact: "Mario Limonciello" <mario.limonciello@dell.com>
4+
Contact: Dell.Client.Kernel@dell.com
55
Description:
66
A read-only description of Dell platform tokens
77
available on the machine.

Documentation/ABI/testing/sysfs-platform-intel-wmi-thunderbolt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/devices/platform/<platform>/force_power
22
Date: September 2017
33
KernelVersion: 4.15
4-
Contact: "Mario Limonciello" <mario.limonciello@dell.com>
4+
Contact: "Mario Limonciello" <mario.limonciello@outlook.com>
55
Description:
66
Modify the platform force power state, influencing
77
Thunderbolt controllers to turn on or off when no

Documentation/ABI/testing/sysfs-power

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Description:
295295

296296
What: /sys/power/resume_offset
297297
Date: April 2018
298-
Contact: Mario Limonciello <mario.limonciello@dell.com>
298+
Contact: Mario Limonciello <mario.limonciello@outlook.com>
299299
Description:
300300
This file is used for telling the kernel an offset into a disk
301301
to use when hibernating the system such as with a swap file.

Documentation/admin-guide/laptops/lg-laptop.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ Hotkeys
1313
The following FN keys are ignored by the kernel without this driver:
1414

1515
- FN-F1 (LG control panel) - Generates F15
16-
- FN-F5 (Touchpad toggle) - Generates F13
16+
- FN-F5 (Touchpad toggle) - Generates F21
1717
- FN-F6 (Airplane mode) - Generates RFKILL
18-
- FN-F8 (Keyboard backlight) - Generates F16.
19-
This key also changes keyboard backlight mode.
2018
- FN-F9 (Reader mode) - Generates F14
2119

2220
The rest of the FN keys work without a need for a special driver.

MAINTAINERS

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9269,13 +9269,20 @@ INTEL ATOMISP2 DUMMY / POWER-MANAGEMENT DRIVER
92699269
M: Hans de Goede <hdegoede@redhat.com>
92709270
L: platform-driver-x86@vger.kernel.org
92719271
S: Maintained
9272-
F: drivers/platform/x86/intel_atomisp2_pm.c
9272+
F: drivers/platform/x86/intel/atomisp2/pm.c
92739273

92749274
INTEL ATOMISP2 LED DRIVER
92759275
M: Hans de Goede <hdegoede@redhat.com>
92769276
L: platform-driver-x86@vger.kernel.org
92779277
S: Maintained
9278-
F: drivers/platform/x86/intel_atomisp2_led.c
9278+
F: drivers/platform/x86/intel/atomisp2/led.c
9279+
9280+
INTEL BIOS SAR INT1092 DRIVER
9281+
M: Shravan S <s.shravan@intel.com>
9282+
M: Intel Corporation <linuxwwan@intel.com>
9283+
L: platform-driver-x86@vger.kernel.org
9284+
S: Maintained
9285+
F: drivers/platform/x86/intel/int1092/
92799286

92809287
INTEL BROXTON PMC DRIVER
92819288
M: Mika Westerberg <mika.westerberg@linux.intel.com>
@@ -9371,7 +9378,7 @@ INTEL HID EVENT DRIVER
93719378
M: Alex Hung <alex.hung@canonical.com>
93729379
L: platform-driver-x86@vger.kernel.org
93739380
S: Maintained
9374-
F: drivers/platform/x86/intel-hid.c
9381+
F: drivers/platform/x86/intel/hid.c
93759382

93769383
INTEL I/OAT DMA DRIVER
93779384
M: Dave Jiang <dave.jiang@intel.com>
@@ -9515,25 +9522,25 @@ F: include/linux/mfd/intel-m10-bmc.h
95159522

95169523
INTEL MENLOW THERMAL DRIVER
95179524
M: Sujith Thomas <sujith.thomas@intel.com>
9518-
L: platform-driver-x86@vger.kernel.org
9525+
L: linux-pm@vger.kernel.org
95199526
S: Supported
95209527
W: https://01.org/linux-acpi
9521-
F: drivers/platform/x86/intel_menlow.c
9528+
F: drivers/thermal/intel/intel_menlow.c
95229529

95239530
INTEL P-Unit IPC DRIVER
95249531
M: Zha Qipeng <qipeng.zha@intel.com>
95259532
L: platform-driver-x86@vger.kernel.org
95269533
S: Maintained
95279534
F: arch/x86/include/asm/intel_punit_ipc.h
9528-
F: drivers/platform/x86/intel_punit_ipc.c
9535+
F: drivers/platform/x86/intel/punit_ipc.c
95299536

95309537
INTEL PMC CORE DRIVER
95319538
M: Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>
95329539
M: David E Box <david.e.box@intel.com>
95339540
L: platform-driver-x86@vger.kernel.org
95349541
S: Maintained
95359542
F: Documentation/ABI/testing/sysfs-platform-intel-pmc
9536-
F: drivers/platform/x86/intel_pmc_core*
9543+
F: drivers/platform/x86/intel/pmc/
95379544

95389545
INTEL PMIC GPIO DRIVERS
95399546
M: Andy Shevchenko <andy@kernel.org>
@@ -9551,7 +9558,7 @@ INTEL PMT DRIVER
95519558
M: "David E. Box" <david.e.box@linux.intel.com>
95529559
S: Maintained
95539560
F: drivers/mfd/intel_pmt.c
9554-
F: drivers/platform/x86/intel_pmt_*
9561+
F: drivers/platform/x86/intel/pmt/
95559562

95569563
INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
95579564
M: Stanislav Yakovlev <stas.yakovlev@gmail.com>
@@ -9588,7 +9595,7 @@ INTEL SPEED SELECT TECHNOLOGY
95889595
M: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
95899596
L: platform-driver-x86@vger.kernel.org
95909597
S: Maintained
9591-
F: drivers/platform/x86/intel_speed_select_if/
9598+
F: drivers/platform/x86/intel/speed_select_if/
95929599
F: include/uapi/linux/isst_if.h
95939600
F: tools/power/x86/intel-speed-select/
95949601

@@ -9609,19 +9616,19 @@ M: "David E. Box" <david.e.box@linux.intel.com>
96099616
L: platform-driver-x86@vger.kernel.org
96109617
S: Maintained
96119618
F: arch/x86/include/asm/intel_telemetry.h
9612-
F: drivers/platform/x86/intel_telemetry*
9619+
F: drivers/platform/x86/intel/telemetry/
96139620

96149621
INTEL UNCORE FREQUENCY CONTROL
96159622
M: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
96169623
L: platform-driver-x86@vger.kernel.org
96179624
S: Maintained
9618-
F: drivers/platform/x86/intel-uncore-frequency.c
9625+
F: drivers/platform/x86/intel/uncore-frequency.c
96199626

96209627
INTEL VIRTUAL BUTTON DRIVER
96219628
M: AceLan Kao <acelan.kao@canonical.com>
96229629
L: platform-driver-x86@vger.kernel.org
96239630
S: Maintained
9624-
F: drivers/platform/x86/intel-vbtn.c
9631+
F: drivers/platform/x86/intel/vbtn.c
96259632

96269633
INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
96279634
M: Stanislaw Gruszka <stf_xl@wp.pl>
@@ -9642,12 +9649,12 @@ M: Jithu Joseph <jithu.joseph@intel.com>
96429649
R: Maurice Ma <maurice.ma@intel.com>
96439650
S: Maintained
96449651
W: https://slimbootloader.github.io/security/firmware-update.html
9645-
F: drivers/platform/x86/intel-wmi-sbl-fw-update.c
9652+
F: drivers/platform/x86/intel/wmi/sbl-fw-update.c
96469653

96479654
INTEL WMI THUNDERBOLT FORCE POWER DRIVER
96489655
L: Dell.Client.Kernel@dell.com
96499656
S: Maintained
9650-
F: drivers/platform/x86/intel-wmi-thunderbolt.c
9657+
F: drivers/platform/x86/intel/wmi/thunderbolt.c
96519658

96529659
INTEL WWAN IOSM DRIVER
96539660
M: M Chetan Kumar <m.chetan.kumar@intel.com>

drivers/i2c/i2c-core-acpi.c

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,38 @@ bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
6969
}
7070
EXPORT_SYMBOL_GPL(i2c_acpi_get_i2c_resource);
7171

72+
static int i2c_acpi_resource_count(struct acpi_resource *ares, void *data)
73+
{
74+
struct acpi_resource_i2c_serialbus *sb;
75+
int *count = data;
76+
77+
if (i2c_acpi_get_i2c_resource(ares, &sb))
78+
*count = *count + 1;
79+
80+
return 1;
81+
}
82+
83+
/**
84+
* i2c_acpi_client_count - Count the number of I2cSerialBus resources
85+
* @adev: ACPI device
86+
*
87+
* Returns the number of I2cSerialBus resources in the ACPI-device's
88+
* resource-list; or a negative error code.
89+
*/
90+
int i2c_acpi_client_count(struct acpi_device *adev)
91+
{
92+
int ret, count = 0;
93+
LIST_HEAD(r);
94+
95+
ret = acpi_dev_get_resources(adev, &r, i2c_acpi_resource_count, &count);
96+
if (ret < 0)
97+
return ret;
98+
99+
acpi_dev_free_resource_list(&r);
100+
return count;
101+
}
102+
EXPORT_SYMBOL_GPL(i2c_acpi_client_count);
103+
72104
static int i2c_acpi_fill_info(struct acpi_resource *ares, void *data)
73105
{
74106
struct i2c_acpi_lookup *lookup = data;

0 commit comments

Comments
 (0)