From nobody Tue Apr 29 13:56:06 2025 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 4Zn20Q6wyYz5v4bX; Tue, 29 Apr 2025 13:56:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zn20Q4Yknz45N4; Tue, 29 Apr 2025 13:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745934966; 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=SU2FY8quyToYd49uikuu4METIgIE5qk4PrvSAEce6xo=; b=Ze+tG5nFHWbEjD2JHjKPpTthgjGSmxCH+WT6d7V8BdK98gZx1QpFN1dJ2koZrPjxr44tAg LRUJ8/L/rFB0sKIMtHRB/YuSA5AA/UK6+6toz3cFZnw5n/8FSENrwe6utPMBcKiuzk8tb2 Lx7piC1HvO5DFQPtz4ub58/pRTPy2g73Cs2h4aw1ZhF1VjGAAe0sZ/m29DaDLAoeMNrG0p JSsAbbLuTGLfnaCrCUAW6JBF3vSNjAfv0D5smmZarMEd0UKCepEZQvNnZ9erBd8K+b/5la BxgfjR6wztGAJMJ/SWYbbgL4YnURL/gAzL4hVKrk5xIu0HWRAJoWspcYziyvRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745934966; a=rsa-sha256; cv=none; b=tHnH4wpj2Z0kyx+UbRMc6ULz+rLWXbA5yNEGdrkc6hv/H4TUs4/xuzHONbDJ/7+NyoJpBS RivPUxyiq36Zb2J1uWm1MybG1Bk6o+7aF6TDqmgZPHiu6pMKc13CDp/4kVvooI7eF6+Fne xOazbeaXElVUTXT+3wbTl/3/bIHDOH+sknI4KaU8SLu5iGQkWAe+7OG9p+wZyC/ogKFUzF xwDtV+FlyWVNlkIWZd8s6TCcbUkS+QWNZVbDr0+SBDAD+eP4iIL/9NPEzMCH9YQSm+k+kF VLfIH/D1BJMC7rL6Ps7xzOhZEBPWOgbk1xr+Mwj+kkA/xSf+z3DPUrRSMLyC1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745934966; 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=SU2FY8quyToYd49uikuu4METIgIE5qk4PrvSAEce6xo=; b=CBlNXu89MPDMneoM0jx+5EFpDQUCRIcJ35MV8GUhQH3fRrlSnrrv1XPlN7KgwexwVlxhdV 2KuLwWmguUNErKRlQFOQq6bC5+rWHjL1aXt0q9e8XAMD0RLZayDRMckG4DJ7SCKeg6RDVz RiS1sQbUTT6/faFY0iDOhBZcGKXdtqTjDqFTZZbAjNJzSRG0B4XAnCTPMYxdrZR0Un8Vk3 nybIxFyJzsXb7tuaDUhT7omXHjk8l55qV/5PSswCHTkRqOTrXptJIXsBLthZAlabsti6dW UNpM9wdBj23tDCq755hA76lnU+VScGW3wcQCsI0mtrbsd9LSMIbt+xusmWE4qA== 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 4Zn20Q44Ndz7Ff; Tue, 29 Apr 2025 13:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53TDu6mo003737; Tue, 29 Apr 2025 13:56:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TDu6N2003734; Tue, 29 Apr 2025 13:56:06 GMT (envelope-from git) Date: Tue, 29 Apr 2025 13:56:06 GMT Message-Id: <202504291356.53TDu6N2003734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 901256f6ea3c - main - mlx5: jiffies is unsigned long 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 901256f6ea3cda2e0951b80b9be466e1b596f7fa Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=901256f6ea3cda2e0951b80b9be466e1b596f7fa commit 901256f6ea3cda2e0951b80b9be466e1b596f7fa Author: Konstantin Belousov AuthorDate: 2025-01-27 12:12:05 +0000 Commit: Mark Johnston CommitDate: 2025-04-29 13:53:40 +0000 mlx5: jiffies is unsigned long Sponsored by: NVidia networking Differential revision: https://reviews.freebsd.org/D48878 --- sys/dev/mlx5/mlx5_core/mlx5_cmd.c | 4 ++-- sys/dev/mlx5/mlx5_core/mlx5_fw.c | 4 ++-- sys/dev/mlx5/mlx5_core/mlx5_health.c | 5 +++-- sys/dev/mlx5/mlx5_core/mlx5_main.c | 8 ++++---- sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_cmd.c b/sys/dev/mlx5/mlx5_core/mlx5_cmd.c index a961c9d7c3dd..86c721a83cb7 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_cmd.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_cmd.c @@ -247,7 +247,7 @@ static void poll_timeout(struct mlx5_cmd_work_ent *ent) { struct mlx5_core_dev *dev = container_of(ent->cmd, struct mlx5_core_dev, cmd); - int poll_end = jiffies + + long poll_end = jiffies + msecs_to_jiffies(MLX5_CMD_TIMEOUT_MSEC + 1000); u8 own; @@ -951,7 +951,7 @@ static const char *deliv_status_to_str(u8 status) static int wait_func(struct mlx5_core_dev *dev, struct mlx5_cmd_work_ent *ent) { - int timeout = msecs_to_jiffies(MLX5_CMD_TIMEOUT_MSEC); + unsigned long timeout = msecs_to_jiffies(MLX5_CMD_TIMEOUT_MSEC); int err; if (ent->polling) { diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fw.c b/sys/dev/mlx5/mlx5_core/mlx5_fw.c index b3a7ffb732f9..233bd4a38c91 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fw.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fw.c @@ -306,7 +306,7 @@ int mlx5_cmd_force_teardown_hca(struct mlx5_core_dev *dev) #define MLX5_FAST_TEARDOWN_WAIT_MS 3000 int mlx5_cmd_fast_teardown_hca(struct mlx5_core_dev *dev) { - int end, delay_ms = MLX5_FAST_TEARDOWN_WAIT_MS; + unsigned long end, delay_ms = MLX5_FAST_TEARDOWN_WAIT_MS; u32 out[MLX5_ST_SZ_DW(teardown_hca_out)] = {}; u32 in[MLX5_ST_SZ_DW(teardown_hca_in)] = {}; int state; @@ -343,7 +343,7 @@ int mlx5_cmd_fast_teardown_hca(struct mlx5_core_dev *dev) } while (!time_after(jiffies, end)); if (mlx5_get_nic_state(dev) != MLX5_NIC_IFC_DISABLED) { - mlx5_core_err(dev, "NIC IFC still %d after %ums.\n", + mlx5_core_err(dev, "NIC IFC still %d after %lums.\n", mlx5_get_nic_state(dev), delay_ms); return -EIO; } diff --git a/sys/dev/mlx5/mlx5_core/mlx5_health.c b/sys/dev/mlx5/mlx5_core/mlx5_health.c index f4049d23d75d..bedd51eb02e4 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_health.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_health.c @@ -265,7 +265,8 @@ mlx5_health_allow_reset(struct mlx5_core_dev *dev) #define MLX5_NIC_STATE_POLL_MS 5 void mlx5_enter_error_state(struct mlx5_core_dev *dev, bool force) { - int end, delay_ms = MLX5_CRDUMP_WAIT_MS; + unsigned long end; + int delay_ms = MLX5_CRDUMP_WAIT_MS; u32 fatal_error; int lock = -EBUSY; @@ -445,7 +446,7 @@ static void health_care(struct work_struct *work) spin_unlock_irqrestore(&health->wq_lock, flags); } -static int get_next_poll_jiffies(void) +static unsigned long get_next_poll_jiffies(void) { unsigned long next; diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index 2b0c9f584088..221781327b51 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -761,8 +761,8 @@ static inline int fw_initializing(struct mlx5_core_dev *dev) static int wait_fw_init(struct mlx5_core_dev *dev, u32 max_wait_mili, u32 warn_time_mili) { - int warn = jiffies + msecs_to_jiffies(warn_time_mili); - int end = jiffies + msecs_to_jiffies(max_wait_mili); + unsigned long warn = jiffies + msecs_to_jiffies(warn_time_mili); + unsigned long end = jiffies + msecs_to_jiffies(max_wait_mili); int err = 0; MPASS(max_wait_mili > warn_time_mili); @@ -774,8 +774,8 @@ static int wait_fw_init(struct mlx5_core_dev *dev, u32 max_wait_mili, } if (warn_time_mili && time_after(jiffies, warn)) { mlx5_core_warn(dev, - "Waiting for FW initialization, timeout abort in %u s\n", - (unsigned)(jiffies_to_msecs(end - warn) / 1000)); + "Waiting for FW initialization, timeout abort in %lu s\n", + (unsigned long)(jiffies_to_msecs(end - warn) / 1000)); warn = jiffies + msecs_to_jiffies(warn_time_mili); } msleep(FW_INIT_WAIT_MS); diff --git a/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c b/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c index 6207442e756f..b1798f909ee5 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c @@ -519,7 +519,7 @@ enum { s64 mlx5_wait_for_reclaim_vfs_pages(struct mlx5_core_dev *dev) { - int end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS); + unsigned long end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS); s64 prevpages = 0; s64 npages = 0; @@ -557,7 +557,7 @@ static int optimal_reclaimed_pages(void) int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev) { - int end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS); + unsigned long end = jiffies + msecs_to_jiffies(MAX_RECLAIM_TIME_MSECS); struct mlx5_fw_page *fwp; struct rb_node *p; int nclaimed = 0;