From nobody Thu Feb 16 11:55:55 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 4PHYLN1Qkkz3q5cw; Thu, 16 Feb 2023 11:55:56 +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 4PHYLM5hX0z49C0; Thu, 16 Feb 2023 11:55:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548555; 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=OIe4MjYA06uu5WoPdGIcbJidvZCzfNoIqImJOfatD/I=; b=UG3z53GLZWESp/PnGV81N73v19CevWiEGMIzUh2i5LlBQKrXbdyJp9AvEQi6ju9H0txjSL 8fzYsnBHCM3LaV9rPxHbaezIMi46U6q0Q7sc7Km2Vw1uG+AkgM6zr71BvGy8AGX3JgluQs seLvQLWWi+QMd8FgUdoaPOs6r8zzfovnLmLwEIkY+JCdCMwWS6bYIsTLRYgtMAYlQ5lj1C xt79QlELnGLbOWj1QaHPZVHI5QV5qeS3PUdWRxTa2aiOo39FyCKxdu9j61T2qWTJtgJmQl PUrUJ81amCTZhcuqJUsQzU3CHHO1qAi0iR2QYkTovSQ0EYtS8TJPgRpn0wt9iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548555; 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=OIe4MjYA06uu5WoPdGIcbJidvZCzfNoIqImJOfatD/I=; b=xjek58cKSsk5LJATy390vZCJzc79aEWWiG2PeV2zOKxwDWXRn8vev3QnETY/wcUj+2qmKi tUQJW6XQlZmnJyWNSPwvDGNimBmUmoyHmxGbN5fVOZCWH54EPy3aaW/rjCLhbPykqjVMlm vp/0SGxKLu/t6j1th8Pggwl9u47UmPIl6Bs4NThO2iX8WhLdBJp4I/TprbF7tHNMmMBS8+ hr/FT15bpu+Fdn5nd0/hQk2Ug/GrNZ3sNMHBOvEbmPeL2j7jUZPLRP3f8fep3H3U/WVrEo 6TZ+kwoBB6+9ELRdA22aERddEKh/sjWQGHe9Aa1PxRoHUYhohSevDHtH8LRBTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676548555; a=rsa-sha256; cv=none; b=ItL9WF6DmQNwC4vWcvUJRIxJQfN3pgdwVaSfzbVtPDit7SU0ZdR6G8t+wIX3eoRj+EhOt7 EZdJSnsusDSeaK6HYyE01jeGDpSzy/HFEQZWsyulT04itELEfDVxJ4qwy5c5YaZqNkjUK3 I280yQPBmWFUDNIpSVoHtRyttOyeZGFRcWKv8YBW2rc36H3EECQbQ7jFQqML+578MlYsOL ewiO3GppY0SIKnnoIoxbWXgoIst6oYWpwuMu9iTmD95+E6rMSEr9gkqjl1tLY0/xcmL+Xm DZh3PW1C5Pd7xY7qIC9wdpwXiAl9Rmf2lyoh4Wfad2sHnhEguC1G8QQd8YZ7cg== 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 4PHYLM4Bz7z13H4; Thu, 16 Feb 2023 11:55:55 +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 31GBtt1o055307; Thu, 16 Feb 2023 11:55:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GBttNv055306; Thu, 16 Feb 2023 11:55:55 GMT (envelope-from git) Date: Thu, 16 Feb 2023 11:55:55 GMT Message-Id: <202302161155.31GBttNv055306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: 00ccfc51f72e - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 00ccfc51f72eec7c801b77c7a142e7b9de0e9ed7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=00ccfc51f72eec7c801b77c7a142e7b9de0e9ed7 commit 00ccfc51f72eec7c801b77c7a142e7b9de0e9ed7 Author: Jean-Sébastien Pédron AuthorDate: 2023-01-20 17:17:37 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-16 11:55:14 +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 (cherry picked from commit 04cbeeb59742a9e88d838e18b84004e9bb89ca00) --- 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 5cae2b9fdc33..72c09bf2b452 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