On Fri, 24 Jan 2025, Vadim Pasternak wrote:
> Move 'mlx-platform' driver 'x86' to 'mellanox' folder.
>
> Motivation to allow running it on systems with ARM architecture.
>
> Since drivers/platform/x86/mlx-platform.c is rellocated to folder
> drivers/platform/x86/, remove "MELLANOX PLATFORM DRIVER" item.
> This driver will be located under "MELLANOX HARDWARE PLATFORM SUPPORT"
> item.
>
> Add reference for Documentation/ABI/testing/sysfs-driver-mlxreg-io under
> "MELLANOX HARDWARE PLATFORM SUPPORT".
>
> Reviewed-by: Michael Shych <michaelsh@xxxxxxxxxx>
> Signed-off-by: Vadim Pasternak <vadimp@xxxxxxxxxx>
> ---
> MAINTAINERS | 7 +------
> drivers/platform/mellanox/Kconfig | 13 +++++++++++++
> drivers/platform/mellanox/Makefile | 1 +
> drivers/platform/{x86 => mellanox}/mlx-platform.c | 0
> drivers/platform/x86/Kconfig | 13 -------------
> drivers/platform/x86/Makefile | 1 -
> 6 files changed, 15 insertions(+), 20 deletions(-)
> rename drivers/platform/{x86 => mellanox}/mlx-platform.c (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 6bb4ec0c162a..7d12a8f08f52 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -14705,6 +14705,7 @@ M: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
> M: Vadim Pasternak <vadimp@xxxxxxxxxx>
> L: platform-driver-x86@xxxxxxxxxxxxxxx
> S: Supported
> +F: Documentation/ABI/testing/sysfs-driver-mlxreg-io
I ended up dropping this line (and the related explanation in the commit
message) from this change in the review-ilpo-next branch because there
appears to be stable vs testing confusion which was caught by lkp. Please
add it in a separate patch.
--
i.
> F: Documentation/ABI/testing/sysfs-platform-mellanox-bootctl
> F: drivers/platform/mellanox/
> F: include/linux/platform_data/mlxreg.h
> @@ -14775,12 +14776,6 @@ F: Documentation/leds/leds-mlxcpld.rst
> F: drivers/leds/leds-mlxcpld.c
> F: drivers/leds/leds-mlxreg.c
>
> -MELLANOX PLATFORM DRIVER
> -M: Vadim Pasternak <vadimp@xxxxxxxxxx>
> -L: platform-driver-x86@xxxxxxxxxxxxxxx
> -S: Supported
> -F: drivers/platform/x86/mlx-platform.c
> -
> MEMBARRIER SUPPORT
> M: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
> M: "Paul E. McKenney" <paulmck@xxxxxxxxxx>
> diff --git a/drivers/platform/mellanox/Kconfig b/drivers/platform/mellanox/Kconfig
> index f7dfa0e785fd..aa760f064a17 100644
> --- a/drivers/platform/mellanox/Kconfig
> +++ b/drivers/platform/mellanox/Kconfig
> @@ -14,6 +14,19 @@ menuconfig MELLANOX_PLATFORM
>
> if MELLANOX_PLATFORM
>
> +config MLX_PLATFORM
> + tristate "Mellanox Technologies platform support"
> + depends on ACPI && I2C && PCI
> + 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 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 3875abba5a79..92a3d5be0e36 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -1010,19 +1010,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 ACPI && I2C && PCI
> - 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 e1b142947067..8849c0a36419 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -122,7 +122,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/
>
