| Message ID | 20170522164907.22915-7-romain.perier@collabora.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
On Mon, May 22, 2017 at 06:48:58PM +0200, Romain Perier wrote: > 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: Romain Perier <romain.perier@collabora.com> > Reviewed-by: Peter Senna Tschudin <peter.senna@collabora.com> > Acked-by: Doug Ledford <dledford@redhat.com> > Tested-by: Doug Ledford <dledford@redhat.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 ++++++----- > include/linux/mlx5/driver.h | 2 +- > 2 files changed, 7 insertions(+), 6 deletions(-) > Who is supposed to merge this patch series? Acked-by: Leon Romanovsky <leonro@mellanox.com>
Hello, Le 23/05/2017 à 09:27, Leon Romanovsky a écrit : > On Mon, May 22, 2017 at 06:48:58PM +0200, Romain Perier wrote: >> 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: Romain Perier <romain.perier@collabora.com> >> Reviewed-by: Peter Senna Tschudin <peter.senna@collabora.com> >> Acked-by: Doug Ledford <dledford@redhat.com> >> Tested-by: Doug Ledford <dledford@redhat.com> >> --- >> drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 ++++++----- >> include/linux/mlx5/driver.h | 2 +- >> 2 files changed, 7 insertions(+), 6 deletions(-) >> > Who is supposed to merge this patch series? > > Acked-by: Leon Romanovsky <leonro@mellanox.com> Each maintainer of the corresponding subsystem, can take a patch, I guess. No ? Romain
On Tue, May 23, 2017 at 10:53:36AM +0200, Romain Perier wrote: > Hello, > > > Le 23/05/2017 à 09:27, Leon Romanovsky a écrit : > > On Mon, May 22, 2017 at 06:48:58PM +0200, Romain Perier wrote: > >> 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: Romain Perier <romain.perier@collabora.com> > >> Reviewed-by: Peter Senna Tschudin <peter.senna@collabora.com> > >> Acked-by: Doug Ledford <dledford@redhat.com> > >> Tested-by: Doug Ledford <dledford@redhat.com> > >> --- > >> drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 ++++++----- > >> include/linux/mlx5/driver.h | 2 +- > >> 2 files changed, 7 insertions(+), 6 deletions(-) > >> > > Who is supposed to merge this patch series? > > > > Acked-by: Leon Romanovsky <leonro@mellanox.com> > Each maintainer of the corresponding subsystem, can take a patch, I > guess. No ? I wonder if they know that. Dave, Do you want us to resubmit mlx4/mlx5 patches as part of our general series, or do you prefer to grab them from this patch series? Thanks > > Romain
From: Romain Perier <romain.perier@collabora.com> Date: Tue, 23 May 2017 10:53:36 +0200 > Hello, > > > Le 23/05/2017 à 09:27, Leon Romanovsky a écrit : >> On Mon, May 22, 2017 at 06:48:58PM +0200, Romain Perier wrote: >>> 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: Romain Perier <romain.perier@collabora.com> >>> Reviewed-by: Peter Senna Tschudin <peter.senna@collabora.com> >>> Acked-by: Doug Ledford <dledford@redhat.com> >>> Tested-by: Doug Ledford <dledford@redhat.com> >>> --- >>> drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 ++++++----- >>> include/linux/mlx5/driver.h | 2 +- >>> 2 files changed, 7 insertions(+), 6 deletions(-) >>> >> Who is supposed to merge this patch series? >> >> Acked-by: Leon Romanovsky <leonro@mellanox.com> > Each maintainer of the corresponding subsystem, can take a patch, I > guess. No ? It might be easier to accumulate acks and you submit them as a series, in my opinion.
Hello, Le 23/05/2017 à 17:26, David Miller a écrit : > From: Romain Perier <romain.perier@collabora.com> > Date: Tue, 23 May 2017 10:53:36 +0200 > >> Hello, >> >> >> Le 23/05/2017 à 09:27, Leon Romanovsky a écrit : >>> On Mon, May 22, 2017 at 06:48:58PM +0200, Romain Perier wrote: >>>> 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: Romain Perier <romain.perier@collabora.com> >>>> Reviewed-by: Peter Senna Tschudin <peter.senna@collabora.com> >>>> Acked-by: Doug Ledford <dledford@redhat.com> >>>> Tested-by: Doug Ledford <dledford@redhat.com> >>>> --- >>>> drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 ++++++----- >>>> include/linux/mlx5/driver.h | 2 +- >>>> 2 files changed, 7 insertions(+), 6 deletions(-) >>>> >>> Who is supposed to merge this patch series? >>> >>> Acked-by: Leon Romanovsky <leonro@mellanox.com> >> Each maintainer of the corresponding subsystem, can take a patch, I >> guess. No ? > It might be easier to accumulate acks and you submit them as a series, > in my opinion. That's what I did already, no ? Romain
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c index 5bdaf3d545b2..aae7d9207ff3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c @@ -1069,7 +1069,7 @@ static struct mlx5_cmd_mailbox *alloc_cmd_box(struct mlx5_core_dev *dev, if (!mailbox) return ERR_PTR(-ENOMEM); - mailbox->buf = pci_pool_zalloc(dev->cmd.pool, flags, + mailbox->buf = dma_pool_zalloc(dev->cmd.pool, flags, &mailbox->dma); if (!mailbox->buf) { mlx5_core_dbg(dev, "failed allocation\n"); @@ -1084,7 +1084,7 @@ static struct mlx5_cmd_mailbox *alloc_cmd_box(struct mlx5_core_dev *dev, static void free_cmd_box(struct mlx5_core_dev *dev, 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); } @@ -1704,7 +1704,8 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 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) return -ENOMEM; @@ -1794,7 +1795,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) free_cmd_page(dev, cmd); err_free_pool: - pci_pool_destroy(cmd->pool); + dma_pool_destroy(cmd->pool); return err; } @@ -1808,6 +1809,6 @@ void mlx5_cmd_cleanup(struct mlx5_core_dev *dev) destroy_workqueue(cmd->wq); destroy_msg_cache(dev); free_cmd_page(dev, cmd); - pci_pool_destroy(cmd->pool); + dma_pool_destroy(cmd->pool); } EXPORT_SYMBOL(mlx5_cmd_cleanup); diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index bcdf739ee41a..6b35111a74a1 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -284,7 +284,7 @@ struct mlx5_cmd { struct semaphore pages_sem; int mode; struct mlx5_cmd_work_ent *ent_arr[MLX5_MAX_COMMANDS]; - struct pci_pool *pool; + struct dma_pool *pool; struct mlx5_cmd_debug dbg; struct cmd_msg_cache cache[MLX5_NUM_COMMAND_CACHES]; int checksum_disabled;