Skip to content

Disable liquidio driver on ark/rhel

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1993393

liquidio driver was already disabled on Fedora, but was still being
enabled on RHEL/ark. This was enabled back in rhel8 but we got a request
to revert that later in rhel8. So there is no reason to keep it enabled
anymore in RHEL/ark too.

Disabling the driver also allowed some simplification/removal of now
uneeded config files and unification of them. While at it, I also
moved CAVIUM_PTP to m in rhel/ark as is already the case in Fedora
(afaik there is no apparent reason to keep it builtin, and was just the
result of default choice of this option looking at the option history),
and I also disabled LIQUIDIO_VF following the liquidio disabling (this
affects Fedora too where it was still enabled).

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>

To make the review easier, this is the diff before (old) and after (new) this change on the final generated configs for both Fedora and RHEL/ARK:

diff -Naurp old/fedora/kernel-5.14.0-aarch64.config new/fedora/kernel-5.14.0-aarch64.config
--- old/fedora/kernel-5.14.0-aarch64.config	2021-08-20 13:05:17.186846139 -0300
+++ new/fedora/kernel-5.14.0-aarch64.config	2021-08-20 13:02:14.997015608 -0300
@@ -3073,7 +3073,7 @@ CONFIG_THUNDER_NIC_BGX=m
 CONFIG_THUNDER_NIC_RGX=m
 CONFIG_CAVIUM_PTP=m
 # CONFIG_LIQUIDIO is not set
-CONFIG_LIQUIDIO_VF=m
+# CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
diff -Naurp old/fedora/kernel-5.14.0-aarch64-debug.config new/fedora/kernel-5.14.0-aarch64-debug.config
--- old/fedora/kernel-5.14.0-aarch64-debug.config	2021-08-20 13:05:17.186846139 -0300
+++ new/fedora/kernel-5.14.0-aarch64-debug.config	2021-08-20 13:02:14.997015608 -0300
@@ -3053,7 +3053,7 @@ CONFIG_THUNDER_NIC_BGX=m
 CONFIG_THUNDER_NIC_RGX=m
 CONFIG_CAVIUM_PTP=m
 # CONFIG_LIQUIDIO is not set
-CONFIG_LIQUIDIO_VF=m
+# CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
diff -Naurp old/rhel/kernel-5.14.0-aarch64.config new/rhel/kernel-5.14.0-aarch64.config
--- old/rhel/kernel-5.14.0-aarch64.config	2021-08-20 13:03:54.306013391 -0300
+++ new/rhel/kernel-5.14.0-aarch64.config	2021-08-20 13:00:37.093052563 -0300
@@ -2612,9 +2612,9 @@ CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
 CONFIG_THUNDER_NIC_BGX=m
 CONFIG_THUNDER_NIC_RGX=m
-CONFIG_CAVIUM_PTP=y
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
+CONFIG_CAVIUM_PTP=m
+# CONFIG_LIQUIDIO is not set
+# CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
diff -Naurp old/rhel/kernel-5.14.0-aarch64-debug.config new/rhel/kernel-5.14.0-aarch64-debug.config
--- old/rhel/kernel-5.14.0-aarch64-debug.config	2021-08-20 13:03:54.306013391 -0300
+++ new/rhel/kernel-5.14.0-aarch64-debug.config	2021-08-20 13:00:37.092052555 -0300
@@ -2594,9 +2594,9 @@ CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
 CONFIG_THUNDER_NIC_BGX=m
 CONFIG_THUNDER_NIC_RGX=m
-CONFIG_CAVIUM_PTP=y
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
+CONFIG_CAVIUM_PTP=m
+# CONFIG_LIQUIDIO is not set
+# CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
diff -Naurp old/rhel/kernel-5.14.0-ppc64le.config new/rhel/kernel-5.14.0-ppc64le.config
--- old/rhel/kernel-5.14.0-ppc64le.config	2021-08-20 13:03:54.306013391 -0300
+++ new/rhel/kernel-5.14.0-ppc64le.config	2021-08-20 13:00:37.093052563 -0300
@@ -2378,14 +2378,7 @@ CONFIG_BNXT_DCB=y
 CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_BNA is not set
 # CONFIG_NET_VENDOR_CADENCE is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-# CONFIG_THUNDER_NIC_PF is not set
-# CONFIG_THUNDER_NIC_VF is not set
-# CONFIG_THUNDER_NIC_BGX is not set
-# CONFIG_THUNDER_NIC_RGX is not set
-CONFIG_CAVIUM_PTP=y
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
+# CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
diff -Naurp old/rhel/kernel-5.14.0-ppc64le-debug.config new/rhel/kernel-5.14.0-ppc64le-debug.config
--- old/rhel/kernel-5.14.0-ppc64le-debug.config	2021-08-20 13:03:54.306013391 -0300
+++ new/rhel/kernel-5.14.0-ppc64le-debug.config	2021-08-20 13:00:37.093052563 -0300
@@ -2376,14 +2376,7 @@ CONFIG_BNXT_DCB=y
 CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_BNA is not set
 # CONFIG_NET_VENDOR_CADENCE is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-# CONFIG_THUNDER_NIC_PF is not set
-# CONFIG_THUNDER_NIC_VF is not set
-# CONFIG_THUNDER_NIC_BGX is not set
-# CONFIG_THUNDER_NIC_RGX is not set
-CONFIG_CAVIUM_PTP=y
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
+# CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
diff -Naurp old/rhel/kernel-5.14.0-s390x.config new/rhel/kernel-5.14.0-s390x.config
--- old/rhel/kernel-5.14.0-s390x.config	2021-08-20 13:03:54.307013401 -0300
+++ new/rhel/kernel-5.14.0-s390x.config	2021-08-20 13:00:37.094052570 -0300
@@ -1877,14 +1877,7 @@ CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_BROCADE is not set
 # CONFIG_NET_VENDOR_CADENCE is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-# CONFIG_THUNDER_NIC_PF is not set
-# CONFIG_THUNDER_NIC_VF is not set
-# CONFIG_THUNDER_NIC_BGX is not set
-# CONFIG_THUNDER_NIC_RGX is not set
-CONFIG_CAVIUM_PTP=y
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
+# CONFIG_NET_VENDOR_CAVIUM is not set
 # CONFIG_NET_VENDOR_CHELSIO is not set
 # CONFIG_NET_VENDOR_CISCO is not set
 # CONFIG_NET_VENDOR_CORTINA is not set
diff -Naurp old/rhel/kernel-5.14.0-s390x-debug.config new/rhel/kernel-5.14.0-s390x-debug.config
--- old/rhel/kernel-5.14.0-s390x-debug.config	2021-08-20 13:03:54.306013391 -0300
+++ new/rhel/kernel-5.14.0-s390x-debug.config	2021-08-20 13:00:37.093052563 -0300
@@ -1854,14 +1854,7 @@ CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_BROCADE is not set
 # CONFIG_NET_VENDOR_CADENCE is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-# CONFIG_THUNDER_NIC_PF is not set
-# CONFIG_THUNDER_NIC_VF is not set
-# CONFIG_THUNDER_NIC_BGX is not set
-# CONFIG_THUNDER_NIC_RGX is not set
-CONFIG_CAVIUM_PTP=y
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
+# CONFIG_NET_VENDOR_CAVIUM is not set
 # CONFIG_NET_VENDOR_CHELSIO is not set
 # CONFIG_NET_VENDOR_CISCO is not set
 # CONFIG_NET_VENDOR_CORTINA is not set
diff -Naurp old/rhel/kernel-5.14.0-x86_64.config new/rhel/kernel-5.14.0-x86_64.config
--- old/rhel/kernel-5.14.0-x86_64.config	2021-08-20 13:03:54.315013482 -0300
+++ new/rhel/kernel-5.14.0-x86_64.config	2021-08-20 13:00:37.094052570 -0300
@@ -2672,14 +2672,7 @@ CONFIG_BNXT_DCB=y
 CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_BNA is not set
 # CONFIG_NET_VENDOR_CADENCE is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-# CONFIG_THUNDER_NIC_PF is not set
-# CONFIG_THUNDER_NIC_VF is not set
-# CONFIG_THUNDER_NIC_BGX is not set
-# CONFIG_THUNDER_NIC_RGX is not set
-CONFIG_CAVIUM_PTP=y
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
+# CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
diff -Naurp old/rhel/kernel-5.14.0-x86_64-debug.config new/rhel/kernel-5.14.0-x86_64-debug.config
--- old/rhel/kernel-5.14.0-x86_64-debug.config	2021-08-20 13:03:54.307013401 -0300
+++ new/rhel/kernel-5.14.0-x86_64-debug.config	2021-08-20 13:00:37.094052570 -0300
@@ -2674,14 +2674,7 @@ CONFIG_BNXT_DCB=y
 CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_BNA is not set
 # CONFIG_NET_VENDOR_CADENCE is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-# CONFIG_THUNDER_NIC_PF is not set
-# CONFIG_THUNDER_NIC_VF is not set
-# CONFIG_THUNDER_NIC_BGX is not set
-# CONFIG_THUNDER_NIC_RGX is not set
-CONFIG_CAVIUM_PTP=y
-CONFIG_LIQUIDIO=m
-CONFIG_LIQUIDIO_VF=m
+# CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
Edited by Herton R. Krzesinski

Merge request reports