From 14ee173c279442e3546682022e462844c70b0bc4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 18 Dec 2020 13:19:08 -0600 Subject: Linux v5.10.1 rebase Signed-off-by: Justin M. Forbes --- configs/fedora/generic/s390x/CONFIG_RTC_NVMEM | 1 + configs/fedora/generic/s390x/CONFIG_VFIO_PCI_ZDEV | 22 ++++++++++++++++++ configs/fedora/generic/s390x/CONFIG_VIRTIO_CONSOLE | 2 +- configs/fedora/generic/s390x/CONFIG_ZCRYPT_DEBUG | 26 ++++++++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 configs/fedora/generic/s390x/CONFIG_RTC_NVMEM create mode 100644 configs/fedora/generic/s390x/CONFIG_VFIO_PCI_ZDEV create mode 100644 configs/fedora/generic/s390x/CONFIG_ZCRYPT_DEBUG (limited to 'configs/fedora/generic/s390x') diff --git a/configs/fedora/generic/s390x/CONFIG_RTC_NVMEM b/configs/fedora/generic/s390x/CONFIG_RTC_NVMEM new file mode 100644 index 000000000..5abe8e336 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_RTC_NVMEM @@ -0,0 +1 @@ +# CONFIG_RTC_NVMEM is not set diff --git a/configs/fedora/generic/s390x/CONFIG_VFIO_PCI_ZDEV b/configs/fedora/generic/s390x/CONFIG_VFIO_PCI_ZDEV new file mode 100644 index 000000000..7040692bb --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_VFIO_PCI_ZDEV @@ -0,0 +1,22 @@ +# CONFIG_VFIO_PCI_ZDEV: +# +# Enabling this option exposes VFIO capabilities containing hardware +# configuration for zPCI devices. This enables userspace (e.g. QEMU) +# to supply proper configuration values instead of hard-coded defaults +# for zPCI devices passed through via VFIO on s390. +# +# Say Y here. +# +# Symbol: VFIO_PCI_ZDEV [=y] +# Type : bool +# Defined at drivers/vfio/pci/Kconfig:49 +# Prompt: VFIO PCI ZPCI device CLP support +# Depends on: VFIO_PCI [=m] && S390 [=y] +# Location: +# -> Device Drivers +# -> VFIO Non-Privileged userspace driver framework (VFIO [=m]) +# -> VFIO support for PCI devices (VFIO_PCI [=m]) +# +# +# +CONFIG_VFIO_PCI_ZDEV=y diff --git a/configs/fedora/generic/s390x/CONFIG_VIRTIO_CONSOLE b/configs/fedora/generic/s390x/CONFIG_VIRTIO_CONSOLE index 390e7e6d8..763c8331d 100644 --- a/configs/fedora/generic/s390x/CONFIG_VIRTIO_CONSOLE +++ b/configs/fedora/generic/s390x/CONFIG_VIRTIO_CONSOLE @@ -1 +1 @@ -CONFIG_VIRTIO_CONSOLE=y +# CONFIG_VIRTIO_CONSOLE is not set diff --git a/configs/fedora/generic/s390x/CONFIG_ZCRYPT_DEBUG b/configs/fedora/generic/s390x/CONFIG_ZCRYPT_DEBUG new file mode 100644 index 000000000..b0a111e75 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_ZCRYPT_DEBUG @@ -0,0 +1,26 @@ +# CONFIG_ZCRYPT_DEBUG: +# +# Say 'Y' here to enable some additional debug features on the +# s390 cryptographic adapters driver. +# +# There will be some more sysfs attributes displayed for ap cards +# and queues and some flags on crypto requests are interpreted as +# debugging messages to force error injection. +# +# Do not enable on production level kernel build. +# +# If unsure, say N. +# +# Symbol: ZCRYPT_DEBUG [=n] +# Type : bool +# Defined at drivers/crypto/Kconfig:78 +# Prompt: Enable debug features for s390 cryptographic adapters +# Depends on: CRYPTO [=y] && CRYPTO_HW [=y] && DEBUG_KERNEL [=y] && ZCRYPT [=m] +# Location: +# -> Cryptographic API (CRYPTO [=y]) +# -> Hardware crypto devices (CRYPTO_HW [=y]) +# -> Support for s390 cryptographic adapters (ZCRYPT [=m]) +# +# +# +# CONFIG_ZCRYPT_DEBUG is not set -- cgit