Commit 12376084 authored by Holger Dengler's avatar Holger Dengler Committed by Alexander Gordeev
Browse files

s390/ap: modularize ap bus 



There is no hard requirement to have the ap bus statically in the
kernel, so add an option to compile it as module.

Cc: Tony Krowiak <akrowiak@linux.ibm.com>
Cc: Halil Pasic <pasic@linux.ibm.com>
Signed-off-by: default avatarHolger Dengler <dengler@linux.ibm.com>
Reviewed-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Reviewed-by: default avatarAnthony Krowiak <akrowiak@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 2a483d33

Documentation/arch/s390/vfio-ap.rst

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ These are the steps: 
   following Kconfig elements selected:

   * IOMMU_SUPPORT

   * S390

   * ZCRYPT

   * AP

   * VFIO

   * KVM

arch/s390/Kconfig

+14 −1
Original line number Diff line number Diff line
@@ -724,6 +724,19 @@ config EADM_SCH 
	  To compile this driver as a module, choose M here: the

	  module will be called eadm_sch.



config AP

	def_tristate y

	prompt "Support for Adjunct Processors (ap)"

	help

	  This driver allows usage to Adjunct Processor (AP) devices via

	  the ap bus, cards and queues. Supported Adjunct Processors are

	  the CryptoExpress Cards (CEX).



	  To compile this driver as a module, choose M here: the

	  module will be called ap.



	  If unsure, say Y (default).



config VFIO_CCW

	def_tristate n

	prompt "Support for VFIO-CCW subchannels"
@@ -740,7 +753,7 @@ config VFIO_AP 
	prompt "VFIO support for AP devices"

	depends on KVM

	depends on VFIO

	depends on ZCRYPT

	depends on AP

	select VFIO_MDEV

	help

	  This driver grants access to Adjunct Processor (AP) devices

drivers/crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ config CRYPTO_DEV_GEODE 
config ZCRYPT

	tristate "Support for s390 cryptographic adapters"

	depends on S390

	depends on AP

	select HW_RANDOM

	help

	  Select this option if you want to enable support for

drivers/s390/char/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ obj-$(CONFIG_SCLP_VT220_TTY) += sclp_vt220.o 


obj-$(CONFIG_PCI) += sclp_pci.o



obj-$(subst m,y,$(CONFIG_ZCRYPT)) += sclp_ap.o

obj-$(subst m,y,$(CONFIG_AP)) += sclp_ap.o



obj-$(CONFIG_VMLOGRDR) += vmlogrdr.o

obj-$(CONFIG_VMCP) += vmcp.o

drivers/s390/crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#



ap-objs := ap_bus.o ap_card.o ap_queue.o

obj-$(subst m,y,$(CONFIG_ZCRYPT)) += ap.o

obj-$(CONFIG_AP) += ap.o

# zcrypt_api.o and zcrypt_msgtype*.o depend on ap.o

zcrypt-objs := zcrypt_api.o zcrypt_card.o zcrypt_queue.o

zcrypt-objs += zcrypt_msgtype6.o zcrypt_msgtype50.o