diff options
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/ath11k/Makefile | 63 | ||||
| -rw-r--r-- | sys/modules/ath12k/Makefile | 38 | ||||
| -rw-r--r-- | sys/modules/netgraph/netflow/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/netlink/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/ufshci/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/zfs/Makefile | 91 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 207 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
8 files changed, 249 insertions, 159 deletions
diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile index 42aa9b9936cd..d17e76255802 100644 --- a/sys/modules/ath11k/Makefile +++ b/sys/modules/ath11k/Makefile @@ -2,30 +2,62 @@ DEVATH11KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath11k .PATH: ${DEVATH11KDIR} -WITH_DEBUGFS= 0 # Does not yet compile -WITH_CONFIG_PM= 0 +ATH11K_DEBUGFS= 0 +ATH11K_TRACE= 0 +ATH11K_THERMAL= 0 +ATH11K_SPECTRAL= 0 +ATH11K_PM= 0 +ATH11K_DEV_COREDUMP= 0 KMOD= if_ath11k SRCS+= core.c hal.c hal_tx.c hal_rx.c SRCS+= wmi.c mac.c reg.c htc.c qmi.c SRCS+= dp.c dp_tx.c dp_rx.c debug.c -SRCS+= ce.c peer.c dbring.c hw.c -SRCS+= coredump.c fw.c p2p.c +SRCS+= ce.c peer.c dbring.c hw.c pcic.c +SRCS+= fw.c p2p.c -SRCS+= mhi.c pci.c pcic.c +# PCI +SRCS+= mhi.c pci.c -.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 -CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} +# AHB +#SRCS+= ahb.c + +.if defined(ATH11K_DEBUGFS) && ${ATH11K_DEBUGFS} > 0 +SRCS+= debugfs.c debugfs_htt_stats.c debugfs_sta.c +CFLAGS+= -DCONFIG_ATH11K_DEBUGFS +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS +.endif + +.if defined(ATH11K_TRACE) && ${ATH11K_TRACE} > 0 +SRCS+= trace.c +CFLAGS+= -DCONFIG_ATH11K_TRACING +.endif + +.if defined(ATH11K_THERMAL) && ${ATH11K_THERMAL} > 0 +SRCS+= thermal.c +CFLAGS+= -DCONFIG_ATH11K_THERMAL +.endif + +.if defined(ATH11K_SPECTRAL) && ${ATH11K_SPECTRAL} > 0 +SRCS+= spectral.c +CFLAGS+= -DCONFIG_ATH11K_SPECTRAL +.endif + +.if defined(ATH11K_PM) && ${ATH11K_PM} > 0 +CFLAGS+= -DCONFIG_PM SRCS+= wow.c .endif +.if defined(ATH11K_DEV_COREDUMP) && ${ATH11K_DEV_COREDUMP} > 0 +CFLAGS+= -DCONFIG_DEV_COREDUMP +SRCS+= coredump.c +.endif + # Other SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h -CFLAGS+= -DKBUILD_MODNAME='"ath11k"' - CFLAGS+= -I${DEVATH11KDIR} CFLAGS+= -I${DEVATH11KDIR}/.. CFLAGS+= ${LINUXKPI_INCLUDES} @@ -34,16 +66,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_ATH11K_DEBUG -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 -SRCS+= debugfs.c debugfs_htt_stats.c debugfs_sta.c -CFLAGS+= -DCONFIG_ATH11K_DEBUGFS=${WITH_DEBUGFS} -CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS} -.endif - -#CFLAGS+= -DCONFIG_ATH11K_SPECTRAL -#CFLAGS+= -DCONFIG_ATH11K_TRACING -#CFLAGS+= -DCONFIG_NL80211_TESTMODE -#CFLAGS+= -DCONFIG_PM -#CFLAGS+= -DCONFIG_THERMAL +CFLAGS+= -DKBUILD_MODNAME='"ath11k"' +CFLAGS+= -DLINUXKPI_VERSION=61900 .include <bsd.kmod.mk> diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile index 674a68e12813..ff61769bd99e 100644 --- a/sys/modules/ath12k/Makefile +++ b/sys/modules/ath12k/Makefile @@ -2,28 +2,51 @@ DEVATH12KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath12k .PATH: ${DEVATH12KDIR} -WITH_CONFIG_ATH12K_TRACING= 0 +ATH12K_ACPI= 0 +ATH12K_AHB= 0 +ATH12K_COREDUMP= 0 +ATH12K_DEBUGFS= 0 +ATH12K_PM= 0 +ATH12K_TRACING= 0 KMOD= if_ath12k SRCS+= core.c hal.c hal_tx.c hal_rx.c SRCS+= wmi.c mac.c reg.c htc.c qmi.c SRCS+= dp.c dp_tx.c dp_rx.c dp_mon.c debug.c -SRCS+= ce.c peer.c dbring.c hw.c +SRCS+= ce.c peer.c dbring.c hw.c fw.c p2p.c SRCS+= mhi.c pci.c -.if defined(WITH_CONFIG_ATH12K_TRACING) && ${WITH_CONFIG_ATH12K_TRACING} > 0 -CFLAGS+= -DCONFIG_ATH12K_TRACING=${WITH_CONFIG_ATH12K_TRACING} +.if defined(ATH12K_AHB) && ${ATH12K_AHB} > 0 +CFLAGS+= -DCONFIG_ATH12K_AHB +SRCS+= ahb.c +.endif +.if defined(ATH12K_DEBUGFS) && ${ATH12K_DEBUGFS} > 0 +CFLAGS+= -DCONFIG_ATH12K_DEBUGFS +SRCS+= debugfs.c debugfs_htt_stats.c debugfs_sta.c +.endif +.if defined(ATH12K_ACPI) && ${ATH12K_ACPI} > 0 +CFLAGS+= -DCONFIG_ATH12K_ACPI +SRCS+= acpi.c +.endif +.if defined(ATH12K_TRACING) && ${ATH12K_TRACING} > 0 +CFLAGS+= -DCONFIG_ATH12K_TRACING SRCS+= trace.c .endif +.if defined(ATH12K_PM) && ${ATH12K_PM} > 0 +CFLAGS+= -DCONFIG_PM +SRCS+= wow.c +.endif +.if defined(ATH12K_COREDUMP) && ${ATH12K_COREDUMP} > 0 +CFLAGS+= -DCONFIG_ATH12K_COREDUMP +SRCS+= coredump.c +.endif # Other SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h -CFLAGS+= -DKBUILD_MODNAME='"ath12k"' - CFLAGS+= -I${DEVATH12KDIR} CFLAGS+= -I${DEVATH12KDIR}/.. CFLAGS+= ${LINUXKPI_INCLUDES} @@ -32,4 +55,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_ATH12K_DEBUG +CFLAGS+= -DKBUILD_MODNAME='"ath12k"' +CFLAGS+= -DLINUXKPI_VERSION=61900 + .include <bsd.kmod.mk> diff --git a/sys/modules/netgraph/netflow/Makefile b/sys/modules/netgraph/netflow/Makefile index c73e9ac41680..c743db9d7eca 100644 --- a/sys/modules/netgraph/netflow/Makefile +++ b/sys/modules/netgraph/netflow/Makefile @@ -5,6 +5,6 @@ .PATH: ${SRCTOP}/sys/netgraph/netflow KMOD= ng_netflow -SRCS= ng_netflow.c netflow.c netflow_v9.c opt_inet.h opt_inet6.h opt_route.h +SRCS= ng_netflow.c netflow.c netflow_v9.c opt_inet.h opt_inet6.h .include <bsd.kmod.mk> diff --git a/sys/modules/netlink/Makefile b/sys/modules/netlink/Makefile index 4abef5106899..6f8205289dd4 100644 --- a/sys/modules/netlink/Makefile +++ b/sys/modules/netlink/Makefile @@ -5,7 +5,7 @@ SRCS = netlink_module.c netlink_domain.c netlink_io.c \ netlink_message_writer.c netlink_generic.c \ netlink_route.c route/iface.c route/iface_drivers.c route/neigh.c \ route/nexthop.c route/rt.c -SRCS+= opt_inet.h opt_inet6.h opt_route.h +SRCS+= opt_inet.h opt_inet6.h CFLAGS+= -DNETLINK_MODULE diff --git a/sys/modules/ufshci/Makefile b/sys/modules/ufshci/Makefile index ab5f3eaf88d0..aa0419d3a6d6 100644 --- a/sys/modules/ufshci/Makefile +++ b/sys/modules/ufshci/Makefile @@ -3,6 +3,7 @@ KMOD = ufshci SRCS = ufshci.c \ + ufshci_acpi.c \ ufshci_pci.c \ ufshci_ctrlr.c \ ufshci_dev.c \ @@ -12,8 +13,10 @@ SRCS = ufshci.c \ ufshci_req_sdb.c \ ufshci_sim.c \ ufshci_sysctl.c \ + acpi_if.h \ bus_if.h \ device_if.h \ + opt_acpi.h \ opt_cam.h \ pci_if.h diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 4479c3c6eb12..8fd023005b54 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -34,14 +34,15 @@ CFLAGS+= -I${ZINCDIR}/os/freebsd/zfs CFLAGS+= -I${SRCDIR}/zstd/include CFLAGS+= -I${.CURDIR} -CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS \ +CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D__BSD_VISIBLE=1 \ -DHAVE_UIO_ZEROCOPY -DWITHOUT_NETDUMP -D__KERNEL -D_SYS_CONDVAR_H_ \ -D_SYS_VMEM_H_ .if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -D__x86_64 -DHAVE_SSE2 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 \ - -DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW \ - -DHAVE_VAES -DHAVE_VPCLMULQDQ +CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3 \ + -DHAVE_TOOLCHAIN_SSE4_1 -DHAVE_TOOLCHAIN_AVX -DHAVE_TOOLCHAIN_AVX2 \ + -DHAVE_TOOLCHAIN_AVX512F -DHAVE_TOOLCHAIN_AVX512VL \ + -DHAVE_TOOLCHAIN_AVX512BW .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ @@ -53,18 +54,14 @@ CFLAGS+= -DBITS_PER_LONG=64 SRCS= vnode_if.h device_if.h bus_if.h -# avl +#avl SRCS+= avl.c -# icp -SRCS+= edonr.c - #icp/algs/blake3 SRCS+= blake3.c \ blake3_generic.c \ blake3_impl.c - .if ${MACHINE_ARCH} == "aarch64" #icp/asm-aarch64/blake3 SRCS+= b3_aarch64_sse2.S \ @@ -88,9 +85,12 @@ SRCS+= blake3_avx2.S \ SRCS+= aesni-gcm-avx2-vaes.S .endif +#icp/algs/edonr +SRCS+= edonr.c + #icp/algs/sha2 -SRCS+= sha2_generic.c \ - sha256_impl.c \ +SRCS+= sha256_impl.c \ + sha2_generic.c \ sha512_impl.c .if ${MACHINE_ARCH} == "armv7" @@ -108,8 +108,8 @@ OBJS+= zfs-sha256-armv8.o \ .if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le" #icp/asm-ppc64/sha2 SRCS+= sha256-p8.S \ - sha512-p8.S \ sha256-ppc.S \ + sha512-p8.S \ sha512-ppc.S .endif @@ -146,10 +146,10 @@ SRCS+= lapi.c \ lzio.c #nvpair -SRCS+= nvpair.c \ - fnvpair.c \ - nvpair_alloc_spl.c \ - nvpair_alloc_fixed.c +SRCS+= fnvpair.c \ + nvpair.c \ + nvpair_alloc_fixed.c \ + nvpair_alloc_spl.c #os/freebsd/spl SRCS+= acl_common.c \ @@ -196,6 +196,7 @@ SRCS+= abd_os.c \ zfs_crrd.c \ zfs_debug.c \ zfs_dir.c \ + zfs_file_os.c \ zfs_ioctl_compat.c \ zfs_ioctl_os.c \ zfs_racct.c \ @@ -206,15 +207,16 @@ SRCS+= abd_os.c \ zvol_os.c #zcommon -SRCS+= zfeature_common.c \ +SRCS+= cityhash.c \ + zfeature_common.c \ zfs_comutil.c \ zfs_deleg.c \ - zfs_fletcher.c \ zfs_fletcher_avx512.c \ + zfs_fletcher.c \ zfs_fletcher_intel.c \ zfs_fletcher_sse.c \ - zfs_fletcher_superscalar.c \ zfs_fletcher_superscalar4.c \ + zfs_fletcher_superscalar.c \ zfs_namecheck.c \ zfs_prop.c \ zfs_valstr.c \ @@ -229,14 +231,13 @@ SRCS+= abd.c \ blkptr.c \ bplist.c \ bpobj.c \ + bptree.c \ + bqueue.c \ brt.c \ btree.c \ - cityhash.c \ + dataset_kstats.c \ dbuf.c \ dbuf_stats.c \ - bptree.c \ - bqueue.c \ - dataset_kstats.c \ ddt.c \ ddt_log.c \ ddt_stats.c \ @@ -254,13 +255,13 @@ SRCS+= abd.c \ dmu_zfetch.c \ dnode.c \ dnode_sync.c \ + dsl_bookmark.c \ + dsl_crypt.c \ dsl_dataset.c \ dsl_deadlist.c \ dsl_deleg.c \ - dsl_bookmark.c \ - dsl_dir.c \ - dsl_crypt.c \ dsl_destroy.c \ + dsl_dir.c \ dsl_pool.c \ dsl_prop.c \ dsl_scan.c \ @@ -269,9 +270,9 @@ SRCS+= abd.c \ edonr_zfs.c \ fm.c \ gzip.c \ - lzjb.c \ lz4.c \ lz4_zfs.c \ + lzjb.c \ metaslab.c \ mmp.c \ multilist.c \ @@ -284,6 +285,8 @@ SRCS+= abd.c \ sha2_zfs.c \ skein_zfs.c \ spa.c \ + space_map.c \ + space_reftree.c \ spa_checkpoint.c \ spa_config.c \ spa_errlog.c \ @@ -291,8 +294,6 @@ SRCS+= abd.c \ spa_log_spacemap.c \ spa_misc.c \ spa_stats.c \ - space_map.c \ - space_reftree.c \ txg.c \ u8_textprep.c \ uberblock.c \ @@ -301,8 +302,8 @@ SRCS+= abd.c \ vdev_draid.c \ vdev_draid_rand.c \ vdev_file.c \ - vdev_indirect.c \ vdev_indirect_births.c \ + vdev_indirect.c \ vdev_indirect_mapping.c \ vdev_initialize.c \ vdev_label.c \ @@ -310,11 +311,11 @@ SRCS+= abd.c \ vdev_missing.c \ vdev_queue.c \ vdev_raidz.c \ - vdev_raidz_math.c \ - vdev_raidz_math_scalar.c \ vdev_raidz_math_avx2.c \ vdev_raidz_math_avx512bw.c \ vdev_raidz_math_avx512f.c \ + vdev_raidz_math.c \ + vdev_raidz_math_scalar.c \ vdev_raidz_math_sse2.c \ vdev_raidz_math_ssse3.c \ vdev_rebuild.c \ @@ -333,7 +334,6 @@ SRCS+= abd.c \ zfeature.c \ zfs_byteswap.c \ zfs_chksum.c \ - zfs_file_os.c \ zfs_fm.c \ zfs_fuid.c \ zfs_impl.c \ @@ -358,23 +358,23 @@ SRCS+= abd.c \ zvol.c #zstd -SRCS+= zfs_zstd.c \ - entropy_common.c \ +SRCS+= zfs_zstd.c + +#zstd/common +SRCS+= entropy_common.c \ error_private.c \ - fse_compress.c \ fse_decompress.c \ + pool.c \ + zstd_common.c + +#zstd/compress +SRCS+= fse_compress.c \ hist.c \ huf_compress.c \ - huf_decompress.c \ - pool.c \ - zstd_common.c \ zstd_compress.c \ zstd_compress_literals.c \ zstd_compress_sequences.c \ zstd_compress_superblock.c \ - zstd_ddict.c \ - zstd_decompress.c \ - zstd_decompress_block.c \ zstd_double_fast.c \ zstd_fast.c \ zstd_lazy.c \ @@ -382,9 +382,16 @@ SRCS+= zfs_zstd.c \ zstd_opt.c \ zstd_preSplit.c +#zstd/decompress +SRCS+= huf_decompress.c \ + zstd_ddict.c \ + zstd_decompress_block.c \ + zstd_decompress.c + .include <bsd.kmod.mk> CFLAGS+= -include ${SRCTOP}/sys/cddl/compat/opensolaris/sys/debug_compat.h +CFLAGS+= -include ${ZINCDIR}/sys/simd_config.h CFLAGS+= -include ${ZINCDIR}/os/freebsd/spl/sys/ccompile.h CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/static_ccompile.h diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 8b5e3ffc4573..d61e2643fa5c 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -20,48 +20,11 @@ /* add_disk() returns int */ /* #undef HAVE_ADD_DISK_RET */ -/* Define if host toolchain supports AES */ -#define HAVE_AES 1 - /* Define if you have [rt] */ #define HAVE_AIO_H 1 -#ifdef __amd64__ -#ifndef RESCUE -/* Define if host toolchain supports AVX */ -#define HAVE_AVX 1 -#endif - -/* Define if host toolchain supports AVX2 */ -#define HAVE_AVX2 1 - -/* Define if host toolchain supports AVX512BW */ -#define HAVE_AVX512BW 1 - -/* Define if host toolchain supports AVX512CD */ -#define HAVE_AVX512CD 1 - -/* Define if host toolchain supports AVX512DQ */ -#define HAVE_AVX512DQ 1 - -/* Define if host toolchain supports AVX512ER */ -#define HAVE_AVX512ER 1 - -/* Define if host toolchain supports AVX512F */ -#define HAVE_AVX512F 1 - -/* Define if host toolchain supports AVX512IFMA */ -#define HAVE_AVX512IFMA 1 - -/* Define if host toolchain supports AVX512PF */ -#define HAVE_AVX512PF 1 - -/* Define if host toolchain supports AVX512VBMI */ -#define HAVE_AVX512VBMI 1 - -/* Define if host toolchain supports AVX512VL */ -#define HAVE_AVX512VL 1 -#endif +/* Define if your assembler supports .cfi_negate_ra_state. */ +/* #undef HAVE_AS_CFI_PSEUDO_OP */ /* backtrace() is available */ /* #undef HAVE_BACKTRACE */ @@ -382,6 +345,9 @@ /* inode_set_mtime_to_ts() exists in linux/fs.h */ /* #undef HAVE_INODE_SET_MTIME_TO_TS */ +/* inode_state_read_once() exists */ +/* #undef HAVE_INODE_STATE_READ_ONCE */ + /* timestamp_truncate() exists */ /* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ @@ -445,6 +411,24 @@ /* kasan_enabled() is GPL-only */ /* #undef HAVE_KASAN_ENABLED_GPL_ONLY */ +/* Define if kernel toolchain supports AES */ +/* #undef HAVE_KERNEL_AES */ + +/* Define if kernel toolchain supports AVX */ +/* #undef HAVE_KERNEL_AVX */ + +/* Define if kernel toolchain supports AVX2 */ +/* #undef HAVE_KERNEL_AVX2 */ + +/* Define if kernel toolchain supports AVX512BW */ +/* #undef HAVE_KERNEL_AVX512BW */ + +/* Define if kernel toolchain supports AVX512F */ +/* #undef HAVE_KERNEL_AVX512F */ + +/* Define if kernel toolchain supports AVX512VL */ +/* #undef HAVE_KERNEL_AVX512VL */ + /* kernel has kernel_fpu_* functions */ /* #undef HAVE_KERNEL_FPU */ @@ -463,6 +447,9 @@ /* kernel defines intptr_t */ /* #undef HAVE_KERNEL_INTPTR_T */ +/* Define if kernel toolchain supports MOVBE */ +/* #undef HAVE_KERNEL_MOVBE */ + /* kernel has kernel_neon_* functions */ /* #undef HAVE_KERNEL_NEON */ @@ -472,9 +459,39 @@ /* kernel has linux/objtool.h */ /* #undef HAVE_KERNEL_OBJTOOL_HEADER */ +/* Define if kernel toolchain supports PCLMULQDQ */ +/* #undef HAVE_KERNEL_PCLMULQDQ */ + +/* Define if kernel toolchain supports SHA512EXT */ +/* #undef HAVE_KERNEL_SHA512EXT */ + +/* Define if kernel toolchain supports SSE2 */ +/* #undef HAVE_KERNEL_SSE2 */ + +/* Define if kernel toolchain supports SSE4_1 */ +/* #undef HAVE_KERNEL_SSE4_1 */ + +/* Define if kernel toolchain supports SSSE3 */ +/* #undef HAVE_KERNEL_SSSE3 */ + /* strlcpy() exists */ /* #undef HAVE_KERNEL_STRLCPY */ +/* Define if kernel toolchain supports VAES */ +/* #undef HAVE_KERNEL_VAES */ + +/* Define if kernel toolchain supports VPCLMULQDQ */ +/* #undef HAVE_KERNEL_VPCLMULQDQ */ + +/* Define if kernel toolchain supports XSAVE */ +/* #undef HAVE_KERNEL_XSAVE */ + +/* Define if kernel toolchain supports XSAVEOPT */ +/* #undef HAVE_KERNEL_XSAVEOPT */ + +/* Define if kernel toolchain supports XSAVES */ +/* #undef HAVE_KERNEL_XSAVES */ + /* kernel has kmap_local_page */ /* #undef HAVE_KMAP_LOCAL_PAGE */ @@ -529,8 +546,8 @@ /* page_size() is available */ /* #undef HAVE_MM_PAGE_SIZE */ -/* Define if host toolchain supports MOVBE */ -#define HAVE_MOVBE 1 +/* mount_setattr() and struct mount_attr are available */ +/* #undef HAVE_MOUNT_SETATTR */ /* Define if ns_type is accessible through ns_common */ /* #undef HAVE_NS_COMMON_TYPE */ @@ -547,9 +564,6 @@ /* iops->getattr() takes a path */ /* #undef HAVE_PATH_IOPS_GETATTR */ -/* Define if host toolchain supports PCLMULQDQ */ -#define HAVE_PCLMULQDQ 1 - /* pin_user_pages_unlocked() is available */ /* #undef HAVE_PIN_USER_PAGES_UNLOCKED */ @@ -613,9 +627,6 @@ /* Define if set_default_d_op() is available */ /* #undef HAVE_SET_DEFAULT_D_OP */ -/* Define if host toolchain supports SHA512 */ -#define HAVE_SHA512EXT 1 - /* shrinker_register exists */ /* #undef HAVE_SHRINKER_REGISTER */ @@ -625,26 +636,6 @@ /* sops->free_inode() exists */ /* #undef HAVE_SOPS_FREE_INODE */ -#if defined(__amd64__) || defined(__i386__) -/* Define if host toolchain supports SSE */ -#define HAVE_SSE 1 - -/* Define if host toolchain supports SSE2 */ -#define HAVE_SSE2 1 - -/* Define if host toolchain supports SSE3 */ -#define HAVE_SSE3 1 - -/* Define if host toolchain supports SSE4.1 */ -#define HAVE_SSE4_1 1 - -/* Define if host toolchain supports SSE4.2 */ -#define HAVE_SSE4_2 1 - -/* Define if host toolchain supports SSSE3 */ -#define HAVE_SSSE3 1 -#endif - /* STACK_FRAME_NON_STANDARD is defined */ /* #undef HAVE_STACK_FRAME_NON_STANDARD */ @@ -717,6 +708,65 @@ /* i_op->tmpfile() has userns */ /* #undef HAVE_TMPFILE_USERNS */ +/* Define if host toolchain supports AES */ +#define HAVE_TOOLCHAIN_AES 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_TOOLCHAIN_AVX 1 + +/* Define if host toolchain supports AVX2 */ +#define HAVE_TOOLCHAIN_AVX2 1 +#endif + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_TOOLCHAIN_AVX512BW 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_TOOLCHAIN_AVX512F 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_TOOLCHAIN_AVX512VL 1 +#endif + +/* Define if host toolchain supports MOVBE */ +#define HAVE_TOOLCHAIN_MOVBE 1 + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_TOOLCHAIN_PCLMULQDQ 1 + +/* Define if host toolchain supports SHA512EXT */ +#define HAVE_TOOLCHAIN_SHA512EXT 1 + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE2 */ +#define HAVE_TOOLCHAIN_SSE2 1 + +/* Define if host toolchain supports SSE4_1 */ +#define HAVE_TOOLCHAIN_SSE4_1 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_TOOLCHAIN_SSSE3 1 +#endif + +#ifdef __amd64__ +/* Define if host toolchain supports VAES */ +#define HAVE_TOOLCHAIN_VAES 1 + +/* Define if host toolchain supports VPCLMULQDQ */ +#define HAVE_TOOLCHAIN_VPCLMULQDQ 1 +#endif + +/* Define if host toolchain supports XSAVE */ +#define HAVE_TOOLCHAIN_XSAVE 1 + +/* Define if host toolchain supports XSAVEOPT */ +#define HAVE_TOOLCHAIN_XSAVEOPT 1 + +/* Define if host toolchain supports XSAVES */ +#define HAVE_TOOLCHAIN_XSAVES 1 + /* totalhigh_pages() exists */ /* #undef HAVE_TOTALHIGH_PAGES */ @@ -738,11 +788,6 @@ /* iops->setattr() takes struct user_namespace* */ /* #undef HAVE_USERNS_IOPS_SETATTR */ -#ifdef __amd64__ -/* Define if host toolchain supports VAES */ -#define HAVE_VAES 1 -#endif - /* fops->clone_file_range() is available */ /* #undef HAVE_VFS_CLONE_FILE_RANGE */ @@ -782,11 +827,6 @@ /* __vmalloc page flags exists */ /* #undef HAVE_VMALLOC_PAGE_KERNEL */ -#ifdef __amd64__ -/* Define if host toolchain supports VPCLMULQDQ */ -#define HAVE_VPCLMULQDQ 1 -#endif - /* int (*writepage_t)() takes struct folio* */ /* #undef HAVE_WRITEPAGE_T_FOLIO */ @@ -805,15 +845,6 @@ /* xattr_handler->set() takes user_namespace */ /* #undef HAVE_XATTR_SET_USERNS */ -/* Define if host toolchain supports XSAVE */ -#define HAVE_XSAVE 1 - -/* Define if host toolchain supports XSAVEOPT */ -#define HAVE_XSAVEOPT 1 - -/* Define if host toolchain supports XSAVES */ -#define HAVE_XSAVES 1 - /* ZERO_PAGE() is GPL-only */ /* #undef HAVE_ZERO_PAGE_GPL_ONLY */ @@ -880,7 +911,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.99-402-FreeBSD_gf8e5af53e" +#define ZFS_META_ALIAS "zfs-2.4.99-468-FreeBSD_g3ee08abd2" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -910,7 +941,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "402-FreeBSD_gf8e5af53e" +#define ZFS_META_RELEASE "468-FreeBSD_g3ee08abd2" /* Define the project version. */ #define ZFS_META_VERSION "2.4.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 5868c6ed60e2..156d9a25fdcb 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.99-402-gf8e5af53e-dirty" +#define ZFS_META_GITREV "zfs-2.4.99-468-g3ee08abd2" |