Page MenuHomeFreeBSD
Files F115812341

D48878.diff
No OneTemporary
Actions

D48878.diff
View Options

diff --git a/sys/dev/mlx5/mlx5_core/mlx5_cmd.c b/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
--- a/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
@@ -247,7 +247,7 @@
{
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;
@@ -950,7 +950,7 @@
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
--- a/sys/dev/mlx5/mlx5_core/mlx5_fw.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_fw.c
@@ -306,7 +306,7 @@
#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 @@
} 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
--- a/sys/dev/mlx5/mlx5_core/mlx5_health.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_health.c
@@ -265,7 +265,8 @@
#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 @@
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
--- a/sys/dev/mlx5/mlx5_core/mlx5_main.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c
@@ -761,8 +761,8 @@
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 @@
}
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
--- a/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c
@@ -519,7 +519,7 @@
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 @@
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;
diff --git a/sys/ofed/drivers/infiniband/core/ib_addr.c b/sys/ofed/drivers/infiniband/core/ib_addr.c
--- a/sys/ofed/drivers/infiniband/core/ib_addr.c
+++ b/sys/ofed/drivers/infiniband/core/ib_addr.c
@@ -65,7 +65,7 @@
void *context;
void (*callback)(int status, struct sockaddr *src_addr,
struct rdma_dev_addr *addr, void *context);
- int timeout;
+ unsigned long timeout;
int status;
};
@@ -210,9 +210,9 @@
}
EXPORT_SYMBOL(rdma_translate_ip);
-static void set_timeout(int time)
+static void set_timeout(unsigned long time)
{
- int delay; /* under FreeBSD ticks are 32-bit */
+ unsigned long delay;
delay = time - jiffies;
if (delay <= 0)
diff --git a/sys/ofed/drivers/infiniband/core/ib_sysfs.c b/sys/ofed/drivers/infiniband/core/ib_sysfs.c
--- a/sys/ofed/drivers/infiniband/core/ib_sysfs.c
+++ b/sys/ofed/drivers/infiniband/core/ib_sysfs.c
@@ -874,7 +874,7 @@
struct hw_stats_attribute *hsa;
struct rdma_hw_stats *stats;
int msecs;
- int jiffies;
+ unsigned long jiffies;
int ret;
ret = kstrtoint(buf, 10, &msecs);

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 30, 12:39 AM (8 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17848834
Default Alt Text
D48878.diff (4 KB)

Event Timeline