[OS-BUILD PATCH 0/7] redhat/configs: Update RHEL9/ARK/Fedora s390x kernel config switches

[Thomas Huth (via Email Bridge)]

From: Thomas Huth on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188

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

While comparing the s390x config switches between RHEL8 and RHEL9, we found
some settings that need to be changed, and the location of some other switches
could be improved (e.g. by consolidating the settings between Fedora and ARK)

Signed-off-by: Thomas Huth

---
 redhat/configs/ark/generic/CONFIG_HW_RANDOM_S390 => redhat/configs/ark/generic/s390x/CONFIG_HW_RANDOM_S390             |  0 
 redhat/configs/ark/generic/s390x/CONFIG_NO_BOOTMEM                                                                     |  1 -
 redhat/configs/ark/generic/s390x/CONFIG_S390_CCW_IOMMU                                                                 |  1 -
 redhat/configs/ark/generic/s390x/CONFIG_EXPOLINE_OFF => redhat/configs/common/generic/s390x/CONFIG_EXPOLINE_OFF        |  0 
 redhat/configs/ark/generic/s390x/CONFIG_HMC_DRV => redhat/configs/common/generic/s390x/CONFIG_HMC_DRV                  |  0 
 redhat/configs/fedora/generic/s390x/CONFIG_S390_CCW_IOMMU => redhat/configs/common/generic/s390x/CONFIG_S390_CCW_IOMMU |  0 
 redhat/configs/fedora/generic/s390x/CONFIG_VFIO_CCW => redhat/configs/common/generic/s390x/CONFIG_VFIO_CCW             |  0 
 redhat/configs/common/generic/s390x/CONFIG_VIRTIO_CONSOLE                                                              |  1 -
 redhat/configs/fedora/generic/s390x/CONFIG_HMC_DRV                                                                     |  1 -
 redhat/configs/fedora/generic/s390x/CONFIG_HOTPLUG_PCI_SHPC                                                            |  1 -
 redhat/configs/fedora/generic/CONFIG_EXPOLINE_OFF                                                                      |  1 -
 redhat/configs/fedora/generic/CONFIG_HMC_DRV                                                                           |  1 -
 12 files changed, 0 insertions(+), 7 deletions(-)

[OS-BUILD PATCH 1/7] redhat/configs: Enable CONFIG_S390_CCW_IOMMU and CONFIG_VFIO_CCW for ARK, too

[Thomas Huth (via Email Bridge)]

From: Thomas Huth

redhat/configs: Enable CONFIG_S390_CCW_IOMMU and CONFIG_VFIO_CCW for ARK, too

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

These two options have been enabled for RHEL8 in BZ 1660917, so we should
enable those now in RHEL9/ARK, too.

Signed-off-by: Thomas Huth

diff --git a/redhat/configs/ark/generic/s390x/CONFIG_S390_CCW_IOMMU b/redhat/configs/ark/generic/s390x/CONFIG_S390_CCW_IOMMU
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/s390x/CONFIG_S390_CCW_IOMMU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_S390_CCW_IOMMU is not set
diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_S390_CCW_IOMMU b/redhat/configs/common/generic/s390x/CONFIG_S390_CCW_IOMMU
rename from redhat/configs/fedora/generic/s390x/CONFIG_S390_CCW_IOMMU
rename to redhat/configs/common/generic/s390x/CONFIG_S390_CCW_IOMMU
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/s390x/CONFIG_S390_CCW_IOMMU
+++ b/redhat/configs/common/generic/s390x/CONFIG_S390_CCW_IOMMU
diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_VFIO_CCW b/redhat/configs/common/generic/s390x/CONFIG_VFIO_CCW
rename from redhat/configs/fedora/generic/s390x/CONFIG_VFIO_CCW
rename to redhat/configs/common/generic/s390x/CONFIG_VFIO_CCW
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/s390x/CONFIG_VFIO_CCW
+++ b/redhat/configs/common/generic/s390x/CONFIG_VFIO_CCW

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188

[OS-BUILD PATCH 2/7] redhat/configs: Compile the virtio-console as a module on s390x

[Thomas Huth (via Email Bridge)]

From: Thomas Huth

redhat/configs: Compile the virtio-console as a module on s390x

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

Since upstream commit bb533ec8bacd ("s390/config: do not select VIRTIO_CONSOLE
via Kconfig"), it's possible to build the virtio-console driver as a module
on s390x, too. We've switch the RHEL8 setting to "m" in BZ 1954119, so we
should adapt the Fedora / ARK / RHEL9 setting accordingly now, too (by
disabling the s390x-specific setting, so that we fall back to the generic
CONFIG_VIRTIO_CONSOLE=m setting).

Signed-off-by: Thomas Huth

diff --git a/redhat/configs/common/generic/s390x/CONFIG_VIRTIO_CONSOLE b/redhat/configs/common/generic/s390x/CONFIG_VIRTIO_CONSOLE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/s390x/CONFIG_VIRTIO_CONSOLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIRTIO_CONSOLE=y

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188

[OS-BUILD PATCH 3/7] redhat/configs: Remove the non-existent CONFIG_NO_BOOTMEM switch

[Thomas Huth (via Email Bridge)]

From: Thomas Huth

redhat/configs: Remove the non-existent CONFIG_NO_BOOTMEM switch

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

The CONFIG_NO_BOOTMEM switch has been removed upstream in commit
b4a991ec584b ("mm: remove CONFIG_NO_BOOTMEM"), so we can drop this
setting in the ARK kernel config now, too.

Signed-off-by: Thomas Huth

diff --git a/redhat/configs/ark/generic/s390x/CONFIG_NO_BOOTMEM b/redhat/configs/ark/generic/s390x/CONFIG_NO_BOOTMEM
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/s390x/CONFIG_NO_BOOTMEM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NO_BOOTMEM=y

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188

[OS-BUILD PATCH 4/7] redhat/configs: Disable CONFIG_HOTPLUG_PCI_SHPC in the Fedora settings

[Thomas Huth (via Email Bridge)]

From: Thomas Huth

redhat/configs: Disable CONFIG_HOTPLUG_PCI_SHPC in the Fedora settings

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

We never enabled this for the RHEL/ARK kernel, so this setting in
Fedora looked suspicious... and after asking some people from IBM,
they confirmed that this is unused on s390x, so we can disable this
now.

Signed-off-by: Thomas Huth

diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_HOTPLUG_PCI_SHPC b/redhat/configs/fedora/generic/s390x/CONFIG_HOTPLUG_PCI_SHPC
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/s390x/CONFIG_HOTPLUG_PCI_SHPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HOTPLUG_PCI_SHPC=y

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188

[OS-BUILD PATCH 5/7] redhat/configs: Move CONFIG_HW_RANDOM_S390 into the s390x/ subfolder

[Thomas Huth (via Email Bridge)]

From: Thomas Huth

redhat/configs: Move CONFIG_HW_RANDOM_S390 into the s390x/ subfolder

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

This switch is specific to s390x, so it should reside in the
s390x/ folder.

Signed-off-by: Thomas Huth

diff --git a/redhat/configs/ark/generic/CONFIG_HW_RANDOM_S390 b/redhat/configs/ark/generic/s390x/CONFIG_HW_RANDOM_S390
rename from redhat/configs/ark/generic/CONFIG_HW_RANDOM_S390
rename to redhat/configs/ark/generic/s390x/CONFIG_HW_RANDOM_S390
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/CONFIG_HW_RANDOM_S390
+++ b/redhat/configs/ark/generic/s390x/CONFIG_HW_RANDOM_S390

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188

[OS-BUILD PATCH 6/7] redhat/configs: Consolidate CONFIG_EXPOLINE_OFF in the common folder

[Thomas Huth (via Email Bridge)]

From: Thomas Huth

redhat/configs: Consolidate CONFIG_EXPOLINE_OFF in the common folder

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

The other CONFIG_EXPOLINE_* options already reside in the folder
redhat/configs/common/generic/s390x/, so we should move the
CONFIG_EXPOLINE_OFF switch here, too.

Signed-off-by: Thomas Huth

diff --git a/redhat/configs/ark/generic/s390x/CONFIG_EXPOLINE_OFF b/redhat/configs/common/generic/s390x/CONFIG_EXPOLINE_OFF
rename from redhat/configs/ark/generic/s390x/CONFIG_EXPOLINE_OFF
rename to redhat/configs/common/generic/s390x/CONFIG_EXPOLINE_OFF
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/s390x/CONFIG_EXPOLINE_OFF
+++ b/redhat/configs/common/generic/s390x/CONFIG_EXPOLINE_OFF
diff --git a/redhat/configs/fedora/generic/CONFIG_EXPOLINE_OFF b/redhat/configs/fedora/generic/CONFIG_EXPOLINE_OFF
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/CONFIG_EXPOLINE_OFF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXPOLINE_OFF is not set

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188

[OS-BUILD PATCH 7/7] redhat/configs: Consolidate CONFIG_HMC_DRV in the common s390x folder

[Thomas Huth (via Email Bridge)]

From: Thomas Huth

redhat/configs: Consolidate CONFIG_HMC_DRV in the common s390x folder

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

The CONFIG_HMC_DRV switch is specific to s390x, and uses the same
setting in Fedora and ARK, so we should consolidate this setting
in the redhat/configs/common/generic/s390x/ folder.

Signed-off-by: Thomas Huth

diff --git a/redhat/configs/ark/generic/s390x/CONFIG_HMC_DRV b/redhat/configs/common/generic/s390x/CONFIG_HMC_DRV
rename from redhat/configs/ark/generic/s390x/CONFIG_HMC_DRV
rename to redhat/configs/common/generic/s390x/CONFIG_HMC_DRV
index blahblah..blahblah 100644
--- a/redhat/configs/ark/generic/s390x/CONFIG_HMC_DRV
+++ b/redhat/configs/common/generic/s390x/CONFIG_HMC_DRV
diff --git a/redhat/configs/fedora/generic/CONFIG_HMC_DRV b/redhat/configs/fedora/generic/CONFIG_HMC_DRV
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/CONFIG_HMC_DRV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_HMC_DRV is not set
diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_HMC_DRV b/redhat/configs/fedora/generic/s390x/CONFIG_HMC_DRV
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/s390x/CONFIG_HMC_DRV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HMC_DRV=m

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188

[Thomas Huth (via Email Bridge)]

From: Thomas Huth on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188#note_6139399...

@dhorak1 , @cohuck , @davidhildenbrand : Please have a look at the settings!
Thanks!

[Thomas Huth (via Email Bridge)]

From: Thomas Huth on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188#note_6139472...

@cimbrend : Please also have a look if you've got some spare minutes! Thanks!

[Cornelia Huck (via Email Bridge)]

From: Cornelia Huck on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188#note_6139596...

Acked-by: Cornelia Huck

[Daniel Horak (via Email Bridge)]

From: Daniel Horak on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188#note_6139611...

Acked-by: Dan Horák

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1188#note_6142183...

Acked-by: Justin M. Forbes 
(via approve button)