From nobody Wed Jan 25 22:15:06 2023 X-Original-To: dev-commits-src-all@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 4P2J6z0T1vz3bbh8; Wed, 25 Jan 2023 22:15:07 +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 4P2J6y6m0Wz46c9; Wed, 25 Jan 2023 22:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674684907; 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=7bGswC6qcgGsSeyPSiuFUTQcJdsFb63fOiiYbmHh+fM=; b=DJkw9CYh/eaDEocXuTTlyuuRoFH45WS9GqMy8dCRpI1XUvaxuVZ+EpketIktPWdetgvWJR Dryi6WtF98uPLnPrEzjIrizMlTj5EG3S1N//GSfgXSqcutbcuyL8DFGejZ35+mpDUYmRKJ 1TQ+nRdhihqjC+hY3AlWr0HgdNJm7Fp9C9yCxIfQz80YgbsWcNQe5kRbUC65hk0yf5Vuhi jwNWYpJKU9H6vtpXDjsauKXhKtbEiE9QFsha9SuWtoty2e2hylhOgM5JAD7v3AM0PtoG5W EKG4cH+sI2T8TofkJO21gLGuknWgsG1gcBLMq290zjuQoYBRfiHa65yCuWKn4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674684907; 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=7bGswC6qcgGsSeyPSiuFUTQcJdsFb63fOiiYbmHh+fM=; b=Lf3EaatIQBCQhMB1wv01D6R83xZGdvHVG71yF+ddlXY6C92JbC70DMKeuVYuQbrV2s0Cul sJ/CGvNZTtMViKiamd3ZYFVOGJt6r09eaYxVl2GOUPO1qjj1h2tpKg6lHxTJ06gWcVEXR8 oTyoBt9YJ3zhSlAYqA5pu+0UZBXTsVR2gLngkcoXJ+0p3qDPobGTHleV09eIHY/OF6p0xL 1IX6vhQBZOb1PhKnaZmntquk24aDpzyVmOTf56r5fruQ41S3+CrnbKcv0k7jVDi9mkwduP 9LBLMGdhyjLerISRyRGICgO5rSmdDO2ywOCv9TcdjVFNTxhMPdoMqEGJnZjRNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674684907; a=rsa-sha256; cv=none; b=FdVqv3RGql7IwHSgyHNyeA0itWn6X8jgApFNqPCGHgwhp3DlZ8E3dioU2TbR7CmaPkyax4 Xr8CG3eZFirrNa6C8GOwH3Rsv7p/38455bpoNaNKBzG6SUUGL6yvn4mC+GrBn+FXhPh1F3 Dap6XvY68OW3w91LsAET3sMA/wW+AytAr7Uc36zhl1uvKUCfy8LKJgB3d+5mOL5jNgTl5e 7/b5DdGZNlcZtp5jR1GAVma3Kdvsu4T2k7ui2MfG4DVboiUqvjyGPyklMAImVuUPXXomBC TSoT+Tq5Tuup0AC5zNbEsMZFNAkgyzpP9Wb9F8DVrcUTBVhE+eDJiOs4J5F3/Q== 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 4P2J6y5qsdz14sr; Wed, 25 Jan 2023 22:15:06 +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 30PMF6nN064261; Wed, 25 Jan 2023 22:15:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30PMF6Ff064260; Wed, 25 Jan 2023 22:15:06 GMT (envelope-from git) Date: Wed, 25 Jan 2023 22:15:06 GMT Message-Id: <202301252215.30PMF6Ff064260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: 04cbeeb59742 - main - linuxkpi: Adds more `SZ_*` macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04cbeeb59742a9e88d838e18b84004e9bb89ca00 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N 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 AuthorDate: 2023-01-20 17:17:37 +0000 Commit: Jean-Sébastien Pédron 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