diff options
author | Shani Michaeli <shanim@mellanox.com> | 2013-02-06 11:19:14 -0500 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2013-02-25 13:44:32 -0500 |
commit | 804d6a89a5c0b076317966bcbcd7a63d42241831 (patch) | |
tree | 07360d8b8c6f099bfc5007b951844a133d4c43bd /drivers/net/ethernet/mellanox | |
parent | e448834e3545e02789897ab68905220aea39cd40 (diff) |
mlx4: Implement memory windows allocation and deallocation
Implement MW allocation and deallocation in mlx4_core and mlx4_ib.
Pass down the enable bind flag when registering memory regions.
Signed-off-by: Haggai Eran <haggaie@mellanox.com>
Signed-off-by: Shani Michaeli <shanim@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mr.c | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c index 5e785bdcc694..602ca9bf78e4 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mr.c +++ b/drivers/net/ethernet/mellanox/mlx4/mr.c | |||
@@ -654,6 +654,101 @@ int mlx4_buf_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt, | |||
654 | } | 654 | } |
655 | EXPORT_SYMBOL_GPL(mlx4_buf_write_mtt); | 655 | EXPORT_SYMBOL_GPL(mlx4_buf_write_mtt); |
656 | 656 | ||
657 | int mlx4_mw_alloc(struct mlx4_dev *dev, u32 pd, enum mlx4_mw_type type, | ||
658 | struct mlx4_mw *mw) | ||
659 | { | ||
660 | u32 index; | ||
661 | |||
662 | if ((type == MLX4_MW_TYPE_1 && | ||
663 | !(dev->caps.flags & MLX4_DEV_CAP_FLAG_MEM_WINDOW)) || | ||
664 | (type == MLX4_MW_TYPE_2 && | ||
665 | !(dev->caps.bmme_flags & MLX4_BMME_FLAG_TYPE_2_WIN))) | ||
666 | return -ENOTSUPP; | ||
667 | |||
668 | index = mlx4_mpt_reserve(dev); | ||
669 | if (index == -1) | ||
670 | return -ENOMEM; | ||
671 | |||
672 | mw->key = hw_index_to_key(index); | ||
673 | mw->pd = pd; | ||
674 | mw->type = type; | ||
675 | mw->enabled = MLX4_MPT_DISABLED; | ||
676 | |||
677 | return 0; | ||
678 | } | ||
679 | EXPORT_SYMBOL_GPL(mlx4_mw_alloc); | ||
680 | |||
681 | int mlx4_mw_enable(struct mlx4_dev *dev, struct mlx4_mw *mw) | ||
682 | { | ||
683 | struct mlx4_cmd_mailbox *mailbox; | ||
684 | struct mlx4_mpt_entry *mpt_entry; | ||
685 | int err; | ||
686 | |||
687 | err = mlx4_mpt_alloc_icm(dev, key_to_hw_index(mw->key)); | ||
688 | if (err) | ||
689 | return err; | ||
690 | |||
691 | mailbox = mlx4_alloc_cmd_mailbox(dev); | ||
692 | if (IS_ERR(mailbox)) { | ||
693 | err = PTR_ERR(mailbox); | ||
694 | goto err_table; | ||
695 | } | ||
696 | mpt_entry = mailbox->buf; | ||
697 | |||
698 | memset(mpt_entry, 0, sizeof(*mpt_entry)); | ||
699 | |||
700 | /* Note that the MLX4_MPT_FLAG_REGION bit in mpt_entry->flags is turned | ||
701 | * off, thus creating a memory window and not a memory region. | ||
702 | */ | ||
703 | mpt_entry->key = cpu_to_be32(key_to_hw_index(mw->key)); | ||
704 | mpt_entry->pd_flags = cpu_to_be32(mw->pd); | ||
705 | if (mw->type == MLX4_MW_TYPE_2) { | ||
706 | mpt_entry->flags |= cpu_to_be32(MLX4_MPT_FLAG_FREE); | ||
707 | mpt_entry->qpn = cpu_to_be32(MLX4_MPT_QP_FLAG_BOUND_QP); | ||
708 | mpt_entry->pd_flags |= cpu_to_be32(MLX4_MPT_PD_FLAG_EN_INV); | ||
709 | } | ||
710 | |||
711 | err = mlx4_SW2HW_MPT(dev, mailbox, | ||
712 | key_to_hw_index(mw->key) & | ||
713 | (dev->caps.num_mpts - 1)); | ||
714 | if (err) { | ||
715 | mlx4_warn(dev, "SW2HW_MPT failed (%d)\n", err); | ||
716 | goto err_cmd; | ||
717 | } | ||
718 | mw->enabled = MLX4_MPT_EN_HW; | ||
719 | |||
720 | mlx4_free_cmd_mailbox(dev, mailbox); | ||
721 | |||
722 | return 0; | ||
723 | |||
724 | err_cmd: | ||
725 | mlx4_free_cmd_mailbox(dev, mailbox); | ||
726 | |||
727 | err_table: | ||
728 | mlx4_mpt_free_icm(dev, key_to_hw_index(mw->key)); | ||
729 | return err; | ||
730 | } | ||
731 | EXPORT_SYMBOL_GPL(mlx4_mw_enable); | ||
732 | |||
733 | void mlx4_mw_free(struct mlx4_dev *dev, struct mlx4_mw *mw) | ||
734 | { | ||
735 | int err; | ||
736 | |||
737 | if (mw->enabled == MLX4_MPT_EN_HW) { | ||
738 | err = mlx4_HW2SW_MPT(dev, NULL, | ||
739 | key_to_hw_index(mw->key) & | ||
740 | (dev->caps.num_mpts - 1)); | ||
741 | if (err) | ||
742 | mlx4_warn(dev, "xxx HW2SW_MPT failed (%d)\n", err); | ||
743 | |||
744 | mw->enabled = MLX4_MPT_EN_SW; | ||
745 | } | ||
746 | if (mw->enabled) | ||
747 | mlx4_mpt_free_icm(dev, key_to_hw_index(mw->key)); | ||
748 | mlx4_mpt_release(dev, key_to_hw_index(mw->key)); | ||
749 | } | ||
750 | EXPORT_SYMBOL_GPL(mlx4_mw_free); | ||
751 | |||
657 | int mlx4_init_mr_table(struct mlx4_dev *dev) | 752 | int mlx4_init_mr_table(struct mlx4_dev *dev) |
658 | { | 753 | { |
659 | struct mlx4_priv *priv = mlx4_priv(dev); | 754 | struct mlx4_priv *priv = mlx4_priv(dev); |