ef3c9a4618
This commit back-ports the auxiliary bus device driver from kernel version 5.11 to the StarlingX kernels, along with the bug fixes to this driver to date. This is necessary, because Intel's out-of-tree ice and iavf drivers, and Mellanox OFED v5.5's out-of-tree drivers rely on the functionality provided by the auxiliary bus driver. However, because the v5.10 kernel baseline used by StarlingX does not have this driver, the out-of-tree drivers would build and install their own version of the driver, named auxiliary.ko. This would cause kernel module symbol resolution errors at run-time when attempting to load ice and mlx5 kernel modules concurrently. Hence, this commit cherry-picks eight patches to add the auxiliary bus device driver to StarlingX's kernels, and adds a ninth patch to enable CONFIG_AUXILIARY_BUS by default. The latter is necessary, because StarlingX does not enable any in-tree kernel modules that 'select' CONFIG_AUXILIARY_BUS, which causes the kernel's build system to automatically disable this option. (None of the cherry-picked patches had merge conflicts.) It should be noted that all affected out-of-tree drivers' build systems are robust enough to detect that the kernel provides an auxiliary.ko driver, so the only out-of-tree driver modification involved changing the ice driver's spec file so that the installation of auxiliary.ko is removed. Testing: - An incremental monolithic build of StarlingX's master branch was successful. This build included currently-unreleased Mellanox OFED v5.5 work as well. - The built ISO image was successfully installed into and bootstrapped in a VM with low-latency profile in All-in-One simplex configuration, and the ability to insert ice, iavf and mlx5 kernel modules concurrently was confirmed. - The same test was repeated with a different VM, this time with the standard (i.e., non-low-latency) profile in All-in-One simplex mode. - The same ISO image was installed onto a 'standard' StarlingX system with two controller and two compute nodes with network adapters managed by Mellanox's OFED drivers. The low-latency profile was used. The Mellanox network adapters are used for inter-node communication in this server set-up. The bootstrap procedure was successful, and the RDMA/Infiniband over Ethernet functionalities of the Mellanox adapters were successfully tested using the Linux RDMA community's perftest package. - The same ISO image was installed onto an All-in-One simplex StarlingX system with an Intel E810 network adapter, managed by the ice driver, which is the system's management (OAM) interface. While the bootstrap of the system ultimately failed, this was due to an unrelated reason, and the network adapter's functionality was not found to be affected by this commit. iperf3 was used on virtual function interfaces (belonging to the same E810 network adapter) manually set up and attached to separate network namespaces, as an additional sanity test. Story: 2009878 Task: 44612 Change-Id: I8acfb0539757a35be3fb099ea2a6f95e05557e4f Signed-off-by: M. Vefa Bicakci <vefa.bicakci@windriver.com>
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From e691ecf482fc75f7ed09aac3fa58436b56d5393b Mon Sep 17 00:00:00 2001
|
|
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Date: Fri, 4 Dec 2020 12:43:47 +0100
|
|
Subject: [PATCH] driver core: auxiliary bus: move slab.h from include file
|
|
|
|
No need to include slab.h in include/linux/auxiliary_bus.h, as it is not
|
|
needed there. Move it to drivers/base/auxiliary.c instead.
|
|
|
|
Cc: Dan Williams <dan.j.williams@intel.com>
|
|
Cc: Dave Ertman <david.m.ertman@intel.com>
|
|
Cc: Fred Oh <fred.oh@linux.intel.com>
|
|
Cc: Kiran Patil <kiran.patil@intel.com>
|
|
Cc: Leon Romanovsky <leonro@nvidia.com>
|
|
Cc: Martin Habets <mhabets@solarflare.com>
|
|
Cc: Parav Pandit <parav@mellanox.com>
|
|
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
|
Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
|
|
Cc: Shiraz Saleem <shiraz.saleem@intel.com>
|
|
Link: https://lore.kernel.org/r/X8og8xi3WkoYXet9@kroah.com
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
(cherry picked from commit 7bbb79ff5f7499e0c5d65987458410e8099207d8)
|
|
Signed-off-by: M. Vefa Bicakci <vefa.bicakci@windriver.com>
|
|
---
|
|
drivers/base/auxiliary.c | 1 +
|
|
include/linux/auxiliary_bus.h | 1 -
|
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c
|
|
index ef2af417438b..eca36d6284d0 100644
|
|
--- a/drivers/base/auxiliary.c
|
|
+++ b/drivers/base/auxiliary.c
|
|
@@ -9,6 +9,7 @@
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/init.h>
|
|
+#include <linux/slab.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pm_domain.h>
|
|
#include <linux/pm_runtime.h>
|
|
diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h
|
|
index 282fbf7bf9af..3580743d0e8d 100644
|
|
--- a/include/linux/auxiliary_bus.h
|
|
+++ b/include/linux/auxiliary_bus.h
|
|
@@ -10,7 +10,6 @@
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/mod_devicetable.h>
|
|
-#include <linux/slab.h>
|
|
|
|
struct auxiliary_device {
|
|
struct device dev;
|
|
--
|
|
2.29.2
|
|
|