From nobody Sun Mar 12 06:23:08 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 4PZ8qK1y8Nz3xSW6; Sun, 12 Mar 2023 06:23:09 +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 4PZ8qK1Kzwz3ssG; Sun, 12 Mar 2023 06:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678602189; 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=71zf+G1qFpQABmKF7D2jorr7p9SSXdATZMKwBmaohXg=; b=ZshLXS6xKfTR49CZqPh4kEUI4UqXgzZF6zEuXWiHXREFCK6y0JSJHs5fvkYqs4XdX9as+W kNjcYIDB/Th26lJP7ZRGNbE5F9w7VDlwoTcoSrevmrS9GFnUaEBXScDPn0+leK+xGgLRFL w/M2fpSHcnI8/yZK2VqIDt9qZ1jcgdEfOwDk8rObqWEUZ8WY8d9Ez7Q+TSAGN53u1sedBT KNL8mWUOgzVx0A95MptMD0pS4y+xa+HnLjW7nADFrRm3YnsTwDYg/PG2REX28/1Wgb8FYL fa/Os2PrWWiQx3PEKUYplNhu/ao8TYqy9UA9HNJRz6G39ituZ/bOQpTHTUGbGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678602189; 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=71zf+G1qFpQABmKF7D2jorr7p9SSXdATZMKwBmaohXg=; b=kDqTqK5cTH/aAraOYxsmWZ4BzBOUGJdWQpYVhR7jSM+JsuMWGa3/UnP3Yi4XINTRa73qfy xsgHFrV/0xpf/ok4G10sHdyfKMBbDCdk2FN3NpyDCNaBjpEwwedeNyKi/SB/crK9YKnJX8 ydXTvMb0HLZAKpuCC4ULCdN6GpHu8qoRwPSHTtr/sY9VFcLcwmpQe/woLvYmK1RVDFD7U6 zNA2Z9DFsblKta4jna/w5N0P0dD2fUejKqXoQw4pmR7kxUvi0wn1CVeZa3nFkxcwmZjjdm YAIw6iUYQUctVjfNJ5v6K2IKBD7N3UojKM0AyfTS7WBq5eCrkpgVgdzhDdnXkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678602189; a=rsa-sha256; cv=none; b=rYUxpOR8OchSDQf3nzTnNAYfFPjWId2Vjr3E2pgqXZxWu7GHjRlHUGt6tPsFHXiNSyBkDi HWl7Rkh4w+GbNCj21gQdLxfFmgDYyCMEzHfDlbV4UVRjGwH6m/n3xccPUnQ2SYh4WQykmO MoBm33Rfowfx0xIcEEYY4rTPZ6Xz3iewAJKkveXCQSwtyP91cJ0V2x2YHFo20ortSV8QgF 6PS24Va5yHndA/jeYmtCPhqq1y+gvZIsUxMG9kBm7z0C5zC1D0Ujt96uIihG3pMAgMWSfr HBogaXofumD7jggYFLQVRdushyWped32rp/SRThQ8cyp7PNzJ7goz5TFOKU3MA== 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 4PZ8qK0PC4z11GX; Sun, 12 Mar 2023 06:23:09 +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 32C6N8iY035791; Sun, 12 Mar 2023 06:23:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32C6N83E035790; Sun, 12 Mar 2023 06:23:08 GMT (envelope-from git) Date: Sun, 12 Mar 2023 06:23:08 GMT Message-Id: <202303120623.32C6N83E035790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfredo Dal'Ava Junior" Subject: git: 63715498ac6b - main - powerpc: enable ZFS on 32 bit powerpc/powerpcspe 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: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63715498ac6b003a024e1fd0eefbc0db504f126e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=63715498ac6b003a024e1fd0eefbc0db504f126e commit 63715498ac6b003a024e1fd0eefbc0db504f126e Author: Alfredo Dal'Ava Junior AuthorDate: 2023-03-12 06:20:11 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2023-03-12 06:20:11 +0000 powerpc: enable ZFS on 32 bit powerpc/powerpcspe Enable ZFS on powerpc 32 bit since it appears to build and work correctly. MFC after: 3 weeks Relnotes: yes --- share/mk/src.opts.mk | 5 ----- sys/conf/kern.opts.mk | 5 ----- sys/modules/Makefile | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 7cd1ef9731fc..7e865b31db25 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -356,11 +356,6 @@ __DEFAULT_NO_OPTIONS+=OPENMP BROKEN_OPTIONS+= OFED .endif -# ZFS is broken on 32-bit powerpc (missing atomics), but works on 64-bit -.if ${__T} == "powerpc" || ${__T} == "powerpcspe" -BROKEN_OPTIONS+= ZFS LOADER_ZFS -.endif - .include # diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 25057dcbb8d9..35ce97fae633 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -78,11 +78,6 @@ __DEFAULT_NO_OPTIONS = \ BROKEN_OPTIONS+= INIT_ALL_ZERO .endif -# ZFS is broken on 32-bit powerpc, missing atomics -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" -BROKEN_OPTIONS+= ZFS -.endif - # Broken on 32-bit arm, kernel module compile errors .if ${MACHINE_CPUARCH} == "arm" BROKEN_OPTIONS+= OFED diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 3737dddb57ab..421fd1d3dd32 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -643,7 +643,7 @@ _mpr= mpr SUBDIR+= tests .endif -.if ${MK_ZFS} != "no" || (defined(ALL_MODULES) && ${MACHINE_CPUARCH} != "powerpc") +.if ${MK_ZFS} != "no" || defined(ALL_MODULES) SUBDIR+= zfs .endif