Commit 7817ffd2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 platform driver updates from Andy Shevchenko:
 "Gathered pile of patches for Platform Drivers x86. No surprises and no
  merge conflicts. Business as usual.

  Summary:

   - New driver of power button for Basin Cove PMIC.

   - ASUS WMI driver has got a Fn lock mode switch support.

   - Resolve a never end story with non working Wi-Fi on newer Lenovo
     Ideapad computers. Now the black list is replaced with white list.

   - New facility to debug S0ix failures on Intel Atom platforms. The
     Intel PMC and accompanying drivers are cleaned up.

   - Mellanox got a new TmFifo driver. Besides tachometer sensor and
     watchdog are enabled on Mellanox platforms.

   - The information of embedded controller is now recognized on new
     Thinkpads. Bluetooth driver on Thinkpads is blacklisted for some
     models.

   - Touchscreen DMI driver extended to support 'jumper ezpad 6 pro b'
     and Myria MY8307 2-in-1.

   - Additionally few small fixes here and there for WMI and ACPI laptop
     drivers.

   - The following is an automated git shortlog grouped by driver:

   - alienware-wmi:
      - printing the wrong error code
      - fix kfree on potentially uninitialized pointer

   - asus-wmi:
      - Add fn-lock mode switch support

   - dell-laptop:
      - fix rfkill functionality

   - dell-rbtn:
      - Add missing #include

   - ideapad-laptop:
      - Remove no_hw_rfkill_list

   - intel_pmc_core:
      - Allow to dump debug registers on S0ix failure
      - Convert to a platform_driver
      - Mark local function static

   - intel_pmc_ipc:
      - Don't map non-used optional resources
      - Apply same width for offset definitions
      - Use BIT() macro
      - adding error handling

   - intel_punit_ipc:
      - Revert "Fix resource ioremap warning"

   - mlx-platform:
      - Add mlx-wdt platform driver activation
      - Add support for tachometer speed register
      - Add TmFifo driver for Mellanox BlueField Soc

   - sony-laptop:
      - Fix unintentional fall-through

   - thinkpad_acpi:
      - cleanup for Thinkpad ACPI led
      - Mark expected switch fall-throughs
      - fix spelling mistake "capabilites" -> "capabilities"
      - Read EC information on newer models
      - Disable Bluetooth for some machines

   - touchscreen_dmi:
      - Add info for 'jumper ezpad 6 pro b' touchscreen
      - Add info for Myria MY8307 2-in-1"

* tag 'platform-drivers-x86-v5.2-1' of git://git.infradead.org/linux-platform-drivers-x86: (26 commits)
  platform/x86: Add support for Basin Cove power button
  platform/x86: asus-wmi: Add fn-lock mode switch support
  platform/x86: ideapad-laptop: Remove no_hw_rfkill_list
  platform/x86: touchscreen_dmi: Add info for 'jumper ezpad 6 pro b' touchscreen
  platform/x86: thinkpad_acpi: cleanup for Thinkpad ACPI led
  platform/x86: thinkpad_acpi: Mark expected switch fall-throughs
  platform/x86: sony-laptop: Fix unintentional fall-through
  platform/x86: alienware-wmi: printing the wrong error code
  platform/x86: intel_pmc_core: Allow to dump debug registers on S0ix failure
  platform/x86: intel_pmc_core: Convert to a platform_driver
  platform/x86: mlx-platform: Add mlx-wdt platform driver activation
  platform/x86: mlx-platform: Add support for tachometer speed register
  platform/mellanox: Add TmFifo driver for Mellanox BlueField Soc
  platform/x86: thinkpad_acpi: fix spelling mistake "capabilites" -> "capabilities"
  platform/x86: intel_punit_ipc: Revert "Fix resource ioremap warning"
  platform/x86: intel_pmc_ipc: Don't map non-used optional resources
  platform/x86: intel_pmc_ipc: Apply same width for offset definitions
  platform/x86: intel_pmc_ipc: Use BIT() macro
  platform/x86: alienware-wmi: fix kfree on potentially uninitialized pointer
  platform/x86: dell-laptop: fix rfkill functionality
  ...
parents cccd559e 6456fd73

drivers/platform/mellanox/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


menuconfig MELLANOX_PLATFORM

	bool "Platform support for Mellanox hardware"

	depends on X86 || ARM || COMPILE_TEST

	depends on X86 || ARM || ARM64 || COMPILE_TEST

	---help---

	  Say Y here to get to see options for platform support for

	  Mellanox systems. This option alone does not add any kernel code.
@@ -34,4 +34,14 @@ config MLXREG_IO 
	  to system resets operation, system reset causes monitoring and some

	  kinds of mux selection.



config MLXBF_TMFIFO

	tristate "Mellanox BlueField SoC TmFifo platform driver"

	depends on ARM64

	depends on ACPI

	depends on VIRTIO_CONSOLE && VIRTIO_NET

	help

	  Say y here to enable TmFifo support. The TmFifo driver provides

          platform driver support for the TmFifo which supports console

          and networking based on the virtio framework.



endif # MELLANOX_PLATFORM

drivers/platform/mellanox/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ 
# Makefile for linux/drivers/platform/mellanox

# Mellanox Platform-Specific Drivers

#

obj-$(CONFIG_MLXBF_TMFIFO)	+= mlxbf-tmfifo.o

obj-$(CONFIG_MLXREG_HOTPLUG)	+= mlxreg-hotplug.o

obj-$(CONFIG_MLXREG_IO) += mlxreg-io.o

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

0 → 100644
+63 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2019, Mellanox Technologies. All rights reserved.

 */



#ifndef __MLXBF_TMFIFO_REGS_H__

#define __MLXBF_TMFIFO_REGS_H__



#include <linux/types.h>

#include <linux/bits.h>



#define MLXBF_TMFIFO_TX_DATA				0x00

#define MLXBF_TMFIFO_TX_STS				0x08

#define MLXBF_TMFIFO_TX_STS__LENGTH			0x0001

#define MLXBF_TMFIFO_TX_STS__COUNT_SHIFT		0

#define MLXBF_TMFIFO_TX_STS__COUNT_WIDTH		9

#define MLXBF_TMFIFO_TX_STS__COUNT_RESET_VAL		0

#define MLXBF_TMFIFO_TX_STS__COUNT_RMASK		GENMASK_ULL(8, 0)

#define MLXBF_TMFIFO_TX_STS__COUNT_MASK			GENMASK_ULL(8, 0)

#define MLXBF_TMFIFO_TX_CTL				0x10

#define MLXBF_TMFIFO_TX_CTL__LENGTH			0x0001

#define MLXBF_TMFIFO_TX_CTL__LWM_SHIFT			0

#define MLXBF_TMFIFO_TX_CTL__LWM_WIDTH			8

#define MLXBF_TMFIFO_TX_CTL__LWM_RESET_VAL		128

#define MLXBF_TMFIFO_TX_CTL__LWM_RMASK			GENMASK_ULL(7, 0)

#define MLXBF_TMFIFO_TX_CTL__LWM_MASK			GENMASK_ULL(7, 0)

#define MLXBF_TMFIFO_TX_CTL__HWM_SHIFT			8

#define MLXBF_TMFIFO_TX_CTL__HWM_WIDTH			8

#define MLXBF_TMFIFO_TX_CTL__HWM_RESET_VAL		128

#define MLXBF_TMFIFO_TX_CTL__HWM_RMASK			GENMASK_ULL(7, 0)

#define MLXBF_TMFIFO_TX_CTL__HWM_MASK			GENMASK_ULL(15, 8)

#define MLXBF_TMFIFO_TX_CTL__MAX_ENTRIES_SHIFT		32

#define MLXBF_TMFIFO_TX_CTL__MAX_ENTRIES_WIDTH		9

#define MLXBF_TMFIFO_TX_CTL__MAX_ENTRIES_RESET_VAL	256

#define MLXBF_TMFIFO_TX_CTL__MAX_ENTRIES_RMASK		GENMASK_ULL(8, 0)

#define MLXBF_TMFIFO_TX_CTL__MAX_ENTRIES_MASK		GENMASK_ULL(40, 32)

#define MLXBF_TMFIFO_RX_DATA				0x00

#define MLXBF_TMFIFO_RX_STS				0x08

#define MLXBF_TMFIFO_RX_STS__LENGTH			0x0001

#define MLXBF_TMFIFO_RX_STS__COUNT_SHIFT		0

#define MLXBF_TMFIFO_RX_STS__COUNT_WIDTH		9

#define MLXBF_TMFIFO_RX_STS__COUNT_RESET_VAL		0

#define MLXBF_TMFIFO_RX_STS__COUNT_RMASK		GENMASK_ULL(8, 0)

#define MLXBF_TMFIFO_RX_STS__COUNT_MASK			GENMASK_ULL(8, 0)

#define MLXBF_TMFIFO_RX_CTL				0x10

#define MLXBF_TMFIFO_RX_CTL__LENGTH			0x0001

#define MLXBF_TMFIFO_RX_CTL__LWM_SHIFT			0

#define MLXBF_TMFIFO_RX_CTL__LWM_WIDTH			8

#define MLXBF_TMFIFO_RX_CTL__LWM_RESET_VAL		128

#define MLXBF_TMFIFO_RX_CTL__LWM_RMASK			GENMASK_ULL(7, 0)

#define MLXBF_TMFIFO_RX_CTL__LWM_MASK			GENMASK_ULL(7, 0)

#define MLXBF_TMFIFO_RX_CTL__HWM_SHIFT			8

#define MLXBF_TMFIFO_RX_CTL__HWM_WIDTH			8

#define MLXBF_TMFIFO_RX_CTL__HWM_RESET_VAL		128

#define MLXBF_TMFIFO_RX_CTL__HWM_RMASK			GENMASK_ULL(7, 0)

#define MLXBF_TMFIFO_RX_CTL__HWM_MASK			GENMASK_ULL(15, 8)

#define MLXBF_TMFIFO_RX_CTL__MAX_ENTRIES_SHIFT		32

#define MLXBF_TMFIFO_RX_CTL__MAX_ENTRIES_WIDTH		9

#define MLXBF_TMFIFO_RX_CTL__MAX_ENTRIES_RESET_VAL	256

#define MLXBF_TMFIFO_RX_CTL__MAX_ENTRIES_RMASK		GENMASK_ULL(8, 0)

#define MLXBF_TMFIFO_RX_CTL__MAX_ENTRIES_MASK		GENMASK_ULL(40, 32)



#endif /* !defined(__MLXBF_TMFIFO_REGS_H__) */

drivers/platform/mellanox/mlxbf-tmfifo.c

0 → 100644
+1281 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/platform/x86/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -1263,6 +1263,17 @@ config INTEL_CHTDC_TI_PWRBTN 
	  To compile this driver as a module, choose M here: the module

	  will be called intel_chtdc_ti_pwrbtn.



config INTEL_MRFLD_PWRBTN

	tristate "Intel Merrifield Basin Cove power button driver"

	depends on INTEL_SOC_PMIC_MRFLD

	depends on INPUT

	---help---

	  This option adds a power button driver for Basin Cove PMIC

	  on Intel Merrifield devices.



	  To compile this driver as a module, choose M here: the module

	  will be called intel_mrfld_pwrbtn.



config I2C_MULTI_INSTANTIATE

	tristate "I2C multi instantiate pseudo device driver"

	depends on I2C && ACPI

CRA Git | Maintained and supported by SUSTech CRA and CCSE