The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a1c871e6a7c80a7646c2b95db9e98ec2b283a2
commit f5a1c871e6a7c80a7646c2b95db9e98ec2b283a2 Author: Piotr Kubaj <[email protected]> AuthorDate: 2023-02-25 23:57:41 +0000 Commit: Piotr Kubaj <[email protected]> CommitDate: 2023-02-25 23:57:41 +0000 Revert "powerpc64*: port mlx5, OFED, KTLS and krping" Wrong push, another commit was supposed to be pushed. This reverts commit 83d6d8877ef7dad4f4e8f409a01c9f28139cd026. --- share/mk/src.opts.mk | 4 ++-- sys/conf/kern.opts.mk | 3 +-- sys/contrib/rdma/krping/krping.c | 4 ---- sys/modules/Makefile | 13 ------------- sys/powerpc/conf/GENERIC64 | 10 ---------- sys/powerpc/conf/GENERIC64LE | 10 ---------- 6 files changed, 3 insertions(+), 41 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 8008a94ae329..fe2159cd4f5e 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -318,8 +318,8 @@ BROKEN_OPTIONS+=LOADER_UBOOT BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA .endif -# Kernel TLS is enabled by default on amd64, aarch64 and powerpc64* -.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T:Mpowerpc64*} != "" +# Kernel TLS is enabled by default on amd64 and aarch64 +.if ${__T} == "aarch64" || ${__T} == "amd64" __DEFAULT_YES_OPTIONS+=OPENSSL_KTLS .else __DEFAULT_NO_OPTIONS+=OPENSSL_KTLS diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 93edc1b6e63f..5cda70156394 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -84,8 +84,7 @@ BROKEN_OPTIONS+= ZFS # Things that don't work because the kernel doesn't have the support # for them. -.if ${MACHINE} != "i386" && ${MACHINE} != "amd64" && \ - ${MACHINE_ARCH:Mpowerpc64*} == "" +.if ${MACHINE} != "i386" && ${MACHINE} != "amd64" BROKEN_OPTIONS+= OFED .endif diff --git a/sys/contrib/rdma/krping/krping.c b/sys/contrib/rdma/krping/krping.c index 98f129597464..182e5f111028 100644 --- a/sys/contrib/rdma/krping/krping.c +++ b/sys/contrib/rdma/krping/krping.c @@ -69,13 +69,9 @@ MODULE_DEPEND(krping, linuxkpi, 1, 1, 1); static __inline uint64_t get_cycles(void) { -#if defined(__amd64__) || defined(__i386__) uint32_t low, high; __asm __volatile("rdtsc" : "=a" (low), "=d" (high)); return (low | ((u_int64_t)high << 32)); -#elif defined(__powerpc64__) - return __builtin_readcyclecounter(); -#endif } typedef uint64_t cycles_t; diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 4397c7beb56e..9c2664460067 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -843,21 +843,8 @@ _nvme= nvme .if ${MACHINE_ARCH:Mpowerpc64*} != "" _ipmi= ipmi _ixl= ixl -_mlx5= mlx5 _nvram= opal_nvram -.if ${MK_OFED} != "no" || defined(ALL_MODULES) -_ibcore= ibcore -_ipoib= ipoib -_iser= iser -_mlx5ib= mlx5ib -_rdma= rdma -.endif -.if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \ - defined(ALL_MODULES) -_mlx5en= mlx5en -.endif .endif - .if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe" # Don't build powermac_nvram for powerpcspe, it's never supported. _nvram+= powermac_nvram diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 6c40b031bee6..ab36e2032203 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -49,7 +49,6 @@ options TCP_BLACKBOX # Enhanced TCP event logging options TCP_HHOOK # hhook(9) framework for TCP options TCP_RFC7413 # TCP Fast Open options SCTP_SUPPORT # Allow kldload of SCTP -options KERN_TLS # TLS transmit & receive offload options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists @@ -129,8 +128,6 @@ device pci options PCI_HP # PCI-Express native HotPlug device agp -options COMPAT_LINUXKPI - # ATA controllers device ahci # AHCI-compatible SATA controllers device ata # Legacy ATA/SATA controllers @@ -192,12 +189,6 @@ device fxp # Intel EtherExpress PRO/100B (82557, 82558) device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 -# Nvidia/Mellanox Connect-X 4 and later, Ethernet only -# mlx5ib requires ibcore infra and is not included by default -device mlx5 # Base driver -device mlxfw # Firmware update -device mlx5en # Ethernet driver - # Pseudo devices. device crypto # core crypto support device loop # Network loopback @@ -208,7 +199,6 @@ device md # Memory "disks" device ofwd # Open Firmware disks device gif # IPv6 and IPv4 tunneling device firmware # firmware assist module -device xz # lzma decompression # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 99d1975442f7..ffb43628d2b1 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -46,7 +46,6 @@ options TCP_BLACKBOX # Enhanced TCP event logging options TCP_HHOOK # hhook(9) framework for TCP options TCP_RFC7413 # TCP Fast Open options SCTP_SUPPORT # Allow kldload of SCTP -options KERN_TLS # TLS transmit & receive offload options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists @@ -124,8 +123,6 @@ device pci options PCI_HP # PCI-Express native HotPlug device agp -options COMPAT_LINUXKPI - # ATA controllers device ahci # AHCI-compatible SATA controllers device ata # Legacy ATA/SATA controllers @@ -187,12 +184,6 @@ device fxp # Intel EtherExpress PRO/100B (82557, 82558) device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 -# Nvidia/Mellanox Connect-X 4 and later, Ethernet only -# mlx5ib requires ibcore infra and is not included by default -device mlx5 # Base driver -device mlxfw # Firmware update -device mlx5en # Ethernet driver - # Pseudo devices. device crypto # core crypto support device loop # Network loopback @@ -203,7 +194,6 @@ device md # Memory "disks" device ofwd # Open Firmware disks device gif # IPv6 and IPv4 tunneling device firmware # firmware assist module -device xz # lzma decompression # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this!
