From patchwork Wed Nov 4 15:30:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Petrilin X-Patchwork-Id: 57541 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA4CXDQB022451 for ; Wed, 4 Nov 2009 12:33:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755834AbZKDMdA (ORCPT ); Wed, 4 Nov 2009 07:33:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755849AbZKDMc7 (ORCPT ); Wed, 4 Nov 2009 07:32:59 -0500 Received: from mail.mellanox.co.il ([194.90.237.43]:34607 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755834AbZKDMc5 (ORCPT ); Wed, 4 Nov 2009 07:32:57 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from yevgenyp@mellanox.co.il) with SMTP; 4 Nov 2009 14:38:41 +0200 Received: from [10.4.12.75] ([10.4.12.75]) by mtlexch01.mtl.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 4 Nov 2009 14:33:01 +0200 Message-ID: <4AF19E23.9030005@mellanox.co.il> Date: Wed, 04 Nov 2009 17:30:43 +0200 From: Yevgeny Petrilin User-Agent: Thunderbird 2.0.0.23 (X11/20090812) MIME-Version: 1.0 To: rdreier@cisco.com CC: linux-rdma@vger.kernel.org, netdev@vger.kernel.org, liranl@mellanox.co.il, tziporet@mellanox.co.il, yevgenyp@mellanox.co.il Subject: [PATCH 06/25] mlx4_core: slave multicast support X-OriginalArrivalTime: 04 Nov 2009 12:33:01.0332 (UTC) FILETIME=[F2A4A540:01CA5D4A] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/drivers/net/mlx4/cmd.c b/drivers/net/mlx4/cmd.c index b1701d2..dd23aba 100644 --- a/drivers/net/mlx4/cmd.c +++ b/drivers/net/mlx4/cmd.c @@ -565,6 +565,7 @@ static struct mlx4_cmd_info { {MLX4_CMD_MAD_IFC, 1, 1, 0, NULL, NULL}, /* need verifier */ /* Native multicast commands are not available for guests */ + {MLX4_CMD_MCAST_ATTACH, 1, 0, 0, NULL, mlx4_MCAST_wrapper}, {MLX4_CMD_DIAG_RPRT, 0, 1, 0, NULL, NULL}, /* need verifier */ /* Ethernet specific commands */ diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c index 5ccbce9..96f09ed 100644 --- a/drivers/net/mlx4/mcg.c +++ b/drivers/net/mlx4/mcg.c @@ -146,6 +146,45 @@ static int find_mgm(struct mlx4_dev *dev, return err; } +int mlx4_MCAST_wrapper(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr, + struct mlx4_cmd_mailbox *inbox, + struct mlx4_cmd_mailbox *outbox) +{ + struct mlx4_qp qp; /* dummy for calling attach/detach */ + + qp.qpn = vhcr->in_modifier & 0xffffff; + if (vhcr->op_modifier) + return mlx4_multicast_attach(dev, &qp, inbox->buf, vhcr->in_modifier >> 31); + else + return mlx4_multicast_detach(dev, &qp, inbox->buf); +} + +static int mlx4_MCAST(struct mlx4_dev *dev, struct mlx4_qp *qp, + u8 gid[16], u8 attach, + u8 block_loopback) +{ + struct mlx4_cmd_mailbox *mailbox; + int err; + int qpn; + + if (!mlx4_is_slave(dev)) + return -EBADF; + + mailbox = mlx4_alloc_cmd_mailbox(dev); + if (IS_ERR(mailbox)) + return PTR_ERR(mailbox); + + memcpy(mailbox->buf, gid, 16); + qpn = qp->qpn; + if (attach && block_loopback) + qpn |= (1 << 31); + + err = mlx4_cmd(dev, mailbox->dma, qpn, attach, MLX4_CMD_MCAST_ATTACH, + MLX4_CMD_TIME_CLASS_A); + mlx4_free_cmd_mailbox(dev, mailbox); + return err; +} + int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], int block_mcast_loopback) { @@ -159,6 +198,9 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16], int i; int err; + if (mlx4_is_slave(dev)) + return mlx4_MCAST(dev, qp, gid, 1, block_mcast_loopback); + mailbox = mlx4_alloc_cmd_mailbox(dev); if (IS_ERR(mailbox)) return PTR_ERR(mailbox); @@ -254,6 +296,9 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16]) int i, loc; int err; + if (mlx4_is_slave(dev)) + return mlx4_MCAST(dev, qp, gid, 0, 0); + mailbox = mlx4_alloc_cmd_mailbox(dev); if (IS_ERR(mailbox)) return PTR_ERR(mailbox); diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index 91f1215..fafa293 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -507,4 +507,8 @@ void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table); int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port); int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps); +int mlx4_MCAST_wrapper(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr, + struct mlx4_cmd_mailbox *inbox, + struct mlx4_cmd_mailbox *outbox); + #endif /* MLX4_H */ diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h index dceb93f..8265843 100644 --- a/include/linux/mlx4/cmd.h +++ b/include/linux/mlx4/cmd.h @@ -123,6 +123,7 @@ enum { MLX4_CMD_ALLOC_RES = 0x50, MLX4_CMD_FREE_RES = 0x51, MLX4_CMD_GET_EVENT = 0x52, + MLX4_CMD_MCAST_ATTACH = 0x54, /* debug commands */ MLX4_CMD_QUERY_DEBUG_MSG = 0x2a,