From: Vladis Dronov <vdronov@xxxxxxxxxx> Enable Marvell OcteonTX2 crypto device in ARK Enable CRYPTO_DEV_OCTEONTX2_CPT, HW_RANDOM_CN10K and build them as modules in ARK. Enable NET_VENDOR_MARVELL and OCTEONTX2_MBOX in ARK too as these are requirements. Explicitly disable in ARK unsupported Marvell network drivers which become avaliable after enabling NET_VENDOR_MARVELL. Update filter-modules.sh.rhel and filter-modules.sh.fedora so crypto drivers are filtered out to kernel-core and kernel-modules packages the same way as ethernet drivers are. Do not filter out ccp crypto driver as it is required by kvm-amd.ko. This makes a configs layout the same as in the CentOS 9 Stream MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/755 Signed-off-by: Vladis Dronov <vdronov@xxxxxxxxxx> diff --git a/redhat/configs/ark/generic/CONFIG_MVMDIO b/redhat/configs/ark/generic/CONFIG_MVMDIO new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_MVMDIO @@ -0,0 +1 @@ +# CONFIG_MVMDIO is not set diff --git a/redhat/configs/ark/generic/CONFIG_OCTEON_EP b/redhat/configs/ark/generic/CONFIG_OCTEON_EP new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_OCTEON_EP @@ -0,0 +1 @@ +# CONFIG_OCTEON_EP is not set diff --git a/redhat/configs/ark/generic/CONFIG_PRESTERA b/redhat/configs/ark/generic/CONFIG_PRESTERA new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_PRESTERA @@ -0,0 +1 @@ +# CONFIG_PRESTERA is not set diff --git a/redhat/configs/ark/generic/CONFIG_SKGE b/redhat/configs/ark/generic/CONFIG_SKGE new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_SKGE @@ -0,0 +1 @@ +# CONFIG_SKGE is not set diff --git a/redhat/configs/ark/generic/CONFIG_SKY2 b/redhat/configs/ark/generic/CONFIG_SKY2 new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/CONFIG_SKY2 @@ -0,0 +1 @@ +# CONFIG_SKY2 is not set diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_OCTEONTX2_AF b/redhat/configs/ark/generic/arm/aarch64/CONFIG_OCTEONTX2_AF new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_OCTEONTX2_AF @@ -0,0 +1 @@ +# CONFIG_OCTEONTX2_AF is not set diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_OCTEONTX2_PF b/redhat/configs/ark/generic/arm/aarch64/CONFIG_OCTEONTX2_PF new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_OCTEONTX2_PF @@ -0,0 +1 @@ +# CONFIG_OCTEONTX2_PF is not set diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_OCTEONTX2_VF b/redhat/configs/ark/generic/arm/aarch64/CONFIG_OCTEONTX2_VF new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/arm/aarch64/CONFIG_OCTEONTX2_VF @@ -0,0 +1 @@ +# CONFIG_OCTEONTX2_VF is not set diff --git a/redhat/configs/fedora/generic/CONFIG_NET_VENDOR_MARVELL b/redhat/configs/common/generic/CONFIG_NET_VENDOR_MARVELL rename from redhat/configs/fedora/generic/CONFIG_NET_VENDOR_MARVELL rename to redhat/configs/common/generic/CONFIG_NET_VENDOR_MARVELL index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_NET_VENDOR_MARVELL +++ b/redhat/configs/common/generic/CONFIG_NET_VENDOR_MARVELL diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT b/redhat/configs/common/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT rename to redhat/configs/common/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_OCTEONTX2_MBOX b/redhat/configs/common/generic/arm/aarch64/CONFIG_OCTEONTX2_MBOX new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_OCTEONTX2_MBOX @@ -0,0 +1 @@ +CONFIG_OCTEONTX2_MBOX=m diff --git a/redhat/configs/ark/generic/CONFIG_NET_VENDOR_MARVELL b/redhat/configs/common/generic/s390x/CONFIG_NET_VENDOR_MARVELL rename from redhat/configs/ark/generic/CONFIG_NET_VENDOR_MARVELL rename to redhat/configs/common/generic/s390x/CONFIG_NET_VENDOR_MARVELL index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/CONFIG_NET_VENDOR_MARVELL +++ b/redhat/configs/common/generic/s390x/CONFIG_NET_VENDOR_MARVELL diff --git a/redhat/configs/fedora/generic/CONFIG_OCTEON_EP b/redhat/configs/fedora/generic/CONFIG_OCTEON_EP new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/fedora/generic/CONFIG_OCTEON_EP @@ -0,0 +1 @@ +CONFIG_OCTEON_EP=m diff --git a/redhat/configs/fedora/generic/s390x/CONFIG_NET_VENDOR_MARVELL b/redhat/configs/fedora/generic/s390x/CONFIG_NET_VENDOR_MARVELL deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/s390x/CONFIG_NET_VENDOR_MARVELL +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_NET_VENDOR_MARVELL is not set diff --git a/redhat/configs/pending-fedora/generic/CONFIG_OCTEON_EP b/redhat/configs/pending-fedora/generic/CONFIG_OCTEON_EP deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/pending-fedora/generic/CONFIG_OCTEON_EP +++ /dev/null @@ -1,15 +0,0 @@ -# Symbol: OCTEON_EP [=n] -# Type : tristate -# Defined at drivers/net/ethernet/marvell/octeon_ep/Kconfig:6 -# Prompt: Marvell Octeon PCI Endpoint NIC Driver -# Depends on: NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_MARVELL [=y] && 64BIT [=y] && PCI [=y] && PTP_1588_CLOCK_OPTIONAL [=y] -# Location: -# Main menu -# -> Device Drivers -# -> Network device support (NETDEVICES [=y]) -# -> Ethernet driver support (ETHERNET [=y]) -# -> Marvell devices (NET_VENDOR_MARVELL [=y]) -# -# -# -# CONFIG_OCTEON_EP is not set diff --git a/redhat/fedora_files/filter-modules.sh.fedora b/redhat/fedora_files/filter-modules.sh.fedora index blahblah..blahblah 100755 --- a/redhat/fedora_files/filter-modules.sh.fedora +++ b/redhat/fedora_files/filter-modules.sh.fedora @@ -25,6 +25,8 @@ netdrvs="appletalk can dsa hamradio ieee802154 ppp slip usb wireless" ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chelsio cisco dec dlink emulex marvell mellanox neterion nvidia packetengines qlogic rdc sfc silan sis smsc stmicro sun tehuti ti wiznet xircom" +cryptdrvs="bcm caam cavium chelsio hisilicon marvell qat" + iiodrvs="accel light pressure proximity" iiocommondrvs="cros_ec_sensors" @@ -106,6 +108,12 @@ do filter_dir $1 drivers/net/ethernet/${eth} done +# Filter the crypto drivers +for crypt in ${cryptdrvs} +do + filter_dir $1 drivers/crypto/${crypt} +done + # SCSI for scsi in ${scsidrvs} do diff --git a/redhat/rhel_files/filter-modules.sh.rhel b/redhat/rhel_files/filter-modules.sh.rhel index blahblah..blahblah 100755 --- a/redhat/rhel_files/filter-modules.sh.rhel +++ b/redhat/rhel_files/filter-modules.sh.rhel @@ -25,6 +25,8 @@ netdrvs="appletalk can dsa hamradio ieee802154 irda ppp slip usb wireless" ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti wiznet xircom" +cryptdrvs="bcm caam cavium chelsio hisilicon marvell qat" + inputdrvs="gameport tablet touchscreen" scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe fnic hisi_sas isci libsas lpfc megaraid mpt2sas mpt3sas mvsas pm8001 qla2xxx qla4xxx sym53c8xx_2 ufs qedf" @@ -100,6 +102,12 @@ do filter_dir $1 drivers/net/ethernet/${eth} done +# Filter the crypto drivers +for crypt in ${cryptdrvs} +do + filter_dir $1 drivers/crypto/${crypt} +done + # SCSI for scsi in ${scsidrvs} do -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1883 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
