787dd7221d
Why I did it Add platform support for Debian 12 (Bookworm) on Mellanox Platform How I did it Update hw-management to v7.0030.2008 Deprecate the sfp_count == module_count approach in favour of asic init completion Ref: Mellanox/hw-mgmt@bf4f593 Add xxd package to base image which is required by hw-management scripts Add the non-upstream flag into linux kernel cache options Update the thermalctl logic based on new sysfs attributes Fix the integrate-mlnx-hw-mgmt script to not populate the arm64 Kconfig How to verify it Build kernel and run platform tests Signed-off-by: Vivek Reddy <vkarri@nvidia.com> Co-authored-by: Junchao-Mellanox <junchao@nvidia.com> Co-authored-by: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
99 lines
3.9 KiB
Diff
99 lines
3.9 KiB
Diff
From a4eca7c60f361575fb15bcab6fdcd39c795c8244 Mon Sep 17 00:00:00 2001
|
|
From: Vadim Pasternak <vadimp@nvidia.com>
|
|
Date: Mon, 24 Jul 2023 11:52:56 +0000
|
|
Subject: [PATCH backport 6.1.42 58/85] mellanox: Relocate mlx-platform driver
|
|
|
|
Move 'mlx-platform' driver 'x86' to 'mellanox' folder.
|
|
|
|
Motivation to allow running it on systems with ARM architecture.
|
|
|
|
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
|
|
Reviewed-by: Michael Shych <michaelsh@nvidia.com>
|
|
---
|
|
drivers/platform/mellanox/Kconfig | 12 ++++++++++++
|
|
drivers/platform/mellanox/Makefile | 1 +
|
|
drivers/platform/{x86 => mellanox}/mlx-platform.c | 0
|
|
drivers/platform/x86/Kconfig | 13 -------------
|
|
drivers/platform/x86/Makefile | 1 -
|
|
5 files changed, 13 insertions(+), 14 deletions(-)
|
|
rename drivers/platform/{x86 => mellanox}/mlx-platform.c (100%)
|
|
|
|
diff --git a/drivers/platform/mellanox/Kconfig b/drivers/platform/mellanox/Kconfig
|
|
index 382793e73a60..70b628834b4f 100644
|
|
--- a/drivers/platform/mellanox/Kconfig
|
|
+++ b/drivers/platform/mellanox/Kconfig
|
|
@@ -14,6 +14,18 @@ menuconfig MELLANOX_PLATFORM
|
|
|
|
if MELLANOX_PLATFORM
|
|
|
|
+config MLX_PLATFORM
|
|
+ tristate "Mellanox Technologies platform support"
|
|
+ depends on I2C && REGMAP
|
|
+ help
|
|
+ This option enables system support for the Mellanox Technologies
|
|
+ platform. The Mellanox systems provide data center networking
|
|
+ solutions based on Virtual Protocol Interconnect (VPI) technology
|
|
+ enable seamless connectivity to 56/100Gb/s InfiniBand or 10/40/56GbE
|
|
+ connection.
|
|
+
|
|
+ If you have a Mellanox system, say Y or M here.
|
|
+
|
|
config MLXREG_HOTPLUG
|
|
tristate "Mellanox platform hotplug driver support"
|
|
depends on HWMON
|
|
diff --git a/drivers/platform/mellanox/Makefile b/drivers/platform/mellanox/Makefile
|
|
index 04703c0416b1..ba56485cbe8c 100644
|
|
--- a/drivers/platform/mellanox/Makefile
|
|
+++ b/drivers/platform/mellanox/Makefile
|
|
@@ -3,6 +3,7 @@
|
|
# Makefile for linux/drivers/platform/mellanox
|
|
# Mellanox Platform-Specific Drivers
|
|
#
|
|
+obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o
|
|
obj-$(CONFIG_MLXBF_BOOTCTL) += mlxbf-bootctl.o
|
|
obj-$(CONFIG_MLXBF_PMC) += mlxbf-pmc.o
|
|
obj-$(CONFIG_MLXBF_TMFIFO) += mlxbf-tmfifo.o
|
|
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/mellanox/mlx-platform.c
|
|
similarity index 100%
|
|
rename from drivers/platform/x86/mlx-platform.c
|
|
rename to drivers/platform/mellanox/mlx-platform.c
|
|
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
|
index 1396a839dd8a..f11136bbf88d 100644
|
|
--- a/drivers/platform/x86/Kconfig
|
|
+++ b/drivers/platform/x86/Kconfig
|
|
@@ -954,19 +954,6 @@ config SERIAL_MULTI_INSTANTIATE
|
|
To compile this driver as a module, choose M here: the module
|
|
will be called serial-multi-instantiate.
|
|
|
|
-config MLX_PLATFORM
|
|
- tristate "Mellanox Technologies platform support"
|
|
- depends on I2C
|
|
- select REGMAP
|
|
- help
|
|
- This option enables system support for the Mellanox Technologies
|
|
- platform. The Mellanox systems provide data center networking
|
|
- solutions based on Virtual Protocol Interconnect (VPI) technology
|
|
- enable seamless connectivity to 56/100Gb/s InfiniBand or 10/40/56GbE
|
|
- connection.
|
|
-
|
|
- If you have a Mellanox system, say Y or M here.
|
|
-
|
|
config TOUCHSCREEN_DMI
|
|
bool "DMI based touchscreen configuration info"
|
|
depends on ACPI && DMI && I2C=y && TOUCHSCREEN_SILEAD
|
|
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
|
index 1d3d1b02541b..aee1bc4b0a80 100644
|
|
--- a/drivers/platform/x86/Makefile
|
|
+++ b/drivers/platform/x86/Makefile
|
|
@@ -109,7 +109,6 @@ obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o
|
|
# Platform drivers
|
|
obj-$(CONFIG_FW_ATTR_CLASS) += firmware_attributes_class.o
|
|
obj-$(CONFIG_SERIAL_MULTI_INSTANTIATE) += serial-multi-instantiate.o
|
|
-obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o
|
|
obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
|
|
obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o
|
|
obj-$(CONFIG_X86_ANDROID_TABLETS) += x86-android-tablets.o
|
|
--
|
|
2.20.1
|
|
|