From e2276038b91e5c376f4d3daaf33f370689849fea Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 4 May 2021 11:21:53 +0200 Subject: dashboard/config/linux: enable WWAN/CRYPTO configs in linux-next WWAN is a new config and it seems we can reach it, there is a /dev/ node for it. --- dashboard/config/linux/bits/crypto.yml | 2 ++ dashboard/config/linux/bits/wireless.yml | 4 ++++ dashboard/config/linux/upstream-apparmor-kasan.config | 15 +++++++++++---- dashboard/config/linux/upstream-selinux-kasan.config | 15 +++++++++++---- dashboard/config/linux/upstream-smack-kasan.config | 15 +++++++++++---- 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dashboard/config/linux/bits/crypto.yml b/dashboard/config/linux/bits/crypto.yml index 96ddb2a49..069d0cdd6 100644 --- a/dashboard/config/linux/bits/crypto.yml +++ b/dashboard/config/linux/bits/crypto.yml @@ -12,6 +12,8 @@ config: - CRYPTO_CFB - CRYPTO_LRW - CRYPTO_OFB + - CRYPTO_CTS + - CRYPTO_XTS - CRYPTO_KEYWRAP - CRYPTO_ADIANTUM - CRYPTO_XCBC diff --git a/dashboard/config/linux/bits/wireless.yml b/dashboard/config/linux/bits/wireless.yml index 8809a1405..e2d34abf0 100644 --- a/dashboard/config/linux/bits/wireless.yml +++ b/dashboard/config/linux/bits/wireless.yml @@ -53,3 +53,7 @@ config: - WLAN_VENDOR_TI: n - WLAN_VENDOR_ZYDAS: n - WLAN_VENDOR_QUANTENNA: n + - WWAN: [linux-next] + - WWAN_CORE: [linux-next] + - MHI_BUS: [linux-next] + - MHI_WWAN_CTRL: [linux-next] diff --git a/dashboard/config/linux/upstream-apparmor-kasan.config b/dashboard/config/linux/upstream-apparmor-kasan.config index 5762617e1..1d165e3e9 100644 --- a/dashboard/config/linux/upstream-apparmor-kasan.config +++ b/dashboard/config/linux/upstream-apparmor-kasan.config @@ -1763,6 +1763,7 @@ CONFIG_NET_SWITCHDEV=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_QRTR=y CONFIG_QRTR_TUN=y +# CONFIG_QRTR_MHI is not set CONFIG_NET_NCSI=y # CONFIG_NCSI_OEM_CMD_GET_MAC is not set # CONFIG_PCPU_DEV_REFCNT is not set @@ -2180,7 +2181,9 @@ CONFIG_DMA_SHARED_BUFFER=y # # CONFIG_MOXTET is not set # CONFIG_SIMPLE_PM_BUS is not set -# CONFIG_MHI_BUS is not set +CONFIG_MHI_BUS=y +# CONFIG_MHI_BUS_DEBUG is not set +# CONFIG_MHI_BUS_PCI_GENERIC is not set # end of Bus devices CONFIG_CONNECTOR=y @@ -2735,6 +2738,7 @@ CONFIG_VIRTIO_NET=y CONFIG_NLMON=y CONFIG_NET_VRF=y CONFIG_VSOCKMON=y +# CONFIG_MHI_NET is not set # CONFIG_ARCNET is not set CONFIG_ATM_DRIVERS=y # CONFIG_ATM_DUMMY is not set @@ -3124,7 +3128,9 @@ CONFIG_IEEE802154_ATUSB=y # CONFIG_IEEE802154_CA8210 is not set # CONFIG_IEEE802154_MCR20A is not set CONFIG_IEEE802154_HWSIM=y -# CONFIG_WWAN is not set +CONFIG_WWAN=y +CONFIG_WWAN_CORE=y +CONFIG_MHI_WWAN_CTRL=y CONFIG_VMXNET3=y # CONFIG_FUJITSU_ES is not set CONFIG_USB4_NET=y @@ -7718,6 +7724,7 @@ CONFIG_NFS_V4_2_SSC_HELPER=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y CONFIG_SUNRPC_BACKCHANNEL=y +# CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_SUNRPC_DEBUG is not set # CONFIG_SUNRPC_XPRT_RDMA is not set CONFIG_CEPH_FS=y @@ -7979,12 +7986,12 @@ CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CTR=y -# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=y -# CONFIG_CRYPTO_XTS is not set +CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_KEYWRAP=y CONFIG_CRYPTO_NHPOLY1305=y CONFIG_CRYPTO_NHPOLY1305_SSE2=y diff --git a/dashboard/config/linux/upstream-selinux-kasan.config b/dashboard/config/linux/upstream-selinux-kasan.config index d386ae007..409734ebc 100644 --- a/dashboard/config/linux/upstream-selinux-kasan.config +++ b/dashboard/config/linux/upstream-selinux-kasan.config @@ -1757,6 +1757,7 @@ CONFIG_NET_SWITCHDEV=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_QRTR=y CONFIG_QRTR_TUN=y +# CONFIG_QRTR_MHI is not set CONFIG_NET_NCSI=y # CONFIG_NCSI_OEM_CMD_GET_MAC is not set # CONFIG_PCPU_DEV_REFCNT is not set @@ -2174,7 +2175,9 @@ CONFIG_DMA_SHARED_BUFFER=y # # CONFIG_MOXTET is not set # CONFIG_SIMPLE_PM_BUS is not set -# CONFIG_MHI_BUS is not set +CONFIG_MHI_BUS=y +# CONFIG_MHI_BUS_DEBUG is not set +# CONFIG_MHI_BUS_PCI_GENERIC is not set # end of Bus devices CONFIG_CONNECTOR=y @@ -2729,6 +2732,7 @@ CONFIG_VIRTIO_NET=y CONFIG_NLMON=y CONFIG_NET_VRF=y CONFIG_VSOCKMON=y +# CONFIG_MHI_NET is not set # CONFIG_ARCNET is not set CONFIG_ATM_DRIVERS=y # CONFIG_ATM_DUMMY is not set @@ -3118,7 +3122,9 @@ CONFIG_IEEE802154_ATUSB=y # CONFIG_IEEE802154_CA8210 is not set # CONFIG_IEEE802154_MCR20A is not set CONFIG_IEEE802154_HWSIM=y -# CONFIG_WWAN is not set +CONFIG_WWAN=y +CONFIG_WWAN_CORE=y +CONFIG_MHI_WWAN_CTRL=y CONFIG_VMXNET3=y # CONFIG_FUJITSU_ES is not set CONFIG_USB4_NET=y @@ -7712,6 +7718,7 @@ CONFIG_NFS_V4_2_SSC_HELPER=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y CONFIG_SUNRPC_BACKCHANNEL=y +# CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_SUNRPC_DEBUG is not set # CONFIG_SUNRPC_XPRT_RDMA is not set CONFIG_CEPH_FS=y @@ -7976,12 +7983,12 @@ CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CTR=y -# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=y -# CONFIG_CRYPTO_XTS is not set +CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_KEYWRAP=y CONFIG_CRYPTO_NHPOLY1305=y CONFIG_CRYPTO_NHPOLY1305_SSE2=y diff --git a/dashboard/config/linux/upstream-smack-kasan.config b/dashboard/config/linux/upstream-smack-kasan.config index 6749660f2..fad47d1ec 100644 --- a/dashboard/config/linux/upstream-smack-kasan.config +++ b/dashboard/config/linux/upstream-smack-kasan.config @@ -1764,6 +1764,7 @@ CONFIG_NET_SWITCHDEV=y CONFIG_NET_L3_MASTER_DEV=y CONFIG_QRTR=y CONFIG_QRTR_TUN=y +# CONFIG_QRTR_MHI is not set CONFIG_NET_NCSI=y # CONFIG_NCSI_OEM_CMD_GET_MAC is not set # CONFIG_PCPU_DEV_REFCNT is not set @@ -2181,7 +2182,9 @@ CONFIG_DMA_SHARED_BUFFER=y # # CONFIG_MOXTET is not set # CONFIG_SIMPLE_PM_BUS is not set -# CONFIG_MHI_BUS is not set +CONFIG_MHI_BUS=y +# CONFIG_MHI_BUS_DEBUG is not set +# CONFIG_MHI_BUS_PCI_GENERIC is not set # end of Bus devices CONFIG_CONNECTOR=y @@ -2736,6 +2739,7 @@ CONFIG_VIRTIO_NET=y CONFIG_NLMON=y CONFIG_NET_VRF=y CONFIG_VSOCKMON=y +# CONFIG_MHI_NET is not set # CONFIG_ARCNET is not set CONFIG_ATM_DRIVERS=y # CONFIG_ATM_DUMMY is not set @@ -3125,7 +3129,9 @@ CONFIG_IEEE802154_ATUSB=y # CONFIG_IEEE802154_CA8210 is not set # CONFIG_IEEE802154_MCR20A is not set CONFIG_IEEE802154_HWSIM=y -# CONFIG_WWAN is not set +CONFIG_WWAN=y +CONFIG_WWAN_CORE=y +CONFIG_MHI_WWAN_CTRL=y CONFIG_VMXNET3=y # CONFIG_FUJITSU_ES is not set CONFIG_USB4_NET=y @@ -7719,6 +7725,7 @@ CONFIG_NFS_V4_2_SSC_HELPER=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y CONFIG_SUNRPC_BACKCHANNEL=y +# CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_SUNRPC_DEBUG is not set # CONFIG_SUNRPC_XPRT_RDMA is not set CONFIG_CEPH_FS=y @@ -7983,12 +7990,12 @@ CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CTR=y -# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=y -# CONFIG_CRYPTO_XTS is not set +CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_KEYWRAP=y CONFIG_CRYPTO_NHPOLY1305=y CONFIG_CRYPTO_NHPOLY1305_SSE2=y -- cgit mrf-deployment