Commit 18c90df9 authored by Romain Perier's avatar Romain Perier Committed by Doug Ledford

mlx5: Replace PCI pool old API

The PCI pool API is deprecated. This commit replaces the PCI pool old
API by the appropriate function with the DMA pool API.
Signed-off-by: default avatarRomain Perier <romain.perier@collabora.com>
Reviewed-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Acked-by: default avatarDoug Ledford <dledford@redhat.com>
Tested-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent b9f761aa
...@@ -1095,7 +1095,7 @@ static struct mlx5_cmd_mailbox *alloc_cmd_box(struct mlx5_core_dev *dev, ...@@ -1095,7 +1095,7 @@ static struct mlx5_cmd_mailbox *alloc_cmd_box(struct mlx5_core_dev *dev,
if (!mailbox) if (!mailbox)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
mailbox->buf = pci_pool_zalloc(dev->cmd.pool, flags, mailbox->buf = dma_pool_zalloc(dev->cmd.pool, flags,
&mailbox->dma); &mailbox->dma);
if (!mailbox->buf) { if (!mailbox->buf) {
mlx5_core_dbg(dev, "failed allocation\n"); mlx5_core_dbg(dev, "failed allocation\n");
...@@ -1110,7 +1110,7 @@ static struct mlx5_cmd_mailbox *alloc_cmd_box(struct mlx5_core_dev *dev, ...@@ -1110,7 +1110,7 @@ static struct mlx5_cmd_mailbox *alloc_cmd_box(struct mlx5_core_dev *dev,
static void free_cmd_box(struct mlx5_core_dev *dev, static void free_cmd_box(struct mlx5_core_dev *dev,
struct mlx5_cmd_mailbox *mailbox) struct mlx5_cmd_mailbox *mailbox)
{ {
pci_pool_free(dev->cmd.pool, mailbox->buf, mailbox->dma); dma_pool_free(dev->cmd.pool, mailbox->buf, mailbox->dma);
kfree(mailbox); kfree(mailbox);
} }
...@@ -1759,7 +1759,8 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) ...@@ -1759,7 +1759,8 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)
return -EINVAL; return -EINVAL;
} }
cmd->pool = pci_pool_create("mlx5_cmd", dev->pdev, size, align, 0); cmd->pool = dma_pool_create("mlx5_cmd", &dev->pdev->dev, size, align,
0);
if (!cmd->pool) if (!cmd->pool)
return -ENOMEM; return -ENOMEM;
...@@ -1849,7 +1850,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) ...@@ -1849,7 +1850,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev)
free_cmd_page(dev, cmd); free_cmd_page(dev, cmd);
err_free_pool: err_free_pool:
pci_pool_destroy(cmd->pool); dma_pool_destroy(cmd->pool);
return err; return err;
} }
...@@ -1863,6 +1864,6 @@ void mlx5_cmd_cleanup(struct mlx5_core_dev *dev) ...@@ -1863,6 +1864,6 @@ void mlx5_cmd_cleanup(struct mlx5_core_dev *dev)
destroy_workqueue(cmd->wq); destroy_workqueue(cmd->wq);
destroy_msg_cache(dev); destroy_msg_cache(dev);
free_cmd_page(dev, cmd); free_cmd_page(dev, cmd);
pci_pool_destroy(cmd->pool); dma_pool_destroy(cmd->pool);
} }
EXPORT_SYMBOL(mlx5_cmd_cleanup); EXPORT_SYMBOL(mlx5_cmd_cleanup);
...@@ -299,7 +299,7 @@ struct mlx5_cmd { ...@@ -299,7 +299,7 @@ struct mlx5_cmd {
struct semaphore pages_sem; struct semaphore pages_sem;
int mode; int mode;
struct mlx5_cmd_work_ent *ent_arr[MLX5_MAX_COMMANDS]; struct mlx5_cmd_work_ent *ent_arr[MLX5_MAX_COMMANDS];
struct pci_pool *pool; struct dma_pool *pool;
struct mlx5_cmd_debug dbg; struct mlx5_cmd_debug dbg;
struct cmd_msg_cache cache[MLX5_NUM_COMMAND_CACHES]; struct cmd_msg_cache cache[MLX5_NUM_COMMAND_CACHES];
int checksum_disabled; int checksum_disabled;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment