From nobody Sat Feb 25 23:58:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PPNxf41s9z3v2JH; Sat, 25 Feb 2023 23:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PPNxf3Pmyz3CqC; Sat, 25 Feb 2023 23:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677369494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jft14yIQtVR5O/R+janWObSQAoWdfg7gAJgg7FYe3Yg=; b=vLHFwf/TeZUUg6OOwzSz7vW0BtpIbP15vq0gZDT2WIUqFzy2MT1kMM5ZqcDfW9Vz5vrv/c qhvj/3KnCgpV5zQ6dsrfbKj/einkhUVaDy1WjSxobXyv6zxVl93uf5mdAsKPLggT16toRU EShcdd7GAxszVODQH9erWc7Ny+e+g4NXJfhTxqGyg2j5L9dERP0GRYD/nDuLIOXHUaRYNz Ak0ma0Zkh9C8v0MQqK/jt8SpgG6/KltpNEm2KhEmm/2Y+BpGhqgGX7/a0Nn6CK5wNRHTCS 97HArkzhRUXgoMfmio8RNLPkqlralgJiqL6Fbc5r6mnCAP/i9+2PVloXWUKp7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677369494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jft14yIQtVR5O/R+janWObSQAoWdfg7gAJgg7FYe3Yg=; b=bfMFvezibBHidafmGH7c9fSdwAJsD9tP+Mgc4PfL5hKbRgb1AJ8RsESXGmhq3CtXk0ryKQ ty8bVk+SJu2V81Um+Sq3N3NlAD7XoHUGUp2PSUsUg0mOG+cGMTzi4q+p2Vszbhk3Q5cybf 1IzZSB3RXSsxAHDmllmvBKO6Co/+ON14pg+aKvTG2UgUuky7uVa+sK/lt4l97EEQr0Blh6 CJUJ435Dfn4n4MBM99m01t/VjcaZo7jUX4JgYVniWmbAWyWozaVkCHx+q5GG0QEfagxiH1 RXNjcaUNgpRPFe/wYj6a7+wHlQp3h1SFLNSDfNG709u1lTxgtCN+3wLzIXe2dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677369494; a=rsa-sha256; cv=none; b=PMObgkI+p2L721701Djjph2BVyK+eLTidz/+8Mit17KHu+Y73F5TZylfo8+6g8WFXsyYLT Fv3+jqGKwg6fpxfN1y5/OQ1pzxrW6SuoRsj+Dp7Ht35uOZEFQkvhtu6L31TfSeTLLIJrD7 2xUFoxvLF5xi5K4on/ejnBaIZ+pbMgkik6R350WvWz2V1duFvNDTd2/n6t7qk4TpR3xtTl op7tS3LymqLKGKvjgGZ6odojDoKaOfdapcn3fg0BxP6oE0qS+cR2IW5fhoqSHEm6GzLUoq jlqks1/LuZNt9hM/kokcOZORLfR1gVq3TDaaks8l94UcaAyTFRTOXwZvnPS1rQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPNxf2SYTzPBj; Sat, 25 Feb 2023 23:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31PNwEAN072216; Sat, 25 Feb 2023 23:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31PNwEpV072215; Sat, 25 Feb 2023 23:58:14 GMT (envelope-from git) Date: Sat, 25 Feb 2023 23:58:14 GMT Message-Id: <202302252358.31PNwEpV072215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: f5a1c871e6a7 - main - Revert "powerpc64*: port mlx5, OFED, KTLS and krping" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5a1c871e6a7c80a7646c2b95db9e98ec2b283a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a1c871e6a7c80a7646c2b95db9e98ec2b283a2 commit f5a1c871e6a7c80a7646c2b95db9e98ec2b283a2 Author: Piotr Kubaj AuthorDate: 2023-02-25 23:57:41 +0000 Commit: Piotr Kubaj 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!