The branch main has been updated by dumbbell (ports committer):
URL:
https://cgit.FreeBSD.org/src/commit/?id=04cbeeb59742a9e88d838e18b84004e9bb89ca00
commit 04cbeeb59742a9e88d838e18b84004e9bb89ca00
Author: Jean-Sébastien Pédron <dumbb...@freebsd.org>
AuthorDate: 2023-01-20 17:17:37 +0000
Commit: Jean-Sébastien Pédron <dumbb...@freebsd.org>
CommitDate: 2023-01-25 21:50:07 +0000
linuxkpi: Adds more `SZ_*` macros
`SZ_2K` and `SZ_1G` were defined in irdma. They are removed from this
driver.
Reviewed by: manu
Approved by: manu
Differential Revision: https://reviews.freebsd.org/D38150
---
sys/compat/linuxkpi/common/include/linux/sizes.h | 14 ++++++++++++++
sys/dev/irdma/osdep.h | 2 --
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/sizes.h
b/sys/compat/linuxkpi/common/include/linux/sizes.h
index b132eedff933..4e2eee2e1b33 100644
--- a/sys/compat/linuxkpi/common/include/linux/sizes.h
+++ b/sys/compat/linuxkpi/common/include/linux/sizes.h
@@ -32,6 +32,7 @@
#define _LINUXKPI_LINUX_SIZES_H_
#define SZ_1K (1024 * 1)
+#define SZ_2K (1024 * 2)
#define SZ_4K (1024 * 4)
#define SZ_8K (1024 * 8)
#define SZ_16K (1024 * 16)
@@ -43,9 +44,22 @@
#define SZ_1M (1024 * 1024 * 1)
#define SZ_2M (1024 * 1024 * 2)
+#define SZ_4M (1024 * 1024 * 4)
#define SZ_8M (1024 * 1024 * 8)
#define SZ_16M (1024 * 1024 * 16)
#define SZ_32M (1024 * 1024 * 32)
#define SZ_64M (1024 * 1024 * 64)
+#define SZ_128M (1024 * 1024 * 128)
+#define SZ_256M (1024 * 1024 * 256)
+#define SZ_512M (1024 * 1024 * 512)
+
+#define SZ_1G (1024 * 1024 * 1024 * 1)
+#define SZ_2G (1024 * 1024 * 1024 * 2)
+#define SZ_4G (1024 * 1024 * 1024 * 4)
+#define SZ_8G (1024 * 1024 * 1024 * 8)
+#define SZ_16G (1024 * 1024 * 1024 * 16)
+#define SZ_32G (1024 * 1024 * 1024 * 32)
+
+#define SZ_64T (1024 * 1024 * 1024 * 1024 * 64)
#endif
diff --git a/sys/dev/irdma/osdep.h b/sys/dev/irdma/osdep.h
index 0bb062745ffe..9b155bb95b4a 100644
--- a/sys/dev/irdma/osdep.h
+++ b/sys/dev/irdma/osdep.h
@@ -87,8 +87,6 @@
/* a couple of linux size defines */
#define SZ_128 128
-#define SZ_2K SZ_128 * 16
-#define SZ_1G (SZ_1K * SZ_1K * SZ_1K)
#define SPEED_1000 1000
#define SPEED_10000 10000
#define SPEED_20000 20000
