Skip to contentSkip to conversation

platform-drivers-x86 for 5.1-1

GIT PULL Merged Darren Hart 3 participants 4 messages Mar 8, 2019 – Mar 10, 2019

lore
Share & tools
lore
#0 lore raw

Hi Linus,

The wmi mod alias changes collide with a similar series for TEE based devices. I have provided my merge resolution here:

git://git.infradead.org/linux-platform-drivers-x86.git pdx86-5.1-1-merge

This series includes two previously merged patches from the RC cycle:
- 522e4ee6e5 Documentation/ABI: Correct mlxreg-io KernelVersion for 5.0
- ff7c634b4f x86/CPU: Add Icelake model number

Thanks,

Darren Hart
VMware Open Source Technology Center

The following changes since commit 49a57857aeea06ca831043acbb0fa5e0f50602fd:

Linux 5.0-rc3 (2019-01-21 13:14:44 +1300)

are available in the Git repository at:

git://git.infradead.org/linux-platform-drivers-x86.git tags/platform-drivers-x86-v5.1-1

for you to fetch changes up to 9c22cc020db637850ba47a14a598d09f706f19ad:

MAINTAINERS: Include mlxreg.h in Mellanox Platform Driver files (2019-03-07 08:46:29 -0800)

----------------------------------------------------------------
platform-drivers-x86 for v5.1-1

Use MODULE_DEVICE_TABLE across several wmi drivers, keeping wmi_device_id and MODULE_ALIAS() declarations in sync. Add several Ideapad models to the no_hw_rfkill list. Add support for new Mellanox platforms, including new fan and LED functionality. Address Dell keyboard backlight change event and power button release issues. Update dell_rbu to use appropriate memory allocation mechanisms. Several small fixes and Ice Lake support for intel_pmc_core. Fix a suspend regression for Cherry Trail based devices in intel_int0002_vgpio. A few other routine fixes.

The following is an automated git shortlog grouped by driver:

ACPI / scan:
- Create platform device for BSG2150 ACPI nodes

Documentation/ABI:
- Add new attribute for mlxreg-io sysfs interfaces
- Correct mlxreg-io KernelVersion for 5.0

MAINTAINERS:
- Include mlxreg.h in Mellanox Platform Driver files

asus-wmi:
- Allow loading on systems without the Asus Management GUID

dell-smbios-wmi:
- use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()

dell-wmi:
- use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()
- Ignore new keyboard backlight change event

dell-wmi-descriptor:
- use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()

dell_rbu:
- fix lock imbalance in img_update_realloc
- stop abusing the DMA API

huawei-wmi:
- use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()

ideapad-laptop:

 -  Add ideapad 330-15ICH to no_hw_rfkill
 -  Add S130-14IGM to no_hw_rfkill list
 -  Add Ideapad 530S-14ARR to no_hw_rfkill list
 -  Add Yoga C930 to no_hw_rfkill_list
 -  Add Y530-I5ICH-1060 to no_hw_rfkill list
 -  Fix no_hw_rfkill_list for Lenovo RESCUER R720-15IKBN

intel-hid:
- Missing power button release on some Dell models

intel-wmi-thunderbolt:
- use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()

intel_int0002_vgpio:
- Only implement irq_set_wake on Bay Trail

intel_pmc_core:

 -  Quirk to ignore XTAL shutdown
 -  Add Package cstates residency info
 -  Add ICL platform support
 -  Convert to INTEL_CPU_FAM6 macro
 -  Avoid a u32 overflow
 -  Include Reserved IP for LTR
 -  Fix file permissions for ltr_show
 -  Fix PCH IP name
 -  Fix PCH IP sts reading
 -  Handle CFL regmap properly

leds:
- mlxreg: Add support for capability register

mlx-platform:

 -  Fix access mode for fan_dir attribute
 -  Add UID LED for the next generation systems
 -  Add extra CPLD for next generation systems
 -  Add support for new VMOD0007 board name
 -  Add support for fan capability registers
 -  Add support for fan direction register

modpost:
- file2alias: define size of alias

platform/mellanox:
- mlxreg-hotplug: Fix KASAN warning

platform_data/mlxreg:
- Add capability field to core platform data
- Document fixes for core platform data

touchscreen_dmi:

 -  Add info for the CHUWI Hi10 Air tablet
 -  Add info for the Chuwi Hi8 Air tablet
 -  Add info for the PoV Wintab P1006w (v1.0) tablet

wmi:

 -  add WMI support to MODULE_DEVICE_TABLE()
 -  move struct wmi_device_id to mod_devicetable.h
 -  fix potential null pointer dereference

wmi-bmof:
- use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()

x86/CPU:
- Add Icelake model number

----------------------------------------------------------------
Anthony Wong (1):
platform/x86: ideapad: Add ideapad 330-15ICH to no_hw_rfkill

Christian Oder (1):
platform/x86: touchscreen_dmi: Add info for the CHUWI Hi10 Air tablet

Christoph Hellwig (2):
platform/x86: dell_rbu: stop abusing the DMA API platform/x86: dell_rbu: fix lock imbalance in img_update_realloc

Darren Hart (VMware) (2):
Documentation/ABI: Correct mlxreg-io KernelVersion for 5.0
MAINTAINERS: Include mlxreg.h in Mellanox Platform Driver files

Felix Eckhofer (1):
platform/x86: ideapad-laptop: Add S130-14IGM to no_hw_rfkill list

Hans de Goede (4):
ACPI / scan: Create platform device for BSG2150 ACPI nodes platform/x86: touchscreen_dmi: Add info for the PoV Wintab P1006w (v1.0) tablet platform/x86: intel_int0002_vgpio: Only implement irq_set_wake on Bay Trail platform/x86: asus-wmi: Allow loading on systems without the Asus Management GUID

Hugo Trovao (1):
platform/x86: ideapad-laptop: Add Yoga C930 to no_hw_rfkill_list

Jérôme de Bretagne (1):
platform/x86: intel-hid: Missing power button release on some Dell models

Kai Renzig (1):
platform/x86: touchscreen_dmi: Add info for the Chuwi Hi8 Air tablet

Kai-Heng Feng (2):
platform/x86: dell-wmi: Ignore new keyboard backlight change event platform/x86: ideapad-laptop: Add Ideapad 530S-14ARR to no_hw_rfkill list

Mark Levedahl (1):

      platform/x86: ideapad-laptop: Add Y530-I5ICH-1060 to no_hw_rfkill list

Mattias Jacobsson (10):
platform/x86: wmi: fix potential null pointer dereference
modpost: file2alias: define size of alias
platform/x86: wmi: move struct wmi_device_id to mod_devicetable.h platform/x86: wmi: add WMI support to MODULE_DEVICE_TABLE()
platform/x86: dell-smbios-wmi: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: dell-wmi-descriptor: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: dell-wmi: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: huawei-wmi: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: intel-wmi-thunderbolt: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS() platform/x86: wmi-bmof: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()

Rajat Jain (1):
platform/x86: intel_pmc_core: Avoid a u32 overflow

Rajneesh Bhardwaj (10):
platform/x86: intel_pmc_core: Handle CFL regmap properly platform/x86: intel_pmc_core: Fix PCH IP sts reading platform/x86: intel_pmc_core: Fix PCH IP name platform/x86: intel_pmc_core: Fix file permissions for ltr_show platform/x86: intel_pmc_core: Include Reserved IP for LTR x86/CPU: Add Icelake model number
platform/x86: intel_pmc_core: Convert to INTEL_CPU_FAM6 macro platform/x86: intel_pmc_core: Add ICL platform support platform/x86: intel_pmc_core: Add Package cstates residency info platform/x86: intel_pmc_core: Quirk to ignore XTAL shutdown

Vadim Pasternak (11):
platform/x86: mlx-platform: Add support for fan direction register Documentation/ABI: Add new attribute for mlxreg-io sysfs interfaces platform_data/mlxreg: Document fixes for core platform data platform_data/mlxreg: Add capability field to core platform data platform/x86: mlx-platform: Add support for fan capability registers platform/x86: mlx-platform: Add support for new VMOD0007 board name platform/mellanox: mlxreg-hotplug: Fix KASAN warning
leds: mlxreg: Add support for capability register platform/x86: mlx-platform: Add extra CPLD for next generation systems platform/x86: mlx-platform: Add UID LED for the next generation systems platform/x86: mlx-platform: Fix access mode for fan_dir attribute

Yang Fan (1):
platform/x86: ideapad-laptop: Fix no_hw_rfkill_list for Lenovo RESCUER R720-15IKBN

 Documentation/ABI/stable/sysfs-driver-mlxreg-io |  20 ++-
 MAINTAINERS                                     |   1 +
 arch/x86/include/asm/intel-family.h             |   2 +
 drivers/acpi/scan.c                             |   1 +
 drivers/leds/leds-mlxreg.c                      |  19 +++
 drivers/platform/mellanox/mlxreg-hotplug.c      |  28 ++++-
 drivers/platform/x86/asus-wmi.c                 |   9 +-
 drivers/platform/x86/dell-smbios-wmi.c          |   2 +-
 drivers/platform/x86/dell-wmi-descriptor.c      |   2 +-
 drivers/platform/x86/dell-wmi.c                 |   7 +-
 drivers/platform/x86/dell_rbu.c                 |  50 +++-----
 drivers/platform/x86/huawei-wmi.c               |   3 +-
 drivers/platform/x86/i2c-multi-instantiate.c    |   9 ++
 drivers/platform/x86/ideapad-laptop.c           |  37 +++++-
 drivers/platform/x86/intel-hid.c                |   7 +-
 drivers/platform/x86/intel-wmi-thunderbolt.c    |   2 +-
 drivers/platform/x86/intel_int0002_vgpio.c      |  32 ++++-
 drivers/platform/x86/intel_pmc_core.c           | 159 ++++++++++++++++++++----
 drivers/platform/x86/intel_pmc_core.h           |  14 ++-
 drivers/platform/x86/mlx-platform.c             | 105 ++++++++++++++++
 drivers/platform/x86/touchscreen_dmi.c          |  79 ++++++++++++
 drivers/platform/x86/wmi-bmof.c                 |   2 +-
 drivers/platform/x86/wmi.c                      |   5 +-
 include/linux/mod_devicetable.h                 |  12 ++
 include/linux/platform_data/mlxreg.h            |   6 +-
 include/linux/wmi.h                             |   5 +-
 scripts/mod/devicetable-offsets.c               |   3 +
 scripts/mod/file2alias.c                        |  28 ++++-
 28 files changed, 546 insertions(+), 103 deletions(-)
Signature · 2 lines
Darren Hart
VMware Open Source Technology Center
#1 lore raw
Quoted 2 lines · Darren Hart

The wmi mod alias changes collide with a similar series for TEE based devices.

Anyway, you also used a *very* new subkey. Can you please mention it, so that I don't then get taken by surprise when I find a key that was used to sign this and I don't have it?

Yes, yes, I will download it anyway, but basically I want the pull request to give me enough information that when I do the pull I'm not surprised by the result.

That's why the shortlog and diffstat exists of course, but that "don't surprise Linus" also covers things like "oh, and the tag will be signed with a key you've never seen before".

Linus

merge bot Merged
#3 lore raw
In reply to Darren Hart
The pull request you sent on Fri, 8 Mar 2019 12:33:26 -0800:

The pull request you sent on Fri, 8 Mar 2019 12:33:26 -0800:

Quoted 1 line

git://git.infradead.org/linux-platform-drivers-x86.git pdx86-5.1-1-merge

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/dbbdf54c7206bf3f201f9ddaa5f4dd87835271cc

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
#2 lore raw
In reply to Linus Torvalds
Quoted 8 lines · Linus Torvalds
Quoted 2 lines · Darren Hart

The wmi mod alias changes collide with a similar series for TEE based devices.

Anyway, you also used a *very* new subkey. Can you please mention it, so that I don't then get taken by surprise when I find a key that was used to sign this and I don't have it?

Quoted 7 lines

Yes, yes, I will download it anyway, but basically I want the pull request to give me enough information that when I do the pull I'm not surprised by the result.

That's why the shortlog and diffstat exists of course, but that "don't surprise Linus" also covers things like "oh, and the tag will be signed with a key you've never seen before".

Will do. Apologies. I almost sent you a note - but didn't after verifying with others that git-verify-tag still reported "Good Signature" as the subkey is automatically associated with the master key - but, point taken - don't surprise Linus. Will err on the side of more explanation in the future.

Thanks,

Signature · 2 lines
Darren Hart
VMware Open Source Technology Center