Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07c455ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.15-1' of git://git.infradead.org/linux-platform-drivers-x86 

Pull x86 platform driver updates from Andy Shevchenko:
 "Here is the collected material against Platform Drivers x86 subsystem.
  It's rather bit busy cycle for PDx86, mostly due to Dell SMBIOS driver
  activity

  For this cycle we have quite an update for the Dell SMBIOS driver
  including WMI work to provide an interface for SMBIOS tokens via sysfs
  and WMI support for 2017+ Dell laptop models. SMM dispatcher code is
  split into a separate driver followed by a new WMI dispatcher. The
  latter provides a character device interface to user space.

  The git history also contains a merge of immutable branch from Wolfram
  Sang in order to apply a dependent fix to the Intel CherryTrail
  Battery Management driver.

  Other Intel drivers got a lot of cleanups. The Turbo Boost Max 3.0
  support is added for Intel Skylake.

  Peaq WMI hotkeys driver gets its own maintainer and white list of
  supported models.

  Silead DMI is expanded to support few additional platforms.

  Tablet mode via GMMS ACPI method is added to support some ThinkPad
  tablets.

  new driver:
   - Add driver to force WMI Thunderbolt controller power status

  asus-wmi:
   -  Add lightbar led support

  dell-laptop:
   -  Allocate buffer before rfkill use

  dell-smbios:
   -  fix string overflow
   -  Add filtering support
   -  Introduce dispatcher for SMM calls
   -  Add a sysfs interface for SMBIOS tokens
   -  only run if proper oem string is detected
   -  Prefix class/select with cmd_
   -  Add pr_fmt definition to driver

  dell-smbios-smm:
   -  test for WSMT

  dell-smbios-wmi:
   -  release mutex lock on WMI call failure
   -  introduce userspace interface
   -  Add new WMI dispatcher driver

  dell-smo8800:
   -  remove redundant assignments to byte_data

  dell-wmi:
   -  don't check length returned
   -  clean up wmi descriptor check
   -  increase severity of some failures
   -  Do not match on descriptor GUID modalias
   -  Label driver as handling notifications

  dell-*wmi*:
   -  Relay failed initial probe to dependent drivers

  dell-wmi-descriptor:
   -  check if memory was allocated
   -  split WMI descriptor into it's own driver

  fujitsu-laptop:
   -  Fix radio LED detection
   -  Don't oops when FUJ02E3 is not presnt

  hp_accel:
   -  Add quirk for HP ProBook 440 G4

  hp-wmi:
   -  Fix tablet mode detection for convertibles

  ideapad-laptop:
   -  Add Lenovo Yoga 920-13IKB to no_hw_rfkill dmi list

  intel_cht_int33fe:
   -  Update fusb302 type string, add properties
   -  make a couple of local functions static
   -  Work around BIOS bug on some devices

  intel-hid:
   -  Power button suspend on Dell Latitude 7275

  intel_ips:
   -  Convert timers to use timer_setup()
   -  Remove FSF address from GPL notice
   -  Remove unneeded fields and label
   -  Keep pointer to struct device
   -  Use PCI_VDEVICE() macro
   -  Switch to new PCI IRQ allocation API
   -  Simplify error handling via devres API

  intel_pmc_ipc:
   -  Revert Use MFD framework to create dependent devices
   -  Use MFD framework to create dependent devices
   -  Use spin_lock to protect GCR updates
   -  Use devm_* calls in driver probe function

  intel_punit_ipc:
   -  Fix resource ioremap warning

  intel_telemetry:
   -  Remove useless default in Kconfig
   -  Add needed inclusion
   -  cleanup redundant headers
   -  Fix typos
   -  Fix load failure info

  intel_telemetry_debugfs:
   -  Use standard ARRAY_SIZE() macro

  intel_turbo_max_3:
   -  Add Skylake platform

  intel-wmi-thunderbolt:
   -  Silence error cases

  mlx-platform:
   -  make a couple of structures static

  peaq_wmi:
   -  Fix missing terminating entry for peaq_dmi_table

  peaq-wmi:
   -  Remove unnecessary checks from peaq_wmi_exit
   -  Add DMI check before binding to the WMI interface
   -  Revert Blacklist Lenovo ideapad 700-15ISK
   -  Blacklist Lenovo ideapad 700-15ISK

  silead_dmi:
   -  Add silead, home-button property to some tablets
   -  Add entry for the Digma e200 tablet
   -  Fix GP-electronic T701 entry
   -  Add entry for the Chuwi Hi8 Pro tablet

  sony-laptop:
   -  Drop variable assignment in sony_nc_setup_rfkill()
   -  Fix error handling in sony_nc_setup_rfkill()

  thinkpad_acpi:
   -  Implement tablet mode using GMMS method

  tools/wmi:
   -  add a sample for dell smbios communication over WMI

  wmi:
   -  release mutex on module acquistion failure
   -  create userspace interface for drivers
   -  Don't allow drivers to get each other's GUIDs
   -  Add new method wmidev_evaluate_method
   -  Destroy on cleanup rather than unregister
   -  Cleanup exit routine in reverse order of init
   -  Sort include list"

* tag 'platform-drivers-x86-v4.15-1' of git://git.infradead.org/linux-platform-drivers-x86: (74 commits)
  platform/x86: silead_dmi: Add silead, home-button property to some tablets
  platform/x86: dell-laptop: Allocate buffer before rfkill use
  platform/x86: dell-*wmi*: Relay failed initial probe to dependent drivers
  platform/x86: dell-wmi-descriptor: check if memory was allocated
  platform/x86: Revert intel_pmc_ipc: Use MFD framework to create dependent devices
  platform/x86: dell-smbios-wmi: release mutex lock on WMI call failure
  platform/x86: wmi: release mutex on module acquistion failure
  platform/x86: dell-smbios: fix string overflow
  platform/x86: intel_pmc_ipc: Use MFD framework to create dependent devices
  platform/x86: intel_punit_ipc: Fix resource ioremap warning
  platform/x86: dell-smo8800: remove redundant assignments to byte_data
  platform/x86: hp-wmi: Fix tablet mode detection for convertibles
  platform/x86: intel_ips: Convert timers to use timer_setup()
  platform/x86: sony-laptop: Drop variable assignment in sony_nc_setup_rfkill()
  platform/x86: sony-laptop: Fix error handling in sony_nc_setup_rfkill()
  tools/wmi: add a sample for dell smbios communication over WMI
  platform/x86: dell-smbios-wmi: introduce userspace interface
  platform/x86: wmi: create userspace interface for drivers
  platform/x86: dell-smbios: Add filtering support
  platform/x86: dell-smbios-smm: test for WSMT
  ...
parents 1deab8ce aaa40965

Documentation/ABI/testing/dell-smbios-wmi

0 → 100644
+41 −0
Original line number Diff line number Diff line 
What:		/dev/wmi/dell-smbios

Date:		November 2017

KernelVersion:	4.15

Contact:	"Mario Limonciello" <mario.limonciello@dell.com>

Description:

		Perform SMBIOS calls on supported Dell machines.

		through the Dell ACPI-WMI interface.



		IOCTL's and buffer formats are defined in:

		<uapi/linux/wmi.h>



		1) To perform an SMBIOS call from userspace, you'll need to

		first determine the minimum size of the calling interface

		buffer for your machine.

		Platforms that contain larger buffers can return larger

		objects from the system firmware.

		Commonly this size is either 4k or 32k.



		To determine the size of the buffer read() a u64 dword from

		the WMI character device /dev/wmi/dell-smbios.



		2) After you've determined the minimum size of the calling

		interface buffer, you can allocate a structure that represents

		the structure documented above.



		3) In the 'length' object store the size of the buffer you

		determined above and allocated.



		4) In this buffer object, prepare as necessary for the SMBIOS

		call you're interested in.  Typically SMBIOS buffers have

		"class", "select", and "input" defined to values that coincide

		with the data you are interested in.

		Documenting class/select/input values is outside of the scope

		of this documentation. Check with the libsmbios project for

		further documentation on these values.



		6) Run the call by using ioctl() as described in the header.



		7) The output will be returned in the buffer object.



		8) Be sure to free up your allocated object.

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

0 → 100644
+21 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/<platform>/tokens/*

Date:		November 2017

KernelVersion:	4.15

Contact:	"Mario Limonciello" <mario.limonciello@dell.com>

Description:

		A read-only description of Dell platform tokens

		available on the machine.



		Each token attribute is available as a pair of

		sysfs attributes readable by a process with

		CAP_SYS_ADMIN.



		For example the token ID "5" would be available

		as the following attributes:



		0005_location

		0005_value



		Tokens will vary from machine to machine, and

		only tokens available on that machine will be

		displayed.

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

0 → 100644
+11 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/<platform>/force_power

Date:		September 2017

KernelVersion:	4.15

Contact:	"Mario Limonciello" <mario.limonciello@dell.com>

Description:

		Modify the platform force power state, influencing

		Thunderbolt controllers to turn on or off when no

		devices are connected (write-only)

		There are two available states:

		    * 0 -> Force power disabled

		    * 1 -> Force power enabled

Documentation/admin-guide/thunderbolt.rst

+15 −0
Original line number Diff line number Diff line
@@ -221,3 +221,18 @@ The driver will create one virtual ethernet interface per Thunderbolt 
port which are named like ``thunderbolt0`` and so on. From this point

you can either use standard userspace tools like ``ifconfig`` to

configure the interface or let your GUI to handle it automatically.



Forcing power

-------------

Many OEMs include a method that can be used to force the power of a

thunderbolt controller to an "On" state even if nothing is connected.

If supported by your machine this will be exposed by the WMI bus with

a sysfs attribute called "force_power".



For example the intel-wmi-thunderbolt driver exposes this attribute in:

  /sys/devices/platform/PNP0C14:00/wmi_bus/wmi_bus-PNP0C14:00/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power



  To force the power to on, write 1 to this attribute file.

  To disable force power, write 0 to this attribute file.



Note: it's currently not possible to query the force power state of a platform.

MAINTAINERS

+38 −1
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ ACPI WMI DRIVER 
L:	platform-driver-x86@vger.kernel.org

S:	Orphan

F:	drivers/platform/x86/wmi.c

F:	include/uapi/linux/wmi.h



AD1889 ALSA SOUND DRIVER

M:	Thibaut Varene <T-Bone@parisc-linux.org>
@@ -4030,6 +4031,26 @@ M: "Maciej W. Rozycki" <macro@linux-mips.org> 
S:	Maintained

F:	drivers/net/fddi/defxx.*



DELL SMBIOS DRIVER

M:	Pali Rohár <pali.rohar@gmail.com>

M:	Mario Limonciello <mario.limonciello@dell.com>

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

S:	Maintained

F:	drivers/platform/x86/dell-smbios.*



DELL SMBIOS SMM DRIVER

M:	Mario Limonciello <mario.limonciello@dell.com>

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

S:	Maintained

F:	drivers/platform/x86/dell-smbios-smm.c



DELL SMBIOS WMI DRIVER

M:	Mario Limonciello <mario.limonciello@dell.com>

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

S:	Maintained

F:	drivers/platform/x86/dell-smbios-wmi.c

F:	tools/wmi/dell-smbios-example.c



DELL LAPTOP DRIVER

M:	Matthew Garrett <mjg59@srcf.ucam.org>

M:	Pali Rohár <pali.rohar@gmail.com>
@@ -4059,12 +4080,17 @@ S: Maintained 
F:	Documentation/dcdbas.txt

F:	drivers/firmware/dcdbas.*



DELL WMI EXTRAS DRIVER

DELL WMI NOTIFICATIONS DRIVER

M:	Matthew Garrett <mjg59@srcf.ucam.org>

M:	Pali Rohár <pali.rohar@gmail.com>

S:	Maintained

F:	drivers/platform/x86/dell-wmi.c



DELL WMI DESCRIPTOR DRIVER

M:	Mario Limonciello <mario.limonciello@dell.com>

S:	Maintained

F:	drivers/platform/x86/dell-wmi-descriptor.c



DELTA ST MEDIA DRIVER

M:	Hugues Fruchet <hugues.fruchet@st.com>

L:	linux-media@vger.kernel.org
@@ -7181,6 +7207,11 @@ F: Documentation/wimax/README.i2400m 
F:	drivers/net/wimax/i2400m/

F:	include/uapi/linux/wimax/i2400m.h



INTEL WMI THUNDERBOLT FORCE POWER DRIVER

M:	Mario Limonciello <mario.limonciello@dell.com>

S:	Maintained

F:	drivers/platform/x86/intel-wmi-thunderbolt.c



INTEL(R) TRACE HUB

M:	Alexander Shishkin <alexander.shishkin@linux.intel.com>

S:	Supported
@@ -10630,6 +10661,12 @@ S: Maintained 
F:	crypto/pcrypt.c

F:	include/crypto/pcrypt.h



PEAQ WMI HOTKEYS DRIVER

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

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

S:	Maintained

F:	drivers/platform/x86/peaq-wmi.c



PER-CPU MEMORY ALLOCATOR

M:	Tejun Heo <tj@kernel.org>

M:	Christoph Lameter <cl@linux.com>